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

…webauth-poc-app
safe-global · Jan 12, 2024 · 5cf2ea8 · 5cf2ea8
2 parents c33d744 + 145c874
commit 5cf2ea8
Show file tree

Hide file tree

Showing 200 changed files with 27,358 additions and 42,355 deletions.
diff --git a/4337/.eslintrc.js → .eslintrc.js b/4337/.eslintrc.js → .eslintrc.js
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,7 +1,6 @@
 ---
 name: Bug report
 about: Bug report about the Safe smart contracts
-
 ---
 
 ## Prerequisites
@@ -10,7 +9,7 @@ about: Bug report about the Safe smart contracts
 - Support questions are better asked on our Discord: https://chat.safe.global
 - Please ensure the issue isn't already reported.
 
-*Please delete the above section and the instructions in the sections below before submitting*
+_Please delete the above section and the instructions in the sections below before submitting_
 
 ## Description
 
@@ -26,7 +25,7 @@ Please describe concisely the bug you have found, and what you expect instead.
 
 ## Steps to reproduce
 
-If applicable, please provide a *minimal* source code example to trigger the bug you have found.
+If applicable, please provide a _minimal_ source code example to trigger the bug you have found.
 Provide as much information as necessary to reproduce the bug.
 
 ## Additional context

diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,7 +1,6 @@
 ---
 name: Feature request
 about: Suggest an idea or feature request for the Safe smart contracts project
-
 ---
 
 ## Prerequisites
@@ -10,7 +9,7 @@ about: Suggest an idea or feature request for the Safe smart contracts project
 - Support questions are better asked on our Discord: https://chat.safe.global
 - Please ensure the issue isn't already reported.
 
-*Please delete the above section and the instructions in the sections below before submitting*
+_Please delete the above section and the instructions in the sections below before submitting_
 
 ## Context / issue
 

diff --git a/.github/workflows/certora.yml b/.github/workflows/certora.yml
@@ -3,14 +3,14 @@ name: certora
 on:
   push:
     branches:
-      - master
+      - main
     paths:
