Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Contracts from kl/sync-layer-reorg #2677

Merged
merged 11 commits into from
Aug 19, 2024
2 changes: 1 addition & 1 deletion contracts
Submodule contracts updated 66 files
+31 −4 .github/workflows/l1-contracts-ci.yaml
+12 −0 .github/workflows/l1-contracts-foundry-ci.yaml
+1 −0 l1-contracts/.env
+67 −39 l1-contracts/contracts/bridge/L1AssetRouter.sol
+14 −0 l1-contracts/contracts/bridge/interfaces/IL1AssetDeploymentTracker.sol
+0 −10 l1-contracts/contracts/bridge/interfaces/IL1AssetRouter.sol
+10 −0 l1-contracts/contracts/bridge/interfaces/IL1SharedBridgeLegacy.sol
+81 −26 l1-contracts/contracts/bridgehub/Bridgehub.sol
+6 −0 l1-contracts/contracts/bridgehub/IBridgehub.sol
+3 −12 l1-contracts/contracts/bridgehub/ISTMDeploymentTracker.sol
+19 −27 l1-contracts/contracts/bridgehub/STMDeploymentTracker.sol
+3 −2 l1-contracts/contracts/dev-contracts/DummyL1ERC20Bridge.sol
+1 −1 l1-contracts/contracts/dev-contracts/test/AdminFacetTest.sol
+10 −0 l1-contracts/contracts/dev-contracts/test/DummyBridgehub.sol
+25 −0 l1-contracts/contracts/dev-contracts/test/DummyBridgehubSetter.sol
+5 −1 l1-contracts/contracts/dev-contracts/test/DummyHyperchain.sol
+4 −2 l1-contracts/contracts/dev-contracts/test/DummyStateTransitionManager.sol
+4 −0 l1-contracts/contracts/dev-contracts/test/DummyStateTransitionManagerForValidatorTimelock.sol
+3 −2 l1-contracts/contracts/dev-contracts/test/DummyStateTransitionManagerWithBridgeHubAddress.sol
+1 −1 l1-contracts/contracts/dev-contracts/test/MailboxFacetTest.sol
+5 −7 l1-contracts/contracts/state-transition/IStateTransitionManager.sol
+28 −61 l1-contracts/contracts/state-transition/StateTransitionManager.sol
+20 −6 l1-contracts/contracts/state-transition/chain-deps/facets/Admin.sol
+14 −4 l1-contracts/contracts/state-transition/chain-deps/facets/Mailbox.sol
+0 −23 l1-contracts/contracts/upgrades/CustomAssetBridging.sol
+66 −0 l1-contracts/contracts/upgrades/GatewayUpgrade.sol
+9 −0 l1-contracts/contracts/upgrades/IGatewayUpgrade.sol
+6 −5 l1-contracts/deploy-scripts/DeployL1.s.sol
+19 −3 l1-contracts/deploy-scripts/Gateway.s.sol
+128 −0 l1-contracts/deploy-scripts/GenerateForceDeploymentsData.s.sol
+1 −0 l1-contracts/foundry.toml
+2 −2 l1-contracts/package.json
+2 −1 l1-contracts/scripts/setup-legacy-bridge-era.ts
+23 −23 l1-contracts/scripts/sync-layer.ts
+0 −6 l1-contracts/src.ts/deploy-test-process.ts
+7 −2 l1-contracts/src.ts/deploy-utils-zk.ts
+47 −11 l1-contracts/src.ts/deploy.ts
+22 −3 l1-contracts/test/foundry/integration/DeploymentTest.t.sol
+8 −1 l1-contracts/test/foundry/integration/_SharedL1ContractDeployer.t.sol
+7 −0 l1-contracts/test/foundry/integration/deploy-scripts/script-config/generate-force-deployments-data.toml
+15 −15 l1-contracts/test/foundry/unit/concrete/Bridgehub/experimental_bridge.t.sol
+0 −19 l1-contracts/test/foundry/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeBase.t.sol
+17 −17 l1-contracts/test/foundry/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeFails.t.sol
+1 −1 l1-contracts/test/foundry/unit/concrete/DiamondCut/FacetCut.t.sol
+1 −1 l1-contracts/test/foundry/unit/concrete/DiamondCut/UpgradeLogic.t.sol
+2 −2 l1-contracts/test/foundry/unit/concrete/Executor/_Executor_Shared.t.sol
+0 −21 l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/CreateNewChain.t.sol
+12 −11 ...cts/test/foundry/unit/concrete/state-transition/StateTransitionManager/_StateTransitionManager_Shared.t.sol
+1 −1 l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/_Admin_Shared.t.sol
+1 −1 l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Mailbox/_Mailbox_Shared.t.sol
+3 −2 l1-contracts/test/unit_tests/governance_test.spec.ts
+4 −1 l1-contracts/test/unit_tests/mailbox_test.spec.ts
+2 −2 l1-contracts/test/unit_tests/proxy_test.spec.ts
+30 −13 l1-contracts/test/unit_tests/synclayer.spec.ts
+7 −5 l1-contracts/test/unit_tests/validator_timelock_test.spec.ts
+84 −56 l2-contracts/contracts/bridge/L2AssetRouter.sol
+59 −32 l2-contracts/contracts/bridge/L2NativeTokenVault.sol
+137 −14 l2-contracts/contracts/bridge/L2SharedBridgeLegacy.sol
+6 −4 l2-contracts/contracts/bridge/L2StandardERC20.sol
+2 −4 l2-contracts/contracts/bridge/interfaces/IL2AssetRouter.sol
+1 −3 l2-contracts/contracts/bridge/interfaces/IL2NativeTokenVault.sol
+19 −0 l2-contracts/contracts/bridge/interfaces/IL2SharedBridgeLegacy.sol
+0 −21 l2-contracts/contracts/bridge/interfaces/ILegacyL2SharedBridge.sol
+2 −15 l2-contracts/src/deploy-shared-bridge-on-l2-through-l1.ts
+10 −6 l2-contracts/test/erc20.test.ts
+1 −1 l2-contracts/test/weth.test.ts
10 changes: 7 additions & 3 deletions core/tests/loadnext/src/executor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<L2> = 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?;

Expand Down Expand Up @@ -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?;
Expand Down
4 changes: 3 additions & 1 deletion deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ vulnerability = "deny"
unmaintained = "warn"
yanked = "warn"
notice = "warn"
ignore = []
ignore = [
"RUSTSEC-2024-0363", # allows [email protected] until fix is released, more here -- https://github.com/launchbadge/sqlx/issues/3440
]

[licenses]
unlicensed = "deny"
Expand Down
4 changes: 2 additions & 2 deletions etc/env/base/contracts.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "0x405ddf3e881479826ae5e09316adde62c0251510723570b7a26a0092d84a87d2"
GENESIS_BATCH_COMMITMENT = "0x97a8d80434646aa54503cf65a9b5282fb166399af69e7bb43c95b2587657ef28"
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"
Expand Down
Loading