Skip to content

Commit

Permalink
Merge branch 'jihwan/op-stack-fund-batcher' into jihwan/op-succinct-i…
Browse files Browse the repository at this point in the history
…ntegration

Signed-off-by: Ji Hwan <jkim@polygon.technology>
  • Loading branch information
jhkimqd committed Feb 19, 2025
2 parents 12e7e36 + ad18692 commit d4cff25
Show file tree
Hide file tree
Showing 40 changed files with 1,042 additions and 567 deletions.
1 change: 1 addition & 0 deletions .github/tests/chains/l1-cdk1-cdk2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ deployment_stages:

args:
agglayer_prover_sp1_key: null
agglayer_prover_primary_prover: "mock-prover"
consensus_contract_type: pessimistic
erigon_strict_mode: false
gas_token_enabled: false
Expand Down
7 changes: 4 additions & 3 deletions .github/tests/combinations/fork11-cdk-erigon-rollup.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
# This file has been generated automatically.
deployment_stages:
deploy_l2_contracts: true
args:
verbosity: debug
agglayer_image: ghcr.io/agglayer/agglayer:0.2.0-rc.19
zkevm_contracts_image: leovct/zkevm-contracts:v7.0.0-rc.2-fork.11-patch.1
zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.4-fork.11
zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.4-hotfix.2-fork.11
zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11
agglayer_image: ghcr.io/agglayer/agglayer:0.2.0-rc.19
additional_services:
- tx_spammer
deploy_l2_contracts: true
consensus_contract_type: rollup
sequencer_type: erigon
7 changes: 4 additions & 3 deletions .github/tests/combinations/fork11-cdk-erigon-validium.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
# This file has been generated automatically.
deployment_stages:
deploy_l2_contracts: true
args:
verbosity: debug
agglayer_image: ghcr.io/agglayer/agglayer:0.2.0-rc.19
zkevm_contracts_image: leovct/zkevm-contracts:v7.0.0-rc.2-fork.11-patch.1
zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.4-fork.11
zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.4-hotfix.2-fork.11
zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11
agglayer_image: ghcr.io/agglayer/agglayer:0.2.0-rc.19
additional_services:
- tx_spammer
deploy_l2_contracts: true
consensus_contract_type: cdk-validium
sequencer_type: erigon
10 changes: 5 additions & 5 deletions .github/tests/combinations/fork11-legacy-zkevm-rollup.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# This file has been generated automatically.
deployment_stages:
deploy_l2_contracts: true
deploy_cdk_erigon_node: false
args:
verbosity: debug
agglayer_image: ghcr.io/agglayer/agglayer:0.2.0-rc.19
zkevm_contracts_image: leovct/zkevm-contracts:v7.0.0-rc.2-fork.11-patch.1
zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.4-fork.11
zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.4-hotfix.2-fork.11
zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11
agglayer_image: ghcr.io/agglayer/agglayer:0.2.0-rc.19
additional_services:
- tx_spammer
deploy_l2_contracts: true
consensus_contract_type: rollup
sequencer_type: zkevm
deployment_stages:
deploy_cdk_erigon_node: false
7 changes: 4 additions & 3 deletions .github/tests/combinations/fork12-cdk-erigon-rollup.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
# This file has been generated automatically.
deployment_stages:
deploy_l2_contracts: true
args:
verbosity: debug
zkevm_contracts_image: leovct/zkevm-contracts:v8.0.0-fork.12-patch.1
zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC14-fork.12
zkevm_contracts_image: leovct/zkevm-contracts:v9.0.0-rc.6-pp-fork.12
zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC16-fork.12
additional_services:
- tx_spammer
deploy_l2_contracts: true
consensus_contract_type: rollup
sequencer_type: erigon
5 changes: 3 additions & 2 deletions .github/tests/combinations/fork12-cdk-erigon-sovereign.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
# This file has been generated automatically.
deployment_stages:
deploy_l2_contracts: true
args:
verbosity: debug
zkevm_contracts_image: leovct/zkevm-contracts:v9.0.0-rc.5-pp-fork.12
zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC14-fork.12
zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC16-fork.12
additional_services:
- tx_spammer
deploy_l2_contracts: true
consensus_contract_type: pessimistic
erigon_strict_mode: false
gas_token_enabled: false
Expand Down
7 changes: 4 additions & 3 deletions .github/tests/combinations/fork12-cdk-erigon-validium.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
# This file has been generated automatically.
deployment_stages:
deploy_l2_contracts: true
args:
verbosity: debug
zkevm_contracts_image: leovct/zkevm-contracts:v8.0.0-fork.12-patch.1
zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC14-fork.12
zkevm_contracts_image: leovct/zkevm-contracts:v9.0.0-rc.6-pp-fork.12
zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC16-fork.12
additional_services:
- tx_spammer
deploy_l2_contracts: true
consensus_contract_type: cdk-validium
sequencer_type: erigon
7 changes: 4 additions & 3 deletions .github/tests/combinations/fork13-cdk-erigon-rollup.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
# This file has been generated automatically.
deployment_stages:
deploy_l2_contracts: true
args:
verbosity: debug
zkevm_contracts_image: leovct/zkevm-contracts:v8.1.0-rc.1-fork.13-patch.1
zkevm_prover_image: hermeznetwork/zkevm-prover:v9.0.0-RC2-fork.13
zkevm_contracts_image: leovct/zkevm-contracts:v8.1.0-rc.2-fork.13
zkevm_prover_image: hermeznetwork/zkevm-prover:v9.0.0-RC3-fork.13
additional_services:
- tx_spammer
deploy_l2_contracts: true
consensus_contract_type: rollup
sequencer_type: erigon
7 changes: 4 additions & 3 deletions .github/tests/combinations/fork13-cdk-erigon-validium.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
# This file has been generated automatically.
deployment_stages:
deploy_l2_contracts: true
args:
verbosity: debug
zkevm_contracts_image: leovct/zkevm-contracts:v8.1.0-rc.1-fork.13-patch.1
zkevm_prover_image: hermeznetwork/zkevm-prover:v9.0.0-RC2-fork.13
zkevm_contracts_image: leovct/zkevm-contracts:v8.1.0-rc.2-fork.13
zkevm_prover_image: hermeznetwork/zkevm-prover:v9.0.0-RC3-fork.13
additional_services:
- tx_spammer
deploy_l2_contracts: true
consensus_contract_type: cdk-validium
sequencer_type: erigon
5 changes: 3 additions & 2 deletions .github/tests/combinations/fork9-cdk-erigon-rollup.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
# This file has been generated automatically.
deployment_stages:
deploy_l2_contracts: true
args:
verbosity: debug
agglayer_image: ghcr.io/agglayer/agglayer:0.2.0-rc.19
zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9-patch.1
zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.8
zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3
cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk
agglayer_image: ghcr.io/agglayer/agglayer:0.2.0-rc.19
additional_services:
- pless_zkevm_node
- tx_spammer
deploy_l2_contracts: true
consensus_contract_type: rollup
sequencer_type: erigon
5 changes: 3 additions & 2 deletions .github/tests/combinations/fork9-cdk-erigon-validium.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
# This file has been generated automatically.
deployment_stages:
deploy_l2_contracts: true
args:
verbosity: debug
agglayer_image: ghcr.io/agglayer/agglayer:0.2.0-rc.19
zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9-patch.1
zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.8
zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3
cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk
agglayer_image: ghcr.io/agglayer/agglayer:0.2.0-rc.19
additional_services:
- pless_zkevm_node
- tx_spammer
deploy_l2_contracts: true
consensus_contract_type: cdk-validium
sequencer_type: erigon
8 changes: 4 additions & 4 deletions .github/tests/combinations/fork9-legacy-zkevm-rollup.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# This file has been generated automatically.
deployment_stages:
deploy_l2_contracts: true
deploy_cdk_erigon_node: false
args:
verbosity: debug
agglayer_image: ghcr.io/agglayer/agglayer:0.2.0-rc.19
zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9-patch.1
zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.8
zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3
cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk
agglayer_image: ghcr.io/agglayer/agglayer:0.2.0-rc.19
additional_services:
- pless_zkevm_node
- tx_spammer
deploy_l2_contracts: true
consensus_contract_type: rollup
sequencer_type: zkevm
deployment_stages:
deploy_cdk_erigon_node: false
8 changes: 4 additions & 4 deletions .github/tests/combinations/fork9-legacy-zkevm-validium.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# This file has been generated automatically.
deployment_stages:
deploy_l2_contracts: true
deploy_cdk_erigon_node: false
args:
verbosity: debug
agglayer_image: ghcr.io/agglayer/agglayer:0.2.0-rc.19
zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9-patch.1
zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.8
zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3
cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk
agglayer_image: ghcr.io/agglayer/agglayer:0.2.0-rc.19
additional_services:
- pless_zkevm_node
- tx_spammer
deploy_l2_contracts: true
consensus_contract_type: cdk-validium
sequencer_type: zkevm
deployment_stages:
deploy_cdk_erigon_node: false
15 changes: 8 additions & 7 deletions .github/tests/forks/fork11.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
deployment_stages:
deploy_l2_contracts: true

