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

Feat/config improvements #149

Merged
merged 2 commits into from
Oct 31, 2024
Merged

Feat/config improvements #149

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a98962c
minor improvements on the config
arnaubennassar Oct 30, 2024
89efbdf
Merge branch 'develop' into feat/config-improvements
arnaubennassar Oct 31, 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
12 changes: 5 additions & 7 deletions config/default.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ package config
const DefaultMandatoryVars = `
L1URL = "http://localhost:8545"
L2URL = "http://localhost:8123"
L1AggOracleURL = "http://test-aggoracle-l1:8545"
L2AggOracleURL = "http://test-aggoracle-l2:8545"


ForkId = 9
Expand Down Expand Up @@ -220,18 +218,18 @@ GlobalExitRootAddr="{{NetworkConfig.L1.GlobalExitRootManagerAddr}}"
RollupManagerAddr = "{{NetworkConfig.L1.RollupManagerAddr}}"
SyncBlockChunkSize=10
BlockFinality="LatestBlock"
URLRPCL1="{{L1AggOracleURL}}"
URLRPCL1="{{L1URL}}"
WaitForNewBlocksPeriod="100ms"
InitialBlock=0

[AggOracle]
TargetChainType="EVM"
URLRPCL1="{{L1AggOracleURL}}"
URLRPCL1="{{L1URL}}"
BlockFinality="FinalizedBlock"
WaitPeriodNextGER="100ms"
[AggOracle.EVMSender]
GlobalExitRootL2="{{L2Config.GlobalExitRootAddr}}"
URLRPCL2="{{L2AggOracleURL}}"
URLRPCL2="{{L2URL}}"
ChainIDL2=1337
GasOffset=0
WaitPeriodMonitorTx="100ms"
Expand All @@ -252,7 +250,7 @@ WaitPeriodNextGER="100ms"
SafeStatusL1NumberOfBlocks = 5
FinalizedStatusL1NumberOfBlocks = 10
[AggOracle.EVMSender.EthTxManager.Etherman]
URL = "{{L2AggOracleURL}}"
URL = "{{L2URL}}"
MultiGasProvider = false
L1ChainID = {{NetworkConfig.L1.L1ChainID}}
HTTPHeaders = []
Expand Down Expand Up @@ -291,7 +289,7 @@ GasOffset = 0
SafeStatusL1NumberOfBlocks = 5
FinalizedStatusL1NumberOfBlocks = 10
[ClaimSponsor.EthTxManager.Etherman]
URL = "{{L2AggOracleURL}}"
URL = "{{L2URL}}"
MultiGasProvider = false
L1ChainID = {{NetworkConfig.L1.L1ChainID}}
HTTPHeaders = []
Expand Down
1 change: 1 addition & 0 deletions logerror
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ok github.com/0xPolygon/cdk/l1infotreesync 2.438s
2 changes: 0 additions & 2 deletions test/config/kurtosis-cdk-node-config.toml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
PathRWData = "/data/"
L1URL="{{.l1_rpc_url}}"
L2URL="http://{{.l2_rpc_name}}{{.deployment_suffix}}:{{.zkevm_rpc_http_port}}"
L1AggOracleURL = "http://test-aggoracle-l1:8545"
L2AggOracleURL = "http://test-aggoracle-l2:8545"

ForkId = {{.zkevm_rollup_fork_id}}
IsValidiumMode = {{.is_cdk_validium}}
Expand Down
Loading