Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/jhilliard/pp-integr…
Browse files Browse the repository at this point in the history 
…ation' into jhilliard/pp-integration
  • Loading branch information
@praetoriansentry
praetoriansentry committed Nov 5, 2024
2 parents 70184a1 + ed0d9a0 commit 2d632e7
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 211 deletions.
3 changes: 2 additions & 1 deletion lib/cdk_node.star
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ def create_cdk_node_service_config(
"sleep 20 && cdk-node run "
+ "--cfg=/etc/cdk/cdk-node-config.toml "
+ "--custom-network-file=/etc/cdk/genesis.json "
+ "--components=rpc,"
+ "--save-config-path=/tmp/ "
+ "--components="
+ NODE_COMPONENTS.aggsender
]

Expand Down
249 changes: 39 additions & 210 deletions templates/trusted-node/cdk-node-config.toml
View file
Original file line number Diff line number Diff line change
@@ -1,89 +1,51 @@
ForkUpgradeBatchNumber = 0
ForkUpgradeNewForkId = 0
PathRWData = "{{or .path_rw_data "/tmp/"}}"
L1URL="{{.l1_rpc_url}}"
L2URL="http://{{.l2_rpc_name}}{{.deployment_suffix}}:{{.zkevm_rpc_http_port}}"
AggLayerURL="http://agglayer:{{.agglayer_port}}"

[Common]
ForkId = {{.zkevm_rollup_fork_id}}
IsValidiumMode = {{.is_cdk_validium}}
ContractVersions = "{{.zkevm_rollup_fork_name}}"
{{if eq .zkevm_rollup_fork_id "12"}}
ContractVersions = "banana"
{{else}}
ContractVersions = "elderberry"
{{end}}

L2Coinbase = "{{.zkevm_l2_sequencer_address}}"
SequencerPrivateKeyPath = "{{or .zkevm_l2_sequencer_keystore_file "/etc/cdk/sequencer.keystore"}}"
SequencerPrivateKeyPassword = "{{.zkevm_l2_keystore_password}}"

[Etherman]
URL = "{{.l1_rpc_url}}"
AggregatorPrivateKeyPath = "{{or .zkevm_l2_aggregator_keystore_file "/etc/cdk/aggregator.keystore"}}"
AggregatorPrivateKeyPassword = "{{.zkevm_l2_keystore_password}}"
SenderProofToL1Addr = "{{.zkevm_l2_agglayer_address}}"
polygonBridgeAddr = "{{.zkevm_bridge_address}}"


RPCURL = "http://{{.l2_rpc_name}}{{.deployment_suffix}}:{{.zkevm_rpc_http_port}}"
WitnessURL = "http://{{.l2_rpc_name}}{{.deployment_suffix}}:{{.zkevm_rpc_http_port}}"

# This values can be override directly from genesis.json
rollupCreationBlockNumber = "{{.zkevm_rollup_manager_block_number}}"
rollupManagerCreationBlockNumber = "{{.zkevm_rollup_manager_block_number}}"
genesisBlockNumber = "{{.zkevm_rollup_manager_block_number}}"
[L1Config]
chainId = "{{.l1_chain_id}}"
polygonZkEVMGlobalExitRootAddress = "{{.zkevm_global_exit_root_address}}"
polygonRollupManagerAddress = "{{.zkevm_rollup_manager_address}}"
polTokenAddress = "{{.pol_token_address}}"
polygonZkEVMAddress = "{{.zkevm_rollup_address}}"

[L2Config]
GlobalExitRootAddr = "{{.zkevm_global_exit_root_address}}"

[Log]
Environment = "development" # "production" or "development"
Level = "{{.global_log_level}}"
Outputs = ["stderr"]

[SequenceSender]
WaitPeriodSendSequence = "15s"
LastBatchVirtualizationTimeMaxWaitPeriod = "10s"
MaxTxSizeForL1 = 131072
L2Coinbase = "{{.zkevm_l2_sequencer_address}}"
PrivateKey = {Path = "/etc/cdk/sequencer.keystore", Password = "{{.zkevm_l2_keystore_password}}"}
SequencesTxFileName = "/data/sequencesender.json"
GasOffset = 80000
WaitPeriodPurgeTxFile = "15m"
MaxPendingTx = 1
{{if eq .zkevm_rollup_fork_name "banana"}}
MaxBatchesForL1 = 300
BlockFinality="FinalizedBlock"
{{end}}
RPCURL = "http://{{.l2_rpc_name}}{{.deployment_suffix}}:{{.zkevm_rpc_http_port}}"
GetBatchWaitInterval = "10s"
[SequenceSender.EthTxManager]
FrequencyToMonitorTxs = "1s"
WaitTxToBeMined = "2m"
ConsolidationL1ConfirmationBlocks = 5
{{if eq .zkevm_rollup_fork_name "banana"}}
FinalizedStatusL1NumberOfBlocks = 10
WaitReceiptMaxTime = "250ms"
WaitReceiptCheckInterval = "8s"
{{else}}
FinalizationL1ConfirmationBlocks = 10
WaitReceiptToBeGenerated = "8s"
{{end}}
PrivateKeys = [
{Path = "/etc/cdk/sequencer.keystore", Password = "{{.zkevm_l2_keystore_password}}"},
]
ForcedGas = 0
GasPriceMarginFactor = 1
MaxGasPriceLimit = 0
StoragePath = "/data/ethtxmanager.db"
[SequenceSender.EthTxManager.Etherman]
URL = "{{.l1_rpc_url}}"
L1ChainID = {{.l1_chain_id}}
HTTPHeaders = []

