feat: update to 0.8.24 (#238)

* feat: update to 0.8.24 - no need for unchecked iterators anymore - minor optimizer improvements * fix: fmt
Uniswap · Apr 9, 2024 · 459f58a · 459f58a
1 parent a23f3a3
commit 459f58a
Show file tree

Hide file tree

Showing 58 changed files with 94 additions and 105 deletions.
diff --git a/.forge-snapshots/Base-DutchOrder-BaseExecuteSingleWithFee.snap b/.forge-snapshots/Base-DutchOrder-BaseExecuteSingleWithFee.snap
@@ -1 +1 @@
-181935
+181594
diff --git a/.forge-snapshots/Base-DutchOrder-ExecuteBatch.snap b/.forge-snapshots/Base-DutchOrder-ExecuteBatch.snap
@@ -1 +1 @@
-196793
+196531
diff --git a/.forge-snapshots/Base-DutchOrder-ExecuteBatchMultipleOutputs.snap b/.forge-snapshots/Base-DutchOrder-ExecuteBatchMultipleOutputs.snap
@@ -1 +1 @@
-206561
+206231
diff --git a/.forge-snapshots/Base-DutchOrder-ExecuteBatchMultipleOutputsDifferentTokens.snap b/.forge-snapshots/Base-DutchOrder-ExecuteBatchMultipleOutputsDifferentTokens.snap
@@ -1 +1 @@
-260215
+259817
diff --git a/.forge-snapshots/Base-DutchOrder-ExecuteBatchNativeOutput.snap b/.forge-snapshots/Base-DutchOrder-ExecuteBatchNativeOutput.snap
@@ -1 +1 @@
-190325
+190063
diff --git a/.forge-snapshots/Base-DutchOrder-ExecuteSingle.snap b/.forge-snapshots/Base-DutchOrder-ExecuteSingle.snap
@@ -1 +1 @@
-148151
+148015
diff --git a/.forge-snapshots/Base-DutchOrder-ExecuteSingleNativeOutput.snap b/.forge-snapshots/Base-DutchOrder-ExecuteSingleNativeOutput.snap
@@ -1 +1 @@
-133713
+133577
diff --git a/.forge-snapshots/Base-DutchOrder-ExecuteSingleValidation.snap b/.forge-snapshots/Base-DutchOrder-ExecuteSingleValidation.snap
@@ -1 +1 @@
-157462
+157326
diff --git a/.forge-snapshots/Base-ExclusiveDutchOrder-BaseExecuteSingleWithFee.snap b/.forge-snapshots/Base-ExclusiveDutchOrder-BaseExecuteSingleWithFee.snap
@@ -1 +1 @@
-182099
+181758
diff --git a/.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteBatch.snap b/.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteBatch.snap
@@ -1 +1 @@
-197099
+196837
diff --git a/.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteBatchMultipleOutputs.snap b/.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteBatchMultipleOutputs.snap
@@ -1 +1 @@
-206862
+206532
diff --git a/.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteBatchMultipleOutputsDifferentTokens.snap b/.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteBatchMultipleOutputsDifferentTokens.snap
@@ -1 +1 @@
-260530
+260132
diff --git a/.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteBatchNativeOutput.snap b/.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteBatchNativeOutput.snap
@@ -1 +1 @@
-190625
+190363
diff --git a/.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteSingle.snap b/.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteSingle.snap
@@ -1 +1 @@
-148314
+148178
diff --git a/.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteSingleNativeOutput.snap b/.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteSingleNativeOutput.snap
@@ -1 +1 @@
-133881
+133745
diff --git a/.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteSingleValidation.snap b/.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteSingleValidation.snap
@@ -1 +1 @@
-157629
+157493
diff --git a/.forge-snapshots/Base-LimitOrderReactor-BaseExecuteSingleWithFee.snap b/.forge-snapshots/Base-LimitOrderReactor-BaseExecuteSingleWithFee.snap
@@ -1 +1 @@
-178079
+177738
diff --git a/.forge-snapshots/Base-LimitOrderReactor-ExecuteBatch.snap b/.forge-snapshots/Base-LimitOrderReactor-ExecuteBatch.snap
@@ -1 +1 @@
-188982
+188720
diff --git a/.forge-snapshots/Base-LimitOrderReactor-ExecuteBatchMultipleOutputs.snap b/.forge-snapshots/Base-LimitOrderReactor-ExecuteBatchMultipleOutputs.snap
@@ -1 +1 @@
-197815
+197485
diff --git a/.forge-snapshots/Base-LimitOrderReactor-ExecuteBatchMultipleOutputsDifferentTokens.snap b/.forge-snapshots/Base-LimitOrderReactor-ExecuteBatchMultipleOutputsDifferentTokens.snap
@@ -1 +1 @@
-250543
+250145
diff --git a/.forge-snapshots/Base-LimitOrderReactor-ExecuteBatchNativeOutput.snap b/.forge-snapshots/Base-LimitOrderReactor-ExecuteBatchNativeOutput.snap
@@ -1 +1 @@
-182508
+182246
diff --git a/.forge-snapshots/Base-LimitOrderReactor-ExecuteSingle.snap b/.forge-snapshots/Base-LimitOrderReactor-ExecuteSingle.snap
@@ -1 +1 @@
-144296
+144160
diff --git a/.forge-snapshots/Base-LimitOrderReactor-ExecuteSingleNativeOutput.snap b/.forge-snapshots/Base-LimitOrderReactor-ExecuteSingleNativeOutput.snap
@@ -1 +1 @@
-129858
+129722
diff --git a/.forge-snapshots/Base-LimitOrderReactor-ExecuteSingleValidation.snap b/.forge-snapshots/Base-LimitOrderReactor-ExecuteSingleValidation.snap
@@ -1 +1 @@
-153606
+153470
diff --git a/.forge-snapshots/Base-V2DutchOrder-BaseExecuteSingleWithFee.snap b/.forge-snapshots/Base-V2DutchOrder-BaseExecuteSingleWithFee.snap
@@ -1 +1 @@
-189053
+188641
diff --git a/.forge-snapshots/Base-V2DutchOrder-ExclusiveFiller.snap b/.forge-snapshots/Base-V2DutchOrder-ExclusiveFiller.snap
@@ -1 +1 @@
-158962
+158755
diff --git a/.forge-snapshots/Base-V2DutchOrder-ExecuteBatch.snap b/.forge-snapshots/Base-V2DutchOrder-ExecuteBatch.snap
@@ -1 +1 @@
-211110
+210706
diff --git a/.forge-snapshots/Base-V2DutchOrder-ExecuteBatchMultipleOutputs.snap b/.forge-snapshots/Base-V2DutchOrder-ExecuteBatchMultipleOutputs.snap
@@ -1 +1 @@
-221518
+220975
diff --git a/.forge-snapshots/Base-V2DutchOrder-ExecuteBatchMultipleOutputsDifferentTokens.snap b/.forge-snapshots/Base-V2DutchOrder-ExecuteBatchMultipleOutputsDifferentTokens.snap
@@ -1 +1 @@
-275828
+275146
diff --git a/.forge-snapshots/Base-V2DutchOrder-ExecuteBatchNativeOutput.snap b/.forge-snapshots/Base-V2DutchOrder-ExecuteBatchNativeOutput.snap
@@ -1 +1 @@
-204636
+204232
diff --git a/.forge-snapshots/Base-V2DutchOrder-ExecuteSingle.snap b/.forge-snapshots/Base-V2DutchOrder-ExecuteSingle.snap
@@ -1 +1 @@
-155265
+155058
diff --git a/.forge-snapshots/Base-V2DutchOrder-ExecuteSingleNativeOutput.snap b/.forge-snapshots/Base-V2DutchOrder-ExecuteSingleNativeOutput.snap
@@ -1 +1 @@
-140827
+140620
diff --git a/.forge-snapshots/Base-V2DutchOrder-ExecuteSingleValidation.snap b/.forge-snapshots/Base-V2DutchOrder-ExecuteSingleValidation.snap
@@ -1 +1 @@
-164576
+164369
diff --git a/.forge-snapshots/Base-V2DutchOrder-InputOverride.snap b/.forge-snapshots/Base-V2DutchOrder-InputOverride.snap
@@ -1 +1 @@
-159319
+159044
diff --git a/.forge-snapshots/Base-V2DutchOrder-OutputOverride.snap b/.forge-snapshots/Base-V2DutchOrder-OutputOverride.snap
@@ -1 +1 @@
-158989
+158782
diff --git a/.forge-snapshots/DirectFillerFillMacroSingleOrderWithFee.snap b/.forge-snapshots/DirectFillerFillMacroSingleOrderWithFee.snap
@@ -1 +1 @@
-175018
+174742
diff --git a/.forge-snapshots/DirectFillerFillMacroThreeOrdersWithFees.snap b/.forge-snapshots/DirectFillerFillMacroThreeOrdersWithFees.snap
@@ -1 +1 @@
-435049
+434221
diff --git a/.forge-snapshots/EthOutputTest3OrdersWithEthAndERC20Outputs.snap b/.forge-snapshots/EthOutputTest3OrdersWithEthAndERC20Outputs.snap
@@ -1 +1 @@
-363346
+362870
diff --git a/.forge-snapshots/EthOutputTestEthOutput.snap b/.forge-snapshots/EthOutputTestEthOutput.snap
@@ -1 +1 @@
-156180
+156044
diff --git a/.forge-snapshots/ProtocolFeesGasComparisonTest-InterfaceAndProtocolFee.snap b/.forge-snapshots/ProtocolFeesGasComparisonTest-InterfaceAndProtocolFee.snap
@@ -1 +1 @@
-176825
+176277
diff --git a/.forge-snapshots/ProtocolFeesGasComparisonTest-InterfaceAndProtocolFeeEthOutput.snap b/.forge-snapshots/ProtocolFeesGasComparisonTest-InterfaceAndProtocolFeeEthOutput.snap
@@ -1 +1 @@
-162817
+162269
diff --git a/.forge-snapshots/ProtocolFeesGasComparisonTest-InterfaceFee.snap b/.forge-snapshots/ProtocolFeesGasComparisonTest-InterfaceFee.snap
@@ -1 +1 @@
-165956
+165610
diff --git a/.forge-snapshots/ProtocolFeesGasComparisonTest-InterfaceFeeEthOutput.snap b/.forge-snapshots/ProtocolFeesGasComparisonTest-InterfaceFeeEthOutput.snap
@@ -1 +1 @@
-146783
+146437
diff --git a/.forge-snapshots/ProtocolFeesGasComparisonTest-NoFees.snap b/.forge-snapshots/ProtocolFeesGasComparisonTest-NoFees.snap
@@ -1 +1 @@
-149180
+148973
diff --git a/.forge-snapshots/ProtocolFeesGasComparisonTest-NoFeesEthOutput.snap b/.forge-snapshots/ProtocolFeesGasComparisonTest-NoFeesEthOutput.snap
@@ -1 +1 @@
-124842
+124635
diff --git a/.forge-snapshots/SwapRouter02ExecutorExecute.snap b/.forge-snapshots/SwapRouter02ExecutorExecute.snap
@@ -1 +1 @@
-262930
+262869
diff --git a/.forge-snapshots/SwapRouter02ExecutorExecuteAlreadyApproved.snap b/.forge-snapshots/SwapRouter02ExecutorExecuteAlreadyApproved.snap
@@ -1 +1 @@
-118049
+117988
diff --git a/.forge-snapshots/testExclusiveFillerSucceeds.snap b/.forge-snapshots/testExclusiveFillerSucceeds.snap
@@ -1 +1 @@
-174023
+173887
diff --git a/foundry.toml b/foundry.toml
@@ -1,5 +1,5 @@
 [profile.default]
-solc = "0.8.19"
+solc = "0.8.24"
 src = 'src'
 out = 'out'
 libs = ['lib']

diff --git a/src/base/ProtocolFees.sol b/src/base/ProtocolFees.sol
@@ -49,33 +49,26 @@ abstract contract ProtocolFees is Owned {
         // fill new outputs with old outputs
         OutputToken[] memory newOutputs = new OutputToken[](outputsLength + feeOutputsLength);
 
-        unchecked {
-            for (uint256 i = 0; i < outputsLength; i++) {
-                newOutputs[i] = order.outputs[i];
-            }
+        for (uint256 i = 0; i < outputsLength; i++) {
+            newOutputs[i] = order.outputs[i];
         }
 
-        for (uint256 i = 0; i < feeOutputsLength;) {
+        for (uint256 i = 0; i < feeOutputsLength; i++) {
             OutputToken memory feeOutput = feeOutputs[i];
             // assert no duplicates
-            unchecked {
-                for (uint256 j = 0; j < i; j++) {
-                    if (feeOutput.token == feeOutputs[j].token) {
-                        revert DuplicateFeeOutput(feeOutput.token);
-                    }
+            for (uint256 j = 0; j < i; j++) {
+                if (feeOutput.token == feeOutputs[j].token) {
+                    revert DuplicateFeeOutput(feeOutput.token);
                 }
             }
 
             // assert not greater than MAX_FEE_BPS
             uint256 tokenValue;
-            for (uint256 j = 0; j < outputsLength;) {
+            for (uint256 j = 0; j < outputsLength; j++) {
                 OutputToken memory output = order.outputs[j];
                 if (output.token == feeOutput.token) {
                     tokenValue += output.amount;
                 }
-                unchecked {
-                    j++;
-                }
             }
 
             // allow fee on input token as well
@@ -88,10 +81,8 @@ abstract contract ProtocolFees is Owned {
             if (feeOutput.amount > tokenValue.mulDivDown(MAX_FEE_BPS, BPS)) {
                 revert FeeTooLarge(feeOutput.token, feeOutput.amount, feeOutput.recipient);
             }
-            newOutputs[outputsLength + i] = feeOutput;
-
             unchecked {
-                i++;
+                newOutputs[outputsLength + i] = feeOutput;
             }
         }
 

diff --git a/src/reactors/DutchOrderReactor.sol b/src/reactors/DutchOrderReactor.sol
@@ -65,11 +65,9 @@ contract DutchOrderReactor is BaseReactor {
         }
 
         if (order.input.startAmount != order.input.endAmount) {
-            unchecked {
-                for (uint256 i = 0; i < order.outputs.length; i++) {
-                    if (order.outputs[i].startAmount != order.outputs[i].endAmount) {
-                        revert InputAndOutputDecay();
-                    }
+            for (uint256 i = 0; i < order.outputs.length; i++) {
+                if (order.outputs[i].startAmount != order.outputs[i].endAmount) {
+                    revert InputAndOutputDecay();
                 }
             }
         }