Merge branch 'main' of github.com:safe-global/safe-modules into featu…

…re-287-webauthn-package

.github/workflows/certora_4337.yml

@@ -20,20 +20,13 @@ jobs:
     strategy:
       matrix:
         rule: ['verify4337Module.sh', 'verifyTransactionExecutionMethods.sh', 'verifyValidationData.sh']
-    defaults:
-      run:
-        working-directory: ./modules/4337
     steps:
       - uses: actions/checkout@v3
 
       - name: Install python
         uses: actions/setup-python@v4
         with: { python-version: 3.11 }
 
-      - name: Install java
-        uses: actions/setup-java@v3
-        with: { java-version: '17', java-package: jre, distribution: semeru }
-
       - name: Install certora cli
         run: pip install -Iv certora-cli==6.1.3
 
@@ -47,6 +40,7 @@ jobs:
         run: npm ci
 
       - name: Verify rule ${{ matrix.rule }}
+        working-directory: ./modules/4337
         run: |
           echo "key length" ${#CERTORAKEY}
           chmod +x ./certora/scripts/${{ matrix.rule }}

.github/workflows/ci_4337.yml

@@ -14,9 +14,9 @@ jobs:
           node-version: 20.x
           cache: npm
           cache-dependency-path: package-lock.json
-      - run: npm ci
-      - run: npm run build -w modules/4337 && npm run build:ts -w modules/4337
-      - run: npm run coverage -w modules/4337
+      - run: |
+          npm ci
+          npm run coverage -w modules/4337
       - name: Coveralls
         uses: coverallsapp/github-action@master
         with:
@@ -33,7 +33,7 @@ jobs:
           cache-dependency-path: package-lock.json
       - run: |
           npm ci
-          npm run test:e2e -w modules/4337
+          npm run test:4337 -w modules/4337
   lint:
     runs-on: ubuntu-latest
     steps:
@@ -43,6 +43,7 @@ jobs:
           node-version: 20.x
           cache: npm
           cache-dependency-path: package-lock.json
-      - run: npm ci
-      - run: npm run lint -w modules/4337
-      - run: npm run fmt:check -w modules/4337
+      - run: |
+          npm ci
+          npm run lint -w modules/4337
+          npm run fmt:check -w modules/4337

.github/workflows/ci_4337_gas_metering.yml

@@ -15,7 +15,8 @@ jobs:
           node-version: 20.x
           cache: npm
           cache-dependency-path: package-lock.json
-      - run: npm ci
-      - run: npm run fmt:check -w examples/4337-gas-metering
-      - run: npm run lint -w examples/4337-gas-metering
-      - run: npm run build -w examples/4337-gas-metering
+      - run: |
+          npm ci
+          npm run fmt:check -w examples/4337-gas-metering
+          npm run lint -w examples/4337-gas-metering
+          npm run build -w examples/4337-gas-metering

.github/workflows/ci_4337_local_bundler.yml

@@ -0,0 +1,19 @@
+name: safe-modules-4337-local-bundler
+on:
+  push:
+    paths:
+      - 'packages/4337-local-bundler/**'
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20.x
+          cache: npm
+          cache-dependency-path: package-lock.json
+      - run: |
+          npm ci
+          npm run lint -w packages/4337-local-bundler

.github/workflows/ci_4337_upstream_bundler.yml

@@ -1,4 +1,4 @@
-name: 4337 Module End-to-End Tests With Upstream Bundler
+name: 4337 End-to-End Tests With Upstream Bundler
 on:
   schedule:
     # * is a special character in YAML so you have to quote this string
@@ -7,6 +7,8 @@ on:
   push:
     paths:
       - 'modules/4337/**'
+      - 'modules/passkey/**'
+      - 'packages/4337-local-bundler/**'
 
 jobs:
   e2e-upstream-bundler:
@@ -20,4 +22,5 @@ jobs:
           cache-dependency-path: package-lock.json
       - run: |
           npm ci
-          npm run test:e2e:upstream -w modules/4337
+          npm run test:4337:upstream -w modules/4337
+          npm run test:4337:upstream -w modules/passkey

.github/workflows/ci_passkey_example.yml

@@ -17,10 +17,6 @@ jobs:
           cache: npm
           cache-dependency-path: package-lock.json
       - run: |
-          npm ci
-          # Build the 4337 module so the app can use the artifacts
-          npm run build -w modules/4337
-          # Reinstall the dependencies so the 4337 dependency includes artifacts
           npm ci
           npm run lint -w examples/4337-passkeys
           npm run build -w examples/4337-passkeys

.prettierignore

@@ -1,2 +1,3 @@
-modules/**
 examples/**
+modules/**
+packages/**

examples/4337-gas-metering/.env.example

@@ -32,18 +32,16 @@ ALCHEMY_ERC20_TOKEN_CONTRACT = "0x255de08fb52fde17a3aab145de8e2ffb7fd0310f"
 ALCHEMY_ERC721_TOKEN_CONTRACT = "0x16bc5fba06f3f5875e915c0ba6963377eb6651e1"
 
 # Gelato Values
-GELATO_CHAIN = "sepolia"
-GELATO_CHAIN_ID = "11155111"
-GELATO_RPC_URL = "https://rpc.ankr.com/eth_sepolia"
-GELATO_API_KEY = "" # Sponsor API Key
-GELATO_GAS_POLICY = ""
-GELATO_ENTRYPOINT_ADDRESS = "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789"
+GELATO_CHAIN = "base-sepolia" # "base-sepolia" or "sepolia"
+GELATO_CHAIN_ID = "84532" # "84532" or "11155111"
+GELATO_RPC_URL = "https://rpc.ankr.com/base_sepolia" # "https://rpc.ankr.com/base_sepolia" or "https://rpc.ankr.com/eth_sepolia"
+GELATO_API_KEY = "" # Sponsor API Key: https://app.gelato.network/relay?networkGroup=testnets
 GELATO_MULTISEND_ADDRESS = "0x38869bf66a61cF6bDB996A6aE40D5853Fd43B526" # https://github.com/safe-global/safe-deployments/blob/main/src/assets/v1.4.1/multi_send.json
 # Make sure all nonce are unique for it to deploy account when run initially.
 GELATO_NONCE = "3"
 # Gelato Token Operation Values (Based on the chain selected, these values should also change accordingly.)
-GELATO_ERC20_TOKEN_CONTRACT = "0x255de08fb52fde17a3aab145de8e2ffb7fd0310f"
-GELATO_ERC721_TOKEN_CONTRACT = "0x16bc5fba06f3f5875e915c0ba6963377eb6651e1"
+GELATO_ERC20_TOKEN_CONTRACT = "0x0b3ff6382bd1a8a74f23d39b4d131a08cea2502a"
+GELATO_ERC721_TOKEN_CONTRACT = "0xf13eca34092D27cbF91cD377eFB261704C687a05"
 
 # Safe Values
 SAFE_VERSION = "1.4.1"
@@ -55,3 +53,5 @@ SAFE_VERSION = "1.4.1"
 # ERC721 Token Sepolia: https://sepolia.etherscan.io/token/0x16bc5fba06f3f5875e915c0ba6963377eb6651e1
 # ERC20 Token Mumbai: https://mumbai.polygonscan.com/address/0x255de08fb52fde17a3aab145de8e2ffb7fd0310f
 # ERC721 Token Mumbai: https://mumbai.polygonscan.com/address/0x16bc5fba06f3f5875e915c0ba6963377eb6651e1
+# ERC20 Token Base Sepolia: https://sepolia.basescan.org/address/0x0b3ff6382bd1a8a74f23d39b4d131a08cea2502a
+# ERC721 Token Base Sepolia: https://sepolia.basescan.org/address/0xf13eca34092D27cbF91cD377eFB261704C687a05