From 514bcdb90e92e1625b5e2b9fbb6beccb383767c0 Mon Sep 17 00:00:00 2001 From: Quentin Mc Gaw Date: Mon, 10 Feb 2025 15:39:46 +0100 Subject: [PATCH] core/types: create libevm.go containing extras registration moved from state_account.go --- core/types/libevm.go | 14 ++++++++++++++ core/types/state_account.go | 9 +-------- 2 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 core/types/libevm.go diff --git a/core/types/libevm.go b/core/types/libevm.go new file mode 100644 index 0000000000..31a603d421 --- /dev/null +++ b/core/types/libevm.go @@ -0,0 +1,14 @@ +// (c) 2025, Ava Labs, Inc. All rights reserved. +// See the file LICENSE for licensing terms. + +package types + +import ( + ethtypes "github.com/ava-labs/libevm/core/types" +) + +var extras = ethtypes.RegisterExtras[ + ethtypes.NOOPHeaderHooks, *ethtypes.NOOPHeaderHooks, + ethtypes.NOOPBlockBodyHooks, *ethtypes.NOOPBlockBodyHooks, + isMultiCoin, +]() diff --git a/core/types/state_account.go b/core/types/state_account.go index e1bd711670..9e06d8a901 100644 --- a/core/types/state_account.go +++ b/core/types/state_account.go @@ -32,14 +32,7 @@ import ( type isMultiCoin bool -var ( - extras = ethtypes.RegisterExtras[ - ethtypes.NOOPHeaderHooks, *ethtypes.NOOPHeaderHooks, - ethtypes.NOOPBlockBodyHooks, *ethtypes.NOOPBlockBodyHooks, - isMultiCoin, - ]() - IsMultiCoinPayloads = extras.StateAccount -) +var IsMultiCoinPayloads = extras.StateAccount func IsMultiCoin(s ethtypes.StateOrSlimAccount) bool { return bool(extras.StateAccount.Get(s))