From 7123edc4312dea90f26f4199ecf7c6bcc5bf6dc8 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Tue, 9 Jul 2024 18:54:21 +0200 Subject: [PATCH 1/3] Make funding work for all chain combos --- test-node.bash | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test-node.bash b/test-node.bash index daa6be7d..736b504e 100755 --- a/test-node.bash +++ b/test-node.bash @@ -470,12 +470,11 @@ if $force_init; then echo == Fund L3 accounts if $l3_custom_fee_token; then docker compose run scripts bridge-native-token-to-l3 --amount 5000 --from user_fee_token_deployer --wait - docker compose run scripts send-l3 --ethamount 5 --from user_fee_token_deployer --wait - docker compose run scripts send-l3 --ethamount 5 --from user_fee_token_deployer --to "key_0x$devprivkey" --wait + docker compose run scripts send-l3 --ethamount 100 --from user_fee_token_deployer --wait else docker compose run scripts bridge-to-l3 --ethamount 50000 --wait fi - docker compose run scripts send-l3 --ethamount 100 --to l3owner --wait + docker compose run scripts send-l3 --ethamount 10 --to l3owner --wait echo == Deploy CacheManager on L3 docker compose run -e CHILD_CHAIN_RPC="http://l3node:3347" -e CHAIN_OWNER_PRIVKEY=$l3ownerkey rollupcreator deploy-cachemanager-testnode From 230d5c4878a127f07f01d83cd78ffd4ae2d3bbe0 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Tue, 9 Jul 2024 18:56:06 +0200 Subject: [PATCH 2/3] Bump versions --- test-node.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test-node.bash b/test-node.bash index 736b504e..3ebd6c6c 100755 --- a/test-node.bash +++ b/test-node.bash @@ -7,8 +7,8 @@ BLOCKSCOUT_VERSION=offchainlabs/blockscout:v1.0.0-c8db5b1 # This commit matches the v1.2.1 contracts, with additional support for CacheManger deployment. # Once v1.2.2 is released, we can switch to that version. -DEFAULT_NITRO_CONTRACTS_VERSION="867663657b98a66b60ff244e46226e0cb368ab94" -DEFAULT_TOKEN_BRIDGE_VERSION="v1.2.1" +DEFAULT_NITRO_CONTRACTS_VERSION="v2.0.0-beta.1" +DEFAULT_TOKEN_BRIDGE_VERSION="v1.2.2" # Set default versions if not overriden by provided env vars : ${NITRO_CONTRACTS_BRANCH:=$DEFAULT_NITRO_CONTRACTS_VERSION} From ec94da8fd4defce857edd2f399462b5914c4d252 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Tue, 9 Jul 2024 19:05:28 +0200 Subject: [PATCH 3/3] Remove comment --- test-node.bash | 2 -- 1 file changed, 2 deletions(-) diff --git a/test-node.bash b/test-node.bash index 3ebd6c6c..5e041b36 100755 --- a/test-node.bash +++ b/test-node.bash @@ -5,8 +5,6 @@ set -e NITRO_NODE_VERSION=offchainlabs/nitro-node:v3.0.1-cf4b74e-dev BLOCKSCOUT_VERSION=offchainlabs/blockscout:v1.0.0-c8db5b1 -# This commit matches the v1.2.1 contracts, with additional support for CacheManger deployment. -# Once v1.2.2 is released, we can switch to that version. DEFAULT_NITRO_CONTRACTS_VERSION="v2.0.0-beta.1" DEFAULT_TOKEN_BRIDGE_VERSION="v1.2.2"