args:
verbosity: debug

# Use this specific version of the agglayer to avoid the following issue:
# Error: Unable to get the InitL1InfoRootMap: Event InitL1InfoRootMap not found
agglayer_image: ghcr.io/agglayer/agglayer:0.2.0-rc.19

# https://hub.docker.com/repository/docker/leovct/zkevm-contracts/tags?name=fork.11
zkevm_contracts_image: leovct/zkevm-contracts:v7.0.0-rc.2-fork.11-patch.1

# https://hub.docker.com/r/hermeznetwork/zkevm-prover/tags?name=fork.11
zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.4-fork.11
zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.4-hotfix.2-fork.11

# https://hub.docker.com/r/hermeznetwork/zkevm-node/tags?name=fork11
zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11

# Use this specific version of the agglayer to avoid the following issue:
# Error: Unable to get the InitL1InfoRootMap: Event InitL1InfoRootMap not found
agglayer_image: ghcr.io/agglayer/agglayer:0.2.0-rc.19

additional_services:
- tx_spammer

deploy_l2_contracts: true
9 changes: 5 additions & 4 deletions .github/tests/forks/fork12.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
deployment_stages:
deploy_l2_contracts: true

args:
verbosity: debug

# https://hub.docker.com/repository/docker/leovct/zkevm-contracts/tags?name=fork.12
zkevm_contracts_image: leovct/zkevm-contracts:v8.0.0-fork.12-patch.1
zkevm_contracts_image: leovct/zkevm-contracts:v9.0.0-rc.6-pp-fork.12

