forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-06-16 20:01:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

closure approach

Browse source
This commit is contained in:
Sina Mahmoodi 2026-03-24 16:35:09 +00:00
parent f71d097a14
commit 858bc9b590
1 changed files with 76 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

157
cmd/utils/cmd.go
View file

@ -276,96 +276,91 @@ func ImportHistory(chain *core.BlockChain, dir string, network string, from func
) )
for i, file := range entries { for i, file := range entries {
path := filepath.Join(dir, file) err := func() error {
path := filepath.Join(dir, file)
// Validate against checksum file in directory. // Validate against checksum file in directory.
f, err := os.Open(path) f, err := os.Open(path)
if err != nil { if err != nil {
return fmt.Errorf("open %s: %w", path, err) return fmt.Errorf("open %s: %w", path, err)
} }
h := sha256.New() defer f.Close()
if _, err := io.Copy(h, f); err != nil {
f.Close()
return fmt.Errorf("checksum %s: %w", path, err)
}
got := common.BytesToHash(h.Sum(nil)).Hex()
if got != checksums[i] {
f.Close()
return fmt.Errorf("%s checksum mismatch: have %s want %s", file, got, checksums[i])
}
if _, err := f.Seek(0, io.SeekStart); err != nil {
f.Close()
return fmt.Errorf("seek %s: %w", path, err)
}
e, err := from(f) h := sha256.New()
if err != nil { if _, err := io.Copy(h, f); err != nil {
f.Close() // onedb.From does not close on metadata errors return fmt.Errorf("checksum %s: %w", path, err)
return fmt.Errorf("error opening era: %w", err) }
} got := common.BytesToHash(h.Sum(nil)).Hex()
it, err := e.Iterator() if got != checksums[i] {
if err != nil { return fmt.Errorf("%s checksum mismatch: have %s want %s", file, got, checksums[i])
e.Close() }
return fmt.Errorf("error creating iterator: %w", err) if _, err := f.Seek(0, io.SeekStart); err != nil {
} return fmt.Errorf("seek %s: %w", path, err)
}
var ( // Import all block data from Era1.
blocks = make([]*types.Block, 0, importBatchSize) e, err := from(f)
receiptsList = make([]types.Receipts, 0, importBatchSize) if err != nil {
flush = func() error { return fmt.Errorf("error opening era: %w", err)
if len(blocks) == 0 { }
defer e.Close()
it, err := e.Iterator()
if err != nil {
return fmt.Errorf("error creating iterator: %w", err)
}
var (
blocks = make([]*types.Block, 0, importBatchSize)
receiptsList = make([]types.Receipts, 0, importBatchSize)
flush = func() error {
if len(blocks) == 0 {
return nil
}
enc := types.EncodeBlockReceiptLists(receiptsList)
if _, err := chain.InsertReceiptChain(blocks, enc, math.MaxUint64); err != nil {
return fmt.Errorf("error inserting blocks %d-%d: %w",
blocks[0].NumberU64(), blocks[len(blocks)-1].NumberU64(), err)
}
imported += len(blocks)
if time.Since(reported) >= 8*time.Second {
head := blocks[len(blocks)-1].NumberU64()
log.Info("Importing Era files", "head", head, "imported", imported,
"elapsed", common.PrettyDuration(time.Since(start)))
imported = 0
reported = time.Now()
}
blocks = blocks[:0]
receiptsList = receiptsList[:0]
return nil return nil
} }
enc := types.EncodeBlockReceiptLists(receiptsList) )
if _, err := chain.InsertReceiptChain(blocks, enc, math.MaxUint64); err != nil { for it.Next() {
return fmt.Errorf("error inserting blocks %d-%d: %w", block, err := it.Block()
blocks[0].NumberU64(), blocks[len(blocks)-1].NumberU64(), err) if err != nil {
return fmt.Errorf("error reading block %d: %w", it.Number(), err)
} }
imported += len(blocks) if block.Number().BitLen() == 0 {
if time.Since(reported) >= 8*time.Second { continue // skip genesis
head := blocks[len(blocks)-1].NumberU64()
log.Info("Importing Era files", "head", head, "imported", imported,
"elapsed", common.PrettyDuration(time.Since(start)))
imported = 0
reported = time.Now()
} }
blocks = blocks[:0] receipts, err := it.Receipts()
receiptsList = receiptsList[:0] if err != nil {
return nil return fmt.Errorf("error reading receipts %d: %w", it.Number(), err)
} }
) blocks = append(blocks, block)
for it.Next() { receiptsList = append(receiptsList, receipts)
block, err := it.Block() if len(blocks) == importBatchSize {
if err != nil { if err := flush(); err != nil {
e.Close() return err
return fmt.Errorf("error reading block %d: %w", it.Number(), err) }
}
if block.Number().BitLen() == 0 {
continue // skip genesis
}
receipts, err := it.Receipts()
if err != nil {
e.Close()
return fmt.Errorf("error reading receipts %d: %w", it.Number(), err)
}
blocks = append(blocks, block)
receiptsList = append(receiptsList, receipts)
if len(blocks) == importBatchSize {
if err := flush(); err != nil {
e.Close()
return err
} }
} }
} if err := it.Error(); err != nil {
if err := it.Error(); err != nil { return err
e.Close() }
return err return flush()
} }()
if err := flush(); err != nil { if err != nil {
e.Close()
return err
}
if err := e.Close(); err != nil {
return err return err
} }
} }