mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-06-20 13:44:31 +00:00
## Why this should be merged The `temporary.WithTempRegisteredExtras()` global lock introduced in #234 wasn't fit for purpose when used in `coreth` as it required central coordination of registration, types, and usage of the payload accessor. ## How this works Instead of a central registration point, the new `libevm.WithTemporaryExtrasLock()` function takes out a global lock and provides the caller with a handle that proves the lock is held. All of the override functions, e.g. `params.WithTempRegisteredExtras()` now require a current lock, which will be propagated by the respective `coreth` functions. See https://github.com/ava-labs/coreth/pull/1328 for intended usage in `coreth` and `subnet-evm`. A consumer of both of these can then safely do the following: ```go import ( "github.com/ava-labs/libevm/libevm" coreth "github.com/ava-labs/coreth/plugin/evm" subnet "github.com/ava-labs/subnet-evm/plugin/evm" ) // asCChain calls `fn` while emulating `coreth`. It is safe for concurrent usage with [asSubnetEVM]. func asCChain(fn func() error) error { return libevm.WithTemporaryExtrasLock(func(l libevm.ExtrasLock) error { return coreth.WithTempRegisteredLibEVMExtras(l, fn) }) } // asSubnetEVM calls `fn` while emulating `subnet-evm`. It is safe for concurrent usage with [asCChain]. func asSubnetEVM(fn func() error) error { return libevm.WithTemporaryExtrasLock(func(l libevm.ExtrasLock) error { return subnet.WithTempRegisteredLibEVMExtras(l, fn) }) } ``` ## How this was tested Unit test of the new function plus existing integration tests of all modified code.
254 lines
10 KiB
Go
254 lines
10 KiB
Go
// Copyright 2024-2025 the libevm authors.
|
|
//
|
|
// The libevm additions to go-ethereum are free software: you can redistribute
|
|
// them and/or modify them under the terms of the GNU Lesser General Public License
|
|
// as published by the Free Software Foundation, either version 3 of the License,
|
|
// or (at your option) any later version.
|
|
//
|
|
// The libevm additions are distributed in the hope that they will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
|
|
// General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Lesser General Public License
|
|
// along with the go-ethereum library. If not, see
|
|
// <http://www.gnu.org/licenses/>.
|
|
|
|
package params
|
|
|
|
import (
|
|
"fmt"
|
|
"math/big"
|
|
"reflect"
|
|
|
|
"github.com/ava-labs/libevm/libevm"
|
|
"github.com/ava-labs/libevm/libevm/pseudo"
|
|
"github.com/ava-labs/libevm/libevm/register"
|
|
"github.com/ava-labs/libevm/log"
|
|
)
|
|
|
|
// Extras are arbitrary payloads to be added as extra fields in [ChainConfig]
|
|
// and [Rules] structs. See [RegisterExtras].
|
|
type Extras[C ChainConfigHooks, R RulesHooks] struct {
|
|
// ReuseJSONRoot, if true, signals that JSON unmarshalling of a
|
|
// [ChainConfig] MUST reuse the root JSON input when unmarshalling the extra
|
|
// payload. If false, it is assumed that the extra JSON payload is nested in
|
|
// the "extra" key.
|
|
//
|
|
// *NOTE* this requires multiple passes for both marshalling and
|
|
// unmarshalling of JSON so is inefficient and should be used as a last
|
|
// resort.
|
|
ReuseJSONRoot bool
|
|
// NewRules, if non-nil is called at the end of [ChainConfig.Rules] with the
|
|
// newly created [Rules] and other context from the method call. Its
|
|
// returned value will be the extra payload of the [Rules]. If NewRules is
|
|
// nil then so too will the [Rules] extra payload be a zero-value `R`.
|
|
//
|
|
// NewRules MAY modify the [Rules] but MUST NOT modify the [ChainConfig].
|
|
// TODO(arr4n): add the [Rules] to the return signature to make it clearer
|
|
// that the caller can modify the generated Rules.
|
|
NewRules func(_ *ChainConfig, _ *Rules, _ C, blockNum *big.Int, isMerge bool, timestamp uint64) R
|
|
}
|
|
|
|
// RegisterExtras registers the types `C` and `R` such that they are carried as
|
|
// extra payloads in [ChainConfig] and [Rules] structs, respectively. It is
|
|
// expected to be called in an `init()` function and MUST NOT be called more
|
|
// than once. Both `C` and `R` MUST be structs or pointers to structs.
|
|
//
|
|
// After registration, JSON unmarshalling of a [ChainConfig] will create a new
|
|
// `C` and unmarshal the JSON key "extra" into it. Conversely, JSON marshalling
|
|
// will populate the "extra" key with the contents of the `C`. Both the
|
|
// [json.Marshaler] and [json.Unmarshaler] interfaces are honoured if
|
|
// implemented by `C` and/or `R.`
|
|
//
|
|
// Calls to [ChainConfig.Rules] will call the `NewRules` function of the
|
|
// registered [Extras] to create a new `R`.
|
|
//
|
|
// The payloads can be accessed via the [ExtraPayloads.FromChainConfig] and
|
|
// [ExtraPayloads.FromRules] methods of the accessor returned by RegisterExtras.
|
|
// Where stated in the interface definitions, they will also be used as hooks to
|
|
// alter Ethereum behaviour; if this isn't desired then they can embed
|
|
// [NOOPHooks] to satisfy either interface.
|
|
func RegisterExtras[C ChainConfigHooks, R RulesHooks](e Extras[C, R]) ExtraPayloads[C, R] {
|
|
mustBeStructOrPointerToOne[C]()
|
|
mustBeStructOrPointerToOne[R]()
|
|
|
|
payloads, ctors := payloadsAndConstructors(e)
|
|
registeredExtras.MustRegister(ctors)
|
|
log.Info(
|
|
"Registered params extras",
|
|
"ChainConfig", log.TypeOf(pseudo.Zero[C]().Value.Get()),
|
|
"Rules", log.TypeOf(pseudo.Zero[R]().Value.Get()),
|
|
"ReuseJSONRoot", e.ReuseJSONRoot,
|
|
)
|
|
return payloads
|
|
}
|
|
|
|
func payloadsAndConstructors[C ChainConfigHooks, R RulesHooks](e Extras[C, R]) (ExtraPayloads[C, R], *extraConstructors) {
|
|
payloads := e.payloads()
|
|
return payloads, &extraConstructors{
|
|
newChainConfig: pseudo.NewConstructor[C]().Zero,
|
|
newRules: pseudo.NewConstructor[R]().Zero,
|
|
reuseJSONRoot: e.ReuseJSONRoot,
|
|
newForRules: e.newForRules,
|
|
payloads: payloads,
|
|
}
|
|
}
|
|
|
|
// WithTempRegisteredExtras temporarily registers `HPtr`, `BPtr`, and `SA` as if
|
|
// calling [RegisterExtras] the same type parameters. The [ExtraPayloads] are
|
|
// passed to `fn` instead of being returned; the argument MUST NOT be persisted
|
|
// beyond the life of `fn`. After `fn` returns, the registration is returned to
|
|
// its former state, be that none or the types originally passed to
|
|
// [RegisterExtras].
|
|
//
|
|
// This MUST NOT be used on a live chain. It is solely intended for off-chain
|
|
// consumers that require access to extras. Said consumers SHOULD NOT, however
|
|
// call this function directly. Use the libevm/temporary.WithRegisteredExtras()
|
|
// function instead as it atomically overrides all possible packages.
|
|
func WithTempRegisteredExtras[C ChainConfigHooks, R RulesHooks](
|
|
lock libevm.ExtrasLock,
|
|
e Extras[C, R],
|
|
fn func(ExtraPayloads[C, R]) error,
|
|
) error {
|
|
if err := lock.Verify(); err != nil {
|
|
return err
|
|
}
|
|
payloads, ctors := payloadsAndConstructors(e)
|
|
return registeredExtras.TempOverride(ctors, func() error { return fn(payloads) })
|
|
}
|
|
|
|
// TestOnlyClearRegisteredExtras clears the [Extras] previously passed to
|
|
// [RegisterExtras]. It panics if called from a non-testing call stack.
|
|
//
|
|
// In tests it SHOULD be called before every call to [RegisterExtras] and then
|
|
// defer-called afterwards, either directly or via testing.TB.Cleanup(). This is
|
|
// a workaround for the single-call limitation on [RegisterExtras].
|
|
func TestOnlyClearRegisteredExtras() {
|
|
registeredExtras.TestOnlyClear()
|
|
}
|
|
|
|
// registeredExtras holds non-generic constructors for the [Extras] types
|
|
// registered via [RegisterExtras].
|
|
var registeredExtras register.AtMostOnce[*extraConstructors]
|
|
|
|
type extraConstructors struct {
|
|
newChainConfig, newRules func() *pseudo.Type
|
|
reuseJSONRoot bool
|
|
newForRules func(_ *ChainConfig, _ *Rules, blockNum *big.Int, isMerge bool, timestamp uint64) *pseudo.Type
|
|
// use top-level hooksFrom<X>() functions instead of these as they handle
|
|
// instances where no [Extras] were registered.
|
|
payloads interface {
|
|
hooksFromChainConfig(*ChainConfig) ChainConfigHooks
|
|
hooksFromRules(*Rules) RulesHooks
|
|
}
|
|
}
|
|
|
|
func (e *Extras[C, R]) newForRules(c *ChainConfig, r *Rules, blockNum *big.Int, isMerge bool, timestamp uint64) *pseudo.Type {
|
|
if e.NewRules == nil {
|
|
return registeredExtras.Get().newRules()
|
|
}
|
|
rExtra := e.NewRules(c, r, e.payloads().ChainConfig.Get(c), blockNum, isMerge, timestamp)
|
|
return pseudo.From(rExtra).Type
|
|
}
|
|
|
|
func (*Extras[C, R]) payloads() ExtraPayloads[C, R] {
|
|
return ExtraPayloads[C, R]{
|
|
ChainConfig: pseudo.NewAccessor[*ChainConfig, C](
|
|
(*ChainConfig).extraPayload,
|
|
func(c *ChainConfig, t *pseudo.Type) { c.extra = t },
|
|
),
|
|
Rules: pseudo.NewAccessor[*Rules, R](
|
|
(*Rules).extraPayload,
|
|
func(r *Rules, t *pseudo.Type) { r.extra = t },
|
|
),
|
|
}
|
|
}
|
|
|
|
// mustBeStructOrPointerToOne panics if `T` isn't a struct or a *struct.
|
|
func mustBeStructOrPointerToOne[T any]() {
|
|
var x T
|
|
switch t := reflect.TypeOf(x); t.Kind() {
|
|
case reflect.Struct:
|
|
return
|
|
case reflect.Pointer:
|
|
if t.Elem().Kind() == reflect.Struct {
|
|
return
|
|
}
|
|
}
|
|
panic(notStructMessage[T]())
|
|
}
|
|
|
|
// notStructMessage returns the message with which [mustBeStructOrPointerToOne]
|
|
// might panic. It exists to avoid change-detector tests should the message
|
|
// contents change.
|
|
func notStructMessage[T any]() string {
|
|
var x T
|
|
return fmt.Sprintf("%T is not a struct nor a pointer to a struct", x)
|
|
}
|
|
|
|
// ExtraPayloads provides strongly typed access to the extra payloads carried by
|
|
// [ChainConfig] and [Rules] structs. The only valid way to construct an
|
|
// instance is by a call to [RegisterExtras].
|
|
type ExtraPayloads[C ChainConfigHooks, R RulesHooks] struct {
|
|
ChainConfig pseudo.Accessor[*ChainConfig, C]
|
|
Rules pseudo.Accessor[*Rules, R]
|
|
}
|
|
|
|
// hooksFromChainConfig is equivalent to FromChainConfig(), but returns an
|
|
// interface instead of the concrete type implementing it; this allows it to be
|
|
// used in non-generic code.
|
|
func (e ExtraPayloads[C, R]) hooksFromChainConfig(c *ChainConfig) ChainConfigHooks {
|
|
return e.ChainConfig.Get(c)
|
|
}
|
|
|
|
// hooksFromRules is the [RulesHooks] equivalent of hooksFromChainConfig().
|
|
func (e ExtraPayloads[C, R]) hooksFromRules(r *Rules) RulesHooks {
|
|
return e.Rules.Get(r)
|
|
}
|
|
|
|
// addRulesExtra is called at the end of [ChainConfig.Rules]; it exists to
|
|
// abstract the libevm-specific behaviour outside of original geth code.
|
|
func (c *ChainConfig) addRulesExtra(r *Rules, blockNum *big.Int, isMerge bool, timestamp uint64) {
|
|
r.extra = nil
|
|
if registeredExtras.Registered() {
|
|
r.extra = registeredExtras.Get().newForRules(c, r, blockNum, isMerge, timestamp)
|
|
}
|
|
}
|
|
|
|
// extraPayload returns the ChainConfig's extra payload iff [RegisterExtras] has
|
|
// already been called. If the payload hasn't been populated (typically via
|
|
// unmarshalling of JSON), a nil value is constructed and returned.
|
|
func (c *ChainConfig) extraPayload() *pseudo.Type {
|
|
if !registeredExtras.Registered() {
|
|
// This will only happen if someone constructs an [ExtraPayloads]
|
|
// directly, without a call to [RegisterExtras]. It would also panic on
|
|
// the next call anyway so this is at least a useful message.
|
|
//
|
|
// See https://google.github.io/styleguide/go/best-practices#when-to-panic
|
|
panic(fmt.Sprintf("%T.ExtraPayload() called before RegisterExtras()", c))
|
|
}
|
|
if c.extra == nil {
|
|
c.extra = registeredExtras.Get().newChainConfig()
|
|
}
|
|
return c.extra
|
|
}
|
|
|
|
// extraPayload is equivalent to [ChainConfig.extraPayload].
|
|
func (r *Rules) extraPayload() *pseudo.Type {
|
|
if !registeredExtras.Registered() {
|
|
// See ChainConfig.extraPayload() equivalent.
|
|
panic(fmt.Sprintf("%T.ExtraPayload() called before RegisterExtras()", r))
|
|
}
|
|
if r.extra == nil {
|
|
r.extra = registeredExtras.Get().newRules()
|
|
}
|
|
return r.extra
|
|
}
|
|
|
|
// NewTimestampCompatError returns a new config-compatibility error indicating an incompatible timestamp.
|
|
func NewTimestampCompatError(what string, storedTime, newTime *uint64) *ConfigCompatError {
|
|
// If this breaks when merging a new version of `geth`, the wrapping function's signature MUST be
|
|
// changed to match as it exists only to export the function.
|
|
return newTimestampCompatError(what, storedTime, newTime)
|
|
}
|