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

fix: the calldata for the upgrades, small fixes for the migration scrips #1785

Merged
merged 623 commits into from May 9, 2024
Merged
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
623 commits
Select commit Hold shift + click to select a range
a19be60
Revert changes to .init.env
jrchatruc Mar 8, 2024
a78f686
fix: cargo test build
fkrause98 Mar 8, 2024
edc04d3
chore: zk fmt
fkrause98 Mar 8, 2024
d99e9bf
rmv flask app, rename component & refactor func
juan518munoz Mar 11, 2024
8d37924
rename module
juan518munoz Mar 11, 2024
feaf132
Merge pull request #1319 from lambdaclass/conversion_rate_component
jrchatruc Mar 11, 2024
3fff7d9
Merge remote-tracking branch 'upstream/lambdaclass_gas_oracle' into r…
jrchatruc Mar 11, 2024
ba7762c
Merge pull request #1360 from lambdaclass/remove-token-fetcher-singleton
jrchatruc Mar 11, 2024
f544652
feat: Handle Web3Error::NotImplemented on EN
fkrause98 Mar 11, 2024
ffa9e11
Merge branch 'kl-factory' into base-token-addr-endpoint
fkrause98 Mar 11, 2024
d81aef0
Merge branch 'kl-factory' into lambdaclass_gas_oracle
jrchatruc Mar 12, 2024
421090f
Fix unit tests
ly0va Mar 13, 2024
1330692
Tweak CI for kl-factory
ly0va Mar 13, 2024
c246082
Merge branch 'main' into kl-factory
ly0va Mar 15, 2024
3afcade
post-merge fixes
ly0va Mar 15, 2024
1e22b58
Commitment utils fix
ly0va Mar 15, 2024
599d318
fix init and zk test i server
juan518munoz Mar 15, 2024
35df259
Merge pull request #1440 from lambdaclass/kl-factory
benceharomi Mar 15, 2024
cb6b373
Merge branch 'kl-factory' into base-token-addr-endpoint
fkrause98 Mar 15, 2024
28f6523
feat: Handle Web3Error::NotImplemented after merge
fkrause98 Mar 15, 2024
9cd48b7
fix: update protobuf config
fkrause98 Mar 15, 2024
5680df8
zk fmt
juan518munoz Mar 19, 2024
47c444f
Merge remote-tracking branch 'matter-labs/kl-factory' into gas-oracle
juan518munoz Mar 20, 2024
df9664c
update package.json
Mar 21, 2024
3baab56
initial commit
juan518munoz Mar 21, 2024
b6baace
zk fmt
juan518munoz Mar 21, 2024
aa868fb
fix test
juan518munoz Mar 21, 2024
b520744
rename native token to base token
juan518munoz Mar 25, 2024
29289c9
fix env load
juan518munoz Mar 25, 2024
53aa529
Merge pull request #1479 from lambdaclass/kl-factory-integration-test…
ly0va Mar 26, 2024
7c8ec45
add gas oracle documentation
Mar 27, 2024
2a7761d
fmt
Mar 27, 2024
55ae89f
Merge branch 'kl-factory' into gas-oracle
fkrause98 Mar 27, 2024
911e1de
Merge pull request #1481 from lambdaclass/kl-factory-fix-contracts-tests
ly0va Mar 28, 2024
cef5baa
Update yarn.lock
ly0va Mar 29, 2024
8166d7f
Switch contracts to without-1.5.0 branch
ly0va Apr 2, 2024
3c284b3
Bump contracts again
ly0va Apr 3, 2024
4735e34
Upgrade test works
ly0va Apr 3, 2024
b2bb23c
Minor integration tests fixes
ly0va Apr 3, 2024
4b58ffa
zk fmt
ly0va Apr 3, 2024
e16c3e7
add hyperchain upgrade script
kelemeno Apr 3, 2024
c684bf4
changing back bridge names in server for backwards
kelemeno Mar 26, 2024
d4b3842
bridge names in server for backwards comp
kelemeno Mar 26, 2024
6e4e4c9
generating upgrade data
kelemeno Mar 27, 2024
f5e39dc
latest to genesis protocol version
kelemeno Apr 3, 2024
dc320c3
yarn lock
kelemeno Apr 3, 2024
e3014e7
updated contracts.toml
kelemeno Apr 3, 2024
e415f74
Merge branch 'main' into kl-factory
Deniallugo Apr 4, 2024
78dabaa
zk compiles
Deniallugo Apr 4, 2024
206b682
Fix configs
Deniallugo Apr 4, 2024
7d2fc46
Fix configs
Deniallugo Apr 4, 2024
83f246a
Fix vm version
Deniallugo Apr 4, 2024
6668cf9
Switch to calldata
Deniallugo Apr 4, 2024
2d5d584
Fix tests
Deniallugo Apr 4, 2024
bb287d6
Merge branch 'main' into kl-factory
Deniallugo Apr 4, 2024
3e59eb1
feat(init): hardcode initial chain id
Deniallugo Apr 5, 2024
930eb77
Merge pull request #1581 from matter-labs/deniallugo-hardcode-initial…
kelemeno Apr 5, 2024
1a638f4
rpc endpoints added back weth
kelemeno Apr 4, 2024
23d7d67
fix multiple proofs error t4 for dummy batches
kelemeno Apr 5, 2024
9cb3105
zk lint fmt
kelemeno Apr 5, 2024
797a67e
updated yarn lock
kelemeno Apr 5, 2024
1c057d6
Remove bridge config from genesis
Deniallugo Apr 5, 2024
c8c552e
Merge pull request #1582 from matter-labs/deniallugo-slighlty-rearran…
kelemeno Apr 5, 2024
6cb4a51
update contracts submodule
juan518munoz Apr 5, 2024
0eb0be1
feat(genesis): Add genesis config generator
Deniallugo Apr 5, 2024
2bbecac
Add sqlx_offline=true
Deniallugo Apr 5, 2024
40825d6
Make sqlx work offline
Deniallugo Apr 5, 2024
f4b67c0
fix path
juan518munoz Apr 5, 2024
712bcd2
Merge remote-tracking branch 'matter-labs/kl-factory' into kl-factory
juan518munoz Apr 5, 2024
fb39e9e
fix first zk test i server
juan518munoz Apr 5, 2024
f135f9b
Fix suggestions
Deniallugo Apr 5, 2024
ee214a7
Merge pull request #1591 from lambdaclass/kl-factory
kelemeno Apr 5, 2024
0ffd1fe
Merge branch 'kl-factory' into base-token-addr-endpoint
fkrause98 Apr 5, 2024
eae48e5
CI and init fixes
ly0va Apr 8, 2024
c7cd528
Merge pull request #1592 from matter-labs/deniallugo-add-genesis-conf…
Deniallugo Apr 8, 2024
4aafcd8
fix(genesis): remove set-chain-id
Deniallugo Apr 5, 2024
a6a49df
Merge branch 'kl-factory' into deniallugo-remove-set-chain-id
Deniallugo Apr 8, 2024
99d90ee
Merge pull request #1593 from matter-labs/deniallugo-remove-set-chain-id
Deniallugo Apr 8, 2024
e6cc008
zk fmt
ly0va Apr 8, 2024
9f2c3ed
Fix ci
ly0va Apr 8, 2024
44aaa1b
Fix zk
ly0va Apr 8, 2024
633f15e
Bump contracts
ly0va Apr 8, 2024
5bccb09
Update yarn lock
ly0va Apr 8, 2024
b48b325
renaming and tests
kelemeno Apr 5, 2024
ef878c2
updated abis,
kelemeno Apr 8, 2024
cb17f04
Bump contracts again
ly0va Apr 8, 2024
04e6eba
Fix chain_eth_network
ly0va Apr 8, 2024
b4bbc8e
More fixes
ly0va Apr 8, 2024
a0868d5
Merge pull request #1031 from lambdaclass/base-token-addr-endpoint
lferrigno Apr 8, 2024
c97b667
Merge branch 'main' of github.com:matter-labs/zksync-era into kl-factory
kelemeno Apr 8, 2024
bdbf665
fixing merge errors
kelemeno Apr 8, 2024
d326e66
bump contracts
kelemeno Apr 8, 2024
bac7a4c
Merge branch 'kl-factory' into gas-oracle
fkrause98 Apr 8, 2024
cd2e52b
chore(fmt): zk fmt
fkrause98 Apr 8, 2024
b3ea30b
linting
kelemeno Apr 9, 2024
1831eaf
merge errors
kelemeno Apr 9, 2024
818f157
merge issue
kelemeno Apr 9, 2024
b19b7fc
protobuf fixes
kelemeno Apr 9, 2024
5fea3c4
Bump contracts
ly0va Apr 9, 2024
add9cf3
Merge remote-tracking branch 'origin/kl-factory' into kl-factory-ci
ly0va Apr 9, 2024
3d7921b
Update zk with validium-mode
ly0va Apr 9, 2024
d43d4fe
Switch contracts to dev
ly0va Apr 9, 2024
48bc261
fix first init
Apr 9, 2024
07103f2
Revert
ly0va Apr 9, 2024
2497d74
Fix docker.toml config
ly0va Apr 9, 2024
f4ee050
protobuf fixes
kelemeno Apr 9, 2024
fc749ea
remove init.env
Mar 25, 2024
72ddc7d
delete dev.env
Mar 25, 2024
3803823
fix web3 test
Apr 3, 2024
0fa0b04
update setup to support different base tokens & erc20 non-eth based c…
Apr 3, 2024
78dd836
update erc20 test
Apr 3, 2024
23e8b50
resolve conflicts in ether test
Apr 5, 2024
0a4e78d
add base-token test & small fixes
Apr 3, 2024
3490459
delete test
Apr 5, 2024
975126e
resolve yarn
Apr 5, 2024
e53c6e4
remove custom bridge test
Apr 5, 2024
e25b33e
feat: add resources/conversion_rate_fetcher.rs
fborello-lambda Apr 8, 2024
3b280b4
added extra script to
kelemeno Apr 9, 2024
bac9345
remove test & fix shared bridge addres is zksync_core
Apr 9, 2024
f971469
zk fmt
Apr 9, 2024
20574f7
Merge pull request #1492 from matter-labs/feat/update-integration-tests
kelemeno Apr 9, 2024
1d85502
Merge branch 'kl-factory' into gas-oracle
fkrause98 Apr 9, 2024
2a9b9bd
Merge pull request #996 from lambdaclass/gas-oracle
lferrigno Apr 9, 2024
17bce52
Merge branch 'kl-factory' into kl-factory-ci
ly0va Apr 10, 2024
b67fd20
Update sqlx
ly0va Apr 10, 2024
0fee8ca
Merge pull request #1620 from lambdaclass/kl-factory-fix-first-init
kelemeno Apr 10, 2024
62ef505
bump contracts, base_token in rpc
kelemeno Apr 10, 2024
5136c1c
remove validium mode zk init
kelemeno Apr 10, 2024
58d45df
Merge remote-tracking branch 'origin/kl-factory' into kl-factory-ci
ly0va Apr 10, 2024
a020f51
small lint fixes, abi, and
kelemeno Apr 11, 2024
67ef103
linting
kelemeno Apr 11, 2024
08d67f5
Revert "Merge pull request #996 from lambdaclass/gas-oracle"
ly0va Apr 11, 2024
c327083
upgrade preperation
kelemeno Apr 11, 2024
88713e0
bump contracts and config vars
kelemeno Apr 11, 2024
884e03c
Merge branch 'main' of github.com:matter-labs/zksync-era into kl-factory
kelemeno Apr 11, 2024
31035b5
bumping contracts
kelemeno Apr 11, 2024
6b8daba
update contracts.toml
kelemeno Apr 11, 2024
a94fb7b
upgrade script fixes
kelemeno Apr 11, 2024
616dce8
lint
kelemeno Apr 11, 2024
42a1d7f
spellcheck
kelemeno Apr 11, 2024
a28d23e
Merge remote-tracking branch 'origin/kl-factory' into kl-factory-ci
ly0va Apr 11, 2024
036a5bf
Fix some unit tests
ly0va Apr 11, 2024
8123f4f
Fix more tests
ly0va Apr 11, 2024
01e29cd
linkcheck
kelemeno Apr 12, 2024
db0c797
Disable validium mode in ci
ly0va Apr 12, 2024
896f48d
Remove zk test l1-contracts
ly0va Apr 12, 2024
0deea96
Fix some more tests
ly0va Apr 12, 2024
c4e7539
fix ci
StanislavBreadless Apr 12, 2024
4b4df79
Fix configs
ly0va Apr 12, 2024
e59c53d
remove unnecessary files to limit diff to main
mm-zk Apr 12, 2024
c547df3
Fix the last unit test
ly0va Apr 12, 2024
dd4a6fd
Merge pull request #1668 from matter-labs/mmzk_0412_kl
kelemeno Apr 12, 2024
5c65c93
Merge pull request #1604 from matter-labs/kl-factory-ci
ly0va Apr 12, 2024
92861f7
remove vm local from kl-factory
StanislavBreadless Apr 12, 2024
b09fb49
sync with base
StanislavBreadless Apr 12, 2024
1d5ec81
Merge pull request #1672 from matter-labs/sb-remove-vm-local
StanislavBreadless Apr 12, 2024
6d0ffee
fix compile in kl factory
StanislavBreadless Apr 12, 2024
8e0bd2c
Merge pull request #1676 from matter-labs/sb-fix-compile
StanislavBreadless Apr 12, 2024
98e5f98
fix: Fixing integration test for custom base token & temporarily disa…
mm-zk Apr 15, 2024
08fc82a
fix: Fixes EVM-556 - unitests (#1686)
mm-zk Apr 15, 2024
52b22b6
chore: Enable fee projection tests (#1689)
StanislavBreadless Apr 15, 2024
8a8283d
fix: Fixing issues with lint (#1687)
mm-zk Apr 15, 2024
f3737fe
fix ext node test
StanislavBreadless Apr 15, 2024
ed57e75
fix some changes
StanislavBreadless Apr 15, 2024
86366b1
consistency checker fix
benceharomi Apr 15, 2024
0b7f7b8
uncommented snapshot-recovery-test ci job
benceharomi Apr 15, 2024
8252edc
at least partially fix unit tests
StanislavBreadless Apr 15, 2024
dd9bcb2
seemingly fix integration tests for custom token
StanislavBreadless Apr 15, 2024
37c8fba
fix lint
StanislavBreadless Apr 15, 2024
4b5fa6b
remove ls
benceharomi Apr 16, 2024
bf60ce5
one more iteration
StanislavBreadless Apr 16, 2024
c5c6727
take base token from provider in tests
StanislavBreadless Apr 16, 2024
e34cc07
use is address eq
StanislavBreadless Apr 16, 2024
26a2f49
Merge pull request #1691 from matter-labs/sb-return-ext-node-tests
StanislavBreadless Apr 16, 2024
05d2775
Merge branch 'kl-factory' into bh-evm-540-test-and-fix-snapshot-test
benceharomi Apr 16, 2024
b2b31aa
Revert "consistency checker fix"
benceharomi Apr 16, 2024
b142de7
Merge pull request #1692 from matter-labs/bh-evm-540-test-and-fix-sna…
StanislavBreadless Apr 16, 2024
a38c7ef
merge + server compiles
StanislavBreadless Apr 16, 2024
c2797ae
fix lint
StanislavBreadless Apr 16, 2024
79d39c1
Merge pull request #1702 from matter-labs/sb-merge-main-to-kl-factory
StanislavBreadless Apr 17, 2024
2e334d5
chore: Enable upgrade test (#1698)
StanislavBreadless Apr 17, 2024
7fbaf7c
chore(kl-factory): Restore build core images workflow (#1710)
StanislavBreadless Apr 17, 2024
77540c4
Merge branch 'main' into sb-merge-main-to-kl-factory-2
StanislavBreadless Apr 17, 2024
b250b43
fix lint
StanislavBreadless Apr 17, 2024
7a397c9
Merge pull request #1716 from matter-labs/sb-merge-main-to-kl-factory-2
StanislavBreadless Apr 18, 2024
59d65b2
fix(yarn.lock): zksync-ethers commit fix
benceharomi Apr 18, 2024
df56d38
Merge pull request #1728 from matter-labs/bh-zksync-ethers-fix
StanislavBreadless Apr 18, 2024
2da3cc4
fix: zksync-ethers branch changed to sb-old-sdk (#1732)
benceharomi Apr 18, 2024
f02b8eb
sync with main
StanislavBreadless Apr 19, 2024
42479b5
fix lint
StanislavBreadless Apr 19, 2024
1160c68
Merge pull request #1740 from matter-labs/sb-merge-main-into-kl-factory
StanislavBreadless Apr 19, 2024
82d7f2f
feat: Adding local-node support for bridgehub (#1715)
mm-zk Apr 19, 2024
8588aa8
chore: Cleanup + minor fixes with kl-factory PR (#1741)
StanislavBreadless Apr 19, 2024
bf7c867
fix: fixed ethers.test for ETH based chain. (#1742)
mm-zk Apr 19, 2024
fcf0b25
fix cargo deny
StanislavBreadless Apr 19, 2024
9980619
try 2
StanislavBreadless Apr 19, 2024
5afb110
Merge pull request #1749 from matter-labs/sb-fix-cargo-deny
kelemeno Apr 19, 2024
01974b3
fix: More migration fixes, bumping contracts (#1694)
kelemeno Apr 19, 2024
f09f4b7
chore: Merge main to kl factory 3 (#1748)
StanislavBreadless Apr 20, 2024
919fc1e
chore: Some additional fixes from review to kl-factory (#1745)
StanislavBreadless Apr 21, 2024
4704f19
fix: kl-factory revert test (#1744)
Raid5594 Apr 22, 2024
651407e
fix(shared bridge): fix loadtest (#1750)
ly0va Apr 22, 2024
0c5bd0a
merge main to kl-factory
StanislavBreadless Apr 22, 2024
9ef148e
chore(kl-factory): Respond to comments by mm-zk (#1756)
StanislavBreadless Apr 22, 2024
a9d1c24
Merge pull request #1759 from matter-labs/sb-merge-main-to-kl-factory-4
StanislavBreadless Apr 22, 2024
a82b882
chore: factory l2 erc20 removal (#1762)
kelemeno Apr 22, 2024
1e8ceb9
add test for migration
StanislavBreadless Apr 22, 2024
0603e8b
fixed hash
StanislavBreadless Apr 23, 2024
9d6659d
use dev branch for contracts + address comments
StanislavBreadless Apr 23, 2024
ad1aa12
small hyperchain upgrade fix
kelemeno Apr 23, 2024
495ee2b
bump contracts
kelemeno Apr 23, 2024
0a6693f
bump contracts
kelemeno Apr 23, 2024
fc2a3ed
fix: Add test for migration (#1765)
StanislavBreadless Apr 23, 2024
e4b4b6a
chore: Respond to comments by mm-zk 2 (#1768)
StanislavBreadless Apr 23, 2024
52002b5
chore: factory stops CI, final PR (#1766)
kelemeno Apr 23, 2024
e3064ea
more params fix
kelemeno Apr 23, 2024
d900455
chore: Fix comments from mishap (#1770)
StanislavBreadless Apr 23, 2024
183826c
Merge branch 'kl-factory' of github.com:matter-labs/zksync-era into k…
kelemeno Apr 23, 2024
612e12f
Merge branch 'main' of github.com:matter-labs/zksync-era into kl/fact…
kelemeno Apr 23, 2024
6f08449
printing out operations
kelemeno Apr 24, 2024
4772931
separate hot wallet operations
kelemeno Apr 24, 2024
df96c0d
Merge branch 'main' of github.com:matter-labs/zksync-era into kl/fact…
kelemeno Apr 24, 2024
d17b34a
deployment process
kelemeno Apr 24, 2024
38fab9e
stage upgrade data
kelemeno Apr 25, 2024
55afddd
bump contracts
kelemeno Apr 25, 2024
faa81b1
correcct verification parrams
kelemeno Apr 25, 2024
4a97c0b
stage upgrade
kelemeno Apr 25, 2024
1922cb3
linting
kelemeno Apr 25, 2024
1ab704e
lint
kelemeno Apr 25, 2024
de8d2b2
change environment for phase 2
kelemeno Apr 25, 2024
537fd17
more fixes
kelemeno Apr 26, 2024
1a0afe0
Merge branch 'main' of github.com:matter-labs/zksync-era into kl/fact…
kelemeno Apr 26, 2024
120ef00
stage proofs migration data
kelemeno Apr 26, 2024
8224dc3
bumped protocol vesion, regenerating
kelemeno Apr 28, 2024
0754d20
stage 24 upgrade data
kelemeno May 5, 2024
26c88d1
bump contracts
kelemeno May 3, 2024
5ca5ac9
testnet data
kelemeno May 5, 2024
b48473f
bump contracts
kelemeno May 6, 2024
cbfc1c1
mainnet upgrade data
kelemeno May 7, 2024
841a583
bump contracts
kelemeno May 7, 2024
90f8cb0
modified timestamp
kelemeno May 8, 2024
6c7525e
bump contracts
kelemeno May 8, 2024
6ae57c9
adding bridge upgrade data
kelemeno May 8, 2024
9c4c59d
bump contracts
kelemeno May 8, 2024
72cec66
Merge branch 'main' of github.com:matter-labs/zksync-era into kl/fact…
kelemeno May 8, 2024
75913c3
hyperchain upgrade cleanup
kelemeno May 8, 2024
2eaf242
remove operations
kelemeno May 8, 2024
2c561c9
fix spellcheck
kelemeno May 8, 2024
4c3dc33
spellcheck
kelemeno May 8, 2024
2d65a96
Merge branch 'main' of github.com:matter-labs/zksync-era into kl/fact…
kelemeno May 8, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion contracts
Submodule contracts updated 45 files
+0 −0 .github/workflows/build-release.yaml
+0 −50 .github/workflows/buld-release.yaml
+3 −1 .github/workflows/l1-contracts-foundry-ci.yaml
+3 −1 .github/workflows/slither.yaml
+51 −0 gas-bound-caller/README.md
+1 −0 gas-bound-caller/canonical-bytecodes/GasBoundCaller
+27 −8 gas-bound-caller/contracts/GasBoundCaller.sol
+61 −0 gas-bound-caller/contracts/ISystemContext.sol
+35 −6 gas-bound-caller/contracts/test-contracts/GasBoundCallerTester.sol
+355 −0 gas-bound-caller/contracts/test-contracts/SystemContractHelper.sol
+268 −0 gas-bound-caller/contracts/test-contracts/SystemContractsCaller.sol
+62 −0 gas-bound-caller/hardhat.config.ts
+60 −0 gas-bound-caller/package.json
+42 −0 gas-bound-caller/scripts/check-canonical-bytecode.ts
+104 −0 gas-bound-caller/scripts/deploy-on-hyperchain.ts
+11 −0 gas-bound-caller/scripts/utils.ts
+22 −14 gas-bound-caller/test/GasBoundCaller.spec.ts
+0 −10 l1-contracts-foundry/script-config-template/config-deploy-l1.toml
+12 −0 l1-contracts-foundry/script-config-template/register-hyperchain.toml
+7 −3 l1-contracts-foundry/script/DeployL1.s.sol
+76 −165 l1-contracts-foundry/script/RegisterHyperchain.s.sol
+15 −8 l1-contracts/scripts/governance-accept-ownership.ts
+4 −2 l1-contracts/scripts/hyperchain-upgrade-1.ts
+2 −1 l1-contracts/scripts/hyperchain-upgrade-2.ts
+3 −2 l1-contracts/scripts/hyperchain-upgrade-3.ts
+2 −2 l1-contracts/scripts/token-migration.ts
+39 −83 l1-contracts/scripts/upgrade-consistency-checker.ts
+129 −17 l1-contracts/scripts/verify.ts
+3 −1 l1-contracts/src.ts/deploy-utils.ts
+32 −8 l1-contracts/src.ts/deploy.ts
+180 −277 l1-contracts/src.ts/hyperchain-upgrade.ts
+16 −16 l1-contracts/test/test_config/constant/hardhat.json
+13 −10 l2-contracts/contracts/bridge/L2SharedBridge.sol
+2 −0 l2-contracts/contracts/bridge/interfaces/IL2SharedBridge.sol
+33 −0 l2-contracts/contracts/dev-contracts/DevL2SharedBridge.sol
+1 −1 l2-contracts/hardhat.config.ts
+34 −17 l2-contracts/src/deploy-shared-bridge-on-l2-through-l1.ts
+2 −2 l2-contracts/src/upgrade-consistency-checker.ts
+2 −1 l2-contracts/src/verify.ts
+4 −2 package.json
+0 −7 system-contracts/SystemContractsHashes.json
+8 −0 system-contracts/hardhat.config.ts
+3 −1 system-contracts/scripts/compile-yul.ts
+1 −1 system-contracts/scripts/deploy-preimages.ts
+6 −1 yarn.lock
6 changes: 6 additions & 0 deletions etc/tokens/mainnet.json
Expand Up @@ -94,5 +94,11 @@
"decimals": 18,
"symbol": "ZRX",
"name": "0x Protocol Token"
},
{
"name": "Wrapped Ether",
"symbol": "WETH",
"decimals": 18,
"address": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2"
}
]
2 changes: 1 addition & 1 deletion etc/upgrades/1711451944-hyperchain-upgrade/common.json
@@ -1,5 +1,5 @@
{
"name": "hyperchain-upgrade",
"creationTimestamp": 1711451944,
"protocolVersion": "23"
"protocolVersion": "24"
}
StanislavBreadless marked this conversation as resolved.
Show resolved Hide resolved
@@ -0,0 +1 @@
[]
@@ -0,0 +1,17 @@
{
"l2BridgeUpgrade": {
"schedule": "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000005fe1dacc4e47823f85a74421515ca7361ea5f02b8ac7aed31564ef15a1a297860000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000032400084c286cf3e17e7b677ea9583e60a0003240000000000000000000000000000000000000000000000000654099584706c0000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000244eb67241900000000000000000000000011f943b2c77b743ab90f4a0ae7d5a4e7fca3e102000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000022000000000000000000000000071d84c3404a6ae258e6471d4934b96a2033f943800000000000000000000000000000000000000000000000000000000000001044f1ef286000000000000000000000000470afaacce2acdaefcc662419b74c79d76c914ae00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000084a31ee5b0000000000000000000000000241f19ea8ccd04515b309f1c9953a322f51891fc00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063010001211b0c33353cdf7a320f768e3dc40bce1326d639fcac099bba9ecd8e340000000000000000000000001c732a2061eaccae1c664ebc3e868b8438e050720000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"execute": "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000005fe1dacc4e47823f85a74421515ca7361ea5f02b8ac7aed31564ef15a1a297860000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000032400084c286cf3e17e7b677ea9583e60a0003240000000000000000000000000000000000000000000000000654099584706c0000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000244eb67241900000000000000000000000011f943b2c77b743ab90f4a0ae7d5a4e7fca3e102000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000022000000000000000000000000071d84c3404a6ae258e6471d4934b96a2033f943800000000000000000000000000000000000000000000000000000000000001044f1ef286000000000000000000000000470afaacce2acdaefcc662419b74c79d76c914ae00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000084a31ee5b0000000000000000000000000241f19ea8ccd04515b309f1c9953a322f51891fc00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063010001211b0c33353cdf7a320f768e3dc40bce1326d639fcac099bba9ecd8e340000000000000000000000001c732a2061eaccae1c664ebc3e868b8438e050720000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"value": "456000000048000000"
},
"l1BridgeTransferAdmin": {
"schedule": "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000004fa7041c2dd7ae4f5dfadca3f7248f2b9c3dea4340eb8d2bad94e445f6bde4cc0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde0630000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000248f283970000000000000000000000000f2c1d17441074ffb18e9a918db81a17db175214600000000000000000000000000000000000000000000000000000000",
"execute": "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000004fa7041c2dd7ae4f5dfadca3f7248f2b9c3dea4340eb8d2bad94e445f6bde4cc0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde0630000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000248f283970000000000000000000000000f2c1d17441074ffb18e9a918db81a17db175214600000000000000000000000000000000000000000000000000000000",
"value": "0"
},
"l1BridgeUpgrade": {
"schedule": "0x2c4319170000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000587b437f52256a45b3f8d167a466ffb69883ad7b22bd52e2f12ebd078fef01af00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000f2c1d17441074ffb18e9a918db81a17db175214600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000004499a88ec400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000bf3d4109d65a66c629d1999fb630be2ee16d703800000000000000000000000000000000000000000000000000000000",
"execute": "0x74da756b000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000587b437f52256a45b3f8d167a466ffb69883ad7b22bd52e2f12ebd078fef01af00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000f2c1d17441074ffb18e9a918db81a17db175214600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000004499a88ec400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000bf3d4109d65a66c629d1999fb630be2ee16d703800000000000000000000000000000000000000000000000000000000",
"value": "0"
}
}
11 changes: 11 additions & 0 deletions etc/upgrades/1711451944-hyperchain-upgrade/mainnet/crypto.json
@@ -0,0 +1,11 @@
{
"verifier": {
"address": "0x9D6c59D9A234F585B367b4ba3C62e5Ec7A6179FD",
"txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
},
"keys": {
"recursionNodeLevelVkHash": "0xf520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8",
"recursionLeafLevelVkHash": "0x435202d277dd06ef3c64ddd99fda043fc27c2bd8b7c66882966840202c27f4f6",
"recursionCircuitsSetVksHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
}
}
181 changes: 181 additions & 0 deletions etc/upgrades/1711451944-hyperchain-upgrade/mainnet/facetCuts.json
@@ -0,0 +1,181 @@
[
{
"facet": "0x0000000000000000000000000000000000000000",
"selectors": [
"0x0e18b681",
"0xe58bb639",
"0x64bf8d66",
"0xa9f6d941",
"0x27ae4c16",
"0x4dd18bf5",
"0xf235757f",
"0x1cc5d103",
"0xbe6f11cf",
"0x4623c91d",
"0x17338945"
],
"action": 2,
"isFreezable": false
},
{
"facet": "0x0000000000000000000000000000000000000000",
"selectors": [
"0xcdffacc6",
"0x52ef6b2c",
"0xadfca15e",
"0x7a0ed627",
"0x79823c9a",
"0x4fc07d75",
"0xd86970d8",
"0xfd791f3c",
"0xe5355c75",
"0x9d1b5a81",
"0x7b30c8da",
"0x8665b150",
"0x631f4bac",
"0x0ec6b0b7",
"0x33ce93fe",
"0xdb1f0bf9",
"0xb8c2f66f",
"0xef3f0bae",
"0xfe26699e",
"0x39607382",
"0xaf6a2dcd",
"0xa1954fc5",
"0x46657fe9",
"0x18e3a941",
"0x29b98c67",
"0xbd7c5412",
"0xc3bbd2d7",
"0xe81e0ba1",
"0xfacd743b",
"0x9cd939e4",
"0x56142d7a",
"0xb22dd78e",
"0x74f4d30d"
],
"action": 2,
"isFreezable": false
},
{
"facet": "0x0000000000000000000000000000000000000000",
"selectors": [
"0x6c0960f9",
"0xb473318e",
"0x042901c7",
"0x263b7f8e",
"0xe4948f43",
"0xeb672419"
],
"action": 2,
"isFreezable": false
},
{
"facet": "0x0000000000000000000000000000000000000000",
"selectors": [
"0x701f58c5",
"0xc3d93e7c",
"0x7f61885c",
"0x97c09d34"
],
"action": 2,
"isFreezable": false
},
{
"facet": "0x342a09385E9BAD4AD32a6220765A6c333552e565",
"selectors": [
"0x0e18b681",
"0x64bf8d66",
"0xa9f6d941",
"0x27ae4c16",
"0x4dd18bf5",
"0x1cc5d103",
"0xbe6f11cf",
"0xe76db865",
"0x235d9eb5",
"0x21f603d7",
"0x4623c91d",
"0x17338945",
"0xfc57565f"
],
"action": 0,
"isFreezable": false
},
{
"facet": "0x345c6ca2F3E08445614f4299001418F125AD330a",
"selectors": [
"0x1de72e34",
"0xea6c029c",
"0xcdffacc6",
"0x52ef6b2c",
"0xadfca15e",
"0x7a0ed627",
"0x6e9960c3",
"0x98acd7a6",
"0x086a56f8",
"0x3591c1a0",
"0x79823c9a",
"0xd86970d8",
"0xfd791f3c",
"0xe5355c75",
"0x9d1b5a81",
"0x7b30c8da",
"0xd0468156",
"0x631f4bac",
"0x0ec6b0b7",
"0x33ce93fe",
"0x06d49e5b",
"0x5518c73b",
"0xdb1f0bf9",
"0xb8c2f66f",
"0xef3f0bae",
"0xfe26699e",
"0x39607382",
"0xaf6a2dcd",
"0xa1954fc5",
"0x46657fe9",
"0x18e3a941",
"0x29b98c67",
"0xbd7c5412",
"0xc3bbd2d7",
"0xe81e0ba1",
"0xfacd743b",
"0x9cd939e4",
"0x56142d7a",
"0xb22dd78e",
"0x74f4d30d"
],
"action": 0,
"isFreezable": false
},
{
"facet": "0x7814399116C17F2750Ca99cBFD2b75bA9a0793d7",
"selectors": [
"0x12f43dab",
"0x6c0960f9",
"0xb473318e",
"0x042901c7",
"0x263b7f8e",
"0xe4948f43",
"0xeb672419",
"0xc924de35"
],
"action": 0,
"isFreezable": true
},
{
"facet": "0x1a451d9bFBd176321966e9bc540596Ca9d39B4B1",
"selectors": [
"0x701f58c5",
"0x6edd4f12",
"0xc3d93e7c",
"0x6f497ac6",
"0x7f61885c",
"0xc37533bb",
"0x97c09d34",
"0x0f23da43"
],
"action": 0,
"isFreezable": true
}
]
18 changes: 18 additions & 0 deletions etc/upgrades/1711451944-hyperchain-upgrade/mainnet/facets.json
@@ -0,0 +1,18 @@
{
"ExecutorFacet": {
"address": "0x1a451d9bFBd176321966e9bc540596Ca9d39B4B1",
"txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
},
"AdminFacet": {
"address": "0x342a09385E9BAD4AD32a6220765A6c333552e565",
"txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
},
"GettersFacet": {
"address": "0x345c6ca2F3E08445614f4299001418F125AD330a",
"txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
},
"MailboxFacet": {
"address": "0x7814399116C17F2750Ca99cBFD2b75bA9a0793d7",
"txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
}
}