From 9b0ec28b2c5a24349577b4406b69859bd8147c1a Mon Sep 17 00:00:00 2001 From: Haichen Shen Date: Fri, 21 Nov 2025 16:33:36 -0300 Subject: [PATCH 1/6] Bump up node version --- .github/workflows/contracts.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/contracts.yml b/.github/workflows/contracts.yml index 85d70d9..a419e21 100644 --- a/.github/workflows/contracts.yml +++ b/.github/workflows/contracts.yml @@ -45,10 +45,10 @@ jobs: - name: Setup LCOV uses: hrishikesh-kadam/setup-lcov@6c1aa0cc9e1c02f9f58f01ac599f1064ccc83470 # v1 - - name: Install Node.js 18 + - name: Install Node.js 22 uses: actions/setup-node@v4 with: - node-version: '18' + node-version: '22' - name: Get yarn cache directory path id: yarn-cache-dir-path From 9e55e7cbdec890bdf65377182ea9976e8508d03e Mon Sep 17 00:00:00 2001 From: Haichen Shen Date: Fri, 21 Nov 2025 16:43:16 -0300 Subject: [PATCH 2/6] x --- foundry.toml | 11 ----------- remappings.txt | 8 ++++++++ 2 files changed, 8 insertions(+), 11 deletions(-) create mode 100644 remappings.txt diff --git a/foundry.toml b/foundry.toml index 3d4847b..166fb06 100644 --- a/foundry.toml +++ b/foundry.toml @@ -10,17 +10,6 @@ ast = true build_info = true extra_output = ["storageLayout"] -remappings = [ - '@layerzerolabs/oft-evm/=lib/devtools/packages/oft-evm/', - '@layerzerolabs/oapp-evm/=lib/devtools/packages/oapp-evm/', - '@layerzerolabs/lz-evm-protocol-v2/=lib/layerzero-v2/packages/layerzero-v2/evm/protocol/', - '@layerzerolabs/lz-evm-messagelib-v2/=lib/layerzero-v2/packages/layerzero-v2/evm/messagelib/', - "@openzeppelin/contracts/=lib/openzeppelin-contracts-upgradeable/lib/openzeppelin-contracts/contracts/", - "@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/", - "openzeppelin-foundry-upgrades/=lib/openzeppelin-foundry-upgrades/src/", - 'solidity-bytes-utils/=lib/solidity-bytes-utils/', -] - # Network configurations [rpc_endpoints] scroll = "${SCROLL_MAINNET_RPC}" diff --git a/remappings.txt b/remappings.txt new file mode 100644 index 0000000..76b8eed --- /dev/null +++ b/remappings.txt @@ -0,0 +1,8 @@ +@openzeppelin/contracts/=lib/openzeppelin-contracts-upgradeable/lib/openzeppelin-contracts/contracts/ +@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/ +openzeppelin-foundry-upgrades/=lib/openzeppelin-foundry-upgrades/src/ +solidity-bytes-utils/=lib/solidity-bytes-utils/ +@layerzerolabs/oapp-evm/=lib/devtools/packages/oapp-evm/ +@layerzerolabs/oft-evm/=lib/devtools/packages/oft-evm/ +@layerzerolabs/lz-evm-messagelib-v2/=lib/layerzero-v2/packages/layerzero-v2/evm/messagelib/ +@layerzerolabs/lz-evm-protocol-v2/=lib/layerzero-v2/packages/layerzero-v2/evm/protocol/ From 7e56e2e7a5032344ae6f4bff36b3f9f0351b2e71 Mon Sep 17 00:00:00 2001 From: Haichen Shen Date: Fri, 21 Nov 2025 16:51:24 -0300 Subject: [PATCH 3/6] x --- .gitmodules | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 56cf48f..fd7a8f8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,9 +13,10 @@ [submodule "lib/devtools"] path = lib/devtools url = https://github.com/layerzero-labs/devtools -[submodule "lib/LayerZero-v2"] - path = lib/LayerZero-v2 - url = https://github.com/layerzero-labs/LayerZero-v2 +[submodule "lib/layerzero-v2"] + path = lib/layerzero-v2 + url = https://github.com/layerzero-labs/layerzero-v2 [submodule "lib/solidity-bytes-utils"] path = lib/solidity-bytes-utils url = https://github.com/GNSPS/solidity-bytes-utils.git + From 4c2984ccfc19d41d9ed8d43624f6fbe01852ef61 Mon Sep 17 00:00:00 2001 From: Haichen Shen Date: Fri, 21 Nov 2025 16:53:57 -0300 Subject: [PATCH 4/6] x --- .gitmodules | 1 - foundry.lock | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index fd7a8f8..a9201b5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,4 +19,3 @@ [submodule "lib/solidity-bytes-utils"] path = lib/solidity-bytes-utils url = https://github.com/GNSPS/solidity-bytes-utils.git - diff --git a/foundry.lock b/foundry.lock index 33153f4..7fa954c 100644 --- a/foundry.lock +++ b/foundry.lock @@ -1,5 +1,5 @@ { - "lib/LayerZero-v2": { + "lib/layerzero-v2": { "rev": "3801b9929281261b907eb3482a82364ad00d7868" }, "lib/devtools": { @@ -23,4 +23,4 @@ "lib/solidity-bytes-utils": { "rev": "fc502455bb2a7e26a743378df042612dd50d1eb9" } -} \ No newline at end of file +} From 78cf89beb2ce0775f084a06b6c988bd41982ac4a Mon Sep 17 00:00:00 2001 From: Haichen Shen Date: Sat, 22 Nov 2025 01:46:44 -0300 Subject: [PATCH 5/6] x --- .gitmodules | 6 +++--- remappings.txt | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index a9201b5..56cf48f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,9 +13,9 @@ [submodule "lib/devtools"] path = lib/devtools url = https://github.com/layerzero-labs/devtools -[submodule "lib/layerzero-v2"] - path = lib/layerzero-v2 - url = https://github.com/layerzero-labs/layerzero-v2 +[submodule "lib/LayerZero-v2"] + path = lib/LayerZero-v2 + url = https://github.com/layerzero-labs/LayerZero-v2 [submodule "lib/solidity-bytes-utils"] path = lib/solidity-bytes-utils url = https://github.com/GNSPS/solidity-bytes-utils.git diff --git a/remappings.txt b/remappings.txt index 76b8eed..6937de8 100644 --- a/remappings.txt +++ b/remappings.txt @@ -4,5 +4,5 @@ openzeppelin-foundry-upgrades/=lib/openzeppelin-foundry-upgrades/src/ solidity-bytes-utils/=lib/solidity-bytes-utils/ @layerzerolabs/oapp-evm/=lib/devtools/packages/oapp-evm/ @layerzerolabs/oft-evm/=lib/devtools/packages/oft-evm/ -@layerzerolabs/lz-evm-messagelib-v2/=lib/layerzero-v2/packages/layerzero-v2/evm/messagelib/ -@layerzerolabs/lz-evm-protocol-v2/=lib/layerzero-v2/packages/layerzero-v2/evm/protocol/ +@layerzerolabs/lz-evm-messagelib-v2/=lib/LayerZero-v2/packages/layerzero-v2/evm/messagelib/ +@layerzerolabs/lz-evm-protocol-v2/=lib/LayerZero-v2/packages/layerzero-v2/evm/protocol/ From 9cd15428512741dac79f508697412a8c8889d07e Mon Sep 17 00:00:00 2001 From: Haichen Shen Date: Sat, 22 Nov 2025 12:32:25 -0300 Subject: [PATCH 6/6] cleanup --- foundry.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/foundry.lock b/foundry.lock index 7fa954c..33153f4 100644 --- a/foundry.lock +++ b/foundry.lock @@ -1,5 +1,5 @@ { - "lib/layerzero-v2": { + "lib/LayerZero-v2": { "rev": "3801b9929281261b907eb3482a82364ad00d7868" }, "lib/devtools": { @@ -23,4 +23,4 @@ "lib/solidity-bytes-utils": { "rev": "fc502455bb2a7e26a743378df042612dd50d1eb9" } -} +} \ No newline at end of file