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

integrity: fix interface conversion error #13662

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

integrity: fix interface conversion error #13662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d73f4d
save
AskAlexSharov Feb 2, 2025
2e830a0
save
AskAlexSharov Feb 2, 2025
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
7 changes: 1 addition & 6 deletions eth/integrity/e3_ef_files.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,13 @@ import (
"time"

"github.com/erigontech/erigon-lib/kv"
"github.com/erigontech/erigon-lib/kv/temporal"
"github.com/erigontech/erigon-lib/state"
"golang.org/x/sync/errgroup"
)

func E3EfFiles(ctx context.Context, chainDB kv.RwDB, agg *state.Aggregator, failFast bool, fromStep uint64) error {
func E3EfFiles(ctx context.Context, db kv.TemporalRwDB, failFast bool, fromStep uint64) error {
logEvery := time.NewTicker(20 * time.Second)
defer logEvery.Stop()
db, err := temporal.New(chainDB, agg)
if err != nil {
return err
}
g := &errgroup.Group{}
for _, idx := range []kv.InvertedIdx{kv.AccountsHistoryIdx, kv.StorageHistoryIdx, kv.CodeHistoryIdx, kv.CommitmentHistoryIdx, kv.ReceiptHistoryIdx, kv.LogTopicIdx, kv.LogAddrIdx, kv.TracesFromIdx, kv.TracesToIdx} {
idx := idx
Expand Down
8 changes: 2 additions & 6 deletions eth/integrity/e3_history_no_system_txs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,18 @@ import (
"github.com/erigontech/erigon-lib/kv"
"github.com/erigontech/erigon-lib/kv/order"
"github.com/erigontech/erigon-lib/kv/rawdbv3"
"github.com/erigontech/erigon-lib/kv/temporal"
"github.com/erigontech/erigon-lib/log/v3"
"github.com/erigontech/erigon-lib/state"
"github.com/erigontech/erigon/turbo/services"
"github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks"
)

// E3 History - usually don't have anything attributed to 1-st system txs (except genesis)
func E3HistoryNoSystemTxs(ctx context.Context, chainDB kv.RwDB, blockReader services.FullBlockReader, agg *state.Aggregator) error {
func E3HistoryNoSystemTxs(ctx context.Context, db kv.TemporalRwDB, blockReader services.FullBlockReader) error {
count := atomic.Uint64{}
logEvery := time.NewTicker(20 * time.Second)
defer logEvery.Stop()
db, err := temporal.New(chainDB, agg)
if err != nil {
return err
}
agg := db.(state.HasAgg).Agg().(*state.Aggregator)
g := &errgroup.Group{}
for j := 0; j < 256; j++ {
j := j
Expand Down
2 changes: 1 addition & 1 deletion eth/integrity/no_gaps_bor_events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/erigontech/erigon/turbo/services"
)

func NoGapsInBorEvents(ctx context.Context, db kv.RoDB, blockReader services.FullBlockReader, from, to uint64, failFast bool) (err error) {
func NoGapsInBorEvents(ctx context.Context, db kv.TemporalRoDB, blockReader services.FullBlockReader, from, to uint64, failFast bool) (err error) {
defer func() {
log.Info("[integrity] NoGapsInBorEvents: done", "err", err)
}()
Expand Down
2 changes: 1 addition & 1 deletion eth/integrity/snap_blocks_read.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"github.com/erigontech/erigon/turbo/services"
)

func SnapBlocksRead(ctx context.Context, db kv.RoDB, blockReader services.FullBlockReader, from, to uint64, failFast bool) error {
func SnapBlocksRead(ctx context.Context, db kv.TemporalRoDB, blockReader services.FullBlockReader, from, to uint64, failFast bool) error {
defer log.Info("[integrity] SnapBlocksRead: done")
logEvery := time.NewTicker(10 * time.Second)
defer logEvery.Stop()
Expand Down
4 changes: 2 additions & 2 deletions turbo/app/snapshots_cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,11 +563,11 @@ func doIntegrity(cliCtx *cli.Context) error {
return err
}
case integrity.InvertedIndex:
if err := integrity.E3EfFiles(ctx, db, agg, failFast, fromStep); err != nil {
if err := integrity.E3EfFiles(ctx, db, failFast, fromStep); err != nil {
return err
}
case integrity.HistoryNoSystemTxs:
if err := integrity.E3HistoryNoSystemTxs(ctx, db, blockReader, agg); err != nil {
if err := integrity.E3HistoryNoSystemTxs(ctx, db, blockReader); err != nil {
return err
}
case integrity.NoBorEventGaps:
Expand Down
Loading