Optimize bytecode (#701)

balancer · Jul 1, 2024 · 78ffc4d · 78ffc4d
1 parent b24dfc7
commit 78ffc4d
Show file tree

Hide file tree

Showing 43 changed files with 55 additions and 71 deletions.
diff --git a/...weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] add liquidity proportional b/...weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] add liquidity proportional
@@ -1 +1 @@
-179.6k
+180.1k
diff --git a/...hat-snapshots/[WeightedPool - Standard] add liquidity single token exact out - warm slots b/...hat-snapshots/[WeightedPool - Standard] add liquidity single token exact out - warm slots
@@ -1 +1 @@
-197.4k
+198.0k
diff --git a/...st/gas/.hardhat-snapshots/[WeightedPool - Standard] add liquidity unbalanced - warm slots b/...st/gas/.hardhat-snapshots/[WeightedPool - Standard] add liquidity unbalanced - warm slots
@@ -1 +1 @@
-211.7k
+212.3k
diff --git a/...ghted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] remove liquidity proportional b/...ghted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] remove liquidity proportional
@@ -1 +1 @@
-168.7k
+169.3k
diff --git a/...t-snapshots/[WeightedPool - Standard] remove liquidity single token exact in - warm slots b/...t-snapshots/[WeightedPool - Standard] remove liquidity single token exact in - warm slots
@@ -1 +1 @@
-186.9k
+187.5k
diff --git a/...-snapshots/[WeightedPool - Standard] remove liquidity single token exact out - warm slots b/...-snapshots/[WeightedPool - Standard] remove liquidity single token exact out - warm slots
@@ -1 +1 @@
-208.7k
+209.4k
diff --git a/...hat-snapshots/[WeightedPool - Standard] swap single token exact in with fees - cold slots b/...hat-snapshots/[WeightedPool - Standard] swap single token exact in with fees - cold slots
@@ -1 +1 @@
-175.1k
+175.4k
diff --git a/...hat-snapshots/[WeightedPool - Standard] swap single token exact in with fees - warm slots b/...hat-snapshots/[WeightedPool - Standard] swap single token exact in with fees - warm slots
@@ -1 +1 @@
-158.6k
+158.8k
diff --git a/...eighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate] add liquidity proportional b/...eighted/test/gas/.hardhat-snapshots/[WeightedPool - With rate] add liquidity proportional
@@ -1 +1 @@
-235.0k
+235.6k
diff --git a/...at-snapshots/[WeightedPool - With rate] add liquidity single token exact out - warm slots b/...at-snapshots/[WeightedPool - With rate] add liquidity single token exact out - warm slots
@@ -1 +1 @@
-199.6k
+200.2k
diff --git a/...t/gas/.hardhat-snapshots/[WeightedPool - With rate] add liquidity unbalanced - warm slots b/...t/gas/.hardhat-snapshots/[WeightedPool - With rate] add liquidity unbalanced - warm slots
@@ -1 +1 @@
-228.4k
+229.1k
diff --git a/...hted/test/gas/.hardhat-snapshots/[WeightedPool - With rate] remove liquidity proportional b/...hted/test/gas/.hardhat-snapshots/[WeightedPool - With rate] remove liquidity proportional
@@ -1 +1 @@
-223.9k
+224.6k
diff --git a/...-snapshots/[WeightedPool - With rate] remove liquidity single token exact in - warm slots b/...-snapshots/[WeightedPool - With rate] remove liquidity single token exact in - warm slots
@@ -1 +1 @@
-188.8k
+189.5k
diff --git a/...snapshots/[WeightedPool - With rate] remove liquidity single token exact out - warm slots b/...snapshots/[WeightedPool - With rate] remove liquidity single token exact out - warm slots
@@ -1 +1 @@
-210.6k
+211.3k
diff --git a/...at-snapshots/[WeightedPool - With rate] swap single token exact in with fees - cold slots b/...at-snapshots/[WeightedPool - With rate] swap single token exact in with fees - cold slots
@@ -1 +1 @@
-208.4k
+208.7k
diff --git a/...at-snapshots/[WeightedPool - With rate] swap single token exact in with fees - warm slots b/...at-snapshots/[WeightedPool - With rate] swap single token exact in with fees - warm slots
@@ -1 +1 @@
-174.8k
+175.1k
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool] donation b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool] donation
@@ -1 +1 @@
-178.3k
+178.8k
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool] initialize with ETH b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool] initialize with ETH
@@ -1 +1 @@
-347.8k
+348.0k
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool] initialize without ETH b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool] initialize without ETH
@@ -1 +1 @@
-335.2k
+335.4k
diff --git a/pkg/vault/contracts/RouterCommon.sol b/pkg/vault/contracts/RouterCommon.sol
@@ -32,9 +32,6 @@ contract RouterCommon is IRouterCommon, VaultGuard {
     // they will be executed every time the constant is used.
     // solhint-disable-next-line var-name-mixedcase
     bytes32 private immutable _SENDER_SLOT = TransientStorageHelpers.calculateSlot(type(RouterCommon).name, "sender");
-    // solhint-disable-next-line var-name-mixedcase
-    bytes32 private immutable _SENDER_LOCKED_SLOT =
-        TransientStorageHelpers.calculateSlot(type(RouterCommon).name, "senderLocked");
 
     /// @dev Incoming ETH transfer from an address that is not WETH.
     error EthTransfer();
@@ -78,36 +75,27 @@ contract RouterCommon is IRouterCommon, VaultGuard {
      *             (Not nested, as the original router call from contractA has returned. Sender is now ContractB.)
      */
     modifier saveSender() {
-        // isSenderLocked = false means that the sender is the most external one, so lock the sender slot and save the
-        // sender in the transient storage
-        bool isSenderLocked = _getSenderLockedSlot().tload();
-        if (isSenderLocked == false) {
-            _getSenderLockedSlot().tstore(true);
-        }
-
-        _saveSender();
+        bool isExternalSender = _saveSender();
         _;
-
-        if (isSenderLocked == false) {
-            // isSenderLocked = false means that the sender is the most external one, which means that the router
-            // operation is over. Discard the sender (so sender can be used in the same transaction by another router
-            // call) and unlock the sender slot.
-            _discardSender();
-            _getSenderLockedSlot().tstore(false);
-        }
+        _discardSenderIfRequired(isExternalSender);
     }
 
-    function _saveSender() internal {
+    function _saveSender() internal returns (bool isExternalSender) {
         address sender = _getSenderSlot().tload();
 
         // NOTE: Only the most external sender will be saved by the router.
         if (sender == address(0)) {
             _getSenderSlot().tstore(msg.sender);
+            isExternalSender = true;
         }
     }
 
-    function _discardSender() internal {
-        _getSenderSlot().tstore(address(0));
+    function _discardSenderIfRequired(bool isExternalSender) internal {
+        // Only the external sender shall be cleaned up; if it's not an external sender it means that
+        // the value was not saved in this modifier.
+        if (isExternalSender) {
+            _getSenderSlot().tstore(address(0));
+        }
     }
 
     constructor(IVault vault, IWETH weth, IPermit2 permit2) VaultGuard(vault) {
@@ -215,8 +203,4 @@ contract RouterCommon is IRouterCommon, VaultGuard {
     function _getSenderSlot() internal view returns (StorageSlot.AddressSlotType) {
         return _SENDER_SLOT.asAddress();
     }
-
-    function _getSenderLockedSlot() internal view returns (StorageSlot.BooleanSlotType) {
-        return _SENDER_LOCKED_SLOT.asBoolean();
-    }
 }
diff --git a/pkg/vault/test/.contract-sizes/BatchRouter b/pkg/vault/test/.contract-sizes/BatchRouter
@@ -1,2 +1,2 @@
-Bytecode	15.316
-InitCode	16.953
+Bytecode	15.151
+InitCode	16.684
diff --git a/pkg/vault/test/.contract-sizes/Router b/pkg/vault/test/.contract-sizes/Router
@@ -1,2 +1,2 @@
-Bytecode	24.999*
-InitCode	26.381
+Bytecode	23.659
+InitCode	24.739
diff --git a/pkg/vault/test/.contract-sizes/Vault b/pkg/vault/test/.contract-sizes/Vault
@@ -1,2 +1,2 @@
-Bytecode	24.229*
-InitCode	25.512
+Bytecode	23.921
+InitCode	25.203
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard] add liquidity proportional b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard] add liquidity proportional
@@ -1 +1 @@
-179.6k
+180.2k
diff --git a/...hardhat-snapshots/[PoolMock - Standard] add liquidity single token exact out - warm slots b/...hardhat-snapshots/[PoolMock - Standard] add liquidity single token exact out - warm slots
@@ -1 +1 @@
-197.2k
+197.8k
diff --git a/...t/test/gas/.hardhat-snapshots/[PoolMock - Standard] add liquidity unbalanced - warm slots b/...t/test/gas/.hardhat-snapshots/[PoolMock - Standard] add liquidity unbalanced - warm slots
@@ -1 +1 @@
-195.6k
+196.2k
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard] remove liquidity proportional b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - Standard] remove liquidity proportional
@@ -1 +1 @@
-168.7k
+169.3k
diff --git a/...rdhat-snapshots/[PoolMock - Standard] remove liquidity single token exact in - warm slots b/...rdhat-snapshots/[PoolMock - Standard] remove liquidity single token exact in - warm slots
@@ -1 +1 @@
-186.7k
+187.3k
diff --git a/...dhat-snapshots/[PoolMock - Standard] remove liquidity single token exact out - warm slots b/...dhat-snapshots/[PoolMock - Standard] remove liquidity single token exact out - warm slots
@@ -1 +1 @@
-192.8k
+193.5k
diff --git a/...hardhat-snapshots/[PoolMock - Standard] swap single token exact in with fees - cold slots b/...hardhat-snapshots/[PoolMock - Standard] swap single token exact in with fees - cold slots
@@ -1 +1 @@
-175.2k
+175.4k
diff --git a/...hardhat-snapshots/[PoolMock - Standard] swap single token exact in with fees - warm slots b/...hardhat-snapshots/[PoolMock - Standard] swap single token exact in with fees - warm slots
@@ -1 +1 @@
-158.6k
+158.8k
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate] add liquidity proportional b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate] add liquidity proportional
@@ -1 +1 @@
-235.1k
+235.7k
diff --git a/...ardhat-snapshots/[PoolMock - With rate] add liquidity single token exact out - warm slots b/...ardhat-snapshots/[PoolMock - With rate] add liquidity single token exact out - warm slots
@@ -1 +1 @@
-199.3k
+199.9k
diff --git a/.../test/gas/.hardhat-snapshots/[PoolMock - With rate] add liquidity unbalanced - warm slots b/.../test/gas/.hardhat-snapshots/[PoolMock - With rate] add liquidity unbalanced - warm slots
@@ -1 +1 @@
-212.1k
+212.7k
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate] remove liquidity proportional b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - With rate] remove liquidity proportional
@@ -1 +1 @@
-223.9k
+224.6k
diff --git a/...dhat-snapshots/[PoolMock - With rate] remove liquidity single token exact in - warm slots b/...dhat-snapshots/[PoolMock - With rate] remove liquidity single token exact in - warm slots
@@ -1 +1 @@
-188.6k
+189.3k
diff --git a/...hat-snapshots/[PoolMock - With rate] remove liquidity single token exact out - warm slots b/...hat-snapshots/[PoolMock - With rate] remove liquidity single token exact out - warm slots
@@ -1 +1 @@
-194.7k
+195.5k
diff --git a/...ardhat-snapshots/[PoolMock - With rate] swap single token exact in with fees - cold slots b/...ardhat-snapshots/[PoolMock - With rate] swap single token exact in with fees - cold slots
@@ -1 +1 @@
-208.5k
+208.8k
diff --git a/...ardhat-snapshots/[PoolMock - With rate] swap single token exact in with fees - warm slots b/...ardhat-snapshots/[PoolMock - With rate] swap single token exact in with fees - warm slots
@@ -1 +1 @@
-174.8k
+175.0k
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock] donation b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock] donation
@@ -1 +1 @@
-178.3k
+178.9k
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock] initialize with ETH b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock] initialize with ETH
@@ -1 +1 @@
-342.5k
+342.8k
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock] initialize without ETH b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock] initialize without ETH
@@ -1 +1 @@
-330.0k
+330.2k
diff --git a/pvt/common/hardhat-base-config.ts b/pvt/common/hardhat-base-config.ts
@@ -44,7 +44,7 @@ const contractSettings: ContractSettings = {
   },
   '@balancer-labs/v3-vault/contracts/Vault.sol': {
     version: '0.8.24',
-    runs: 500,
+    runs: 200,
     viaIR: true,
   },
   '@balancer-labs/v3-vault/contracts/VaultExtension.sol': {