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

Pessimistic Proof Integration and Features #401

Merged
merged 47 commits into from
Jan 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
cf27b23
feat: adding support for vkey config
praetoriansentry Nov 27, 2024
060f6a9
docs: adding some guidance for testing
praetoriansentry Nov 27, 2024
b548f1b
Merge branch 'main' into jhilliard/multi-pp-testing
praetoriansentry Dec 2, 2024
98bb78e
Merge branch 'main' into jhilliard/multi-pp-testing
praetoriansentry Dec 2, 2024
d5c0b61
chore: version bump
praetoriansentry Dec 2, 2024
bf90e63
fix: vkey
praetoriansentry Dec 2, 2024
432a372
feat: latest changes for testing
praetoriansentry Dec 3, 2024
d59c916
Merge branch 'main' into jhilliard/multi-pp-testing
praetoriansentry Dec 3, 2024
14ff92c
feat: version difference and configs
praetoriansentry Dec 4, 2024
1422668
chore: version bump
praetoriansentry Dec 4, 2024
682aef7
chore: bridge version bump
praetoriansentry Dec 5, 2024
a54f136
chore: minore config changes
praetoriansentry Dec 5, 2024
c5058b8
docs: updating
praetoriansentry Dec 5, 2024
1f5e20a
Merge branch 'main' into jhilliard/multi-pp-testing
praetoriansentry Dec 5, 2024
349a515
chore: version bump and adding reference rate limit
praetoriansentry Dec 5, 2024
9ddebd3
chore: wip docs
praetoriansentry Dec 6, 2024
d44d726
doc: litdown
praetoriansentry Dec 6, 2024
ec8cae5
docs: latest tests
praetoriansentry Dec 6, 2024
7360cd1
wip: testing notes
praetoriansentry Dec 12, 2024
1dca419
docs: latest testing procedures
praetoriansentry Dec 12, 2024
ada28e0
feat: latest testing notes
praetoriansentry Dec 12, 2024
a4d18b2
chore: moving docs
praetoriansentry Dec 12, 2024
1240275
feat: add RPC port to cdk-node
joanestebanr Dec 18, 2024
a7a8df5
Merge pull request #427 from 0xPolygon/jesteban/add_port_cdk_node
praetoriansentry Dec 18, 2024
dbcb1d7
feat: wip docs
praetoriansentry Dec 18, 2024
9a69211
Merge remote-tracking branch 'refs/remotes/origin/jhilliard/multi-pp-…
praetoriansentry Dec 18, 2024
355de58
fix: adding no wait for rpc port
praetoriansentry Dec 18, 2024
92f1ff6
Merge branch 'main' into jhilliard/multi-pp-testing
praetoriansentry Dec 18, 2024
d2ce23a
lint: removing .sh extension
praetoriansentry Dec 18, 2024
539cb72
chore: deleteing unused function
praetoriansentry Dec 18, 2024
f58acdc
fix: pegging pre-banana chains to agglayer rc20
praetoriansentry Dec 18, 2024
e78a426
fix: downgrading to 19 for the older forks
praetoriansentry Dec 19, 2024
b875e87
Merge branch 'main' into jhilliard/multi-pp-testing
praetoriansentry Dec 19, 2024
539ab8e
feat: separating pessmistic config
praetoriansentry Dec 19, 2024
d5ee23e
revert: changes to the attachment file
praetoriansentry Dec 19, 2024
b9f23ce
doc: updating attachment script name
praetoriansentry Dec 19, 2024
8f001e9
docs: re-working docs for 3 networks
praetoriansentry Dec 19, 2024
9e8a747
should not work
praetoriansentry Dec 19, 2024
4cb7bf5
feat: adding debug mode
praetoriansentry Dec 19, 2024
605b1d2
docs: latest docs
praetoriansentry Dec 19, 2024
f344f3a
feat: latest docs
praetoriansentry Dec 20, 2024
b926b0f
feat: latest changes
praetoriansentry Dec 20, 2024
37f1835
Merge branch 'main' into jhilliard/multi-pp-testing
praetoriansentry Jan 6, 2025
d9abe05
fix: tempoarily disable
praetoriansentry Jan 6, 2025
498a8db
fix: dropping some ci
praetoriansentry Jan 6, 2025
5ca6eae
feat: adding reasonable default
praetoriansentry Jan 6, 2025
5152850
feat: bumping bridge service version
praetoriansentry Jan 6, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions .github/tests/attach-second-cdk-pessimistic.yml
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.0
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

Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ args:
additional_services:
- tx_spammer
deploy_l2_contracts: true
agglayer_image: ghcr.io/agglayer/agglayer:0.2.0-rc.19
consensus_contract_type: rollup
sequencer_type: zkevm
deployment_stages:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@ args:
additional_services:
- tx_spammer
deploy_l2_contracts: true
agglayer_image: ghcr.io/agglayer/agglayer:0.2.0-rc.19
consensus_contract_type: cdk-validium
sequencer_type: erigon
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@ args:
additional_services:
- tx_spammer
deploy_l2_contracts: true
agglayer_image: ghcr.io/agglayer/agglayer:0.2.0-rc.19
consensus_contract_type: rollup
sequencer_type: erigon
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ args:
- pless_zkevm_node
- tx_spammer
deploy_l2_contracts: true
agglayer_image: ghcr.io/agglayer/agglayer:0.2.0-rc.19
consensus_contract_type: cdk-validium
sequencer_type: zkevm
deployment_stages:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ args:
- pless_zkevm_node
- tx_spammer
deploy_l2_contracts: true
agglayer_image: ghcr.io/agglayer/agglayer:0.2.0-rc.19
consensus_contract_type: rollup
sequencer_type: zkevm
deployment_stages:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ args:
- pless_zkevm_node
- tx_spammer
deploy_l2_contracts: true
agglayer_image: ghcr.io/agglayer/agglayer:0.2.0-rc.19
consensus_contract_type: cdk-validium
sequencer_type: erigon
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ args:
- pless_zkevm_node
- tx_spammer
deploy_l2_contracts: true
agglayer_image: ghcr.io/agglayer/agglayer:0.2.0-rc.19
consensus_contract_type: rollup
sequencer_type: erigon
8 changes: 4 additions & 4 deletions .github/tests/fork12-pessimistic.yml
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
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: ""

