coordinator: adds config v2 classes and parsing tests

Author: fluentcrafter

config/coordinator/coordinator-config-v2-override-local-dev.toml

@@ -0,0 +1,64 @@
+[defaults]
+l1-endpoint = "http://127.0.0.1:8445"
+l2-endpoint = "http://127.0.0.1:8545"
+
+[prover]
+version = "v2.0.0"
+[prover.execution]
+fs-requests-directory = "tmp/local/prover/v3/execution/requests"
+fs-responses-directory = "tmp/local/prover/v3/execution/responses"
+[prover.blob-compression]
+fs-requests-directory = "tmp/local/prover/v3/compression/requests"
+fs-responses-directory = "tmp/local/prover/v3/compression/responses"
+[prover.proof-aggregation]
+fs-requests-directory = "tmp/local/prover/v2/aggregation/requests"
+fs-responses-directory = "tmp/local/prover/v2/aggregation/responses"
+
+[traces]
+[traces.counters]
+endpoints = ["http://127.0.0.1:8745/"]
+[traces.conflation]
+endpoints = ["http://127.0.0.1:8745/"]
+
+[state-manager]
+endpoints = ["http://127.0.0.1:8998/"]
+
+[type2-state-proof-provider]
+disabled = true
+
+[l1-finalization-monitor]
+l1-query-block-tag="LATEST"
+
+[l1-submission.blob.signer]
+type = "Web3j"
+
+[l1-submission.aggregation.signer]
+type = "Web3j"
+
+[message-anchoring]
+disabled = false
+l1-highest-block-tag="LATEST"
+l2-highest-block-tag="LATEST"
+anchoring-tick-interval = "PT1S"
+messages-anchoring-chuck-size = 100
+
+[message-anchoring.l1-event-scraping]
+polling-interval = "PT1S"
+polling-timeout = "PT5S"
+message-limit-pertick = 100
+block-range-limit = 500
+
+
+[message-anchoring.signer]
+type = "Web3j"
+
+[l2-network-gas-pricing]
+disabled = false
+extra-data-update-endpoint = "http://127.0.0.1:8545/"
+
+[database]
+hostname = "127.0.0.1"
+port = "5432"
+
+[api]
+observability_port = 9545

config/coordinator/coordinator-config-v2-override-web3signer.toml

@@ -0,0 +1,8 @@
+[l1-submission.blob.signer]
+type = "Web3signer"
+
+[l1-submission.aggregation.signer]
+type = "Web3signer"
+
+[message-anchoring.signer]
+type = "Web3signer"

config/coordinator/coordinator-config-v2-sample.toml renamed to config/coordinator/coordinator-config-v2.toml

@@ -9,32 +9,37 @@ genesis-state-root-hash = "0x072ead6777750dc20232d1cee8dc9a395c2d350df4bbaa5096c
 # Keccak256(parentShnarf="0x00...00", snarkHash="0x00...00",
 #   parentStateRootHash="0x072ead6777750dc20232d1cee8dc9a395c2d350df4bbaa5096c6f59b214dcecd",
 #   evaludationClaim="0x00...00", evaludationPoint="0x00...00")
-genesis-shnarf-v5 = "0x47452a1b9ebadfe02bdd02f580fa1eba17680d57eec968a591644d05d78ee84f"
+genesis-shnarf = "0x47452a1b9ebadfe02bdd02f580fa1eba17680d57eec968a591644d05d78ee84f"
 [protocol.l1]
 contract-address = "0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9"
-#contract-deployment-block-number = 3
+block-time = "PT1S"
 [protocol.l2]
 contract-address = "0xe537D669CA013d86EBeF1D64e40fC74CADC91987"
 contract-deployment-block-number = 3
 
-
 [conflation]
 diabled = false
+
 blocks-limit = 2
+new-blocks-polling-interval="PT1S"
 conflation-calculator-version = "1.0.0"
 conflation-deadline = "PT6S" # =3*l2_block_time
 conflation-deadline-check-interval = "PT3S"
 conflation-deadline-last-block-confirmation-delay = "PT2S" # recommended: at least 2 * blockInterval
-2fetch-blocks-limit = 4000
-l2-block-creation-endpoint = "http://sequencer:8545"
-l2-logs-endpoint = "http://sequencer:8545"
+l2-fetch-blocks-limit = 4000
+force-stop-conflation-at-block-inclusive=100_000_000
 
 # This is to prevent inflight trasactions that may change Smart contract state while coordinator is restarted.
 # Queries SMC for last finalised block, and keeps polling until this number of blocks observe the same state.
 # If state is updated meanwhile, it resets counter and restarts the polling.
 consistent-number-of-blocks-on-l1-to-wait = 1
+[conflation.l2-endpoint-request-retries]
+backoff-delay = "PT1S"
+failures-warning-threshold = 3
+
 
 [conflation.blob-compression]
+blob-compressor-version="V1_2"
 blob-size-limit = 102400 # 100KB
 handler-polling-interval = "PT1S"
 # default batches limit is  aggregation-proofs-limit -1