[Aggregator]
Host = "0.0.0.0"
Port = "{{.zkevm_aggregator_port}}"
RetryTime = "30s"
VerifyProofInterval = "30s"
ProofStatePollingInterval = "5s"
TxProfitabilityCheckerType = "acceptall"
TxProfitabilityMinReward = "1.1"
IntervalAfterWhichBatchConsolidateAnyway = "0s"
ChainID = "{{.zkevm_rollup_chain_id}}"
ForkId = {{.zkevm_rollup_fork_id}}
CleanupLockedProofsInterval = "2m0s"
GeneratingProofCleanupThreshold = "10m"
GasOffset = 150000
UpgradeEtrogBatchNumber = "{{.zkevm_rollup_manager_block_number}}"
RPCURL = "http://{{.l2_rpc_name}}{{.deployment_suffix}}:{{.zkevm_rpc_http_port}}"
WitnessURL = "http://{{.l2_rpc_name}}{{.deployment_suffix}}:{{.zkevm_rpc_http_port}}"
{{if .is_cdk_validium}}
SenderAddress = "{{.zkevm_l2_agglayer_address}}"
SettlementBackend = "agglayer"
AggLayerTxTimeout = "600s"
AggLayerURL = "http://agglayer:{{.agglayer_port}}"
{{else}}
SenderAddress = "{{.zkevm_l2_aggregator_address}}"
{{end}}
UseFullWitness = false
SyncModeOnlyEnabled = false

[Aggregator.SequencerPrivateKey]
Path = "/etc/cdk/sequencer.keystore"
Password = "{{.zkevm_l2_keystore_password}}"
[Aggregator.DB]
Name = "{{.aggregator_db.name}}"
User = "{{.aggregator_db.user}}"
Expand All @@ -92,141 +54,7 @@ GetBatchWaitInterval = "10s"
Port = "{{.aggregator_db.port}}"
EnableLog = false
MaxConns = 200
[Aggregator.Log]
Environment = "development" # "production" or "development"
Level = "{{.global_log_level}}"
Outputs = ["stderr"]
[Aggregator.EthTxManager]
FrequencyToMonitorTxs = "1s"
WaitTxToBeMined = "2m"

{{if eq .zkevm_rollup_fork_name "banana"}}
WaitReceiptMaxTime = "250ms"
WaitReceiptCheckInterval = "1s"
{{else}}
GetReceiptMaxTime = "250ms"
GetReceiptWaitInterval = "1s"
{{end}}

PrivateKeys = [
{Path = "/etc/cdk/aggregator.keystore", Password = "{{.zkevm_l2_keystore_password}}"},
]
ForcedGas = 0
GasPriceMarginFactor = 1
MaxGasPriceLimit = 0
StoragePath = ""
ReadPendingL1Txs = false
SafeStatusL1NumberOfBlocks = 0
FinalizedStatusL1NumberOfBlocks = 0
[Aggregator.EthTxManager.Etherman]
URL = "{{.l1_rpc_url}}"
L1ChainID = {{.l1_chain_id}}
HTTPHeaders = []
[Aggregator.Synchronizer]
[Aggregator.Synchronizer.SQLDB]
DriverName = "sqlite3"
DataSource = "file:/data/aggregator_sync_db.sqlite"
[Aggregator.Synchronizer.Synchronizer]
SyncInterval = "10s"
SyncChunkSize = 1000
GenesisBlockNumber = "{{.zkevm_rollup_manager_block_number}}"
SyncUpToBlock = "latest"
BlockFinality = "latest"
OverrideStorageCheck = false
[Aggregator.Synchronizer.Etherman]
[Aggregator.Synchronizer.Etherman.Validium]
Enabled = {{.is_cdk_validium}}