3 changes: 3 additions & 0 deletions .github/tests/forks/fork11.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,6 @@ args:
- tx_spammer

deploy_l2_contracts: true

# https://github.com/agglayer/agglayer/tags
agglayer_image: ghcr.io/agglayer/agglayer:0.2.0-rc.19
praetoriansentry marked this conversation as resolved.
Show resolved Hide resolved
3 changes: 3 additions & 0 deletions .github/tests/forks/fork9.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,6 @@ args:
- tx_spammer

deploy_l2_contracts: true

# https://github.com/agglayer/agglayer/tags
agglayer_image: ghcr.io/agglayer/agglayer:0.2.0-rc.19
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
run: find . -type f -name '*.Dockerfile' | sort | xargs -I {} hadolint --config ${{ github.workspace }}/.hadolint.yml {}

- name: Run shellcheck
run: find . -type f -name '*.sh' | sort | xargs -I {} shellcheck {}
run: find . -type f -name '*.sh' | grep -v "./docs" | sort | xargs -I {} shellcheck {}

check-test-combinations-and-cdk-version-matrix:
runs-on: ubuntu-latest
Expand All @@ -65,7 +65,7 @@ jobs:
- name: Generate test combinations and cdk version matrix
working-directory: .github/tests
run: ./combine-ymls.sh

- name: Check if test combinations and cdk version matrix are up to date
run: |
if [[ -n $(git status --porcelain) ]]; then
Expand Down
28 changes: 15 additions & 13 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# https://github.com/0xPolygon/cdk/blob/main/.github/workflows/test-e2e.yml
praetoriansentry marked this conversation as resolved.
Show resolved Hide resolved
name: Test

on:
on:
pull_request:
push:
branches: [main]
Expand All @@ -18,6 +18,7 @@ env:

jobs:
build-cdk-image:
if: false
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
Expand All @@ -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
Expand All @@ -63,7 +65,7 @@ jobs:
- "fork12-pessimistic"
steps:
- uses: actions/checkout@v4

- name: Login to Docker Hub
uses: docker/login-action@v3
with:
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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: |
Expand Down
Loading
Loading