forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-24 05:36:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

refactor: simplify ccc revert to snapshot (#480)

Browse source 
* simplify ccc revert to snapshot

* Update version.go

---------

Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
This commit is contained in:
iczc 2023-08-24 10:30:00 +08:00 committed by GitHub
parent 6992cfe8c5
commit d02a410b36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
miner/worker.go
View file

@ -895,15 +895,14 @@ func (w *worker) commitTransaction(tx *types.Transaction, coinbase common.Addres
traces, err := w.current.traceEnv.GetBlockTrace(
types.NewBlockWithHeader(w.current.header).WithBody([]*types.Transaction{tx}, nil),
)
if err != nil {
// `w.current.traceEnv.State` & `w.current.state` share a same pointer to the state, so only need to revert `w.current.state`
// revert to snapshot for calling `core.ApplyMessage` again, (both `traceEnv.GetBlockTrace` & `core.ApplyTransaction` will call `core.ApplyMessage`)
w.current.state.RevertToSnapshot(snap)
if err != nil {
return nil, err
}
accRows, err = w.circuitCapacityChecker.ApplyTransaction(traces)
if err != nil {
// `w.current.traceEnv.State` & `w.current.state` share a same pointer to the state, so only need to revert `w.current.state`
w.current.state.RevertToSnapshot(snap)
return nil, err
}
log.Trace(
@ -912,9 +911,6 @@ func (w *worker) commitTransaction(tx *types.Transaction, coinbase common.Addres
"txhash", tx.Hash(),
"accRows", accRows,
)
// revert to snapshot for calling `core.ApplyMessage` again, (both `traceEnv.GetBlockTrace` & `core.ApplyTransaction` will call `core.ApplyMessage`)
w.current.state.RevertToSnapshot(snap)
}
// create new snapshot for `core.ApplyTransaction`

2
params/version.go
View file

@ -24,7 +24,7 @@ import (
const (
VersionMajor = 4 // Major version component of the current release
VersionMinor = 3 // Minor version component of the current release
VersionPatch = 48 // Patch version component of the current release
VersionPatch = 49 // Patch version component of the current release
VersionMeta = "sepolia" // Version metadata to append to the version string
)