Publish

- @0x/contracts-integrations@2.2.1 - 0x.js@9.0.5 - @0x/asset-swapper@4.0.1 - @0x/instant@1.0.42
Updated CHANGELOGS & MD docs
2020-01-23 11:58:27 +10:00 · 2020-01-23 11:58:10 +10:00 · 2020-01-22 18:22:56 -05:00 · 2020-01-22 18:56:10 +10:00
13 changed files with 636 additions and 596 deletions
--- a/contracts/integrations/CHANGELOG.json
+++ b/contracts/integrations/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1579744659,
+        "version": "2.2.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "version": "2.2.0",
        "changes": [
--- a/contracts/integrations/CHANGELOG.md
+++ b/contracts/integrations/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v2.2.1 - _January 23, 2020_
+
+    * Dependencies updated
+
 ## v2.2.0 - _January 22, 2020_

    * Add mainnet contract wrapper `callAsync()` revert behavior tests. (#2433)
--- a/contracts/integrations/package.json
+++ b/contracts/integrations/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/contracts-integrations",
-    "version": "2.2.0",
+    "version": "2.2.1",
    "engines": {
        "node": ">=6.12"
    },
@@ -89,7 +89,7 @@
        "typescript": "3.0.1"
    },
    "dependencies": {
-        "@0x/asset-swapper": "^4.0.0",
+        "@0x/asset-swapper": "^4.0.1",
        "@0x/base-contract": "^6.1.0",
        "@0x/contracts-asset-proxy": "^3.1.1",
        "@0x/contracts-erc1155": "^2.0.4",
--- a/packages/0x.js/CHANGELOG.json
+++ b/packages/0x.js/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "timestamp": 1579744659,
+        "version": "9.0.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
    {
        "version": "9.0.4",
        "changes": [
--- a/packages/0x.js/CHANGELOG.md
+++ b/packages/0x.js/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v9.0.5 - _January 23, 2020_
+
+    * Dependencies updated
+
 ## v9.0.4 - _January 22, 2020_

    * Update exports. (#2432)
--- a/packages/0x.js/docs/reference.mdx
+++ b/packages/0x.js/docs/reference.mdx
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -1,6 +1,6 @@
 {
    "name": "0x.js",
-    "version": "9.0.4",
+    "version": "9.0.5",
    "engines": {
        "node": ">=6.12"
    },
@@ -79,7 +79,7 @@
    "dependencies": {
        "@0x/abi-gen-wrappers": "^5.4.0-beta.3",
        "@0x/assert": "^3.0.4",
-        "@0x/asset-swapper": "^4.0.0",
+        "@0x/asset-swapper": "^4.0.1",
        "@0x/base-contract": "^6.1.0",
        "@0x/contract-wrappers": "^13.4.0",
        "@0x/order-utils": "^10.1.1",
--- a/packages/asset-swapper/CHANGELOG.json
+++ b/packages/asset-swapper/CHANGELOG.json
@@ -1,4 +1,14 @@
 [
+    {
+        "version": "4.0.1",
+        "changes": [
+            {
+                "note": "Fix underestimated protocol fee in worst case quote.",
+                "pr": 2452
+            }
+        ],
+        "timestamp": 1579744659
+    },
    {
        "version": "4.0.0",
        "changes": [
--- a/packages/asset-swapper/CHANGELOG.md
+++ b/packages/asset-swapper/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v4.0.1 - _January 23, 2020_
+
+    * Fix underestimated protocol fee in worst case quote. (#2452)
+
 ## v4.0.0 - _January 22, 2020_

    * Upgrade to new `Forwarder` contract with flat affiliate fees. (#2432)
--- a/packages/asset-swapper/package.json
+++ b/packages/asset-swapper/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/asset-swapper",
-    "version": "4.0.0",
+    "version": "4.0.1",
    "engines": {
        "node": ">=6.12"
    },
--- a/packages/asset-swapper/src/utils/swap_quote_calculator.ts
+++ b/packages/asset-swapper/src/utils/swap_quote_calculator.ts
@@ -298,7 +298,7 @@ export class SwapQuoteCalculator {
            filledOrders.push(order);
        }
        const protocolFeeInWeiAmount = await this._protocolFeeUtils.calculateWorstCaseProtocolFeeAsync(
-            filledOrders,
+            !worstCase ? filledOrders : orders,
            gasPrice,
        );
        return {
@@ -387,7 +387,7 @@ export class SwapQuoteCalculator {
            filledOrders.push(order);
        }
        const protocolFeeInWeiAmount = await this._protocolFeeUtils.calculateWorstCaseProtocolFeeAsync(
-            filledOrders,
+            !worstCase ? filledOrders : orders,
            gasPrice,
        );
        return {
--- a/packages/asset-swapper/test/swap_quote_calculator_test.ts
+++ b/packages/asset-swapper/test/swap_quote_calculator_test.ts
@@ -312,7 +312,7 @@ describe('swapQuoteCalculator', () => {
                takerAssetAmount: assetSellAmount,
                totalTakerAssetAmount: assetSellAmount,
                makerAssetAmount: baseUnitAmount(1.6),
-                protocolFeeInWeiAmount: baseUnitAmount(15, 4),
+                protocolFeeInWeiAmount: baseUnitAmount(45, 4),
            });
        });
        it('calculates a correct swapQuote with no slippage (takerAsset denominated fee orders)', async () => {
@@ -391,7 +391,7 @@ describe('swapQuoteCalculator', () => {
                takerAssetAmount: assetSellAmount.minus(baseUnitAmount(1.2)),
                totalTakerAssetAmount: assetSellAmount,
                makerAssetAmount: baseUnitAmount(1.8),
-                protocolFeeInWeiAmount: baseUnitAmount(15, 4),
+                protocolFeeInWeiAmount: baseUnitAmount(30, 4),
            });
        });
        it('calculates a correct swapQuote with no slippage (makerAsset denominated fee orders)', async () => {
@@ -472,7 +472,7 @@ describe('swapQuoteCalculator', () => {
                takerAssetAmount: assetSellAmount.minus(baseUnitAmount(2)),
                totalTakerAssetAmount: assetSellAmount,
                makerAssetAmount: baseUnitAmount(0.8),
-                protocolFeeInWeiAmount: baseUnitAmount(15, 4),
+                protocolFeeInWeiAmount: baseUnitAmount(45, 4),
            });
        });
    });
--- a/packages/instant/package.json
+++ b/packages/instant/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/instant",
-    "version": "1.0.41",
+    "version": "1.0.42",
    "engines": {
        "node": ">=6.12"
    },
@@ -44,7 +44,7 @@
    "homepage": "https://github.com/0xProject/0x-monorepo/packages/instant/README.md",
    "dependencies": {
        "@0x/assert": "^3.0.4",
-        "@0x/asset-swapper": "^4.0.0",
+        "@0x/asset-swapper": "^4.0.1",
        "@0x/contract-wrappers": "^13.4.0",
        "@0x/json-schemas": "^5.0.4",
        "@0x/subproviders": "^6.0.4",
Author	SHA1	Message	Date
Jacob Evans	1ab7664a60	Publish - @0x/contracts-integrations@2.2.1 - 0x.js@9.0.5 - @0x/asset-swapper@4.0.1 - @0x/instant@1.0.42	2020-01-23 11:58:27 +10:00
Jacob Evans	1be46ffb7e	Updated CHANGELOGS & MD docs	2020-01-23 11:58:10 +10:00
Lawrence Forman	6ca52aed0d	`@0x/asset-swapper`: Fix understimated protocol fee in worst case quote. (#2452 )	2020-01-22 18:22:56 -05:00
Jacob Evans	74e20970e2	Create docs folder for sol-doc	2020-01-22 18:56:10 +10:00