From ac72bf2fa816be0442c752ac2d10ec9f6f044684 Mon Sep 17 00:00:00 2001 From: Jeffrey Hilaire Date: Sat, 21 Dec 2024 00:12:44 +0000 Subject: [PATCH 1/2] upgrade foundry version --- setup-evm-contracts.sh | 15 ++++++++------- versions.sh | 5 +++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/setup-evm-contracts.sh b/setup-evm-contracts.sh index 982de51..6db299a 100755 --- a/setup-evm-contracts.sh +++ b/setup-evm-contracts.sh @@ -15,13 +15,15 @@ # See the License for the specific language governing permissions and # limitations under the License. +source versions.sh echo "Deploying evm-cctp-contracts contracts" +FOUNDRY_SHORT_VERSION=$(echo ${FOUNDRY_VERSION} | cut -d '-' -f2 | cut -c1-7) + # Check if foundry is installed -if ! ~/.foundry/bin/forge -V; then - curl -L https://foundry.paradigm.xyz | bash - # 07-14-2023 - The version following this version breaks our build, so setting to this version for now. - ~/.foundry/bin/foundryup --version nightly-d369d2486f85576eec4ca41d277391dfdae21ba7 +if [ ! -x ~/.foundry/bin/forge ] || ! ~/.foundry/bin/forge --version | grep ${FOUNDRY_SHORT_VERSION} ; then + curl -L https://foundry.paradigm.xyz | bash + ~/.foundry/bin/foundryup --install ${FOUNDRY_VERSION} fi cd evm-cctp-contracts @@ -33,7 +35,7 @@ git submodule update --init --recursive yarn install # Build the anvil image -docker build --no-cache -f Dockerfile -t foundry . +docker build --no-cache --platform linux/amd64 --file Dockerfile --tag foundry --build-arg FOUNDRY_VERSION=${FOUNDRY_VERSION} . # Create the anvil container docker rm -f anvil || true @@ -77,8 +79,7 @@ export DOMAIN=0 ~/.foundry/bin/forge script ../scripts/evm-scripts/cctp_deploy.s.sol:DeployScript --rpc-url $RPC_URL_ETH --sender $SENDER --broadcast mkdir cctp-interfaces cp -R ./out/* ./cctp-interfaces -~/.foundry/bin/forge script ../scripts/evm-scripts/usdc_deploy.s.sol:USDCDeployScript --rpc-url $RPC_URL_ETH --sender $SENDER --broadcast --force --use 0.6.12 +~/.foundry/bin/forge script ../scripts/evm-scripts/usdc_deploy.s.sol:USDCDeployScript --rpc-url $RPC_URL_ETH --sender $SENDER --broadcast mkdir usdc-interfaces cp -R ./out/* ./usdc-interfaces - cd .. diff --git a/versions.sh b/versions.sh index 352bde3..2a1823a 100644 --- a/versions.sh +++ b/versions.sh @@ -14,5 +14,6 @@ # # SPDX-License-Identifier: Apache-2.0 -export SUI_VERSION=mainnet-v1.30.1 -export SUI_VERSION_NUM=1.30.1 +export SUI_VERSION=mainnet-v1.37.3 +export FOUNDRY_VERSION=nightly-5a8bd893eeeeb9489ea66dd52a02eeaa580e3af0 + From aa4249a73c9b3d781bf6f5a49e4b699f9a48924f Mon Sep 17 00:00:00 2001 From: Jeffrey Hilaire Date: Sat, 21 Dec 2024 00:18:51 +0000 Subject: [PATCH 2/2] Upgrade submodule --- evm-cctp-contracts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evm-cctp-contracts b/evm-cctp-contracts index 377c9bd..5f1901a 160000 --- a/evm-cctp-contracts +++ b/evm-cctp-contracts @@ -1 +1 @@ -Subproject commit 377c9bd813fb86a42d900ae4003599d82aef635a +Subproject commit 5f1901a9791b18204e8556bb53fb0dfcb05a832a