[UNTRACKED] V2

.github/workflows/ci-olympix.yml

@@ -0,0 +1,13 @@
+name: "Olympix Scan"
+on:
+  pull_request:
+    branches: [ "master" ]
+  workflow_dispatch:
+  schedule:
+    - cron: '31 14 * * 1' # Every Monday 2:31PM UTC
+
+jobs:
+  run_olympix:
+    if: ${{ github.repository_owner == 'circlefin' }}
+    uses: circlefin/security-seceng-templates/.github/workflows/olympix_scan.yml@v1
+

.github/workflows/ci.yml

@@ -12,6 +12,11 @@ jobs:
         with:
           submodules: 'true'
 
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+
       - name: Install Node
         uses: actions/setup-node@v4
 
@@ -30,10 +35,56 @@ jobs:
       - name: Run Integration Tests
         run: make anvil-test
 
-      - name: Run Slither
-        uses: crytic/[email protected]
+      - name: Run v2 Integration Tests
+        run: make anvil-test-v2
+
+  analyze-message-transmitter:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+        with:
+          submodules: 'true'
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
         with:
-          fail-on: none
+          python-version: '3.10'
+
+      - name: Run Static Analysis on Message Transmitter
+        run: make analyze-message-transmitter
+
+  analyze-message-transmitter-v2:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+        with:
+          submodules: 'true'
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+
+      - name: Run Static Analysis on Message Transmitter V2
+        run: make analyze-message-transmitter-v2
+
+  analyze-token-messenger-minter:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+        with:
+          submodules: 'true'
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+
+      - name: Run Static Analysis on Token Messenger Minter
+        run: make analyze-token-messenger-minter
 
   scan:
     needs: lint-and-test

.vscode/settings.json

@@ -1,12 +1,14 @@
 {
-    "editor.formatOnSave": true,
-    "solidity.compilerOptimization": 200,
-    "solidity.enabledAsYouTypeCompilationErrorCheck": true,
-    "solidity.compileUsingRemoteVersion": "v0.7.6+commit.7338295f",
-    "solidity.formatter": "prettier",
-    "solidity.linter": "solhint",
-    "solidity.validationDelay": 1500,
-    "[solidity]": {
-      "editor.tabSize": 4,
-    }
+  "editor.formatOnSave": true,
+  "solidity.compilerOptimization": 200,
+  "solidity.enabledAsYouTypeCompilationErrorCheck": true,
+  "solidity.compileUsingRemoteVersion": "v0.7.6+commit.7338295f",
+  "solidity.formatter": "prettier",
+  "solidity.linter": "solhint",
+  "solidity.validationDelay": 1500,
+  "[solidity]": {
+    "editor.tabSize": 4,
+  },
+  "security.olympix.project.includePath": "/src",
+  "security.olympix.project.testsPath": "/test"
 }

Dockerfile

@@ -1,6 +1,6 @@
+ARG FOUNDRY_VERSION=nightly-3fa02706ca732c994715ba42d923605692062375
 # Use fixed foundry image
-
-FROM ghcr.io/foundry-rs/foundry:nightly-4a8c7d0e26a1befa526222e22737740f80a7f1c5
+FROM ghcr.io/foundry-rs/foundry:${FOUNDRY_VERSION}
 
 # Copy our source code into the container
 WORKDIR /app

Makefile

@@ -9,19 +9,59 @@ build:
 test:
 	@${FOUNDRY} "forge test -vv"
 
-simulate:
-	forge script scripts/deploy.s.sol:DeployScript --rpc-url ${RPC_URL} --sender ${SENDER}
+simulate-deploy:
+	forge script scripts/v1/deploy.s.sol:DeployScript --rpc-url ${RPC_URL} --sender ${SENDER}
 
 deploy:
-	forge script scripts/deploy.s.sol:DeployScript --rpc-url ${RPC_URL} --sender ${SENDER} --broadcast
+	forge script scripts/v1/deploy.s.sol:DeployScript --rpc-url ${RPC_URL} --sender ${SENDER} --broadcast
+
+simulate-deploy-implementations-v2:
+	forge script scripts/v2/DeployImplementationsV2.s.sol:DeployImplementationsV2Script --rpc-url ${RPC_URL} --sender ${SENDER}
+
+deploy-implementations-v2:
+	forge script scripts/v2/DeployImplementationsV2.s.sol:DeployImplementationsV2Script --rpc-url ${RPC_URL} --sender ${SENDER} --broadcast
+
+simulate-deploy-create2-factory:
+	forge script scripts/DeployCreate2Factory.s.sol:DeployCreate2FactoryScript --rpc-url ${RPC_URL} --sender ${SENDER}
+
+deploy-create2-factory:
+	forge script scripts/DeployCreate2Factory.s.sol:DeployCreate2FactoryScript --rpc-url ${RPC_URL} --sender ${SENDER} --broadcast
+
+simulate-deploy-proxies-v2:
+	forge script scripts/v2/DeployProxiesV2.s.sol:DeployProxiesV2Script --rpc-url ${RPC_URL} --sender ${SENDER}
+
+deploy-proxies-v2:
+	forge script scripts/v2/DeployProxiesV2.s.sol:DeployProxiesV2Script --rpc-url ${RPC_URL} --sender ${SENDER} --broadcast
+
+simulate-setup-remote-resources-v2:
+	forge script scripts/v2/SetupRemoteResourcesV2.s.sol:SetupRemoteResourcesV2Script --rpc-url ${RPC_URL} --sender ${SENDER}
+
+setup-remote-resources-v2:
+	forge script scripts/v2/SetupRemoteResourcesV2.s.sol:SetupRemoteResourcesV2Script --rpc-url ${RPC_URL} --sender ${SENDER} --broadcast
+
+simulate-rotate-keys-v2:
+	forge script scripts/v2/RotateKeysV2.s.sol:RotateKeysV2Script --rpc-url ${RPC_URL} --sender ${SENDER}
+
+rotate-keys-v2:
+	forge script scripts/v2/RotateKeysV2.s.sol:RotateKeysV2Script --rpc-url ${RPC_URL} --sender ${SENDER} --broadcast
+
+simulate-deploy-address-utils-external:
+	forge script scripts/v2/DeployAddressUtilsExternal.s.sol:DeployAddressUtilsExternalScript --rpc-url ${RPC_URL} --sender ${SENDER}
+
+deploy-address-utils-external:
+	forge script scripts/v2/DeployAddressUtilsExternal.s.sol:DeployAddressUtilsExternalScript --rpc-url ${RPC_URL} --sender ${SENDER} --broadcast
 
 anvil:
 	docker rm -f anvil || true
-	@${ANVIL} "anvil --host 0.0.0.0 -a 13 --code-size-limit 250000"	
+	@${ANVIL} "anvil --host 0.0.0.0 -a 13 --code-size-limit 250000"
 
 anvil-test: anvil
 	pip3 install -r requirements.txt
-	python3 anvil/crosschainTransferIT.py
+	python anvil/crosschainTransferIT.py
+
+anvil-test-v2: anvil
+	pip3 install -r requirements.txt
+	python anvil/crosschainTransferITV2.py
 
 deploy-local:
 	@docker exec anvil forge script anvil/scripts/${contract}.s.sol:${contract}Script --rpc-url http://localhost:8545  --private-key 0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80 --broadcast
@@ -31,10 +71,21 @@ cast-call:
 
 cast-send:
 	@docker exec anvil cast send ${contract_address} "${function}" --rpc-url http://localhost:8545 --private-key 0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
-	
+
 clean:
 	@${FOUNDRY} "forge clean"
 
-analyze:
-	pip3 install -r requirements.txt
-	slither .
+analyze-message-transmitter:
+	pip3 install mythril==0.24.8
+	myth -v4 analyze src/MessageTransmitter.sol --solc-json mythril.config.json --solv 0.7.6
+
+analyze-message-transmitter-v2:
+	pip3 install mythril==0.24.8
+	myth -v4 analyze src/v2/MessageTransmitterV2.sol --solc-json mythril.config.json --solv 0.7.6
+
+analyze-token-messenger-minter:
+	pip3 install mythril==0.24.8
+	myth -v4 analyze src/TokenMessenger.sol --solc-json mythril.config.json --solv 0.7.6
+	myth -v4 analyze src/TokenMinter.sol --solc-json mythril.config.json --solv 0.7.6
+	myth -v4 analyze src/v2/TokenMessengerV2.sol --solc-json mythril.config.json --solv 0.7.6
+	myth -v4 analyze src/v2/TokenMinterV2.sol --solc-json mythril.config.json --solv 0.7.6