Merge pull request #718 from safe-global/optimizer-enabled-with-origi…

…nal-solc Reverting back to 0.7.6
safe-global · Dec 21, 2023 · f715936 · f715936
2 parents 24d5abe + 5c23638
commit f715936
Show file tree

Hide file tree

Showing 20 changed files with 73 additions and 50 deletions.
diff --git a/.env.sample b/.env.sample
@@ -10,4 +10,7 @@ ERC4337_TEST_NODE_URL=
 ERC4337_TEST_SINGLETON_ADDRESS=
 ERC4337_TEST_SAFE_FACTORY_ADDRESS=
 # (Optional) Tells the test runner which Safe Singleton Contract to use for testing: Safe or SafeL2. Defaults to Safe.
-SAFE_CONTRACT_UNDER_TEST="Safe"
+SAFE_CONTRACT_UNDER_TEST="Safe"
+# Used for compiling with different solidity testing
+SOLIDITY_VERSION= # Example: "0.8.19"
+SOLIDITY_SETTINGS= # Example: '{"viaIR":true,"optimizer":{"enabled":true, "details": {"yul": true}}}'
diff --git a/certora/applyHarness.patch b/certora/applyHarness.patch
@@ -1,6 +1,6 @@
 diff -druN Safe.sol Safe.sol
---- Safe.sol	2023-12-05 16:23:27
-+++ Safe.sol	2023-12-05 21:15:44
+--- Safe.sol	2023-12-06 16:00:31
++++ Safe.sol	2023-12-07 00:01:59
 @@ -76,7 +76,7 @@
           * so we create a Safe with 0 owners and threshold 1.
           * This is an unusable Safe, perfect for the singleton
@@ -42,12 +42,12 @@ diff -druN Safe.sol Safe.sol
      }
  }
 diff -druN base/Executor.sol base/Executor.sol
---- base/Executor.sol	2023-12-05 16:20:21
-+++ base/Executor.sol	2023-12-05 21:16:46
+--- base/Executor.sol	2023-12-06 16:00:31
++++ base/Executor.sol	2023-12-07 00:01:59
 @@ -29,8 +29,10 @@
              /* solhint-disable no-inline-assembly */
              /// @solidity memory-safe-assembly
-             assembly ("memory-safe") {
+             assembly {
 -                success := delegatecall(txGas, to, add(data, 0x20), mload(data), 0, 0)
 +                // success := delegatecall(txGas, to, add(data, 0x20), mload(data), 0, 0)
 +                // MUNGED: lets be optimistic and assume execute does nothing for DELEGATECALL
@@ -58,7 +58,7 @@ diff -druN base/Executor.sol base/Executor.sol
              /* solhint-disable no-inline-assembly */
 diff -druN base/Executor.sol.orig base/Executor.sol.orig
 --- base/Executor.sol.orig	1970-01-01 05:30:00
-+++ base/Executor.sol.orig	2023-12-05 21:15:44
++++ base/Executor.sol.orig	2023-12-07 00:01:59
 @@ -0,0 +1,44 @@
 +// SPDX-License-Identifier: LGPL-3.0-only
 +pragma solidity >=0.7.0 <0.9.0;
@@ -90,7 +90,7 @@ diff -druN base/Executor.sol.orig base/Executor.sol.orig
 +        if (operation == Enum.Operation.DelegateCall) {
 +            /* solhint-disable no-inline-assembly */
 +            /// @solidity memory-safe-assembly
-+            assembly ("memory-safe") {
++            assembly {
 +                success := delegatecall(txGas, to, add(data, 0x20), mload(data), 0, 0)
 +            }
 +            /* solhint-enable no-inline-assembly */
@@ -106,7 +106,7 @@ diff -druN base/Executor.sol.orig base/Executor.sol.orig
 +}
 diff -druN base/Executor.sol.rej base/Executor.sol.rej
 --- base/Executor.sol.rej	1970-01-01 05:30:00
-+++ base/Executor.sol.rej	2023-12-05 21:15:44
++++ base/Executor.sol.rej	2023-12-07 00:01:59
 @@ -0,0 +1,15 @@
 +@@ -26,12 +26,8 @@
 +         uint256 txGas

diff --git a/certora/conf/module.conf b/certora/conf/module.conf
@@ -11,6 +11,6 @@
     "prover_args": [
         " -smt_groundQuantifiers false"
     ],
-    "solc": "solc8.19",
+    "solc": "solc7.6",
     "verify": "SafeHarness:certora/specs/ModuleReach.spec"
 }
diff --git a/certora/conf/nativeTokenRefund.conf b/certora/conf/nativeTokenRefund.conf
@@ -12,6 +12,6 @@
         " -optimisticFallback true -mediumTimeout 30"
     ],
     "rule_sanity": "basic",
-    "solc": "solc8.19",
+    "solc": "solc7.6",
     "verify": "SafeHarness:certora/specs/NativeTokenRefund.spec"
 }