-      - 4337/**
+      - modules/4337/**
   pull_request:
     branches:
-      - master
+      - main
     paths:
-      - 4337/**
+      - modules/4337/**
 
   workflow_dispatch:
 
@@ -19,11 +19,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        rule:
-          ["verify4337Module.sh", "verifyTransactionExecutionMethods.sh", "verifyValidationData.sh"]
+        rule: ['verify4337Module.sh', 'verifyTransactionExecutionMethods.sh', 'verifyValidationData.sh']
     defaults:
       run:
-        working-directory: ./4337
+        working-directory: ./modules/4337
     steps:
       - uses: actions/checkout@v3
 
@@ -33,10 +32,10 @@ jobs:
 
       - name: Install java
         uses: actions/setup-java@v3
-        with: { java-version: "17", java-package: jre, distribution: semeru }
+        with: { java-version: '17', java-package: jre, distribution: semeru }
 
       - name: Install certora cli
-        run: pip install -Iv certora-cli
+        run: pip install -Iv certora-cli==5.0.5
 
       - name: Install solc
         run: |

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,15 @@
+name: safe-modules
+on: [push]
+
+jobs:
+  checks:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 20.x
+          cache: npm
+          cache-dependency-path: package-lock.json
+      - run: npm ci
+      - run: npm run fmt:global-check
diff --git a/.github/workflows/ci_4337.yml b/.github/workflows/ci_4337.yml
@@ -4,39 +4,33 @@ on: [push]
 jobs:
   tests:
     runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./4337
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
         with:
           node-version: 20.x
           cache: npm
-          cache-dependency-path: 4337/package-lock.json
+          cache-dependency-path: package-lock.json
       - run: npm ci
-      - run: npm run build && npm run build:ts
-      - run: npm run coverage
+      - run: npm run build -w modules/4337 && npm run build:ts -w modules/4337
+      - run: npm run coverage -w modules/4337
       - name: Coveralls
         uses: coverallsapp/github-action@master
         with:
-          path-to-lcov: 4337/coverage/lcov.info
+          path-to-lcov: modules/4337/coverage/lcov.info
           github-token: ${{ secrets.GITHUB_TOKEN }}
   e2e:
     runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./4337
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
         with:
           node-version: 20.x
           cache: npm
-          cache-dependency-path: 4337/package-lock.json
+          cache-dependency-path: package-lock.json
       - run: npm ci
       - run: |
-          docker compose up -d
+          docker compose -f modules/4337/docker-compose.yaml up -d
           # wait for containers to start up
           SECONDS=0
           until curl -fs http://localhost:8545 >/dev/null && curl -fs http://localhost:3000 >/dev/null; do
@@ -48,19 +42,16 @@ jobs:
             sleep 1
           done
 
-          npm run test:e2e
+          npm run test:e2e -w modules/4337
   lint:
     runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./4337
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
         with:
           node-version: 20.x
           cache: npm
-          cache-dependency-path: 4337/package-lock.json
+          cache-dependency-path: package-lock.json
       - run: npm ci
-      - run: npm run lint
-      - run: npm run fmt:check
+      - run: npm run lint -w modules/4337
+      - run: npm run fmt:check -w modules/4337
diff --git a/.github/workflows/ci_4337_gas_metering.yml b/.github/workflows/ci_4337_gas_metering.yml
@@ -4,17 +4,14 @@ on: [push]
 jobs:
   checks:
     runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./4337-gas-metering
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
         with:
           node-version: 20.x
           cache: npm
-          cache-dependency-path: 4337-gas-metering/package-lock.json
+          cache-dependency-path: package-lock.json
       - run: npm ci
-      - run: npm run fmt:check
-      - run: npm run lint
-      - run: npm run build
+      - run: npm run fmt:check -w modules/4337-gas-metering
+      - run: npm run lint -w modules/4337-gas-metering
+      - run: npm run build -w modules/4337-gas-metering
diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml
@@ -1,4 +1,4 @@
-name: "CLA Assistant"
+name: 'CLA Assistant'
 
 on:
   issue_comment:
@@ -16,7 +16,7 @@ jobs:
   CLAAssistant:
     runs-on: ubuntu-latest
     steps:
-      - name: "CLA Assistant"
+      - name: 'CLA Assistant'
         if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
         # Beta Release
         uses: contributor-assistant/github-action@v2.3.1
@@ -25,18 +25,18 @@ jobs:
           # the below token should have repo scope and must be manually added by you in the repository's secret
           PERSONAL_ACCESS_TOKEN: ${{ secrets.CLA_ACCESS_TOKEN }}
         with:
-          path-to-signatures: "signatures/version1/cla.json"
-          path-to-document: "https://safe.global/cla" # e.g. a CLA or a DCO document
+          path-to-signatures: 'signatures/version1/cla.json'
+          path-to-document: 'https://safe.global/cla' # e.g. a CLA or a DCO document
           # branch should not be protected
-          branch: "main"
+          branch: 'main'
           # user names of users allowed to contribute without CLA
           allowlist: lukasschor,rmeissner,Uxio0,tschubotz,bot*
 
           # the followings are the optional inputs - If the optional inputs are not given, then default values will be taken
           # enter the remote organization name where the signatures should be stored (Default is storing the signatures in the same repository)
-          remote-organization-name: "safe-global"
+          remote-organization-name: 'safe-global'
           # enter the  remote repository name where the signatures should be stored (Default is storing the signatures in the same repository)
-          remote-repository-name: "cla-signatures"
+          remote-repository-name: 'cla-signatures'
           #create-file-commit-message: 'For example: Creating file for storing CLA Signatures'
           #signed-commit-message: 'For example: $contributorName has signed the CLA in #$pullRequestNo'
           #custom-notsigned-prcomment: 'pull request comment with Introductory message to ask new contributors to sign'

diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1 @@
+modules/**
diff --git a/4337/.prettierrc → .prettierrc b/4337/.prettierrc → .prettierrc
diff --git a/4337-gas-metering/.eslintrc.cjs b/4337-gas-metering/.eslintrc.cjs