diff --git a/core/plugin_hooks.go b/core/plugin_hooks.go index c08c27ec1..f00730bdd 100644 --- a/core/plugin_hooks.go +++ b/core/plugin_hooks.go @@ -306,7 +306,7 @@ func PluginSetTrieFlushIntervalClone(pl *plugins.PluginLoader, flushInterval tim return ok }) var snc sync.Once - if len(fnList) > 0 { + if len(fnList) > 1 { snc.Do(func() {log.Warn("The blockChain flushInterval value is being accessed by multiple plugins")}) } for _, fni := range fnList { diff --git a/trie/plugin_hooks.go b/trie/plugin_hooks.go index d33dfa414..c2e465165 100644 --- a/trie/plugin_hooks.go +++ b/trie/plugin_hooks.go @@ -4,21 +4,22 @@ import ( "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/plugins" "github.com/ethereum/go-ethereum/common" + "github.com/openrelayxyz/plugeth-utils/core" ) func PluginPreTrieCommit(pl *plugins.PluginLoader, node common.Hash) { fnList := pl.Lookup("PreTrieCommit", func(item interface{}) bool { - _, ok := item.(func(common.Hash)) + _, ok := item.(func(core.Hash)) return ok }) for _, fni := range fnList { - if fn, ok := fni.(func(common.Hash)); ok { - fn(node) + if fn, ok := fni.(func(core.Hash)); ok { + fn(core.Hash(node)) } } } -func pluginPreTrieCommit(node common.Hash,) { +func pluginPreTrieCommit(node common.Hash) { if plugins.DefaultPluginLoader == nil { log.Warn("Attempting PreTrieCommit, but default PluginLoader has not been initialized") return @@ -28,20 +29,40 @@ func pluginPreTrieCommit(node common.Hash,) { func PluginPostTrieCommit(pl *plugins.PluginLoader, node common.Hash) { fnList := pl.Lookup("PostTrieCommit", func(item interface{}) bool { - _, ok := item.(func(common.Hash)) + _, ok := item.(func(core.Hash)) return ok }) for _, fni := range fnList { - if fn, ok := fni.(func(common.Hash)); ok { - fn(node) + if fn, ok := fni.(func(core.Hash)); ok { + fn(core.Hash(node)) } } } -func pluginPostTrieCommit(node common.Hash,) { +func pluginPostTrieCommit(node common.Hash) { if plugins.DefaultPluginLoader == nil { log.Warn("Attempting PostTrieCommit, but default PluginLoader has not been initialized") return } PluginPostTrieCommit(plugins.DefaultPluginLoader, node) -} \ No newline at end of file +} + +// func PluginGetRPCCalls(pl *plugins.PluginLoader, id, method, params string) { +// fnList := pl.Lookup("GetRPCCalls", func(item interface{}) bool { +// _, ok := item.(func(string, string, string)) +// return ok +// }) +// for _, fni := range fnList { +// if fn, ok := fni.(func(string, string, string)); ok { +// fn(id, method, params) +// } +// } +// } + +// func pluginGetRPCCalls(id, method, params string) { +// if plugins.DefaultPluginLoader == nil { +// log.Warn("Attempting GerRPCCalls, but default PluginLoader has not been initialized") +// return +// } +// PluginGetRPCCalls(plugins.DefaultPluginLoader, id, method, params) +// } \ No newline at end of file