chore: merge dev into testnet-holesky

.github/workflows/check-compilation.yml

@@ -0,0 +1,30 @@
+name: CI
+
+on: [push]
+
+jobs:
+  check-compilation:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Build and validate
+        if: github.event_name == 'push'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y make curl git software-properties-common jq
+          sudo add-apt-repository -y ppa:longsleep/golang-backports
+          sudo apt-get update
+          sudo apt-get install -y golang-1.22
+          sudo update-alternatives --install /usr/local/bin/go go /usr/lib/go-1.22/bin/go 1
+          mkdir ~/.go
+          export GOPATH=~/.go
+          export PATH=$PATH:~/.go/bin
+          go install github.com/ethereum/go-ethereum/cmd/[email protected]
+          curl -L https://foundry.paradigm.xyz | bash
+          export PATH=$PATH:/home/runner/.config/.foundry/bin
+          source ~/.bashrc
+          foundryup
+          make bindings
+          if [ ! -z "$(git status --porcelain)" ]; then git diff; git status; exit 1; fi

.github/workflows/run-deploy-scripts.yml

@@ -0,0 +1,38 @@
+name: Run Deploy Scripts
+# We run the deploy scripts just to make sure they work
+
+on:
+  push:
+  pull_request:
+    types: [opened, reopened]
+
+jobs:
+  prepare:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          submodules: true
+
+      # install foundry to run forge script. Should we run forge script in a container instead?
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: nightly
+
+      - name: Start Anvil chain
+        # need to start Anvil chain with -d to let the container run in the background
+        # if we start with 'anvil &' instead, the process stops when the step ends
+        run: docker run -d --rm -p 8545:8545 --entrypoint anvil ghcr.io/foundry-rs/foundry:nightly-5b7e4cb3c882b28f3c32ba580de27ce7381f415a --host 0.0.0.0
+
+      - name: Wait for Anvil chain to start
+        run: sleep 3
+
+      # Run Forge script against the Anvil chain
+      - name: Run M2_Deploy_From_Scratch
+        run: |
+          forge script script/deploy/devnet/M2_Deploy_From_Scratch.s.sol --rpc-url http://localhost:8545 \
+            --private-key 0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80 --broadcast \
+            --sig "run(string memory configFileName)" -- M2_deploy_from_scratch.anvil.config.json

.github/workflows/testinparallel.yml

@@ -25,9 +25,8 @@ jobs:
     needs: prepare
     runs-on: ubuntu-latest
     strategy:
-      matrix:
-        file: ${{fromJson(needs.prepare.outputs.matrix)}}
       fail-fast: false
+
     steps:
     - name: Checkout code
       uses: actions/checkout@v2
@@ -43,8 +42,24 @@ jobs:
         forge build --sizes
       id: build
 
-    - name: Run forge test for the file
-      run: forge test --match-path src/test/${{ matrix.file }} --no-match-contract FFI
+    - name: Run unit tests
+      run: forge test --no-match-contract Integration
+      env:
+        RPC_MAINNET: ${{ secrets.RPC_MAINNET }}
+        RPC_HOLESKY: ${{ secrets.RPC_HOLESKY }}
+        CHAIN_ID: ${{ secrets.CHAIN_ID }}
+
+    - name: Run integration tests
+      run: forge test --match-contract Integration
       env:
         RPC_MAINNET: ${{ secrets.RPC_MAINNET }}
+        RPC_HOLESKY: ${{ secrets.RPC_HOLESKY }}
         CHAIN_ID: ${{ secrets.CHAIN_ID }}
+
+    - name: Run integration mainnet fork tests
+      run: forge test --match-contract Integration
+      env:
+        FOUNDRY_PROFILE: "forktest"
+        RPC_MAINNET: ${{ secrets.RPC_MAINNET }}
+        RPC_HOLESKY: ${{ secrets.RPC_HOLESKY }}
+        CHAIN_ID: ${{ secrets.CHAIN_ID }}

.gitignore

@@ -42,4 +42,6 @@ test.sh
 
 # Surya outputs
 InheritanceGraph.png
-surya_report.md
+surya_report.md
+
+.idea

.gitmodules

@@ -10,3 +10,9 @@
 [submodule "lib/openzeppelin-contracts"]
 	path = lib/openzeppelin-contracts
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
+[submodule "lib/openzeppelin-contracts-v4.9.0"]
+	path = lib/openzeppelin-contracts-v4.9.0
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts
+[submodule "lib/openzeppelin-contracts-upgradeable-v4.9.0"]
+	path = lib/openzeppelin-contracts-upgradeable-v4.9.0
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable

Makefile

@@ -0,0 +1,19 @@
+
+.PHONY: install-hooks
+install-hooks:
+	cp scripts/pre-commit.sh .git/hooks/pre-commit
+
+.PHONY: deps
+deps: install-hooks
+	brew install libusb
+	go install github.com/ethereum/go-ethereum/cmd/abigen@latest
+	curl -L https://foundry.paradigm.xyz | bash
+	foundryup
+
+.PHONY: compile
+compile:
+	forge b
+
+.PHONY: bindings
+bindings: compile
+	./scripts/compile-bindings.sh