From 73bea0510b4cf9397aadfcdc22b2d0c1a27e7d87 Mon Sep 17 00:00:00 2001 From: Stanislav Breadless Date: Mon, 19 Aug 2024 14:46:06 +0200 Subject: [PATCH 1/6] use latest sync layer stable --- contracts | 2 +- etc/env/base/contracts.toml | 4 ++-- infrastructure/zk/src/init.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contracts b/contracts index ce27e0b8a4a..859eed89e35 160000 --- a/contracts +++ b/contracts @@ -1 +1 @@ -Subproject commit ce27e0b8a4a037db2ff7ab4ece54b6b0165ebd3e +Subproject commit 859eed89e353474d77ca411c2fb14be05e2210b9 diff --git a/etc/env/base/contracts.toml b/etc/env/base/contracts.toml index 901c1281d4b..4fb11470317 100644 --- a/etc/env/base/contracts.toml +++ b/etc/env/base/contracts.toml @@ -28,8 +28,8 @@ RECURSION_NODE_LEVEL_VK_HASH = "0x1186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a2 RECURSION_LEAF_LEVEL_VK_HASH = "0x101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba863210" RECURSION_CIRCUITS_SET_VKS_HASH = "0x18c1639094f58177409186e8c48d9f577c9410901d2f1d486b3e7d6cf553ae4c" GENESIS_TX_HASH = "0xb99ebfea46cbe05a21cd80fe5597d97b204befc52a16303f579c607dc1ac2e2e" -GENESIS_ROOT = "0xe7be046eff816e8f02f37485d88b07e4ecfdad099e580bb5355a58021b4c217b" -GENESIS_BATCH_COMMITMENT = "0x7df9ba0a04fb20d9bea5a77add41aa93d535c22c11a13f6460524036a5ca96b9" +GENESIS_ROOT = "0xf600b3d2e85d78ca24ee32195865993a97d2979e9c87f21f533a8a1767714272" +GENESIS_BATCH_COMMITMENT = "0x219cac741b2e9423ce2ea4303e5c17782d754917a44e10f25b6b83c912979823" PRIORITY_TX_MAX_GAS_LIMIT = 72000000 DEPLOY_L2_BRIDGE_COUNTERPART_GAS_LIMIT = 10000000 GENESIS_ROLLUP_LEAF_INDEX = "71" diff --git a/infrastructure/zk/src/init.ts b/infrastructure/zk/src/init.ts index 0ad75ae9c75..eb8300054bb 100644 --- a/infrastructure/zk/src/init.ts +++ b/infrastructure/zk/src/init.ts @@ -268,7 +268,7 @@ export const initCommand = new Command('init') '--local-legacy-bridge-testing', 'used to test LegacyBridge compatibily. The chain will have the same id as the era chain id, while eraChainId in L2SharedBridge will be 0' ) - .option('--should-check-postgres', 'Whether to perform cargo sqlx prepare --check during database setup', true) + .option('--should-check-postgres', 'Whether to perform cargo sqlx prepare --check during database setup', false) .description('Deploys the shared bridge and registers a hyperchain locally, as quickly as possible.') .action(initDevCmdAction); From e958393b9427f8afc5e2ea22ae3f3a163f51f231 Mon Sep 17 00:00:00 2001 From: Stanislav Breadless Date: Mon, 19 Aug 2024 14:48:25 +0200 Subject: [PATCH 2/6] remove unneeded change --- infrastructure/zk/src/init.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infrastructure/zk/src/init.ts b/infrastructure/zk/src/init.ts index eb8300054bb..0ad75ae9c75 100644 --- a/infrastructure/zk/src/init.ts +++ b/infrastructure/zk/src/init.ts @@ -268,7 +268,7 @@ export const initCommand = new Command('init') '--local-legacy-bridge-testing', 'used to test LegacyBridge compatibily. The chain will have the same id as the era chain id, while eraChainId in L2SharedBridge will be 0' ) - .option('--should-check-postgres', 'Whether to perform cargo sqlx prepare --check during database setup', false) + .option('--should-check-postgres', 'Whether to perform cargo sqlx prepare --check during database setup', true) .description('Deploys the shared bridge and registers a hyperchain locally, as quickly as possible.') .action(initDevCmdAction); From 959d54f186f169317189fb85eb32f631b7735175 Mon Sep 17 00:00:00 2001 From: Stanislav Breadless Date: Mon, 19 Aug 2024 14:55:18 +0200 Subject: [PATCH 3/6] surpress error --- deny.toml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/deny.toml b/deny.toml index 1e4a30ad623..3ed6dcb7441 100644 --- a/deny.toml +++ b/deny.toml @@ -6,7 +6,9 @@ vulnerability = "deny" unmaintained = "warn" yanked = "warn" notice = "warn" -ignore = [] +ignore = [ + "RUSTSEC-2024-0363", # allows sqlx@0.8.0 until fix is released, more here -- https://github.com/launchbadge/sqlx/issues/3440 +] [licenses] unlicensed = "deny" From d6e3f1ee73755dc5d1f8cf775c80fb9359ab3bea Mon Sep 17 00:00:00 2001 From: Stanislav Breadless Date: Mon, 19 Aug 2024 18:02:32 +0200 Subject: [PATCH 4/6] another way to fetch l2 token addr --- contracts | 2 +- core/tests/loadnext/src/executor.rs | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/contracts b/contracts index 859eed89e35..ad726f7801a 160000 --- a/contracts +++ b/contracts @@ -1 +1 @@ -Subproject commit 859eed89e353474d77ca411c2fb14be05e2210b9 +Subproject commit ad726f7801abab9c6201948071eaa13b529aaf27 diff --git a/core/tests/loadnext/src/executor.rs b/core/tests/loadnext/src/executor.rs index 9b36ab90cbc..cf6876e7570 100644 --- a/core/tests/loadnext/src/executor.rs +++ b/core/tests/loadnext/src/executor.rs @@ -60,16 +60,17 @@ impl Executor { let pool = AccountPool::new(&config).await?; // derive L2 main token address - let l2_native_token_vault = pool + let l2_shared_default_bridge = pool .master_wallet .provider - .get_native_token_vault_proxy_addr() + .get_bridge_contracts() .await? + .l2_shared_default_bridge .unwrap(); let abi = load_contract(L2_SHARED_BRIDGE_ABI); let query_client: Client = Client::http(config.l2_rpc_address.parse()?)?.build(); let l2_main_token = CallFunctionArgs::new("l2TokenAddress", (config.main_token,)) - .for_contract(l2_native_token_vault, &abi) + .for_contract(l2_shared_default_bridge, &abi) .call(&query_client) .await?; @@ -413,6 +414,9 @@ impl Executor { eth_txs.push(res); } + println!("{:#?} -- ", self.config.main_token); + println!("{:#?} -- ", self.l2_main_token); + let ethereum_erc20_balance = ethereum .erc20_balance(target_address, self.config.main_token) .await?; From 6f978e18648e165a3e3a44757ca66bc3aa362de8 Mon Sep 17 00:00:00 2001 From: Stanislav Breadless Date: Mon, 19 Aug 2024 18:02:46 +0200 Subject: [PATCH 5/6] new contracts --- contracts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts b/contracts index ad726f7801a..fa16bcba2bd 160000 --- a/contracts +++ b/contracts @@ -1 +1 @@ -Subproject commit ad726f7801abab9c6201948071eaa13b529aaf27 +Subproject commit fa16bcba2bd66e2397e262ddd52c98c3fd9298e8 From 6d626828efacf7a57afbd3ec4236d9c8f32de105 Mon Sep 17 00:00:00 2001 From: Stanislav Breadless Date: Mon, 19 Aug 2024 21:28:37 +0200 Subject: [PATCH 6/6] latest commit --- contracts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts b/contracts index fa16bcba2bd..d50bf315d9f 160000 --- a/contracts +++ b/contracts @@ -1 +1 @@ -Subproject commit fa16bcba2bd66e2397e262ddd52c98c3fd9298e8 +Subproject commit d50bf315d9f9cdd9f42e5582f966cc6df1f69c59