diff --git a/certora/conf/owner.conf b/certora/conf/owner.conf
@@ -11,6 +11,6 @@
     "prover_args": [
         "-smt_groundQuantifiers false -mediumTimeout 2000"
     ],
-    "solc": "solc8.19",
+    "solc": "solc7.6",
     "verify": "SafeHarness:certora/specs/OwnerReach.spec"
 }
diff --git a/certora/conf/run.conf b/certora/conf/run.conf
@@ -14,6 +14,6 @@
     "rule_sanity": "basic",
     "run_source": "MUTATION",
     "send_only": true,
-    "solc": "solc8.19",
+    "solc": "solc7.6",
     "verify": "SafeHarness:certora/specs/Safe.spec"
 }
diff --git a/certora/conf/safe.conf b/certora/conf/safe.conf
@@ -12,6 +12,6 @@
         " -optimisticFallback true -s z3 -copyLoopUnroll 5 -mediumTimeout 5 -depth 30"
     ],
     "rule_sanity": "basic",
-    "solc": "solc8.19",
+    "solc": "solc7.6",
     "verify": "SafeHarness:certora/specs/Safe.spec"
 }
diff --git a/certora/conf/signatures.conf b/certora/conf/signatures.conf
@@ -12,6 +12,6 @@
         "-optimisticFallback true -mediumTimeout 30"
     ],
     "rule_sanity": "basic",
-    "solc": "solc8.19",
+    "solc": "solc7.6",
     "verify": "SafeHarness:certora/specs/Signatures.spec"
 }
diff --git a/certora/scripts/verifyNativeTokenRefund.sh b/certora/scripts/verifyNativeTokenRefund.sh
@@ -8,7 +8,7 @@ fi
 
 certoraRun  certora/harnesses/SafeHarness.sol \
     --verify SafeHarness:certora/specs/NativeTokenRefund.spec \
-    --solc solc8.19 \
+    --solc solc7.6 \
     --optimistic_loop \
     --prover_args '-optimisticFallback true -s z3' \
     --loop_iter 3 \

diff --git a/contracts/Safe.sol b/contracts/Safe.sol
@@ -263,7 +263,7 @@ contract Safe is
         uint256 contractSignatureLen;
         /* solhint-disable no-inline-assembly */
         /// @solidity memory-safe-assembly
