Skip to content

delay create erigon rw tx to commiting #4653

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+34 −25
Open

delay create erigon rw tx to commiting #4653

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d99625e
delay open erigon rwtx when commiting
envestcc Jun 12, 2025
41e19a7
fix test
envestcc Jun 12, 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
59 changes: 34 additions & 25 deletions state/factory/workingsetstore_erigon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ type erigonDB struct {
}

type erigonWorkingSetStore struct {
tsw erigonstate.StateWriter
db *erigonDB
intraBlockState *erigonstate.IntraBlockState
tx kv.Tx
}
Expand Down Expand Up @@ -72,14 +72,14 @@ func (db *erigonDB) Stop(ctx context.Context) {
}

func (db *erigonDB) newErigonStore(ctx context.Context, height uint64) (*erigonWorkingSetStore, error) {
tx, err := db.rw.BeginRw(ctx)
tx, err := db.rw.BeginRo(ctx)
if err != nil {
return nil, err
}
r, tsw := erigonstate.NewPlainStateReader(tx), erigonstate.NewPlainStateWriter(tx, tx, height)
r := erigonstate.NewPlainStateReader(tx)
intraBlockState := erigonstate.New(r)
return &erigonWorkingSetStore{
tsw: tsw,
db: db,
tx: tx,
intraBlockState: intraBlockState,
}, nil
Expand All @@ -93,7 +93,7 @@ func (db *erigonDB) newErigonStoreDryrun(ctx context.Context, height uint64) (*e
tsw := erigonstate.NewPlainState(tx, height, nil)
intraBlockState := erigonstate.New(tsw)
return &erigonWorkingSetStore{
tsw: tsw,
db: db,
tx: tx,
intraBlockState: intraBlockState,
}, nil
Expand All @@ -120,6 +120,10 @@ func (store *erigonWorkingSetStore) FinalizeTx(ctx context.Context) error {
}

func (store *erigonWorkingSetStore) Finalize(ctx context.Context) error {
return nil
}

func (store *erigonWorkingSetStore) prepareCommit(ctx context.Context, tx kv.RwTx) error {
blkCtx := protocol.MustGetBlockCtx(ctx)
height := blkCtx.BlockHeight
ts := blkCtx.BlockTimeStamp.Unix()
Expand All @@ -131,40 +135,45 @@ func (store *erigonWorkingSetStore) Finalize(ctx context.Context) error {

chainRules := chainCfg.Rules(big.NewInt(int64(height)), g.IsSumatra(height), uint64(ts))
rules := evm.NewErigonRules(&chainRules)
tsw := erigonstate.NewPlainStateWriter(tx, tx, height)
log.L().Debug("intraBlockState Commit block", zap.Uint64("height", height))
err = store.intraBlockState.CommitBlock(rules, store.tsw)
err = store.intraBlockState.CommitBlock(rules, tsw)
if err != nil {
return err
}
log.L().Debug("erigon store finalize", zap.Uint64("height", height), zap.String("tsw", fmt.Sprintf("%+T", store.tsw)))
log.L().Debug("erigon store finalize", zap.Uint64("height", height), zap.String("tsw", fmt.Sprintf("%T", tsw)))
// store.intraBlockState.Print(*rules)

if c, ok := store.tsw.(erigonstate.WriterWithChangeSets); ok {
log.L().Debug("erigon store write changesets", zap.Uint64("height", height))
err = c.WriteChangeSets()
if err != nil {
return err
}
err = c.WriteHistory()
if err != nil {
return err
}
log.L().Debug("erigon store write changesets", zap.Uint64("height", height))
err = tsw.WriteChangeSets()
if err != nil {
return err
}
if tx, ok := store.tx.(kv.RwTx); ok {
log.L().Debug("erigon store commit tx", zap.Uint64("height", height))
err = tx.Put(systemNS, heightKey, uint256.NewInt(height).Bytes())
if err != nil {
return err
}
err = tsw.WriteHistory()
if err != nil {
return err
}
log.L().Debug("erigon store commit tx", zap.Uint64("height", height))
err = tx.Put(systemNS, heightKey, uint256.NewInt(height).Bytes())
if err != nil {
return err
}
return nil
}

func (store *erigonWorkingSetStore) Commit(ctx context.Context) error {
defer store.tx.Rollback()
err := store.tx.Commit()
tx, err := store.db.rw.BeginRw(ctx)
if err != nil {
return err
return errors.Wrap(err, "failed to begin erigon working set store transaction")
}
defer tx.Rollback()

if err = store.prepareCommit(ctx, tx); err != nil {
return errors.Wrap(err, "failed to prepare erigon working set store commit")
}
if err = tx.Commit(); err != nil {
return errors.Wrap(err, "failed to commit erigon working set store transaction")
}
return nil
}
Expand Down