Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: sunny2022da/op-geth
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 01d96e923bae884655360d0841670919bdac4bb4
Choose a base ref
..
head repository: sunny2022da/op-geth
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ffe9dc0e0bd49cb61fba6068b3fb0e96936596a9
Choose a head ref
Showing with 7 additions and 2 deletions.
  1. +1 −0 core/state/interface.go
  2. +4 −0 core/state/pevm_statedb.go
  3. +1 −1 core/types/dag_test.go
  4. +1 −1 miner/worker_test.go
1 change: 1 addition & 0 deletions core/state/interface.go
Original file line number Diff line number Diff line change
@@ -122,4 +122,5 @@ type StateDBer interface {
timeAddStorageCommits(du time.Duration)
getOrNewStateObject(addr common.Address) *stateObject
prefetchAccount(address common.Address)
CheckFeeReceiversRWSet()
}
4 changes: 4 additions & 0 deletions core/state/pevm_statedb.go
Original file line number Diff line number Diff line change
@@ -2441,3 +2441,7 @@ func (p *ParallelStateDB) setStateObjectIfEmpty(obj *stateObject) bool {
_, loaded := p.stateObjects.LoadOrStore(obj.address, obj)
return !loaded
}

func (s *ParallelStateDB) CheckFeeReceiversRWSet() {
return
}
2 changes: 1 addition & 1 deletion core/types/dag_test.go
Original file line number Diff line number Diff line change
@@ -302,7 +302,7 @@ func mockSystemTxDAGWithLargeDeps() TxDAG {
dag.TxDeps[7].TxIndexes = []uint64{3}
dag.TxDeps[8].TxIndexes = []uint64{}
//dag.TxDeps[9].TxIndexes = []uint64{0, 1, 2, 6, 7, 8}
dag.TxDeps[9] = NewTxDep([]uint64{3, 4, 5, 10, 11}, NonDependentRelFlag)
dag.TxDeps[9] = NewTxDep([]uint64{3, 4, 5}, NonDependentRelFlag)
dag.TxDeps[10] = NewTxDep([]uint64{}, ExcludedTxFlag)
dag.TxDeps[11] = NewTxDep([]uint64{}, ExcludedTxFlag)
return dag
2 changes: 1 addition & 1 deletion miner/worker_test.go
Original file line number Diff line number Diff line change
@@ -255,7 +255,7 @@ func generateTxDAGGaslessBlock(t *testing.T, enableMev, enableTxDAG bool) {
w, b := newTestWorker(t, &config, engine, db, 0, &cfg, &vmConfig)
defer w.close()
if enableTxDAG {
w.chain.SetupTxDAGGeneration()
w.chain.SetupTxDAGGeneration("", false)
}

// Ignore empty commit here for less noise.