From 1340c9508f49ff9ef3ce5449df868b2ce2c9164c Mon Sep 17 00:00:00 2001 From: Yi Sun Date: Wed, 13 Mar 2024 15:00:20 -0400 Subject: [PATCH 1/7] chore: add ast = true --- .github/workflows/test.yml | 2 +- foundry.toml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d3d5a02..213766e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -25,7 +25,7 @@ jobs: - name: Install Foundry uses: foundry-rs/foundry-toolchain@v1 with: - version: nightly-293fad73670b7b59ca901c7f2105bf7a29165a90 + version: nightly - name: Run Forge build run: | diff --git a/foundry.toml b/foundry.toml index cbbff48..a4bc5e1 100644 --- a/foundry.toml +++ b/foundry.toml @@ -10,6 +10,7 @@ remappings = [ "forge-std/=lib/forge-std/src/" ] ffi = true +ast = true # See more config options https://github.com/foundry-rs/foundry/tree/master/config [rpc_endpoints] From ee39c84b00719c3cb99313dca946a2812400389f Mon Sep 17 00:00:00 2001 From: Yi Sun Date: Wed, 13 Mar 2024 15:01:29 -0400 Subject: [PATCH 2/7] chore: remove open zeppelin --- .gitmodules | 3 --- lib/openzeppelin-contracts | 1 - 2 files changed, 4 deletions(-) delete mode 160000 lib/openzeppelin-contracts diff --git a/.gitmodules b/.gitmodules index e8142ff..bc782b1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,6 +7,3 @@ [submodule "lib/forge-std"] path = lib/forge-std url = https://github.com/foundry-rs/forge-std -[submodule "lib/openzeppelin-contracts"] - path = lib/openzeppelin-contracts - url = https://github.com/OpenZeppelin/openzeppelin-contracts diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts deleted file mode 160000 index f8b1ddf..0000000 --- a/lib/openzeppelin-contracts +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f8b1ddf5915dbe14fbeb21a42f5b8d654e358c58 From aa86221c16569cea30ba562d149c95eebefada12 Mon Sep 17 00:00:00 2001 From: Yi Sun Date: Wed, 13 Mar 2024 15:01:33 -0400 Subject: [PATCH 3/7] forge install: openzeppelin-contracts v4.9.5 --- .gitmodules | 3 +++ lib/openzeppelin-contracts | 1 + 2 files changed, 4 insertions(+) create mode 160000 lib/openzeppelin-contracts diff --git a/.gitmodules b/.gitmodules index bc782b1..e8142ff 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "lib/forge-std"] path = lib/forge-std url = https://github.com/foundry-rs/forge-std +[submodule "lib/openzeppelin-contracts"] + path = lib/openzeppelin-contracts + url = https://github.com/OpenZeppelin/openzeppelin-contracts diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts new file mode 160000 index 0000000..bd325d5 --- /dev/null +++ b/lib/openzeppelin-contracts @@ -0,0 +1 @@ +Subproject commit bd325d56b4c62c9c5c1aff048c37c6bb18ac0290 From 887b2ceadf16088ab8bc5e4f13c9ed191087ad9f Mon Sep 17 00:00:00 2001 From: Yu Jiang Tham Date: Wed, 13 Mar 2024 15:25:22 -0400 Subject: [PATCH 4/7] Update submodules --- lib/axiom-v2-periphery | 2 +- lib/forge-std | 2 +- lib/openzeppelin-contracts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/axiom-v2-periphery b/lib/axiom-v2-periphery index 37a9eb3..6482de3 160000 --- a/lib/axiom-v2-periphery +++ b/lib/axiom-v2-periphery @@ -1 +1 @@ -Subproject commit 37a9eb3c39f5f93cd8ed15434efe0b82fccff3cc +Subproject commit 6482de3f73618b0df11f0955af2e1d1fb5a67a8e diff --git a/lib/forge-std b/lib/forge-std index ae570fe..b6a506d 160000 --- a/lib/forge-std +++ b/lib/forge-std @@ -1 +1 @@ -Subproject commit ae570fec082bfe1c1f45b0acca4a2b4f84d345ce +Subproject commit b6a506db2262cad5ff982a87789ee6d1558ec861 diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts index bd325d5..6b4ec6c 160000 --- a/lib/openzeppelin-contracts +++ b/lib/openzeppelin-contracts @@ -1 +1 @@ -Subproject commit bd325d56b4c62c9c5c1aff048c37c6bb18ac0290 +Subproject commit 6b4ec6c6c6b67d7350f5b449c0a2fd2dab1af3c7 From 9bd0c9c0b051678404c031ed09691371d21ecbb2 Mon Sep 17 00:00:00 2001 From: Yu Jiang Tham Date: Wed, 13 Mar 2024 15:26:17 -0400 Subject: [PATCH 5/7] Revert "Update submodules" This reverts commit 887b2ceadf16088ab8bc5e4f13c9ed191087ad9f. --- lib/axiom-v2-periphery | 2 +- lib/forge-std | 2 +- lib/openzeppelin-contracts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/axiom-v2-periphery b/lib/axiom-v2-periphery index 6482de3..37a9eb3 160000 --- a/lib/axiom-v2-periphery +++ b/lib/axiom-v2-periphery @@ -1 +1 @@ -Subproject commit 6482de3f73618b0df11f0955af2e1d1fb5a67a8e +Subproject commit 37a9eb3c39f5f93cd8ed15434efe0b82fccff3cc diff --git a/lib/forge-std b/lib/forge-std index b6a506d..ae570fe 160000 --- a/lib/forge-std +++ b/lib/forge-std @@ -1 +1 @@ -Subproject commit b6a506db2262cad5ff982a87789ee6d1558ec861 +Subproject commit ae570fec082bfe1c1f45b0acca4a2b4f84d345ce diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts index 6b4ec6c..bd325d5 160000 --- a/lib/openzeppelin-contracts +++ b/lib/openzeppelin-contracts @@ -1 +1 @@ -Subproject commit 6b4ec6c6c6b67d7350f5b449c0a2fd2dab1af3c7 +Subproject commit bd325d56b4c62c9c5c1aff048c37c6bb18ac0290 From 8525503e71dde4c0576285b6d2e7d95ce7e9010b Mon Sep 17 00:00:00 2001 From: Yu Jiang Tham Date: Wed, 13 Mar 2024 15:28:00 -0400 Subject: [PATCH 6/7] Update submodules --- lib/axiom-std | 2 +- lib/axiom-v2-periphery | 2 +- lib/openzeppelin-contracts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/axiom-std b/lib/axiom-std index 7511439..0adda22 160000 --- a/lib/axiom-std +++ b/lib/axiom-std @@ -1 +1 @@ -Subproject commit 7511439b85d10f675c0611eca85897666878c934 +Subproject commit 0adda223652f22c82fbc3058a475638a6436ee3c diff --git a/lib/axiom-v2-periphery b/lib/axiom-v2-periphery index 37a9eb3..6482de3 160000 --- a/lib/axiom-v2-periphery +++ b/lib/axiom-v2-periphery @@ -1 +1 @@ -Subproject commit 37a9eb3c39f5f93cd8ed15434efe0b82fccff3cc +Subproject commit 6482de3f73618b0df11f0955af2e1d1fb5a67a8e diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts index bd325d5..6b4ec6c 160000 --- a/lib/openzeppelin-contracts +++ b/lib/openzeppelin-contracts @@ -1 +1 @@ -Subproject commit bd325d56b4c62c9c5c1aff048c37c6bb18ac0290 +Subproject commit 6b4ec6c6c6b67d7350f5b449c0a2fd2dab1af3c7 From 2d5fcd6e53c827cafd0221768b4976431d6df2a6 Mon Sep 17 00:00:00 2001 From: Yu Jiang Tham Date: Wed, 13 Mar 2024 15:32:42 -0400 Subject: [PATCH 7/7] Update submodules --- lib/openzeppelin-contracts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts index 6b4ec6c..bd325d5 160000 --- a/lib/openzeppelin-contracts +++ b/lib/openzeppelin-contracts @@ -1 +1 @@ -Subproject commit 6b4ec6c6c6b67d7350f5b449c0a2fd2dab1af3c7 +Subproject commit bd325d56b4c62c9c5c1aff048c37c6bb18ac0290