Skip to content

Commit a709cd7

Browse files
author
info@weblogix.biz
committed
Merge remote-tracking branch 'origin/main' into alex/mdbx_lag_34
2 parents 4471330 + f354eef commit a709cd7

36 files changed

+1731
-710
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,3 +116,6 @@ mdbx.lck
116116
*.prof
117117

118118
.claude/settings.local.json
119+
120+
# Prevent accidental commit of locally-built binaries
121+
/erigon

cmd/utils/app/snapshots_cmd.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1077,7 +1077,7 @@ func doIntegrity(cliCtx *cli.Context) error {
10771077
}
10781078

10791079
for _, check := range requestedChecks {
1080-
if slices.Contains(integrity.FastChecks, check) || slices.Contains(integrity.SlowChecks, check) {
1080+
if slices.Contains(integrity.AllChecks, check) {
10811081
continue
10821082
}
10831083

@@ -1136,7 +1136,7 @@ func doIntegrity(cliCtx *cli.Context) error {
11361136
heimdallStore, _ := blockRetire.BorStore()
11371137

11381138
g, ctx := errgroup.WithContext(ctx)
1139-
g.SetLimit(4)
1139+
g.SetLimit(2)
11401140
for _, chk := range requestedChecks {
11411141
chk := chk
11421142
g.Go(func() error {

common/dbg/experiments.go

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -80,30 +80,30 @@ var (
8080
numWorkers = runtime.NumCPU() / 2
8181
Exec3Workers = EnvInt("EXEC3_WORKERS", numWorkers)
8282
ExecTerseLoggerLevel = EnvInt("EXEC_TERSE_LOGGER_LEVEL", int(log.LvlWarn))
83-
84-
CompressWorkers = EnvInt("COMPRESS_WORKERS", 1)
85-
MergeWorkers = EnvInt("MERGE_WORKERS", 1)
86-
CollateWorkers = EnvInt("COLLATE_WORKERS", 2)
87-
88-
TraceAccounts = EnvStrings("TRACE_ACCOUNTS", ",", nil)
89-
TraceStateKeys = EnvStrings("TRACE_STATE_KEYS", ",", nil)
90-
TraceInstructions = EnvBool("TRACE_INSTRUCTIONS", false)
91-
TraceTransactionIO = EnvBool("TRACE_TRANSACTION_IO", false)
92-
TraceDomainIO = EnvBool("TRACE_DOMAIN_IO", false)
93-
TraceNoopIO = EnvBool("TRACE_NOOP_IO", false)
94-
TraceLogs = EnvBool("TRACE_LOGS", false)
95-
TraceGas = EnvBool("TRACE_GAS", false)
96-
TraceDynamicGas = EnvBool("TRACE_DYNAMIC_GAS", false)
97-
TraceApply = EnvBool("TRACE_APPLY", false)
98-
TraceBlocks = EnvUints("TRACE_BLOCKS", ",", nil)
99-
TraceTxIndexes = EnvInts("TRACE_TXINDEXES", ",", nil)
100-
TraceUnwinds = EnvBool("TRACE_UNWINDS", false)
101-
traceDomains = EnvStrings("TRACE_DOMAINS", ",", nil)
102-
StopAfterBlock = EnvUint("STOP_AFTER_BLOCK", 0)
103-
BatchCommitments = EnvBool("BATCH_COMMITMENTS", true)
104-
CaplinEfficientReorg = EnvBool("CAPLIN_EFFICIENT_REORG", true)
105-
UseTxDependencies = EnvBool("USE_TX_DEPENDENCIES", false)
106-
UseStateCache = EnvBool("USE_STATE_CACHE", true)
83+
CompressWorkers = EnvInt("COMPRESS_WORKERS", 1)
84+
MergeWorkers = EnvInt("MERGE_WORKERS", 1)
85+
CollateWorkers = EnvInt("COLLATE_WORKERS", 2)
86+
87+
TraceAccounts = EnvStrings("TRACE_ACCOUNTS", ",", nil)
88+
TraceStateKeys = EnvStrings("TRACE_STATE_KEYS", ",", nil)
89+
TraceInstructions = EnvBool("TRACE_INSTRUCTIONS", false)
90+
TraceTransactionIO = EnvBool("TRACE_TRANSACTION_IO", false)
91+
TraceDomainIO = EnvBool("TRACE_DOMAIN_IO", false)
92+
TraceNoopIO = EnvBool("TRACE_NOOP_IO", false)
93+
TraceLogs = EnvBool("TRACE_LOGS", false)
94+
TraceGas = EnvBool("TRACE_GAS", false)
95+
TraceDynamicGas = EnvBool("TRACE_DYNAMIC_GAS", false)
96+
TraceApply = EnvBool("TRACE_APPLY", false)
97+
TraceBlockAccessLists = EnvBool("TRACE_BLOCK_ACCESS_LISTS", false)
98+
TraceBlocks = EnvUints("TRACE_BLOCKS", ",", nil)
99+
TraceTxIndexes = EnvInts("TRACE_TXINDEXES", ",", nil)
100+
TraceUnwinds = EnvBool("TRACE_UNWINDS", false)
101+
traceDomains = EnvStrings("TRACE_DOMAINS", ",", nil)
102+
StopAfterBlock = EnvUint("STOP_AFTER_BLOCK", 0)
103+
BatchCommitments = EnvBool("BATCH_COMMITMENTS", true)
104+
CaplinEfficientReorg = EnvBool("CAPLIN_EFFICIENT_REORG", true)
105+
UseTxDependencies = EnvBool("USE_TX_DEPENDENCIES", false)
106+
UseStateCache = EnvBool("USE_STATE_CACHE", true)
107107

108108
BorValidateHeaderTime = EnvBool("BOR_VALIDATE_HEADER_TIME", true)
109109
TraceDeletion = EnvBool("TRACE_DELETION", false)

0 commit comments

Comments
 (0)