@@ -77,23 +82,20 @@ fs-responses-directory = "/data/prover/v2/aggregation/responses"
 #fs-responses-directory = "/data/prover/v3/aggregation/responses"
 
 [traces]
-raw-execution-traces-version = "0.2.0" # TODO: remove after we remove geth tracing
-expected-traces-api-version = "0.2.0"
+expected-traces-api-version = "beta-v2.1-rc16.2"
 [traces.counters]
 endpoints = ["http://traces-api:8080/"]
 request-limit-per-endpoint = 20
 [traces.counters.request-retries]
-max-attempts = 4
 backoff-delay = "PT1S"
-failures-warning-threshold = 2
+failures-warning-threshold = 10
 
 [traces.conflation]
 endpoints = ["http://traces-api:8080/"]
 request-limit-per-endpoint = 2
 [traces.conflation.request-retries]
-max-attempts = 4
 backoff-delay = "PT1S"
-failures-warning-threshold = 2
+failures-warning-threshold = 10
 
 #[traces.new]
 ##switch-block-number-inclusive=1000
@@ -102,24 +104,24 @@ failures-warning-threshold = 2
 #endpoints = ["http://traces-api-v2:8080/"]
 #request-limit-per-endpoint = 20
 #[traces.new.counters.request-retries]
-#max-attempts = 4
+#max-retries = 4
 #backoff-delay = "PT1S"
 #failures-warning-threshold = 2
 #
 #[traces.new.conflation]
 #endpoints = ["http://traces-api:8080/"]
 #request-limit-per-endpoint = 2
 #[traces.new.conflation.request-retries]
-#max-attempts = 4
+#max-retries = 4
 #backoff-delay = "PT1S"
 #failures-warning-threshold = 2
 
 [state-manager]
-version = "2.2.0"
+version = "2.3.0"
 endpoints = ["http://shomei:8888/"]
 request-limit-per-endpoint = 3
 [state-manager.request-retries]
-max-attempts = 5
+max-retries = 5
 backoff-delay = "PT2S"
 failures-warning-threshold = 2
 
@@ -129,7 +131,7 @@ failures-warning-threshold = 2
 #endpoints = ["http://shomei:8888/"]
 #request-limit-per-endpoint = 3
 #[state-manager.new.request-retries]
-#max-attempts = 5
+#max-retries = 5
 #backoff-delay = "PT2S"
 #failures-warning-threshold = 2
 
@@ -140,27 +142,19 @@ l1-query-block-tag="LATEST"
 l1-polling-interval="PT12S"
 
 [type2-state-proof-provider.request-retries]
-max-attempts = 3
+max-retries = 3
 backoff-delay = "PT1S"
 failures-warning-threshold = 2
 
 
 [l1-finalization-monitor]
-l1-endpoint = "http://l1-el-node:8545"
-l2-endpoint = "http://sequencer:8545"
 polling-interval = "PT1S"
 l1-query-block-tag="FINALIZED"
 
-[l1-finalization-monitor.request-retries]
-max-attempts = 3
-backoff-delay = "PT1S"
-failures-warning-threshold = 2
-
-
 [l1-submission] # submission
 disabled = true
 [l1-submission.dynamic-gas-price-cap]
-disabled = true
+disabled = false
 [l1-submission.dynamic-gas-price-cap.gas-price-cap-calculation]
 adjustment-constant = 25
 blob-adjustment-constant = 25
@@ -173,7 +167,7 @@ gas-price-caps-check-coefficient = 0.9
 fetch-interval = "PT1S"
 max-block-count = 1000
 reward-percentiles = [10, 20, 30, 40, 50, 60, 70, 80, 90, 100]
-[l1-submission.dynamic-gas-price-cap.fee-history-storage]
+num-of-blocks-before-latest = 2
 storage-period = "P10D"
 
 [l1-submission.fallback-gas-price]
@@ -182,7 +176,6 @@ fee-history-reward-percentile = 15
 
 [l1-submission.blob]
 disabled = false
-endpoint = "http://l1-el-node:8545"
 submission-delay = "PT1S"
 submission-tick-interval = "PT1S"
 max-submission-transactions-per-tick = 10
@@ -192,6 +185,7 @@ db-max-blobs-to-return = 100
 gas-limit = 10000000
 max-fee-per-gas-cap = 100000000000
 max-fee-per-blob-gas-cap = 100000000000
+max-priority-fee-per-gas-cap=20000000000
 # Note: prefixed with "fallback-", used when dynamic gas price is disabled or DB is not populated yet
 [l1-submission.blob.gas.fallback]
 priority-fee-per-gas-upper-bound = 20000000000 # 20 GWEI
@@ -219,8 +213,9 @@ submission-delay = "PT1S"
 submission-tick-interval = "PT1S"
 max-submissions-per-tick = 10
 [l1-submission.aggregation.gas]
-gas-limit = 10000000
-max-fee-per-gas-cap = 100000000000
+gas-limit = 10_000_000
+max-fee-per-gas-cap = 100_000_000_000
+max-priority-fee-per-gas-cap = 10_000_000_001
 
 [l1-submission.aggregation.gas.fallback]
 # Note: prefixed with "fallback-", used when dynamic gas price is disabled or DB is not populated yet
