Skip to content
This repository has been archived by the owner on Aug 28, 2024. It is now read-only.

Commit

Permalink
chore: upgrade calldata (matter-labs#2159)
Browse files Browse the repository at this point in the history
## What ❔

<!-- What are the changes this PR brings about? -->
<!-- Example: This PR adds a PR template to the repo. -->
<!-- (For bigger PRs adding more context is appreciated) -->

## Why ❔

<!-- Why are these changes done? What goal do they contribute to? What
are the principles behind them? -->
<!-- Example: PR templates ensure PR reviewers, observers, and future
iterators are in context about the evolution of repos. -->

## Checklist

<!-- Check your PR fulfills the following items. -->
<!-- For draft PRs check the boxes as you complete them. -->

- [ ] PR title corresponds to the body of PR (we generate changelog
entries from PRs).
- [ ] Tests for the changes have been added / updated.
- [ ] Documentation comments have been added / updated.
- [ ] Code has been formatted via `zk fmt` and `zk lint`.
- [ ] Spellcheck has been run via `zk spellcheck`.

---------

Co-authored-by: Stanislav Bezkorovainyi <[email protected]>
  • Loading branch information
kelemeno and StanislavBreadless authored Jun 6, 2024
1 parent e5daf8e commit 500d462
Show file tree
Hide file tree
Showing 42 changed files with 2,607 additions and 89 deletions.
12 changes: 12 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,20 @@ Cargo.lock
!/etc/env/configs/ext-node-validium.toml
!/etc/env/configs/ext-node-docker.toml
!/etc/env/configs/ext-node-validium-docker.toml
!/etc/env/configs/stage.toml
!/etc/env/configs/stage-proofs.toml
!/etc/env/configs/testnet.toml
!/etc/env/configs/mainnet.toml
/etc/env/l1-inits
!/etc/env/l1-inits/stage.env
!/etc/env/l1-inits/stage_proofs.env
!/etc/env/l1-inits/testnet.env
!/etc/env/l1-inits/mainnet.env
/etc/env/l2-inits
!/etc/env/l2-inits/stage.init.env
!/etc/env/l2-inits/stage_proofs.init.env
!/etc/env/l2-inits/testnet.init.env
!/etc/env/l2-inits/mainnet.init.env
!/etc/env/base
!/etc/env/file_based
!/etc/env/dev.toml
Expand Down
6 changes: 3 additions & 3 deletions etc/env/base/contracts.toml
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ MAX_NUMBER_OF_HYPERCHAINS = 100
L1_SHARED_BRIDGE_PROXY_ADDR = "0xFC073319977e314F251EAE6ae6bE76B0B3BAeeCF"
L2_SHARED_BRIDGE_ADDR = "0xFC073319977e314F251EAE6ae6bE76B0B3BAeeCF"
L2_SHARED_BRIDGE_IMPL_ADDR = "0xFC073319977e314F251EAE6ae6bE76B0B3BAeeCF"
FRI_RECURSION_LEAF_LEVEL_VK_HASH = "0xcc4ac1853353538a166f5c2dde2c24e7e6c461dce8e3dc47d81e9139e1719456"
FRI_RECURSION_LEAF_LEVEL_VK_HASH = "0xf9664f4324c1400fa5c3822d667f30e873f53f1b8033180cd15fe41c1e2355c6"
FRI_RECURSION_NODE_LEVEL_VK_HASH = "0xf520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8"
FRI_RECURSION_SCHEDULER_LEVEL_VK_HASH = "0x712bb009b5d5dc81c79f827ca0abff87b43506a8efed6028a818911d4b1b521f"
SNARK_WRAPPER_VK_HASH = "0xb45190a52235abe353afd606a9144728f807804f5282df9247e27c56e817ccd6"
FRI_RECURSION_SCHEDULER_LEVEL_VK_HASH = "0xe6ba9d6b042440c480fa1c7182be32387db6e90281e82f37398d3f98f63f098a"
SNARK_WRAPPER_VK_HASH = "0x14f97b81e54b35fe673d8708cc1a19e1ea5b5e348e12d31e39824ed4f42bbca2"
SHARED_BRIDGE_UPGRADE_STORAGE_SWITCH = 0
ERA_CHAIN_ID = 9
ERA_DIAMOND_PROXY_ADDR = "0x0000000000000000000000000000000000000000"
Expand Down
31 changes: 31 additions & 0 deletions etc/env/configs/mainnet.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
__imports__ = ["base", "l1-inits/mainnet.env", "l2-inits/mainnet.init.env" ]
L1_ENV_NAME = "mainnet"
ZKSYNC_DEBUG_LOGS=true
CHAIN_ETH_ZKSYNC_NETWORK_ID=324
CONTRACTS_ERA_CHAIN_ID="324"
ETH_CLIENT_WEB3_URL= ""
MISC_ETHERSCAN_API_KEY = ""
API_WEB3_JSON_RPC_HTTP_URL="https://zksync2-mainnet.zksync.io/"

CHAIN_ETH_NETWORK = "mainnet"
ETH_CLIENT_CHAIN_ID = 1
CONTRACTS_CREATE2_FACTORY_ADDR="0xce0042b868300000d44a59004da54a005ffdcf9f"
CONTRACTS_DIAMOND_PROXY_ADDR="0x32400084c286cf3e17e7b677ea9583e60a000324"
CONTRACTS_ERA_DIAMOND_PROXY_ADDR="0x32400084c286cf3e17e7b677ea9583e60a000324"
CONTRACTS_L1_WETH_TOKEN_ADDR="0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2"
CONTRACTS_L2_ERC20_BRIDGE_ADDR="0x11f943b2c77b743AB90f4A0Ae7d5A4e7FCA3E102"
CONTRACTS_L2_SHARED_BRIDGE_ADDR="0x11f943b2c77b743AB90f4A0Ae7d5A4e7FCA3E102"
CONTRACTS_L1_ERC20_BRIDGE_PROXY_ADDR="0x57891966931Eb4Bb6FB81430E6cE0A03AAbDe063"
CONTRACTS_BASE_TOKEN_ADDR="0x0000000000000000000000000000000000000001"
CONTRACTS_GOVERNANCE_ADDR="0x0b622A2061EaccAE1c664eBC3E868b8438e03F61"
CONTRACTS_VALIDATOR_TIMELOCK_EXECUTION_DELAY = "75600"
CONTRACTS_PRIORITY_TX_MAX_GAS_LIMIT = "72000000"

CONTRACTS_ERA_POST_DIAMOND_UPGRADE_FIRST_BATCH="0"
CONTRACTS_ERA_POST_LEGACY_BRIDGE_UPGRADE_FIRST_BATCH="0"
CONTRACTS_ERA_LEGACY_UPGRADE_LAST_DEPOSIT_BATCH="0"
CONTRACTS_ERA_LEGACY_UPGRADE_LAST_DEPOSIT_TX_NUMBER="0"

# this might be the wrong way around but it does not matter
ETH_SENDER_SENDER_OPERATOR_COMMIT_ETH_ADDR="0x0D3250c3D5FAcb74Ac15834096397a3Ef790ec99"
ETH_SENDER_SENDER_OPERATOR_BLOBS_ETH_ADDR="0x3527439923a63F8C13CF72b8Fe80a77f6e572092"
31 changes: 31 additions & 0 deletions etc/env/configs/stage-proofs.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
__imports__ = ["base", "l1-inits/stage-proofs.env", "l2-inits/stage-proofs.init.env" ]
L1_ENV_NAME = "stage-proofs"
ZKSYNC_DEBUG_LOGS=true
CHAIN_ETH_ZKSYNC_NETWORK_ID=271
CONTRACTS_ERA_CHAIN_ID="271"
ETH_CLIENT_WEB3_URL= ""
MISC_ETHERSCAN_API_KEY = ""
API_WEB3_JSON_RPC_HTTP_URL="https://dev-api.era-stage-proofs.zksync.dev/"

CHAIN_ETH_NETWORK = "sepolia"
ETH_CLIENT_CHAIN_ID = 11155111
CONTRACTS_CREATE2_FACTORY_ADDR="0xce0042b868300000d44a59004da54a005ffdcf9f"
CONTRACTS_DIAMOND_PROXY_ADDR="0x5BBdEDe0F0bAc61AA64068b60379fe32ecc0F96C"
CONTRACTS_ERA_DIAMOND_PROXY_ADDR="0x5BBdEDe0F0bAc61AA64068b60379fe32ecc0F96C"
CONTRACTS_L1_WETH_TOKEN_ADDR="0x7b79995e5f793A07Bc00c21412e50Ecae098E7f9"
CONTRACTS_L2_ERC20_BRIDGE_ADDR="0x5978EE0398104a68De718c70cB60a4afdeD07EEE"
CONTRACTS_L2_SHARED_BRIDGE_ADDR="0x5978EE0398104a68De718c70cB60a4afdeD07EEE"
CONTRACTS_L1_ERC20_BRIDGE_PROXY_ADDR="0x26d60F0ac5dd7a8DBE98DCf20c0F4b057Ed62775"
CONTRACTS_BASE_TOKEN_ADDR="0x0000000000000000000000000000000000000001"
CONTRACTS_GOVERNANCE_ADDR="0xbF4B985eACb623aAFd0B90D9F8C794fa8585edE9"
CONTRACTS_VALIDATOR_TIMELOCK_EXECUTION_DELAY = 0
CONTRACTS_PRIORITY_TX_MAX_GAS_LIMIT = "72000000"

CONTRACTS_ERA_POST_DIAMOND_UPGRADE_FIRST_BATCH="3431"
CONTRACTS_ERA_POST_LEGACY_BRIDGE_UPGRADE_FIRST_BATCH="3431"
CONTRACTS_ERA_LEGACY_UPGRADE_LAST_DEPOSIT_BATCH="3435"
CONTRACTS_ERA_LEGACY_UPGRADE_LAST_DEPOSIT_TX_NUMBER="13"

# this might be the wrong way around but it does not matter
ETH_SENDER_SENDER_OPERATOR_COMMIT_ETH_ADDR="0x1edC35c96144E77e162e5FbA34343078dab63acD"
ETH_SENDER_SENDER_OPERATOR_BLOBS_ETH_ADDR="0x1230007ae8529E38721669Af4D2fAbc769f0FB21"
29 changes: 29 additions & 0 deletions etc/env/configs/stage.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
__imports__ = ["base", "l1-inits/stage.env", "l2-inits/stage.init.env" ]
ZKSYNC_DEBUG_LOGS=true
CHAIN_ETH_ZKSYNC_NETWORK_ID=270
CONTRACTS_ERA_CHAIN_ID="270"
ETH_CLIENT_WEB3_URL= ""
MISC_ETHERSCAN_API_KEY = ""
API_WEB3_JSON_RPC_HTTP_URL="https://z2-dev-api.zksync.dev/"

CHAIN_ETH_NETWORK = "sepolia"
ETH_CLIENT_CHAIN_ID = 11155111
CONTRACTS_CREATE2_FACTORY_ADDR="0xce0042b868300000d44a59004da54a005ffdcf9f"
CONTRACTS_DIAMOND_PROXY_ADDR="0x6d6e010A2680E2E5a3b097ce411528b36d880EF6"
CONTRACTS_ERA_DIAMOND_PROXY_ADDR="0x6d6e010A2680E2E5a3b097ce411528b36d880EF6"
CONTRACTS_L1_WETH_TOKEN_ADDR="0x7b79995e5f793A07Bc00c21412e50Ecae098E7f9"
CONTRACTS_L2_ERC20_BRIDGE_ADDR="0xCEB8d4888d2025aEaAD0272175281e0CaFC33152"
CONTRACTS_L2_SHARED_BRIDGE_ADDR="0xCEB8d4888d2025aEaAD0272175281e0CaFC33152"
CONTRACTS_L1_ERC20_BRIDGE_PROXY_ADDR="0x7303B5Ce64f1ADB0558572611a0b90620b6dd5F4"
CONTRACTS_BASE_TOKEN_ADDR="0x0000000000000000000000000000000000000001"
CONTRACTS_GOVERNANCE_ADDR="0xEE73438083629026FAfA1f5F5bBE2bBD6Bad6331"
CONTRACTS_PRIORITY_TX_MAX_GAS_LIMIT = "72000000"

CONTRACTS_ERA_POST_DIAMOND_UPGRADE_FIRST_BATCH="522912"
CONTRACTS_ERA_POST_LEGACY_BRIDGE_UPGRADE_FIRST_BATCH="522910"
CONTRACTS_ERA_LEGACY_UPGRADE_LAST_DEPOSIT_BATCH="524274"
CONTRACTS_ERA_LEGACY_UPGRADE_LAST_DEPOSIT_TX_NUMBER="0"

# this might be the wrong way around but it does not matter
ETH_SENDER_SENDER_OPERATOR_COMMIT_ETH_ADDR="0x85b7B2fCFd6d3E5C063e7a5063359f4e6B3fec29"
ETH_SENDER_SENDER_OPERATOR_BLOBS_ETH_ADDR="0x9E0b6Bd7Ed925e5629bd46f8b9D55dAfE9c827d8"
29 changes: 29 additions & 0 deletions etc/env/configs/testnet.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
__imports__ = ["base", "l1-inits/testnet.env", "l2-inits/testnet.init.env" ]
ZKSYNC_DEBUG_LOGS=true
CHAIN_ETH_ZKSYNC_NETWORK_ID=300
CONTRACTS_ERA_CHAIN_ID="300"
ETH_CLIENT_WEB3_URL= ""
MISC_ETHERSCAN_API_KEY = ""
API_WEB3_JSON_RPC_HTTP_URL="https://sepolia.era.zksync.dev"

CHAIN_ETH_NETWORK = "sepolia"
ETH_CLIENT_CHAIN_ID = 11155111
CONTRACTS_CREATE2_FACTORY_ADDR="0xce0042b868300000d44a59004da54a005ffdcf9f"
CONTRACTS_DIAMOND_PROXY_ADDR="0x9A6DE0f62Aa270A8bCB1e2610078650D539B1Ef9"
CONTRACTS_ERA_DIAMOND_PROXY_ADDR="0x9A6DE0f62Aa270A8bCB1e2610078650D539B1Ef9"
CONTRACTS_L1_WETH_TOKEN_ADDR="0x7b79995e5f793A07Bc00c21412e50Ecae098E7f9"
CONTRACTS_L2_ERC20_BRIDGE_ADDR="0x681A1AFdC2e06776816386500D2D461a6C96cB45"
CONTRACTS_L2_SHARED_BRIDGE_ADDR="0x681A1AFdC2e06776816386500D2D461a6C96cB45"
CONTRACTS_L1_ERC20_BRIDGE_PROXY_ADDR="0x2Ae09702F77a4940621572fBcDAe2382D44a2cbA"
CONTRACTS_BASE_TOKEN_ADDR="0x0000000000000000000000000000000000000001"
CONTRACTS_GOVERNANCE_ADDR="0x62E77441531b4B045a6B6f4891be4AdBA7eD4d88"
CONTRACTS_PRIORITY_TX_MAX_GAS_LIMIT = "72000000"

CONTRACTS_ERA_POST_DIAMOND_UPGRADE_FIRST_BATCH="8801"
CONTRACTS_ERA_POST_LEGACY_BRIDGE_UPGRADE_FIRST_BATCH="8801"
CONTRACTS_ERA_LEGACY_UPGRADE_LAST_DEPOSIT_BATCH="8807"
CONTRACTS_ERA_LEGACY_UPGRADE_LAST_DEPOSIT_TX_NUMBER="109"

# this might be the wrong way around but it does not matter
ETH_SENDER_SENDER_OPERATOR_COMMIT_ETH_ADDR="0xEdAdb6F5B5B8A69a162F5eC56e9B1b067f09780d"
ETH_SENDER_SENDER_OPERATOR_BLOBS_ETH_ADDR="0x1B6B037B02Bee131391244838364c89D6C8D4b3f"
18 changes: 18 additions & 0 deletions etc/env/l1-inits/mainnet.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
CONTRACTS_GENESIS_UPGRADE_ADDR=0x3dDD7ED2AeC0758310A4C6596522FCAeD108DdA2
CONTRACTS_VALIDATOR_TIMELOCK_ADDR=0x5D8ba173Dc6C3c90C8f7C04C9288BeF5FDbAd06E
CONTRACTS_HYPERCHAIN_UPGRADE_ADDR=0xD719fca4433646CBD86F6b073EE364D36b856b1D
CONTRACTS_TRANSPARENT_PROXY_ADMIN_ADDR=0xC2a36181fB524a6bEfE639aFEd37A67e77d62cf1
CONTRACTS_BRIDGEHUB_IMPL_ADDR=0x12f893689f9603991a8c22C249FFd0509Be95661
CONTRACTS_BRIDGEHUB_PROXY_ADDR=0x303a465B659cBB0ab36eE643eA362c509EEb5213
CONTRACTS_ADMIN_FACET_ADDR=0xF6F26b416CE7AE5e5FE224Be332C7aE4e1f3450a
CONTRACTS_MAILBOX_FACET_ADDR=0xCDB6228b616EEf8Df47D69A372C4f725C43e718C
CONTRACTS_GETTERS_FACET_ADDR=0xE60E94fCCb18a81D501a38959E532C0A85A1be89
CONTRACTS_DIAMOND_INIT_ADDR=0x3C8bE122b2cf684230c54F891C917A8d7dc3Bef8
CONTRACTS_STATE_TRANSITION_IMPL_ADDR=0x8279B7E48fA074f966385d87AEf29Bd031e54fD5
CONTRACTS_STATE_TRANSITION_PROXY_ADDR=0xc2eE6b6af7d616f6e27ce7F4A451Aedc2b0F5f5C
CONTRACTS_L1_SHARED_BRIDGE_IMPL_ADDR=0xCba1aF8f0bB223b2544F8eB8f69d1c7960f788dB
CONTRACTS_L1_SHARED_BRIDGE_PROXY_ADDR=0xD7f9f54194C633F36CCD5F3da84ad4a1c38cB2cB
CONTRACTS_L1_ERC20_BRIDGE_IMPL_ADDR=0x8191975d8B0851C7f0740918896Cf298c09aA05E
CONTRACTS_EXECUTOR_FACET_ADDR=0xaD193aDe635576d8e9f7ada71Af2137b16c64075
CONTRACTS_VERIFIER_ADDR=0x70F3FBf8a427155185Ec90BED8a3434203de9604
CONTRACTS_DEFAULT_UPGRADE_ADDR=0x4d376798Ba8F69cEd59642c3AE8687c7457e855d
18 changes: 18 additions & 0 deletions etc/env/l1-inits/stage-proofs.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
CONTRACTS_VERIFIER_ADDR=0xCDFDfbc04A58C79f0597E87E5dE680D0EdeABA9f
CONTRACTS_EXECUTOR_FACET_ADDR=0x63f4c229F261c2576E8B5A405321769c08134c73
CONTRACTS_DEFAULT_UPGRADE_ADDR=0xe43fd4f615B4989903C4F4000DE8bc742fd18F0E
CONTRACTS_GENESIS_UPGRADE_ADDR=0x1d2Fb190B100412Bc4C6e07f926E2855E50E03Ac
CONTRACTS_VALIDATOR_TIMELOCK_ADDR=0x1A0EdA40D86213F6D0Ca233D9b33CDf66e2ef1ab
CONTRACTS_HYPERCHAIN_UPGRADE_ADDR=0x706EA5608e5075f6a2eb9C8cf73C37ae9bc58A25
CONTRACTS_TRANSPARENT_PROXY_ADMIN_ADDR=0x93AEeE8d98fB0873F8fF595fDd534A1f288786D2
CONTRACTS_BRIDGEHUB_IMPL_ADDR=0x1cEFbB67C5A98471157594454fDE61340b205feC
CONTRACTS_BRIDGEHUB_PROXY_ADDR=0x7BDF7970F17278a6Ff75Fdbc671E870b0728ae41
CONTRACTS_ADMIN_FACET_ADDR=0xE698A6Fb588A7B4f5b4C7478FCeC51aB8f869B36
CONTRACTS_MAILBOX_FACET_ADDR=0x3aA2A5f021E546f4fe989Fc4b428099D1FA853F5
CONTRACTS_GETTERS_FACET_ADDR=0x22588e7cac6770e43FB99961Db70c608c45D9924
CONTRACTS_DIAMOND_INIT_ADDR=0xaee9C9FfDcDcB2165ab06E07D32dc7B46379aA3e
CONTRACTS_STATE_TRANSITION_IMPL_ADDR=0x99D662d6eAf20bc0aAD185D58BdF945abfc8eDa2
CONTRACTS_STATE_TRANSITION_PROXY_ADDR=0x925Dd0BC14552b0b261CA8A23ad26df9C6f2C8bA
CONTRACTS_L1_SHARED_BRIDGE_IMPL_ADDR=0xAADA1d8Ec8Bc342a642fAEC52F6b92A2ea4411F3
CONTRACTS_L1_SHARED_BRIDGE_PROXY_ADDR=0xc488a65b400769295f8C4b762AdCB3E6a036220b
CONTRACTS_L1_ERC20_BRIDGE_IMPL_ADDR=0x3aF396F034F64A3DC7A1c5F4295d6a827332f100
17 changes: 17 additions & 0 deletions etc/env/l1-inits/stage.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
CONTRACTS_VERIFIER_ADDR=0x82856fED36d36e1d4db24398bC2056C440cB45FC
CONTRACTS_L1_ERC20_BRIDGE_IMPL_ADDR=0x8fE595B3f92AA34962d7A8aF106Fa50A3e4FC6fA
CONTRACTS_L1_SHARED_BRIDGE_PROXY_ADDR=0x6F03861D12E6401623854E494beACd66BC46e6F0
CONTRACTS_L1_SHARED_BRIDGE_IMPL_ADDR=0x91E088D2F36500c4826E5623c9C14Dd90912c23E
CONTRACTS_STATE_TRANSITION_PROXY_ADDR=0x8b448ac7cd0f18F3d8464E2645575772a26A3b6b
CONTRACTS_STATE_TRANSITION_IMPL_ADDR=0xAe43B3ff4c95351B9B9FA0981968AC98eFc5AEbd
CONTRACTS_DIAMOND_INIT_ADDR=0x17384Fd6Cc64468b69df514A940caC89B602d01c
CONTRACTS_GETTERS_FACET_ADDR=0xbF4C2dfBe9E722F0A87E104c3af5780d49872745
CONTRACTS_MAILBOX_FACET_ADDR=0x445aD49fC6d1845ec774783659aA5351381b0c49
CONTRACTS_ADMIN_FACET_ADDR=0x21924127192db478faDf6Ae07f57df928EBCA6AE
CONTRACTS_EXECUTOR_FACET_ADDR=0xd56f4696ecbE9ADc2e1539F5311ae6C92F4B2BAd
CONTRACTS_BRIDGEHUB_PROXY_ADDR=0x236D1c3Ff32Bd0Ca26b72Af287E895627c0478cE
CONTRACTS_BRIDGEHUB_IMPL_ADDR=0x22c456Cb8E657bD48e14E9a54CE20169d78CB0F7
CONTRACTS_TRANSPARENT_PROXY_ADMIN_ADDR=0xCb7F8e556Ef02771eA32F54e767D6F9742ED31c2
CONTRACTS_HYPERCHAIN_UPGRADE_ADDR=0xc029cE1EB5C61C4a3B2a6EE920bb3B7b026bc00b
CONTRACTS_VALIDATOR_TIMELOCK_ADDR=0x8D65310fe158734eEA3197FF9a6211F9Bba3D0A8
CONTRACTS_GENESIS_UPGRADE_ADDR=0x1d2Fb190B100412Bc4C6e07f926E2855E50E03Ac
19 changes: 19 additions & 0 deletions etc/env/l1-inits/testnet.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
CONTRACTS_VERIFIER_ADDR=0xAC3a2Dc46ceA843F0A9d6554f8804AeD18ff0795
CONTRACTS_EXECUTOR_FACET_ADDR=0x200CAf816BCdd94123d3C18488741d4e4fA40ba6
CONTRACTS_DEFAULT_UPGRADE_ADDR=0xe43fd4f615B4989903C4F4000DE8bc742fd18F0E
CONTRACTS_GENESIS_UPGRADE_ADDR=0xc7e2CCe185d9A55F654280DdDbaEaBfA7b9a0C96
CONTRACTS_VALIDATOR_TIMELOCK_ADDR=0xD3876643180A79d0A56d0900C060528395f34453
CONTRACTS_HYPERCHAIN_UPGRADE_ADDR=0x4d376798Ba8F69cEd59642c3AE8687c7457e855d
CONTRACTS_TRANSPARENT_PROXY_ADMIN_ADDR=0x0358BACa94dcD7931B7BA7aAf8a5Ac6090E143a5
CONTRACTS_BRIDGEHUB_IMPL_ADDR=0x206587142ce5AC36C98F522e42e30e8139D1De30
CONTRACTS_BRIDGEHUB_PROXY_ADDR=0x35A54c8C757806eB6820629bc82d90E056394C92
CONTRACTS_ADMIN_FACET_ADDR=0x96b40174102c93155cdB46a5E4691EEB6c4e1B7B
CONTRACTS_MAILBOX_FACET_ADDR=0x550cf73F4b50aA0DF0257f2D07630D48fA00f73a
CONTRACTS_GETTERS_FACET_ADDR=0x183a8459E2a4440f364BeC5040d8327bBB619Be3
CONTRACTS_DIAMOND_INIT_ADDR=0x27A7F18106281fE53d371958E8bC3f833694D24a
CONTRACTS_STATE_TRANSITION_IMPL_ADDR=0x3e7B9b5daD3E70d490A31dD93094e91739B39215
CONTRACTS_STATE_TRANSITION_PROXY_ADDR=0x4e39E90746A9ee410A8Ce173C7B96D3AfEd444a5
CONTRACTS_L1_SHARED_BRIDGE_IMPL_ADDR=0x3658e4a9130E4023bf92a7D7DdAa2698240D82Bc
CONTRACTS_L1_SHARED_BRIDGE_PROXY_ADDR=0x3E8b2fe58675126ed30d0d12dea2A9bda72D18Ae
CONTRACTS_L1_ERC20_BRIDGE_IMPL_ADDR=0xba7e1C3C4d6dAf4cee0D351BB888D01b548B8960
CONTRACTS_GOVERNANCE_ADDR=0x62e77441531b4B045a6B6f4891be4AdBA7eD4d88
1 change: 1 addition & 0 deletions etc/env/l2-inits/mainnet.init.env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CONTRACTS_L2_SHARED_BRIDGE_IMPL_ADDR=0x470afaacce2acdaefcc662419b74c79d76c914ae
1 change: 1 addition & 0 deletions etc/env/l2-inits/stage-proofs.init.env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CONTRACTS_L2_SHARED_BRIDGE_IMPL_ADDR=0x16ef518222299b363519c39e5471487bcc243fe4
1 change: 1 addition & 0 deletions etc/env/l2-inits/stage.init.env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CONTRACTS_L2_SHARED_BRIDGE_IMPL_ADDR=0xce0a8c005a73e35d95cec41a9e8b75668470fb8f
1 change: 1 addition & 0 deletions etc/env/l2-inits/testnet.init.env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CONTRACTS_L2_SHARED_BRIDGE_IMPL_ADDR=0xf25a793eda9e961db8b56dc0aae77fc8c958dd40
19 changes: 19 additions & 0 deletions etc/upgrades/1711451944-hyperchain-upgrade/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Hyperchain upgrades

We encountered multiple issues while doing the upgrade. Initially when upgrading stage from v22->v23 ( upgrade stage
folder) we noticed some issues in the server. We fixed those, and afterwards upgraded stage-proofs and testnet
(stage-proofs and testnet folders) directly to v24.

We noticed issues with the prover here. We upgraded testnet and stage-proofs directly without changing the protocol
version (stage-proofs-fix, testnet-fix), just changing the Verification keys, and we also did a hot fix on the Executor
facet for Validium (a further small issue was that due to the new contracts the upgrade scripts changed to handle
upgrades happening through the STM).

We found a second similar issue in the prover, doing stage-proof-fix2 and testnet-fix2.

We had further round of issues, we made updating the VKs much easier in the process. We introduced a new protocol
version semver, so now we are upgrading to 0.24.1, with the .1 being the patch used for VK fixes.

We upgraded stage to 0.24.1.

We are upgrading mainnet directly from v22->0.24.1 with the prover fixes (mainnet folder) all together.
2 changes: 1 addition & 1 deletion etc/upgrades/1711451944-hyperchain-upgrade/common.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "hyperchain-upgrade",
"creationTimestamp": 1711451944,
"protocolVersion": "24"
"protocolVersion": "0.24.1"
}
11 changes: 0 additions & 11 deletions etc/upgrades/1711451944-hyperchain-upgrade/localhost/crypto.json

This file was deleted.

Loading

0 comments on commit 500d462

Please sign in to comment.