Publish

- @0x/asset-swapper@16.49.2
Updated CHANGELOGS & MD docs
2022-01-31 18:24:47 +00:00 · 2022-01-31 18:24:44 +00:00 · 2022-01-31 12:51:17 -05:00 · 2022-01-31 07:20:03 +00:00 · 2022-01-31 07:19:59 +00:00 · 2022-01-31 17:01:17 +10:00
5 changed files with 46 additions and 9 deletions
--- a/packages/asset-swapper/CHANGELOG.json
+++ b/packages/asset-swapper/CHANGELOG.json
@@ -1,4 +1,24 @@
 [
+    {
+        "version": "16.49.2",
+        "changes": [
+            {
+                "note": "Fix ABI encoding error with two hop buys due to applying slippage to uint(-1) values",
+                "pr": 410
+            }
+        ],
+        "timestamp": 1643653482
+    },
+    {
+        "version": "16.49.1",
+        "changes": [
+            {
+                "note": "Fix WorstCaseQuoteInfo encoding bug",
+                "pr": 402
+            }
+        ],
+        "timestamp": 1643613597
+    },
    {
        "version": "16.49.0",
        "changes": [
--- a/packages/asset-swapper/CHANGELOG.md
+++ b/packages/asset-swapper/CHANGELOG.md
@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.

 CHANGELOG

+## v16.49.2 - _January 31, 2022_
+
+    * Fix ABI encoding error with two hop buys due to applying slippage to uint(-1) values (#410)
+
+## v16.49.1 - _January 31, 2022_
+
+    * Fix WorstCaseQuoteInfo encoding bug (#402)
+
 ## v16.49.0 - _January 28, 2022_

    * Add more curve pools (#409)
--- a/packages/asset-swapper/package.json
+++ b/packages/asset-swapper/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@0x/asset-swapper",
-    "version": "16.49.0",
+    "version": "16.49.2",
    "engines": {
        "node": ">=6.12"
    },
--- a/packages/asset-swapper/src/quote_consumers/exchange_proxy_swap_quote_consumer.ts
+++ b/packages/asset-swapper/src/quote_consumers/exchange_proxy_swap_quote_consumer.ts
@@ -701,8 +701,16 @@ function slipNonNativeOrders(quote: MarketSellSwapQuote | MarketBuySwapQuote): O
        return {
            ...o,
            ...(quote.type === MarketOperation.Sell
-                ? { makerAmount: o.makerAmount.times(1 - slippage).integerValue(BigNumber.ROUND_DOWN) }
-                : { takerAmount: o.takerAmount.times(1 + slippage).integerValue(BigNumber.ROUND_UP) }),
+                ? {
+                      makerAmount: o.makerAmount.eq(MAX_UINT256)
+                          ? MAX_UINT256
+                          : o.makerAmount.times(1 - slippage).integerValue(BigNumber.ROUND_DOWN),
+                  }
+                : {
+                      takerAmount: o.takerAmount.eq(MAX_UINT256)
+                          ? MAX_UINT256
+                          : o.takerAmount.times(1 + slippage).integerValue(BigNumber.ROUND_UP),
+                  }),
        };
    });
 }
--- a/packages/asset-swapper/src/swap_quoter.ts
+++ b/packages/asset-swapper/src/swap_quoter.ts
@@ -599,24 +599,25 @@ function calculateTwoHopQuoteInfo(
            secondHopSource: _.pick(secondHopFill, 'source', 'fillData'),
        }),
    ).toNumber();
+    const isSell = operation === MarketOperation.Sell;
    return {
        bestCaseQuoteInfo: {
-            makerAmount: operation === MarketOperation.Sell ? secondHopFill.output : secondHopFill.input,
-            takerAmount: operation === MarketOperation.Sell ? firstHopFill.input : firstHopFill.output,
-            totalTakerAmount: operation === MarketOperation.Sell ? firstHopFill.input : firstHopFill.output,
+            makerAmount: isSell ? secondHopFill.output : secondHopFill.input,
+            takerAmount: isSell ? firstHopFill.input : firstHopFill.output,
+            totalTakerAmount: isSell ? firstHopFill.input : firstHopFill.output,
            feeTakerTokenAmount: constants.ZERO_AMOUNT,
            protocolFeeInWeiAmount: constants.ZERO_AMOUNT,
            gas,
        },
        // TODO jacob consolidate this with quote simulation worstCase
        worstCaseQuoteInfo: {
-            makerAmount: MarketOperation.Sell
+            makerAmount: isSell
                ? secondHopOrder.makerAmount.times(1 - slippage).integerValue()
                : secondHopOrder.makerAmount,
-            takerAmount: MarketOperation.Sell
+            takerAmount: isSell
                ? firstHopOrder.takerAmount
                : firstHopOrder.takerAmount.times(1 + slippage).integerValue(),
-            totalTakerAmount: MarketOperation.Sell
+            totalTakerAmount: isSell
                ? firstHopOrder.takerAmount
                : firstHopOrder.takerAmount.times(1 + slippage).integerValue(),
            feeTakerTokenAmount: constants.ZERO_AMOUNT,
Author	SHA1	Message	Date
Github Actions	0f701f42d3	Publish - @0x/asset-swapper@16.49.2	2022-01-31 18:24:47 +00:00
Github Actions	3e3e82d3f7	Updated CHANGELOGS & MD docs	2022-01-31 18:24:44 +00:00
Lawrence Forman	c57bf86273	Fix ABI encoding error with two hop buys due to applying slippage to uint(-1) values (#410 ) Co-authored-by: Lawrence Forman <me@merklejerk.com>	2022-01-31 12:51:17 -05:00
Github Actions	f470d282ee	Publish - @0x/asset-swapper@16.49.1	2022-01-31 07:20:03 +00:00
Github Actions	b8a2526da5	Updated CHANGELOGS & MD docs	2022-01-31 07:19:59 +00:00
Jacob Evans	97575bbde9	fix: worstCaseQuoteInfo calculating buys incorrectly [TKR-296] (#402 ) * fix: WorstCaseQuoteInfo buy encoding * CHANGELOG	2022-01-31 17:01:17 +10:00