Skip to content

Commit

Permalink
coordinator: update traces limits-v2 (#548)
Browse files Browse the repository at this point in the history
  • Loading branch information
jpnovais authored Jan 14, 2025
1 parent 6e15740 commit 1ad6131
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 32 deletions.
23 changes: 11 additions & 12 deletions config/common/traces-limits-v2.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,34 +10,34 @@ BLOCK_HASH = 512
EC_DATA = 262144
EUC = 65536
EXP = 8192
EXT = 65536
EXT = 1048576
GAS = 65536
HUB = 2097152
LOG_DATA = 65536
LOG_INFO = 4096
MMIO = 2097152
MMIO = 4194304
MMU = 4194304
MOD = 131072
MUL = 65536
MXP = 524288
OOB = 262144
RLP_ADDR = 4096
RLP_TXN = 131072
RLP_TXN_RCPT = 32768
ROM = 8388608
RLP_TXN_RCPT = 65536
ROM = 4194304
ROM_LEX = 1024
SHAKIRA_DATA = 32768
SHF = 65536
STP = 32768
TRM = 8192
STP = 16384
TRM = 32768
TXN_DATA = 8192
WCP = 262144
#
# Reference table limits
# Reference table limits, set to UInt.MAX_VALUE
#
BIN_REFERENCE_TABLE = 196864
SHF_REFERENCE_TABLE = 4096
INSTRUCTION_DECODER = 512
BIN_REFERENCE_TABLE = 4294967295
SHF_REFERENCE_TABLE = 4294967295
INSTRUCTION_DECODER = 4294967295
#
# Precompiles limits
#
Expand All @@ -48,7 +48,7 @@ PRECOMPILE_MODEXP_EFFECTIVE_CALLS = 4
PRECOMPILE_ECADD_EFFECTIVE_CALLS = 16384
PRECOMPILE_ECMUL_EFFECTIVE_CALLS = 32
PRECOMPILE_ECPAIRING_FINAL_EXPONENTIATIONS = 16
PRECOMPILE_ECPAIRING_G2_MEMBERSHIP_CALLS = 64
PRECOMPILE_ECPAIRING_G2_MEMBERSHIP_CALLS = 64
PRECOMPILE_ECPAIRING_MILLER_LOOPS = 64
PRECOMPILE_BLAKE_EFFECTIVE_CALLS = 600
PRECOMPILE_BLAKE_ROUNDS = 600
Expand All @@ -59,4 +59,3 @@ BLOCK_KECCAK = 8192
BLOCK_L1_SIZE = 1000000
BLOCK_L2_L1_LOGS = 16
BLOCK_TRANSACTIONS = 200

Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ blob-compressor-version="V1_0_1"
expected-traces-api-version-v2="v0.8.0-rc8"
[traces.counters-v2]
endpoints=["http://traces-node-v2:8545/"]
request-limit-per-endpoint=2
request-limit-per-endpoint=1
request-retry.backoff-delay="PT1S"
request-retry.failures-warning-threshold=2
[traces.conflation-v2]
endpoints=["http://traces-node-v2:8545/"]
request-limit-per-endpoint=2
request-limit-per-endpoint=1
request-retry.backoff-delay="PT1S"
request-retry.failures-warning-threshold=2

Expand Down
9 changes: 4 additions & 5 deletions config/coordinator/coordinator-docker.config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -126,12 +126,11 @@ fee-history-reward-percentile=15
last-hash-search-window=25
anchoring-receipt-polling-interval="PT01S"
max-receipt-retries=120
# Number of children blocks to wait before considering a block "finalized"
# and elegible for conflation and
# Number of children blocks to wait before considering a won't be reverted and elegible for conflation.
# this a workaround to mitigate Geth fork issues with Clique PoA
# Coordinator will consider block as finalized after being included in the chain wtih children blocks-to-finalization
# Recommended minimum of 2
blocks-to-finalization=2
# Recommended: Geth sequencer minimum of 2, Besu sequencer minimum of 1, 0 is safe localy
blocks-to-finalization=0

[blob-submission]
disabled=true
Expand All @@ -153,7 +152,7 @@ proof-submission-delay="PT1S"

[proof-aggregation]
aggregation-proofs-limit=3
aggregation-deadline="PT1M"
aggregation-deadline="PT10S"
aggregation-coordinator-polling-interval="PT2S"
deadline-check-interval="PT8S"
target-end-blocks=[]
Expand Down
8 changes: 8 additions & 0 deletions config/coordinator/log4j2-dev.xml
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,10 @@
<DebouncingFilter/>
<appender-ref ref="rewrite"/>
</Logger>
<Logger name="net.consensys.linea.ethereum.gaspricing.staticcap" level="ERROR" additivity="false">
<DebouncingFilter/>
<appender-ref ref="rewrite"/>
</Logger>
<Logger name="net.consensys.zkevm.ethereum.finalization" level="INFO" additivity="false">
<DebouncingFilter/>
<appender-ref ref="rewrite"/>
Expand All @@ -112,6 +116,10 @@
<DebouncingFilter/>
<appender-ref ref="console"/>
</Logger>
<!-- <Logger name="clients.TracesCounters" level="TRACE" additivity="false">-->
<!-- <DebouncingFilter/>-->
<!-- <appender-ref ref="console"/>-->
<!-- </Logger>-->
<!-- <Logger name="clients.l2" level="DEBUG" additivity="false">-->
<!-- <appender-ref ref="console"/>-->
<!-- </Logger>-->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,31 +100,31 @@ class CoordinatorConfigTest {
TracingModuleV2.EC_DATA to 262144u,
TracingModuleV2.EUC to 65536u,
TracingModuleV2.EXP to 8192u,
TracingModuleV2.EXT to 65536u,
TracingModuleV2.EXT to 1048576u,
TracingModuleV2.GAS to 65536u,
TracingModuleV2.HUB to 2097152u,
TracingModuleV2.LOG_DATA to 65536u,
TracingModuleV2.LOG_INFO to 4096u,
TracingModuleV2.MMIO to 2097152u,
TracingModuleV2.MMIO to 4194304u,
TracingModuleV2.MMU to 4194304u,
TracingModuleV2.MOD to 131072u,
TracingModuleV2.MUL to 65536u,
TracingModuleV2.MXP to 524288u,
TracingModuleV2.OOB to 262144u,
TracingModuleV2.RLP_ADDR to 4096u,
TracingModuleV2.RLP_TXN to 131072u,
TracingModuleV2.RLP_TXN_RCPT to 32768u,
TracingModuleV2.ROM to 8388608u,
TracingModuleV2.RLP_TXN_RCPT to 65536u,
TracingModuleV2.ROM to 4194304u,
TracingModuleV2.ROM_LEX to 1024u,
TracingModuleV2.SHAKIRA_DATA to 32768u,
TracingModuleV2.SHF to 65536u,
TracingModuleV2.STP to 32768u,
TracingModuleV2.TRM to 8192u,
TracingModuleV2.STP to 16384u,
TracingModuleV2.TRM to 32768u,
TracingModuleV2.TXN_DATA to 8192u,
TracingModuleV2.WCP to 262144u,
TracingModuleV2.BIN_REFERENCE_TABLE to 196864u,
TracingModuleV2.SHF_REFERENCE_TABLE to 4096u,
TracingModuleV2.INSTRUCTION_DECODER to 512u,
TracingModuleV2.BIN_REFERENCE_TABLE to 4294967295u,
TracingModuleV2.SHF_REFERENCE_TABLE to 4294967295u,
TracingModuleV2.INSTRUCTION_DECODER to 4294967295u,
TracingModuleV2.PRECOMPILE_ECRECOVER_EFFECTIVE_CALLS to 128u,
TracingModuleV2.PRECOMPILE_SHA2_BLOCKS to 671u,
TracingModuleV2.PRECOMPILE_RIPEMD_BLOCKS to 671u,
Expand Down Expand Up @@ -235,7 +235,7 @@ class CoordinatorConfigTest {

private val aggregationConfig = AggregationConfig(
aggregationProofsLimit = 3,
aggregationDeadline = Duration.parse("PT1M"),
aggregationDeadline = Duration.parse("PT10S"),
aggregationCoordinatorPollingInterval = Duration.parse("PT2S"),
deadlineCheckInterval = Duration.parse("PT8S")
)
Expand Down Expand Up @@ -359,7 +359,7 @@ class CoordinatorConfigTest {
maxFeePerGasCap = 100000000000u,
feeHistoryBlockCount = 4U,
feeHistoryRewardPercentile = 15.0,
blocksToFinalization = 2U,
blocksToFinalization = 0U,
lastHashSearchWindow = 25U,
anchoringReceiptPollingInterval = Duration.parse("PT01S"),
maxReceiptRetries = 120U
Expand Down Expand Up @@ -837,13 +837,14 @@ class CoordinatorConfigTest {
blobCompressorVersion = BlobCompressorVersion.V1_0_1,
expectedTracesApiVersionV2 = "v0.8.0-rc8",
conflationV2 = tracesConfig.conflation.copy(
endpoints = listOf(URI("http://traces-node-v2:8545/").toURL())
endpoints = listOf(URI("http://traces-node-v2:8545/").toURL()),
requestLimitPerEndpoint = 1U
),
countersV2 = TracesConfig.FunctionalityEndpoint(
listOf(
URI("http://traces-node-v2:8545/").toURL()
),
requestLimitPerEndpoint = 2U,
requestLimitPerEndpoint = 1U,
requestRetry = RequestRetryConfigTomlFriendly(
backoffDelay = Duration.parse("PT1S"),
failuresWarningThreshold = 2
Expand Down

0 comments on commit 1ad6131

Please sign in to comment.