roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Changes to core/blockchain_hook_test, core/state/plugin_hooks, and eth/plugin_hooks to reslove issues discovered in pull review 9-17-21

Browse Source
This commit is contained in:
philip-morlier 2021-09-17 12:11:30 -07:00
parent 88f38674d1
commit 3af3c8c951
No known key found for this signature in database
GPG Key ID: 0323A143B7B6F663
3 changed files with 23 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
core/blockchain_hooks_test.go
View File

@ -1,22 +1,29 @@
package core
import (
"testing"
"github.com/ethereum/go-ethereum/plugins"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/common"
"testing"
"github.com/ethereum/go-ethereum/plugins"
"github.com/openrelayxyz/plugeth-utils/core"
)
func TestReorgLongHeadersHook(t *testing.T) {
invoked := false
done := plugins.HookTester("NewHead", func(b *types.Block, h common.Hash, logs []*types.Log) {
// invoked = true
if b == nil { t.Errorf("Expected block to be non-nil") }
if h == (common.Hash{}) { t.Errorf("Expected hash to be non-empty") }
if len(logs) > 0 { t.Errorf("Expected some logs") }
})
defer done()
testReorgLong(t, true)
if !invoked { t.Errorf("Expected plugin invocation")}
invoked := false
done := plugins.HookTester("NewHead", func(b []byte, h core.Hash, logs [][]byte) {
invoked = true
if b == nil {
t.Errorf("Expected block to be non-nil")
}
if h == (core.Hash{}) {
t.Errorf("Expected hash to be non-empty")
}
if len(logs) > 0 {
t.Errorf("Expected some logs")
}
})
defer done()
testReorgLong(t, true)
if !invoked {
t.Errorf("Expected plugin invocation")
}
}

2
core/state/plugin_hooks.go
View File

@ -7,8 +7,6 @@ import (
"github.com/openrelayxyz/plugeth-utils/core"
)
// TODO (philip): change common.Hash to core.Hash,
func PluginStateUpdate(pl *plugins.PluginLoader, blockRoot, parentRoot common.Hash, destructs map[common.Hash]struct{}, accounts map[common.Hash][]byte, storage map[common.Hash]map[common.Hash][]byte) {
fnList := pl.Lookup("StateUpdate", func(item interface{}) bool {
_, ok := item.(func(core.Hash, core.Hash, map[core.Hash]struct{}, map[core.Hash][]byte, map[core.Hash]map[core.Hash][]byte))

34
eth/plugin_hooks.go
View File

@ -13,28 +13,6 @@ import (
"github.com/openrelayxyz/plugeth-utils/core"
)
// func PluginCreateConsensusEngine(pl *plugins.PluginLoader, stack *node.Node, chainConfig *params.ChainConfig, config *ethash.Config, notify []string, noverify bool, db ethdb.Database) consensus.Engine {
// fnList := pl.Lookup("CreateConsensusEngine", func(item interface{}) bool {
// _, ok := item.(func(*node.Node, *params.ChainConfig, *ethash.Config, []string, bool, ethdb.Database) consensus.Engine)
// return ok
// })
// for _, fni := range fnList {
// if fn, ok := fni.(func(*node.Node, *params.ChainConfig, *ethash.Config, []string, bool, ethdb.Database) consensus.Engine); ok {
// return fn(stack, chainConfig, config, notify, noverify, db)
// }
// }
// return ethconfig.CreateConsensusEngine(stack, chainConfig, config, notify, noverify, db)
// }
//
// func pluginCreateConsensusEngine(stack *node.Node, chainConfig *params.ChainConfig, config *ethash.Config, notify []string, noverify bool, db ethdb.Database) consensus.Engine {
// if plugins.DefaultPluginLoader == nil {
// log.Warn("Attempting CreateConsensusEngine, but default PluginLoader has not been initialized")
// return ethconfig.CreateConsensusEngine(stack, chainConfig, config, notify, noverify, db)
// }
// return PluginCreateConsensusEngine(plugins.DefaultPluginLoader, stack, chainConfig, config, notify, noverify, db)
// }
// TODO (philip): Translate to core.TracerResult instead of vm.Tracer, with appropriate type adjustments (let me know if this one is too hard)
type metaTracer struct {
tracers []core.TracerResult
}
@ -77,21 +55,11 @@ func PluginUpdateBlockchainVMConfig(pl *plugins.PluginLoader, cfg *vm.Config) {
}
}
cfg.Debug = true
cfg.Tracer = mt //I think this means we will need a vm.config wrapper although confugure doesnt sound very passive
cfg.Tracer = mt
} else {
log.Warn("Module is not tracer")
}
fnList := plugins.Lookup("UpdateBlockchainVMConfig", func(item interface{}) bool {
_, ok := item.(func(*vm.Config))
return ok
})
for _, fni := range fnList {
if fn, ok := fni.(func(*vm.Config)); ok {
fn(cfg)
return
}
}
}
func pluginUpdateBlockchainVMConfig(cfg *vm.Config) {