[L1InfoTreeSync]
DBPath = "/tmp/L1InfoTreeSync" # TODO: put a more realisitic path here
GlobalExitRootAddr = "{{.zkevm_global_exit_root_address}}"
RollupManagerAddr = "{{.zkevm_rollup_manager_address}}"
SyncBlockChunkSize = 10
BlockFinality = "LatestBlock"
URLRPCL1 = "{{.l1_rpc_url}}"
WaitForNewBlocksPeriod = "1s"
InitialBlock = "{{.zkevm_rollup_manager_block_number}}"


[ClaimSponsor]
DBPath = "/tmp/claimsponsor"
Enabled = true
SenderAddr = "{{.zkevm_l2_claimtxmanager_address}}"
BridgeAddrL2 = "{{.zkevm_bridge_l2_address}}"
MaxGas = 200000
RetryAfterErrorPeriod = "1s"
MaxRetryAttemptsAfterError = -1
WaitTxToBeMinedPeriod = "3s"
WaitOnEmptyQueue = "3s"
GasOffset = 0
[ClaimSponsor.EthTxManager]
FrequencyToMonitorTxs = "1s"
WaitTxToBeMined = "2s"
GetReceiptMaxTime = "250ms"
GetReceiptWaitInterval = "1s"
PrivateKeys = [
{Path = "/etc/cdk/claimsponsor.keystore", Password = "{{.zkevm_l2_keystore_password}}"}
]
ForcedGas = 0
GasPriceMarginFactor = 1
MaxGasPriceLimit = 0
StoragePath = "/tmp/ethtxmanager-claimsponsor.db"
ReadPendingL1Txs = false
SafeStatusL1NumberOfBlocks = 5
FinalizedStatusL1NumberOfBlocks = 10
[ClaimSponsor.EthTxManager.Etherman]
URL = "http://{{.l2_rpc_name}}{{.deployment_suffix}}:{{.zkevm_rpc_http_port}}"
MultiGasProvider = false
L1ChainID = 1337
HTTPHeaders = []

[ReorgDetectorL1]
DBPath = "/tmp/reorgdetectorl1"
[ReorgDetectorL2]
DBPath = "/tmp/reorgdetectorl2"

[BridgeL1Sync]
DBPath = "/tmp/bridgel1sync"
BlockFinality = "LatestBlock"
InitialBlockNum = 0
BridgeAddr = "{{.zkevm_bridge_address}}"
SyncBlockChunkSize = 100
RetryAfterErrorPeriod = "1s"
MaxRetryAttemptsAfterError = -1
WaitForNewBlocksPeriod = "3s"

[LastGERSync]
DBPath = "/tmp/lastgersync"
BlockFinality = "LatestBlock"
InitialBlockNum = 0
GlobalExitRootL2Addr = "{{.zkevm_global_exit_root_l2_address}}"
RetryAfterErrorPeriod = "1s"
MaxRetryAttemptsAfterError = -1
WaitForNewBlocksPeriod = "1s"
DownloadBufferSize = 100

[BridgeL2Sync]
DBPath = "/tmp/bridgel2sync"
BlockFinality = "LatestBlock"
InitialBlockNum = 0
BridgeAddr = "{{.zkevm_bridge_l2_address}}"
SyncBlockChunkSize = 100
RetryAfterErrorPeriod = "1s"
MaxRetryAttemptsAfterError = -1
WaitForNewBlocksPeriod = "3s"

[NetworkConfig.L1]
{{if eq .zkevm_rollup_fork_name "banana"}}
L1ChainID = "{{.l1_chain_id}}"
{{else}}
ChainID = "{{.l1_chain_id}}"
{{end}}
PolAddr = "{{.pol_token_address}}"
ZkEVMAddr = "{{.zkevm_rollup_address}}"
RollupManagerAddr = "{{.zkevm_rollup_manager_address}}"
GlobalExitRootManagerAddr = "{{.zkevm_global_exit_root_address}}"


[AggSender]
# DBPath = "/tmp/aggsender"
AggLayerURL = "http://agglayer:{{.agglayer_port}}"
Expand All @@ -236,4 +64,5 @@ CheckSettledInterval = "5s"
StoragePath = "/tmp/aggsender.db"
[AggSender.SequencerPrivateKey]
Path = "/etc/cdk/sequencer.keystore"
Password = "{{.zkevm_l2_keystore_password}}"
Password = "{{.zkevm_l2_keystore_password}}"
SequencerPrivateKey = {Path = "{{or .zkevm_l2_agglayer_keystore_file "/pk/sequencer.keystore"}}", Password = "{{.zkevm_l2_agglayer_keystore_password}}"}

0 comments on commit 2d632e7

Please sign in to comment.