Merge branch 'main' into typo-pass-1

remedcu · remedcu · commit 86b594beb398 · 2025-04-11T09:54:45.000+02:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,7 +1,7 @@
 name: safe-smart-account
 on: [push, pull_request]
 env:
-    NODE_VERSION: 20.16.0
+    NODE_VERSION: 22.14.0
 
 jobs:
     lint-solidity:
@@ -41,6 +41,18 @@ jobs:
             - run: npm run build
             - run: npm run test
 
+    tests-zk:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+            - uses: actions/setup-node@v4
+              with:
+                  node-version: ${{ env.NODE_VERSION }}
+                  cache: "npm"
+            - run: npm ci
+            - run: npm run build
+            - run: npm run test:zk
+
     coverage:
         runs-on: ubuntu-latest
         strategy:
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 .idea/
+.cache/
 build/
 node_modules/
 .DS_Store
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v18.17.1
+v22.14.0
diff --git a/certora/requirements.txt b/certora/requirements.txt
@@ -1 +1 @@
-certora-cli==7.22.2
+certora-cli==7.26.0
diff --git a/contracts/common/StorageAccessible.sol b/contracts/common/StorageAccessible.sol
@@ -31,11 +31,11 @@ abstract contract StorageAccessible {
 
     /**
      * @dev Performs a delegatecall on a targetContract in the context of self.
-     * Internally reverts execution to avoid side effects (making it static).
+     * Internally reverts execution to avoid side effects (making it effectively static).
      *
-     * This method reverts with data equal to `abi.encode(bool(success), bytes(response))`.
+     * This method reverts with data equal to `abi.encodePacked(uint256(success), uint256(response.length), bytes(response))`.
      * Specifically, the `returndata` after a call to this method will be:
-     * `success:bool || response.length:uint256 || response:bytes`.
+     * `success:uint256 || response.length:uint256 || response:bytes`.
      *
      * @param targetContract Address of the contract containing the code to execute.
      * @param calldataPayload Calldata that should be sent to the target contract (encoded method name and arguments).
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`.idea/`
	`2`	`+.cache/`
`2`	`3`	`build/`
`3`	`4`	`node_modules/`
`4`	`5`	`.DS_Store`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-certora-cli==7.22.2`
	`1`	`+certora-cli==7.26.0`
Original file line number	Diff line number	Diff line change
`@@ -31,11 +31,11 @@ abstract contract StorageAccessible {`
`31`	`31`
`32`	`32`	`/**`
`33`	`33`	`* @dev Performs a delegatecall on a targetContract in the context of self.`
`34`		`- * Internally reverts execution to avoid side effects (making it static).`
	`34`	`+ * Internally reverts execution to avoid side effects (making it effectively static).`
`35`	`35`	`*`
`36`		- * This method reverts with data equal to `abi.encode(bool(success), bytes(response))`.
	`36`	+ * This method reverts with data equal to `abi.encodePacked(uint256(success), uint256(response.length), bytes(response))`.
`37`	`37`	* Specifically, the `returndata` after a call to this method will be:
`38`		- * `success:bool \|\| response.length:uint256 \|\| response:bytes`.
	`38`	+ * `success:uint256 \|\| response.length:uint256 \|\| response:bytes`.
`39`	`39`	`*`
`40`	`40`	`* @param targetContract Address of the contract containing the code to execute.`
`41`	`41`	`* @param calldataPayload Calldata that should be sent to the target contract (encoded method name and arguments).`