From 743f3a9a8942e9a02a6987e2a9054c0a235a12de Mon Sep 17 00:00:00 2001 From: wcgcyx Date: Fri, 13 Oct 2023 11:54:12 +1000 Subject: [PATCH 1/4] Add CI and slither --- .github/workflows/static-analysis.yml | 10 ++++++++++ .github/workflows/test.yml | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/static-analysis.yml diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml new file mode 100644 index 00000000..556162f3 --- /dev/null +++ b/.github/workflows/static-analysis.yml @@ -0,0 +1,10 @@ +name: Slither Analysis + +on: [push] + +jobs: + analyze: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: crytic/slither-action@v0.3.0 \ No newline at end of file diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 09880b1d..921bdba7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,6 +1,6 @@ -name: test +name: Build and Test -on: workflow_dispatch +on: [push] env: FOUNDRY_PROFILE: ci From beca9eafcfab6b20c4641989fd7ca684c8983840 Mon Sep 17 00:00:00 2001 From: wcgcyx Date: Mon, 16 Oct 2023 11:17:04 +1000 Subject: [PATCH 2/4] Exclude lib and test folder --- .github/workflows/static-analysis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 556162f3..8198ebf5 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -7,4 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: crytic/slither-action@v0.3.0 \ No newline at end of file + - uses: crytic/slither-action@v0.3.0 + with: + fail-on: high + filter-paths: lib,test \ No newline at end of file From e6fc7361d1b38210d02bacf73f054f063de0ec1a Mon Sep 17 00:00:00 2001 From: wcgcyx Date: Mon, 16 Oct 2023 12:35:30 +1000 Subject: [PATCH 3/4] Update static-analysis.yml --- .github/workflows/static-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 8198ebf5..9be10507 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -10,4 +10,4 @@ jobs: - uses: crytic/slither-action@v0.3.0 with: fail-on: high - filter-paths: lib,test \ No newline at end of file + slither-args: --filter-paths "./lib|./test" \ No newline at end of file From 015e32b0aca0e22e8a18c114cc6bf19ea9925ca2 Mon Sep 17 00:00:00 2001 From: wcgcyx Date: Mon, 16 Oct 2023 14:52:19 +1000 Subject: [PATCH 4/4] Update DeployChildContracts.s.sol --- script/DeployChildContracts.s.sol | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/script/DeployChildContracts.s.sol b/script/DeployChildContracts.s.sol index 6ec7ab47..9bf20df8 100644 --- a/script/DeployChildContracts.s.sol +++ b/script/DeployChildContracts.s.sol @@ -6,6 +6,7 @@ import {Script, console2} from "forge-std/Script.sol"; import {ChildERC20Bridge} from "../src/child/ChildERC20Bridge.sol"; import {ChildAxelarBridgeAdaptor} from "../src/child/ChildAxelarBridgeAdaptor.sol"; import {ChildERC20} from "../src/child/ChildERC20.sol"; +import {WIMX} from "../src/child/WIMX.sol"; // TODO update private key usage to be more secure: https://book.getfoundry.sh/reference/forge/forge-script#wallet-options---raw @@ -29,11 +30,14 @@ contract DeployChildContracts is Script { address(childBridge) // child bridge ); + WIMX wrappedIMX = new WIMX(); + vm.stopBroadcast(); console2.log("====ADDRESSES===="); console2.log("Child ERC20 Bridge: %s", address(childBridge)); console2.log("Child Axelar Bridge Adaptor: %s", address(childBridgeAdaptor)); console2.log("childTokenTemplate: %s", address(childTokenTemplate)); + console2.log("Wrapped IMX: %s", address(wrappedIMX)); } }