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.

Sign up for GitHub

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

Jump to bottom

chore: improve cdk-node-config.toml #335

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

chore: improve cdk-node-config.toml #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
79eae61
chore: improve `cdk-node-config.toml`
leovct Oct 25, 2024
0a97690
fix: typo
leovct Oct 25, 2024
c6c1aa9
ci: dump enclave even when the workflow succeeds for debug purposes
leovct Oct 25, 2024
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
31 changes: 10 additions & 21 deletions .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,10 @@ jobs:
--enclave ${{ env.ENCLAVE_NAME }} \
--rpc-url $(kurtosis port print ${{ env.ENCLAVE_NAME }} cdk-erigon-node-001 rpc)

- name: Dump enclave logs
if: failure()
- name: Dump enclave
run: kurtosis enclave dump ${{ env.ENCLAVE_NAME }} ./dump

- name: Upload logs
if: failure()
- name: Upload enclave dump
uses: actions/upload-artifact@v4
with:
name: dump_run_without_args_${{ github.run_id }}
Expand Down Expand Up @@ -148,20 +146,17 @@ jobs:
echo "Skipping batch verification as there is no zkevm permissionless RPC in the environment"
fi

- name: Dump enclave logs
if: failure()
- name: Dump enclave
run: kurtosis enclave dump ${{ env.ENCLAVE_NAME }} ./dump

- name: Generate archive name
if: failure()
run: |
file_name=$(basename "${{ matrix.file_name }}" ".yml")
archive_name="dump_run_with_args_${file_name}_${{ github.run_id }}"
echo "ARCHIVE_NAME=${archive_name}" >> "$GITHUB_ENV"
echo "Generated archive name: ${archive_name}"

- name: Upload logs
if: failure()
- name: Upload enclave dump
uses: actions/upload-artifact@v4
with:
name: ${{ env.ARCHIVE_NAME }}
Expand Down Expand Up @@ -259,12 +254,10 @@ jobs:
echo "Prometheus is not deployed."
fi

- name: Dump enclave logs
if: failure()
- name: Dump enclave
run: kurtosis enclave dump ${{ env.ENCLAVE_NAME }} ./dump

- name: Upload logs
if: failure()
- name: Upload enclave dump
uses: actions/upload-artifact@v4
with:
name: dump_additional_services_${{ github.run_id }}
Expand Down Expand Up @@ -328,12 +321,10 @@ jobs:
--enclave ${{ env.ENCLAVE_NAME }} \
--rpc-url "$(kurtosis port print ${{ env.ENCLAVE_NAME }} cdk-erigon-node-002 rpc)"

- name: Dump enclave logs
if: failure()
- name: Dump enclave
run: kurtosis enclave dump ${{ env.ENCLAVE_NAME }} ./dump

- name: Upload logs
if: failure()
- name: Upload enclave dump
uses: actions/upload-artifact@v4
with:
name: dump_attach_ckds_${{ github.run_id }}
Expand Down Expand Up @@ -377,12 +368,10 @@ jobs:
--enclave ${{ env.ENCLAVE_NAME }} \
--rpc-url "$(kurtosis port print ${{ env.ENCLAVE_NAME }} cdk-erigon-node-001 rpc)"

- name: Dump enclave logs
if: failure()
- name: Dump enclave
run: kurtosis enclave dump ${{ env.ENCLAVE_NAME }} ./dump

- name: Upload logs
if: failure()
- name: Upload enclave dump
uses: actions/upload-artifact@v4
with:
name: dump_attach_ckds_${{ github.run_id }}
Expand Down
10 changes: 5 additions & 5 deletions templates/trusted-node/cdk-node-config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ForkUpgradeNewForkId = 0
[Common]
IsValidiumMode = {{.is_cdk_validium}}

{{if or (eq .zkevm_rollup_fork_id "12") (eq .zkevm_rollup_fork_id "13")}}
{{if ge .zkevm_rollup_fork_id 12}}
ContractVersions = "banana"
{{else}}
ContractVersions = "elderberry"
Expand All @@ -28,7 +28,7 @@ SequencesTxFileName = "/data/sequencesender.json"
GasOffset = 80000
WaitPeriodPurgeTxFile = "15m"
MaxPendingTx = 1
{{if or (eq .zkevm_rollup_fork_id "12") (eq .zkevm_rollup_fork_id "13")}}
{{if ge .zkevm_rollup_fork_id 12}}
MaxBatchesForL1 = 300
BlockFinality="FinalizedBlock"
{{end}}
Expand All @@ -38,7 +38,7 @@ GetBatchWaitInterval = "10s"
FrequencyToMonitorTxs = "1s"
WaitTxToBeMined = "2m"
ConsolidationL1ConfirmationBlocks = 5
{{if or (eq .zkevm_rollup_fork_id "12") (eq .zkevm_rollup_fork_id "13")}}
{{if ge .zkevm_rollup_fork_id 12}}
FinalizedStatusL1NumberOfBlocks = 10
WaitReceiptMaxTime = "250ms"
WaitReceiptCheckInterval = "8s"
Expand Down Expand Up @@ -108,7 +108,7 @@ GetBatchWaitInterval = "10s"
FrequencyToMonitorTxs = "1s"
WaitTxToBeMined = "2m"

{{if or (eq .zkevm_rollup_fork_id "12") (eq .zkevm_rollup_fork_id "13")}}
{{if ge .zkevm_rollup_fork_id 12}}
WaitReceiptMaxTime = "250ms"
WaitReceiptCheckInterval = "1s"
{{else}}
Expand Down Expand Up @@ -157,7 +157,7 @@ WaitForNewBlocksPeriod = "1s"
InitialBlock = "{{.zkevm_rollup_manager_block_number}}"

[NetworkConfig.L1]
{{if or (eq .zkevm_rollup_fork_id "12") (eq .zkevm_rollup_fork_id "13")}}
{{if ge .zkevm_rollup_fork_id 12}}
L1ChainID = "{{.l1_chain_id}}"
{{else}}
ChainID = "{{.l1_chain_id}}"
Expand Down
Loading