diff --git a/README.md b/README.md index 3477d8c71..04f5a4138 100644 --- a/README.md +++ b/README.md @@ -369,7 +369,7 @@ Examples of stages are: ### JSON-RPC daemon -Most of Erigon's components (sentry, txpool, snapshots downloader, can work inside Erigon and as independent process. +Most of Erigon's components (txpool, rpcdaemon, snapshots downloader, sentry, ...) can work inside Erigon and as independent process. To enable built-in RPC server: `--http` and `--ws` (sharing same port with http) diff --git a/eth/stagedsync/stage_execute.go b/eth/stagedsync/stage_execute.go index 6bd2df277..f5998b7aa 100644 --- a/eth/stagedsync/stage_execute.go +++ b/eth/stagedsync/stage_execute.go @@ -743,11 +743,11 @@ func PruneExecutionStage(s *PruneState, tx kv.RwTx, cfg ExecuteBlockCfg, ctx con if cfg.historyV3 { cfg.agg.SetTx(tx) if initialCycle { - if err = cfg.agg.Prune(ctx, ethconfig.HistoryV3AggregationStep*2); err != nil { // prune part of retired data, before commit + if err = cfg.agg.Prune(ctx, ethconfig.HistoryV3AggregationStep/10); err != nil { // prune part of retired data, before commit return err } } else { - if err = cfg.agg.PruneWithTiemout(ctx, 500*time.Millisecond); err != nil { // prune part of retired data, before commit + if err = cfg.agg.PruneWithTiemout(ctx, 1*time.Second); err != nil { // prune part of retired data, before commit return err } } diff --git a/go.mod b/go.mod index 848cea7c6..d977abf6d 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/ledgerwatch/erigon-lib v0.0.0-20230209052732-dce672859cf3 - github.com/ledgerwatch/erigon-snapshot v1.1.1-0.20230120022649-cd9409a200da + github.com/ledgerwatch/erigon-snapshot v1.1.1-0.20230209051056-e695bb0d2ace github.com/ledgerwatch/log/v3 v3.7.0 github.com/ledgerwatch/secp256k1 v1.0.0 github.com/ledgerwatch/trackerslist v1.0.0 // indirect diff --git a/go.sum b/go.sum index 3a24099f8..a7af7de67 100644 --- a/go.sum +++ b/go.sum @@ -558,8 +558,8 @@ github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7 github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8= github.com/ledgerwatch/erigon-lib v0.0.0-20230209052732-dce672859cf3 h1:Oyseyl3DKlnt1JM0NEjcdENdho5/zGK7H5y5CljdyPM= github.com/ledgerwatch/erigon-lib v0.0.0-20230209052732-dce672859cf3/go.mod h1:0C8ZJf2FL/BUqCJq5NrbZr0mq88yi8xXl3OTwLLBC9o= -github.com/ledgerwatch/erigon-snapshot v1.1.1-0.20230120022649-cd9409a200da h1:lQQBOHzAUThkymfXJj/m07vAjyMx9XoMMy3OomaeOrA= -github.com/ledgerwatch/erigon-snapshot v1.1.1-0.20230120022649-cd9409a200da/go.mod h1:3AuPxZc85jkehh/HA9h8gabv5MSi3kb/ddtzBsTVJFo= +github.com/ledgerwatch/erigon-snapshot v1.1.1-0.20230209051056-e695bb0d2ace h1:42TpaEa42wznKkWVIMuhFPurxTvx8JzITQl+Ofzotq8= +github.com/ledgerwatch/erigon-snapshot v1.1.1-0.20230209051056-e695bb0d2ace/go.mod h1:3AuPxZc85jkehh/HA9h8gabv5MSi3kb/ddtzBsTVJFo= github.com/ledgerwatch/log/v3 v3.7.0 h1:aFPEZdwZx4jzA3+/Pf8wNDN5tCI0cIolq/kfvgcM+og= github.com/ledgerwatch/log/v3 v3.7.0/go.mod h1:J2Jl6zV/58LeA6LTaVVnCGyf1/cYYSEOOLHY4ZN8S2A= github.com/ledgerwatch/secp256k1 v1.0.0 h1:Usvz87YoTG0uePIV8woOof5cQnLXGYa162rFf3YnwaQ=