-
Notifications
You must be signed in to change notification settings - Fork 99
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into jihwan/pp-workflow
- Loading branch information
Showing
39 changed files
with
1,970 additions
and
62 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| deployment_stages: | ||
| deploy_l1: false | ||
| deploy_agglayer: false | ||
|
|
||
| args: | ||
| deployment_suffix: "-002" | ||
| zkevm_rollup_chain_id: 20202 | ||
| zkevm_rollup_id: 2 | ||
|
|
||
| # The following accounts have been generated using the following command: | ||
| # polycli wallet inspect --mnemonic 'bless share truly shadow primary sun relief border van gallery stairs edit reflect gentle athlete main device smile response rescue mirror floor say people' --addresses 9 | tee keys.txt | jq -r '.Addresses[] | [.ETHAddress, .HexPrivateKey] | @tsv' | awk 'BEGIN{split("sequencer,aggregator,claimtxmanager,timelock,admin,loadtest,agglayer,dac,proofsigner",roles,",")} {print "zkevm_l2_" roles[NR] "_address: \"" $1 "\""; print "zkevm_l2_" roles[NR] "_private_key: \"0x" $2 "\"\n"}' | ||
| # Note that admin and agglayer accounts have been removed since we're using the default accounts. | ||
| zkevm_l2_sequencer_address: "0xA670342930242407b9984e467353044f8472055e" | ||
| zkevm_l2_sequencer_private_key: "0x902ed4ce26b536617a4f26da5e0cd0ef61b514a076b4bd766d6ab8b97efbb8c1" | ||
| zkevm_l2_aggregator_address: "0xfC419a9d9Fe0DfA4Cf9971AcD1Fbcd356DD768FD" | ||
| zkevm_l2_aggregator_private_key: "0xa70db9fb4b84a6ba18c03cd2266116dd110538d6c4c88e67ca35a29b910da25d" | ||
| zkevm_l2_claimtxmanager_address: "0x93F63c24735f45Cd0266E87353071B64dd86bc05" | ||
| zkevm_l2_claimtxmanager_private_key: "0x38718f22097afba13be48d818964326c9c5c48133f51e3c3bfd6faf05f813b34" | ||
| zkevm_l2_timelock_address: "0xDB22C6f61A82d6AA6d3607289fC93774AC09413a" | ||
| zkevm_l2_timelock_private_key: "0xae4a69010583a09709baa563fa66f9e6f2dacf9e9c84b89932406b9a0521b561" | ||
| zkevm_l2_loadtest_address: "0xD5278fC3Dc72A226d5C04c3d2C85fd397A46fA08" | ||
| zkevm_l2_loadtest_private_key: "0xef4db4f97684b8307adc332ed6c1bc82d66d160f08e7427d082d66a23889625e" | ||
| zkevm_l2_dac_address: "0xDa07AAD7226B136bc24157Dc4Ff5A813490E20D0" | ||
| zkevm_l2_dac_private_key: "0x992c9ab11d5eab6b6c2634b8bb0b85f3d8d1acf25024dc99c359cb2afd9b40a7" | ||
| zkevm_l2_proofsigner_address: "0xf1a661D7b601Ec46a040f57193cC99aB8c4132FA" | ||
| zkevm_l2_proofsigner_private_key: "0xc7fe3a006d75ba9326d9792523385abb49057c66aee0b8b4248821a89713f975" | ||
|
|
||
|
|
||
| cdk_node_image: ghcr.io/0xpolygon/cdk:0.5.0-beta10 | ||
| cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.2 | ||
| zkevm_contracts_image: leovct/zkevm-contracts:v9.0.0-rc.3-pp-fork.12-patch.1 | ||
| additional_services: [] | ||
| consensus_contract_type: pessimistic | ||
| sequencer_type: erigon | ||
| erigon_strict_mode: false | ||
| gas_token_enabled: true | ||
| zkevm_use_real_verifier: true | ||
| enable_normalcy: true | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,12 @@ | ||
| args: | ||
| agglayer_image: ghcr.io/agglayer/agglayer:0.2.0-rc.11 | ||
| cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0 | ||
| zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC3 | ||
| zkevm_bridge_ui_image: leovct/zkevm-bridge-ui:multi-network | ||
| cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.2 | ||
| zkevm_contracts_image: leovct/zkevm-contracts:v9.0.0-rc.3-pp-fork.12-patch.1 | ||
| additional_services: [] | ||
| consensus_contract_type: pessimistic | ||
| sequencer_type: erigon | ||
| erigon_strict_mode: false | ||
| #agglayer_prover_sp1_key: | ||
| gas_token_enabled: false | ||
| zkevm_use_real_verifier: true | ||
| enable_normalcy: true | ||
| agglayer_prover_sp1_key: "" | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,7 @@ | |
| # https://github.com/0xPolygon/cdk/blob/main/.github/workflows/test-e2e.yml | ||
| name: Test | ||
|
|
||
| on: | ||
| on: | ||
| pull_request: | ||
| push: | ||
| branches: [main] | ||
|
|
@@ -18,6 +18,7 @@ env: | |
|
|
||
| jobs: | ||
| build-cdk-image: | ||
| if: false | ||
| runs-on: ubuntu-latest | ||
| timeout-minutes: 10 | ||
| steps: | ||
|
|
@@ -38,17 +39,18 @@ jobs: | |
| - name: Build cdk docker image | ||
| working-directory: cdk | ||
| run: make build-docker | ||
|
|
||
| - name: Save cdk image to archive | ||
| run: docker save --output /tmp/cdk.tar cdk | ||
|
|
||
| - name: Upload archive | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: cdk | ||
| path: /tmp/cdk.tar | ||
|
|
||
| cdk-e2e-tests: | ||
| if: false | ||
| runs-on: ubuntu-latest | ||
| timeout-minutes: 45 | ||
| needs: build-cdk-image | ||
|
|
@@ -63,7 +65,7 @@ jobs: | |
| - "fork12-pessimistic" | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
|
|
||
| - name: Login to Docker Hub | ||
| uses: docker/login-action@v3 | ||
| with: | ||
|
|
@@ -75,15 +77,15 @@ jobs: | |
| env: | ||
| DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} | ||
| DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} | ||
|
|
||
| - name: Install Kurtosis CDK tools | ||
| uses: ./.github/actions/setup-kurtosis-cdk | ||
|
|
||
| - name: Install polycli | ||
| run: | | ||
| tmp_dir=$(mktemp -d) | ||
| curl -L "https://github.com/0xPolygon/polygon-cli/releases/download/${{ env.POLYCLI_VERSION }}/polycli_${{ env.POLYCLI_VERSION }}_linux_amd64.tar.gz" | tar -xz -C "$tmp_dir" | ||
| mv "$tmp_dir"/* /usr/local/bin/polycli | ||
| tmp_dir=$(mktemp -d) | ||
| curl -L "https://github.com/0xPolygon/polygon-cli/releases/download/${{ env.POLYCLI_VERSION }}/polycli_${{ env.POLYCLI_VERSION }}_linux_amd64.tar.gz" | tar -xz -C "$tmp_dir" | ||
| mv "$tmp_dir"/* /usr/local/bin/polycli | ||
| rm -rf "$tmp_dir" | ||
| sudo chmod +x /usr/local/bin/polycli | ||
| /usr/local/bin/polycli version | ||
|
|
@@ -97,13 +99,13 @@ jobs: | |
|
|
||
| - name: Setup bats | ||
| uses: bats-core/[email protected] | ||
|
|
||
| - name: Download cdk archive | ||
| uses: actions/download-artifact@v4 | ||
| with: | ||
| name: cdk | ||
| path: /tmp | ||
|
|
||
| - name: Load cdk image | ||
| run: | | ||
| docker load --input /tmp/cdk.tar | ||
|
|
@@ -120,11 +122,11 @@ jobs: | |
| KURTOSIS_FOLDER: ${{ github.workspace }} | ||
| BATS_LIB_PATH: /usr/lib/ | ||
| agglayer_prover_sp1_key: ${{ secrets.SP1_PRIVATE_KEY }} | ||
|
|
||
| - name: Dump enclave | ||
| if: failure() | ||
| run: kurtosis enclave dump cdk ./dump | ||
|
|
||
| - name: Generate archive name | ||
| if: failure() | ||
| run: | | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.