Remove silly miscalculation

dekz · dekz · commit 549c7b47cea7 · 2023-07-04T08:07:39.000+10:00
diff --git a/.forge-snapshots/settler_basic_curve_USDT-WETH.snap b/.forge-snapshots/settler_basic_curve_USDT-WETH.snap
@@ -1 +1 @@
-430119
+368143
diff --git a/.forge-snapshots/settler_curveV2VIP_USDT-WETH.snap b/.forge-snapshots/settler_curveV2VIP_USDT-WETH.snap
@@ -1 +1 @@
-369133
+363926
diff --git a/.forge-snapshots/settler_curveV2_fee_USDT-WETH.snap b/.forge-snapshots/settler_curveV2_fee_USDT-WETH.snap
@@ -1 +1 @@
-380029
+374947
diff --git a/.forge-snapshots/settler_metaTxn_otc_DAI-WETH.snap b/.forge-snapshots/settler_metaTxn_otc_DAI-WETH.snap
@@ -1 +1 @@
-98531
+99282
diff --git a/.forge-snapshots/settler_metaTxn_otc_USDC-WETH.snap b/.forge-snapshots/settler_metaTxn_otc_USDC-WETH.snap
@@ -1 +1 @@
-118005
+118756
diff --git a/.forge-snapshots/settler_metaTxn_otc_USDT-WETH.snap b/.forge-snapshots/settler_metaTxn_otc_USDT-WETH.snap
@@ -1 +1 @@
-109643
+110394
diff --git a/.forge-snapshots/settler_metaTxn_uniswapV3_DAI-WETH.snap b/.forge-snapshots/settler_metaTxn_uniswapV3_DAI-WETH.snap
@@ -1 +1 @@
-140692
+151324
diff --git a/.forge-snapshots/settler_metaTxn_uniswapV3_USDC-WETH.snap b/.forge-snapshots/settler_metaTxn_uniswapV3_USDC-WETH.snap
@@ -1 +1 @@
-165337
+167330
diff --git a/.forge-snapshots/settler_metaTxn_uniswapV3_USDT-WETH.snap b/.forge-snapshots/settler_metaTxn_uniswapV3_USDT-WETH.snap
@@ -1 +1 @@
-156700
+157712
diff --git a/.forge-snapshots/settler_otc_DAI-WETH.snap b/.forge-snapshots/settler_otc_DAI-WETH.snap
@@ -1 +1 @@
-93746
+94258
diff --git a/.forge-snapshots/settler_otc_USDC-WETH.snap b/.forge-snapshots/settler_otc_USDC-WETH.snap
@@ -1 +1 @@
-113220
+113732
diff --git a/.forge-snapshots/settler_otc_USDT-WETH.snap b/.forge-snapshots/settler_otc_USDT-WETH.snap
@@ -1 +1 @@
-104858
+105370
diff --git a/.forge-snapshots/settler_otc_buyToken_fee_DAI-WETH.snap b/.forge-snapshots/settler_otc_buyToken_fee_DAI-WETH.snap
@@ -1 +1 @@
-113528
+114170
diff --git a/.forge-snapshots/settler_otc_buyToken_fee_USDC-WETH.snap b/.forge-snapshots/settler_otc_buyToken_fee_USDC-WETH.snap
@@ -1 +1 @@
-133002
+133644
diff --git a/.forge-snapshots/settler_otc_buyToken_fee_USDT-WETH.snap b/.forge-snapshots/settler_otc_buyToken_fee_USDT-WETH.snap
@@ -1 +1 @@
-124640
+125282
diff --git a/.forge-snapshots/settler_otc_fee_full_custody_DAI-WETH.snap b/.forge-snapshots/settler_otc_fee_full_custody_DAI-WETH.snap
@@ -1 +1 @@
-159062
+159816
diff --git a/.forge-snapshots/settler_otc_fee_full_custody_USDC-WETH.snap b/.forge-snapshots/settler_otc_fee_full_custody_USDC-WETH.snap
@@ -1 +1 @@
-181879
+182633
diff --git a/.forge-snapshots/settler_otc_fee_full_custody_USDT-WETH.snap b/.forge-snapshots/settler_otc_fee_full_custody_USDT-WETH.snap
@@ -1 +1 @@
-173601
+174355
diff --git a/.forge-snapshots/settler_otc_fee_single_custody_DAI-WETH.snap b/.forge-snapshots/settler_otc_fee_single_custody_DAI-WETH.snap
@@ -1 +1 @@
-132652
+133414
diff --git a/.forge-snapshots/settler_otc_fee_single_custody_USDC-WETH.snap b/.forge-snapshots/settler_otc_fee_single_custody_USDC-WETH.snap
@@ -1 +1 @@
-152126
+152888
diff --git a/.forge-snapshots/settler_otc_fee_single_custody_USDT-WETH.snap b/.forge-snapshots/settler_otc_fee_single_custody_USDT-WETH.snap
@@ -1 +1 @@
-143764
+144526
diff --git a/.forge-snapshots/settler_otc_sellToken_fee_DAI-WETH.snap b/.forge-snapshots/settler_otc_sellToken_fee_DAI-WETH.snap
@@ -1 +1 @@
-113691
+114327
diff --git a/.forge-snapshots/settler_otc_sellToken_fee_USDC-WETH.snap b/.forge-snapshots/settler_otc_sellToken_fee_USDC-WETH.snap
@@ -1 +1 @@
-137339
+137975
diff --git a/.forge-snapshots/settler_otc_sellToken_fee_USDT-WETH.snap b/.forge-snapshots/settler_otc_sellToken_fee_USDT-WETH.snap
@@ -1 +1 @@
-125915
+126551
diff --git a/.forge-snapshots/settler_uniswapV3VIP_DAI-WETH.snap b/.forge-snapshots/settler_uniswapV3VIP_DAI-WETH.snap
@@ -1 +1 @@
-111798
+121884
diff --git a/.forge-snapshots/settler_uniswapV3VIP_USDC-WETH.snap b/.forge-snapshots/settler_uniswapV3VIP_USDC-WETH.snap
@@ -1 +1 @@
-133100
+134547
diff --git a/.forge-snapshots/settler_uniswapV3VIP_USDT-WETH.snap b/.forge-snapshots/settler_uniswapV3VIP_USDT-WETH.snap
@@ -1 +1 @@
-124379
+124845
diff --git a/.forge-snapshots/settler_uniswapV3VIP_sellToken_fee_DAI-WETH.snap b/.forge-snapshots/settler_uniswapV3VIP_sellToken_fee_DAI-WETH.snap
@@ -1 +1 @@
-128798
+138828
diff --git a/.forge-snapshots/settler_uniswapV3VIP_sellToken_fee_USDC-WETH.snap b/.forge-snapshots/settler_uniswapV3VIP_sellToken_fee_USDC-WETH.snap
@@ -1 +1 @@
-154274
+155665
diff --git a/.forge-snapshots/settler_uniswapV3VIP_sellToken_fee_USDT-WETH.snap b/.forge-snapshots/settler_uniswapV3VIP_sellToken_fee_USDT-WETH.snap
@@ -1 +1 @@
-142491
+142901
diff --git a/.forge-snapshots/settler_uniswapV3_DAI-WETH.snap b/.forge-snapshots/settler_uniswapV3_DAI-WETH.snap
@@ -1 +1 @@
-135179
+145396
diff --git a/.forge-snapshots/settler_uniswapV3_USDC-WETH.snap b/.forge-snapshots/settler_uniswapV3_USDC-WETH.snap
@@ -1 +1 @@
-159824
+161402
diff --git a/.forge-snapshots/settler_uniswapV3_USDT-WETH.snap b/.forge-snapshots/settler_uniswapV3_USDT-WETH.snap
@@ -1 +1 @@
-151187
+151784
diff --git a/.forge-snapshots/settler_uniswapV3_buyToken_fee_full_custody_DAI-WETH.snap b/.forge-snapshots/settler_uniswapV3_buyToken_fee_full_custody_DAI-WETH.snap
@@ -1 +1 @@
-174789
+185256
diff --git a/.forge-snapshots/settler_uniswapV3_buyToken_fee_full_custody_USDC-WETH.snap b/.forge-snapshots/settler_uniswapV3_buyToken_fee_full_custody_USDC-WETH.snap
@@ -1 +1 @@
-199434
+201262
diff --git a/.forge-snapshots/settler_uniswapV3_buyToken_fee_full_custody_USDT-WETH.snap b/.forge-snapshots/settler_uniswapV3_buyToken_fee_full_custody_USDT-WETH.snap
@@ -1 +1 @@
-190797
+191644
diff --git a/.forge-snapshots/settler_uniswapV3_buyToken_fee_single_custody_DAI-WETH.snap b/.forge-snapshots/settler_uniswapV3_buyToken_fee_single_custody_DAI-WETH.snap
@@ -1 +1 @@
-150696
+161032
diff --git a/.forge-snapshots/settler_uniswapV3_buyToken_fee_single_custody_USDC-WETH.snap b/.forge-snapshots/settler_uniswapV3_buyToken_fee_single_custody_USDC-WETH.snap
@@ -1 +1 @@
-171998
+173695
diff --git a/.forge-snapshots/settler_uniswapV3_buyToken_fee_single_custody_USDT-WETH.snap b/.forge-snapshots/settler_uniswapV3_buyToken_fee_single_custody_USDT-WETH.snap
@@ -1 +1 @@
-163277
+163993
diff --git a/.forge-snapshots/settler_uniswapV3_multiplex2_DAI-WETH.snap b/.forge-snapshots/settler_uniswapV3_multiplex2_DAI-WETH.snap
@@ -1 +1 @@
-167133
+178819
diff --git a/.forge-snapshots/settler_uniswapV3_multiplex2_USDC-WETH.snap b/.forge-snapshots/settler_uniswapV3_multiplex2_USDC-WETH.snap
@@ -1 +1 @@
-194949
+198029
diff --git a/.forge-snapshots/settler_uniswapV3_multiplex2_USDT-WETH.snap b/.forge-snapshots/settler_uniswapV3_multiplex2_USDT-WETH.snap
@@ -1 +1 @@
-186037
+187155
diff --git a/.forge-snapshots/settler_uniswapV3_sellToken_fee_single_custody_DAI-WETH.snap b/.forge-snapshots/settler_uniswapV3_sellToken_fee_single_custody_DAI-WETH.snap
@@ -1 +1 @@
-151700
+161889
diff --git a/.forge-snapshots/settler_uniswapV3_sellToken_fee_single_custody_USDC-WETH.snap b/.forge-snapshots/settler_uniswapV3_sellToken_fee_single_custody_USDC-WETH.snap
@@ -1 +1 @@
-180519
+182069
diff --git a/.forge-snapshots/settler_uniswapV3_sellToken_fee_single_custody_USDT-WETH.snap b/.forge-snapshots/settler_uniswapV3_sellToken_fee_single_custody_USDT-WETH.snap
@@ -1 +1 @@
-168820
+169389
diff --git a/.forge-snapshots/settler_zeroExOtc_DAI-WETH.snap b/.forge-snapshots/settler_zeroExOtc_DAI-WETH.snap
@@ -1 +1 @@
-145284
+145780
diff --git a/.forge-snapshots/settler_zeroExOtc_USDC-WETH.snap b/.forge-snapshots/settler_zeroExOtc_USDC-WETH.snap
@@ -1 +1 @@
-174481
+174977
diff --git a/.forge-snapshots/settler_zeroExOtc_USDT-WETH.snap b/.forge-snapshots/settler_zeroExOtc_USDT-WETH.snap
@@ -1 +1 @@
-160187
+160683
diff --git a/src/core/Basic.sol b/src/core/Basic.sol
@@ -23,7 +23,7 @@ abstract contract Basic {
         uint256 proportionSellBalance = (beforeBalanceSell * bips) / 10_000;
         // Update the sellAmount given a proportion of the sellToken balance
         assembly {
-            mstore(add(add(data, offset), 32), proportionSellBalance)
+            mstore(add(data, offset), proportionSellBalance)
         }
         sellToken.safeApproveIfBelow(pool, type(uint256).max);
         uint256 beforeBalance = buyToken.balanceOf(address(this));
diff --git a/test/integration/SettlerPairTest.t.sol b/test/integration/SettlerPairTest.t.sol
@@ -281,7 +281,7 @@ abstract contract SettlerPairTest is BasePairTest {
                     address(fromToken()),
                     address(toToken()),
                     10_000, // bips
-                    68, // offset
+                    100, // offset
                     abi.encodeCall(ICurveV2Pool.exchange, (poolData.fromTokenIndex, poolData.toTokenIndex, amount(), 1))
                 )
             ),