-        assembly ("memory-safe") {
+        assembly {
             contractSignatureLen := mload(add(add(signatures, offset), 0x20))
         }
         /* solhint-enable no-inline-assembly */
@@ -273,7 +273,7 @@ contract Safe is
         bytes memory contractSignature;
         /* solhint-disable no-inline-assembly */
         /// @solidity memory-safe-assembly
-        assembly ("memory-safe") {
+        assembly {
             // The signature data for contract signatures is appended to the concatenated signatures and the offset is stored in s
             contractSignature := add(add(signatures, offset), 0x20)
         }

diff --git a/contracts/base/Executor.sol b/contracts/base/Executor.sol
@@ -28,7 +28,7 @@ abstract contract Executor {
         if (operation == Enum.Operation.DelegateCall) {
             /* solhint-disable no-inline-assembly */
             /// @solidity memory-safe-assembly
-            assembly ("memory-safe") {
+            assembly {
                 success := delegatecall(txGas, to, add(data, 0x20), mload(data), 0, 0)
             }
             /* solhint-enable no-inline-assembly */

diff --git a/contracts/base/FallbackManager.sol b/contracts/base/FallbackManager.sol
@@ -36,7 +36,7 @@ abstract contract FallbackManager is SelfAuthorized {
         bytes32 slot = FALLBACK_HANDLER_STORAGE_SLOT;
         /* solhint-disable no-inline-assembly */
         /// @solidity memory-safe-assembly
-        assembly ("memory-safe") {
+        assembly {
             sstore(slot, handler)
         }
         /* solhint-enable no-inline-assembly */

diff --git a/contracts/base/ModuleManager.sol b/contracts/base/ModuleManager.sol
@@ -183,7 +183,7 @@ abstract contract ModuleManager is SelfAuthorized, Executor, GuardManager {
         // Set correct size of returned array
         /* solhint-disable no-inline-assembly */
         /// @solidity memory-safe-assembly
-        assembly ("memory-safe") {
+        assembly {
             mstore(array, moduleCount)
         }
         /* solhint-enable no-inline-assembly */

diff --git a/contracts/common/SecuredTokenTransfer.sol b/contracts/common/SecuredTokenTransfer.sol
@@ -20,7 +20,7 @@ abstract contract SecuredTokenTransfer {
         bytes memory data = abi.encodeWithSelector(0xa9059cbb, receiver, amount);
         /* solhint-disable no-inline-assembly */
         /// @solidity memory-safe-assembly
-        assembly ("memory-safe") {
+        assembly {
             // We write the return value to scratch space.
             // See https://docs.soliditylang.org/en/v0.7.6/internals/layout_in_memory.html#layout-in-memory
             let success := call(sub(gas(), 10000), token, 0, add(data, 0x20), mload(data), 0, 0x20)

diff --git a/contracts/common/SignatureDecoder.sol b/contracts/common/SignatureDecoder.sol
@@ -21,7 +21,7 @@ abstract contract SignatureDecoder {
     function signatureSplit(bytes memory signatures, uint256 pos) internal pure returns (uint8 v, bytes32 r, bytes32 s) {
         /* solhint-disable no-inline-assembly */
         /// @solidity memory-safe-assembly
-        assembly ("memory-safe") {
+        assembly {
             let signaturePos := mul(0x41, pos)
             r := mload(add(signatures, add(signaturePos, 0x20)))
             s := mload(add(signatures, add(signaturePos, 0x40)))

diff --git a/contracts/common/StorageAccessible.sol b/contracts/common/StorageAccessible.sol
@@ -19,7 +19,7 @@ abstract contract StorageAccessible {
         for (uint256 index = 0; index < length; index++) {
             /* solhint-disable no-inline-assembly */
             /// @solidity memory-safe-assembly
-            assembly ("memory-safe") {
+            assembly {
                 let word := sload(add(offset, index))
                 mstore(add(add(result, 0x20), mul(index, 0x20)), word)
             }
@@ -42,7 +42,7 @@ abstract contract StorageAccessible {
     function simulateAndRevert(address targetContract, bytes memory calldataPayload) external {
         /* solhint-disable no-inline-assembly */
         /// @solidity memory-safe-assembly
-        assembly ("memory-safe") {
+        assembly {
             let success := delegatecall(gas(), targetContract, add(calldataPayload, 0x20), mload(calldataPayload), 0, 0)
             // Load free memory location
             let ptr := mload(0x40)

diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -39,10 +39,8 @@ import "./src/tasks/show_codesize";
 import { BigNumber } from "@ethersproject/bignumber";
 import { DeterministicDeploymentInfo } from "hardhat-deploy/dist/types";
 
-const primarySolidityVersion = SOLIDITY_VERSION || "0.8.19";
-const soliditySettings = SOLIDITY_SETTINGS
-    ? JSON.parse(SOLIDITY_SETTINGS)
-    : JSON.parse('{"viaIR":true,"optimizer":{"enabled":true, "details": {"yul": true}}}');
+const primarySolidityVersion = SOLIDITY_VERSION || "0.7.6";
+const soliditySettings = SOLIDITY_SETTINGS ? JSON.parse(SOLIDITY_SETTINGS) : undefined;
 
 const deterministicDeployment = (network: string): DeterministicDeploymentInfo => {
     const info = getSingletonFactoryInfo(parseInt(network));
@@ -72,12 +70,7 @@ const userConfig: HardhatUserConfig = {
         target: "ethers-v6",
     },
     solidity: {
-        compilers: [
-            { version: primarySolidityVersion, settings: soliditySettings },
-            { version: "0.7.6" },
-            { version: "0.6.12" },
-            { version: "0.5.17" },
-        ],
+        compilers: [{ version: primarySolidityVersion, settings: soliditySettings }, { version: "0.6.12" }, { version: "0.5.17" }],
     },
     networks: {
         hardhat: {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -71,7 +71,7 @@
         "husky": "^8.0.3",
         "prettier": "^3.1.0",
         "prettier-plugin-solidity": "^1.2.0",
-        "solc": "0.8.19",
+        "solc": "0.7.6",
         "solhint": "^4.0.0",
         "ts-node": "^10.9.1",
         "typescript": "^5.3.2",

diff --git a/test/libraries/SignMessageLib.spec.ts b/test/libraries/SignMessageLib.spec.ts
@@ -46,7 +46,7 @@ describe("SignMessageLib", () => {
         it("can be used only via DELEGATECALL opcode", async () => {
             const { lib } = await setupTests();
 
-            await expect(lib.signMessage("0xbaddad")).to.be.rejectedWith("Transaction reverted without a reason string");
+            await expect(lib.signMessage("0xbaddad")).to.be.rejected;
         });
 
         it("changes the expected storage slot without touching the most important ones", async () => {