# https://hub.docker.com/r/hermeznetwork/zkevm-prover/tags?name=v8
zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC14-fork.12
zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC16-fork.12

additional_services:
- tx_spammer

deploy_l2_contracts: true
9 changes: 5 additions & 4 deletions .github/tests/forks/fork13.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
deployment_stages:
deploy_l2_contracts: true

args:
verbosity: debug

# https://hub.docker.com/repository/docker/leovct/zkevm-contracts/tags?name=fork.13
zkevm_contracts_image: leovct/zkevm-contracts:v8.1.0-rc.1-fork.13-patch.1
zkevm_contracts_image: leovct/zkevm-contracts:v8.1.0-rc.2-fork.13

# https://hub.docker.com/r/hermeznetwork/zkevm-prover/tags?name=v9
zkevm_prover_image: hermeznetwork/zkevm-prover:v9.0.0-RC2-fork.13
zkevm_prover_image: hermeznetwork/zkevm-prover:v9.0.0-RC3-fork.13

additional_services:
- tx_spammer

deploy_l2_contracts: true
13 changes: 7 additions & 6 deletions .github/tests/forks/fork9.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
deployment_stages:
deploy_l2_contracts: true

args:
verbosity: debug

# Use this specific version of the agglayer to avoid the following issue:
# Error: Unable to get the InitL1InfoRootMap: Event InitL1InfoRootMap not found
agglayer_image: ghcr.io/agglayer/agglayer:0.2.0-rc.19

# https://hub.docker.com/repository/docker/leovct/zkevm-contracts/tags?name=fork.9
zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9-patch.1

Expand All @@ -13,12 +20,6 @@ args:
# https://hub.docker.com/r/0xpolygon/cdk-validium-node/tags?name=0.7
cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk

# Use this specific version of the agglayer to avoid the following issue:
# Error: Unable to get the InitL1InfoRootMap: Event InitL1InfoRootMap not found
agglayer_image: ghcr.io/agglayer/agglayer:0.2.0-rc.19

additional_services:
- pless_zkevm_node
- tx_spammer

deploy_l2_contracts: true
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,10 @@ deployment_stages:

args:
verbosity: debug
consensus_contract_type: rollup
zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.8
zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3
additional_services:
- pless_zkevm_node
l1_rpc_url: CHANGE_ME
genesis_file: ../../.github/tests/nightly/pless-zkevm-node/cardona-sepolia-testnet-genesis.json
consensus_contract_type: rollup

# Cardona/Sepolia is using fork id 9.
# https://sepolia.etherscan.io/address/0x32d33D5137a7cFFb54c5Bf8371172bcEc5f310ff#readProxyContract#F25
# rollupIDToRollupData(1) => forkID=9
zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.6
zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3-RC1
Loading

0 comments on commit d4cff25

Please sign in to comment.