@@ -242,8 +237,6 @@ public-key = "ba5734d8f7091719471e7f7ed6b9df170dc70cc661ca05e688601ad984f068b0d6
 
 [message-anchoring]
 disabled = false
-l1-endpoint = "http://l1-el-node:8545"
-l2-endpoint = "http://sequencer:8545"
 l1-highest-block-tag="FINALIZED"
 l2-highest-block-tag="LATEST" # optional, default to LATEST it shall not be necessary as Linea has instant finality
 anchoring-tick-interval = "PT10S" # "polling-interval="PT10S"
@@ -283,52 +276,47 @@ disabled = false
 price-update-interval = "PT12S"
 fee-history-block-count = 50
 fee-history-reward-percentile = 15
-min-mineable-fees-enabled = true
-extra-data-enabled = true
-## Usend un both extraDataPricerService and minMineableFeesCalculator,
-# extraDataPricerService just uses minMineableFeesCalculator as delegate to get legacy fees
-gas-price-upper-bound = 10000000000 # 10 GWEI
-gas-price-lower-bound = 90000000 # 0.09 GWEI
 gas-price-fixed-cost = 3000000
+extra-data-update-endpoint = "http://sequencer:8545/"
+[l2-network-gas-pricing.extra-data-update-request-retries]
+max-retries = 4
+timeout = "PT7S"
+backoff-delay = "PT2S"
+failures-warning-threshold = 3
 
-# Defaults to expected-blob-gas
-#bytes-per-data-submission=131072.0 # 2^17
-[l2-network-gas-pricing.request-retries]
-max-attempts = 3
-timeout = "PT6S"
-backoff-delay = "PT1S"
-failures-warning-threshold = 2
-
-[l2-network-gas-pricing.extra-data] # TODO: find proper name for "new", maybe "2D"
-l1-blob-gas = 131072.0 # 2^17 # expected-l1-blob-gas previous name: expected-blob-gas
-blob-submission-expected-execution-gas = 213000.0 # Lower to 120k as we improve efficiency
+[l2-network-gas-pricing.flat-rate-gas-pricing]
+# Relate to legacy gas pricing, goes into extradata
+# and is exposed on Bessu eth_gasPrice
+gas-price-upper-bound = 10000000000 # 10 GWEI
+gas-price-lower-bound = 90000000 # 0.09 GWEI
+compressed-tx-size = 125
+expected-gas = 21000
+cost-multiplier = 1.0
+
+[l2-network-gas-pricing.dynamic-gas-pricing]
+# Propagated to Sequencer and Besude through extraDataPricerService and besu
+# uses it dynaically culcuale the profitability of each transaction on:
+# eth_sendRawTransaction, linea_estimateGas, and block building
+l1-blob-gas = 131072 # 2^17 # expected-l1-blob-gas previous name: expected-blob-gas
+blob-submission-expected-execution-gas = 213000
 variable-cost-upper-bound = 10000000001 # ~10 GWEI
 variable-cost-lower-bound = 90000001  # ~0.09 GWEI
 margin = 4.0
-extra-data-update-endpoint = "http://sequencer:8545/"
-
-[l2-network-gas-pricing.min-mineable] # current legacy implementation
-base-fee-coefficient = 0.1
-priority-fee-coefficient = 1.0
-base-fee-blob-coefficient = 0.1
-legacy-fees-multiplier = 1.2
-geth-gas-price-update-endpoints = [
-  "http://traces-node:8545/",
-  "http://l2-node:8545/"
-]
-besu-gas-price-update-endpoints = [
-  "http://sequencer:8545/"
-]
 
 [database]
-host = "postgres"
-port = "5432"
+hostname = "postgres"
+port=5432
 username = "postgres"
 password = "postgres"
 schema = "linea_coordinator"
 read_pool_size = 10
 read_pipelining_limit = 10
 transactional_pool_size = 10
+[database.persistence-retries]
+max-retries = 3
+backoff-delay = "PT1S"
+timeout = "PT10S"
+failures-warning-threshold = 2
 
 [api]
-observability_port = 9545
+observability-port = 9545

coordinator/app/src/main/kotlin/linea/coordinator/config/Mappers.kt

@@ -0,0 +1,13 @@
+package linea.coordinator.config
+
+import linea.domain.RetryConfig
+import net.consensys.linea.jsonrpc.client.RequestRetryConfig
+
+fun RetryConfig.toJsonRpcRetry(): RequestRetryConfig {
+  return RequestRetryConfig(
+    maxRetries = maxRetries,
+    timeout = timeout,
+    backoffDelay = backoffDelay,
+    failuresWarningThreshold = failuresWarningThreshold
+  )
+}

coordinator/app/src/main/kotlin/linea/coordinator/config/v2/ApiConfig.kt

@@ -0,0 +1,5 @@
+package linea.coordinator.config.v2
+
+data class ApiConfig(
+  val observabilityPort: UInt
+)