Skip to content

refactor: Share EVM Utils #4739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maru-ava merged 8 commits into from
Jan 6, 2026
+475 −943
Merged

refactor: Share EVM Utils #4739

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9fa2894
refactor: Share EVM Utils
alarso16 Dec 15, 2025
b3ca14c
fix: nit
alarso16 Dec 17, 2025
92481c4
Merge remote-tracking branch 'origin/master' into alarso16/shared-utils
alarso16 Dec 17, 2025
9415c2a
Merge remote-tracking branch 'origin/master' into alarso16/shared-utils
alarso16 Dec 19, 2025
c0b7926
fix: unneeded change
alarso16 Dec 22, 2025
779bddb
fix: revert downgrade
alarso16 Dec 30, 2025
146ef36
Merge remote-tracking branch 'origin/master' into alarso16/shared-utils
alarso16 Jan 5, 2026
bb2f259
Merge branch 'master' into alarso16/shared-utils
alarso16 Jan 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ require (
github.com/google/renameio/v2 v2.0.0
github.com/google/uuid v1.6.0
github.com/gorilla/mux v1.8.0
github.com/gorilla/rpc v1.2.0
github.com/gorilla/rpc v1.2.1
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
github.com/holiman/uint256 v1.2.4
github.com/huin/goupnp v1.3.0
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ connectrpc.com/grpcreflect v1.3.0/go.mod h1:nfloOtCS8VUQOQ1+GTdFzVg2CJo4ZGaat8JI
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=
github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno=
github.com/CloudyKit/jet/v3 v3.0.0/go.mod h1:HKQPgSJmdK8hdoAbKUUWajkHyHo4RaU5rMdUywE7VMo=
Expand Down Expand Up @@ -366,8 +366,8 @@ github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORR
github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k=
github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
github.com/gorilla/rpc v1.2.0 h1:WvvdC2lNeT1SP32zrIce5l0ECBfbAlmrmSBsuc57wfk=
github.com/gorilla/rpc v1.2.0/go.mod h1:V4h9r+4sF5HnzqbwIez0fKSpANP0zlYd3qR7p36jkTQ=
github.com/gorilla/rpc v1.2.1 h1:yC+LMV5esttgpVvNORL/xX4jvTTEUE30UZhZ5JF7K9k=
github.com/gorilla/rpc v1.2.1/go.mod h1:uNpOihAlF5xRFLuTYhfR0yfCTm0WTQSQttkMSptRfGk=
github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
Expand Down
2 changes: 1 addition & 1 deletion graft/coreth/consensus/dummy/consensus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/ava-labs/avalanchego/graft/coreth/params/extras"
"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/customheader"
"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/customtypes"
"github.com/ava-labs/avalanchego/graft/coreth/utils"
"github.com/ava-labs/avalanchego/graft/evm/utils"
"github.com/ava-labs/avalanchego/vms/components/gas"
"github.com/ava-labs/avalanchego/vms/evm/acp226"
)
Expand Down
2 changes: 1 addition & 1 deletion graft/coreth/core/extstate/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package extstate
import (
"github.com/ava-labs/libevm/core/state"

"github.com/ava-labs/avalanchego/graft/coreth/utils"
"github.com/ava-labs/avalanchego/graft/evm/utils"
)

type workerPool struct {
Expand Down
2 changes: 1 addition & 1 deletion graft/coreth/core/genesis_extra_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import (
"github.com/ava-labs/avalanchego/graft/coreth/params"
"github.com/ava-labs/avalanchego/graft/coreth/params/extras"
"github.com/ava-labs/avalanchego/graft/coreth/params/paramstest"
"github.com/ava-labs/avalanchego/graft/coreth/utils"
"github.com/ava-labs/avalanchego/graft/evm/utils"
"github.com/ava-labs/avalanchego/upgrade/upgradetest"
"github.com/ava-labs/libevm/common"
"github.com/ava-labs/libevm/core/rawdb"
Expand Down
2 changes: 1 addition & 1 deletion graft/coreth/core/genesis_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ import (
"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/upgrade/ap3"
"github.com/ava-labs/avalanchego/graft/coreth/precompile/contracts/warp"
"github.com/ava-labs/avalanchego/graft/coreth/triedb/pathdb"
"github.com/ava-labs/avalanchego/graft/coreth/utils"
"github.com/ava-labs/avalanchego/graft/evm/firewood"
"github.com/ava-labs/avalanchego/graft/evm/utils"
"github.com/ava-labs/avalanchego/vms/evm/sync/customrawdb"
"github.com/ava-labs/libevm/common"
"github.com/ava-labs/libevm/core/rawdb"
Expand Down
2 changes: 1 addition & 1 deletion graft/coreth/core/state/snapshot/difflayer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"math/rand"
"testing"

"github.com/ava-labs/avalanchego/graft/coreth/utils"
"github.com/ava-labs/avalanchego/graft/evm/utils"
"github.com/ava-labs/libevm/common"
"github.com/ava-labs/libevm/crypto"
"github.com/ava-labs/libevm/ethdb/memorydb"
Expand Down
2 changes: 1 addition & 1 deletion graft/coreth/core/state/snapshot/disklayer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
"sync"
"time"

"github.com/ava-labs/avalanchego/graft/coreth/utils"
"github.com/ava-labs/avalanchego/graft/evm/utils"
"github.com/ava-labs/libevm/common"
"github.com/ava-labs/libevm/core/rawdb"
"github.com/ava-labs/libevm/core/types"
Expand Down
2 changes: 1 addition & 1 deletion graft/coreth/core/state/snapshot/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
"fmt"
"time"

"github.com/ava-labs/avalanchego/graft/coreth/utils"
"github.com/ava-labs/avalanchego/graft/evm/utils"
"github.com/ava-labs/avalanchego/vms/evm/sync/customrawdb"
"github.com/ava-labs/libevm/common"
"github.com/ava-labs/libevm/core/rawdb"
Expand Down
2 changes: 1 addition & 1 deletion graft/coreth/core/state/snapshot/snapshot_ext.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/ava-labs/libevm/common"
"github.com/ava-labs/libevm/ethdb"

"github.com/ava-labs/avalanchego/graft/coreth/utils"
"github.com/ava-labs/avalanchego/graft/evm/utils"
)

func (t *Tree) DiskAccountIterator(seek common.Hash) AccountIterator {
Expand Down
2 changes: 1 addition & 1 deletion graft/coreth/core/state_processor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ import (
"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/upgrade/ap1"
"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/upgrade/ap3"
"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/upgrade/cortina"
"github.com/ava-labs/avalanchego/graft/coreth/utils"
"github.com/ava-labs/avalanchego/graft/evm/utils"
"github.com/ava-labs/avalanchego/upgrade"
"github.com/ava-labs/avalanchego/vms/evm/acp176"
"github.com/ava-labs/libevm/common"
Expand Down
2 changes: 1 addition & 1 deletion graft/coreth/core/txpool/legacypool/legacypool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ import (
"github.com/ava-labs/avalanchego/graft/coreth/core/txpool"
"github.com/ava-labs/avalanchego/graft/coreth/params"
"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/customheader"
"github.com/ava-labs/avalanchego/graft/coreth/utils"
"github.com/ava-labs/avalanchego/graft/evm/utils"
"github.com/ava-labs/libevm/common"
"github.com/ava-labs/libevm/common/prque"
"github.com/ava-labs/libevm/core/state"
Expand Down
3 changes: 1 addition & 2 deletions graft/coreth/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ require (
github.com/deckarep/golang-set/v2 v2.1.0
github.com/go-cmd/cmd v1.4.3
github.com/google/go-cmp v0.7.0
github.com/gorilla/rpc v1.2.0
github.com/gorilla/websocket v1.5.0
github.com/hashicorp/go-bexpr v0.1.10
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d
Expand Down Expand Up @@ -48,7 +47,6 @@ require (
require (
connectrpc.com/connect v1.18.1 // indirect
connectrpc.com/grpcreflect v1.3.0 // indirect
github.com/BurntSushi/toml v1.5.0 // indirect
github.com/DataDog/zstd v1.5.2 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/StephenButtolph/canoto v0.17.3 // indirect
Expand Down Expand Up @@ -98,6 +96,7 @@ require (
github.com/google/renameio/v2 v2.0.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/mux v1.8.0 // indirect
github.com/gorilla/rpc v1.2.1 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 // indirect
github.com/huin/goupnp v1.3.0 // indirect
Expand Down
8 changes: 4 additions & 4 deletions graft/coreth/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ connectrpc.com/grpcreflect v1.3.0 h1:Y4V+ACf8/vOb1XOc251Qun7jMB75gCUNw6llvB9csXc
connectrpc.com/grpcreflect v1.3.0/go.mod h1:nfloOtCS8VUQOQ1+GTdFzVg2CJo4ZGaat8JIovCtDYs=
github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=
github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno=
github.com/CloudyKit/jet/v3 v3.0.0/go.mod h1:HKQPgSJmdK8hdoAbKUUWajkHyHo4RaU5rMdUywE7VMo=
github.com/DataDog/zstd v1.5.2 h1:vUG4lAyuPCXO0TLbXvPv7EB7cNK1QV/luu55UHLrrn8=
Expand Down Expand Up @@ -251,8 +251,8 @@ github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
github.com/gorilla/rpc v1.2.0 h1:WvvdC2lNeT1SP32zrIce5l0ECBfbAlmrmSBsuc57wfk=
github.com/gorilla/rpc v1.2.0/go.mod h1:V4h9r+4sF5HnzqbwIez0fKSpANP0zlYd3qR7p36jkTQ=
github.com/gorilla/rpc v1.2.1 h1:yC+LMV5esttgpVvNORL/xX4jvTTEUE30UZhZ5JF7K9k=
github.com/gorilla/rpc v1.2.1/go.mod h1:uNpOihAlF5xRFLuTYhfR0yfCTm0WTQSQttkMSptRfGk=
github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
Expand Down
2 changes: 1 addition & 1 deletion graft/coreth/internal/ethapi/api_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ import (
"github.com/ava-labs/avalanchego/graft/coreth/params"
"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/upgrade/ap3"
"github.com/ava-labs/avalanchego/graft/coreth/rpc"
"github.com/ava-labs/avalanchego/graft/coreth/utils"
"github.com/ava-labs/avalanchego/graft/evm/utils"
"github.com/ava-labs/libevm/accounts"
"github.com/ava-labs/libevm/accounts/keystore"
"github.com/ava-labs/libevm/common"
Expand Down
2 changes: 1 addition & 1 deletion graft/coreth/network/peer_tracker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/ava-labs/libevm/log"
"github.com/ava-labs/libevm/metrics"

"github.com/ava-labs/avalanchego/graft/coreth/utils/rand"
"github.com/ava-labs/avalanchego/graft/evm/utils/rand"
"github.com/ava-labs/avalanchego/ids"
"github.com/ava-labs/avalanchego/utils/set"
"github.com/ava-labs/avalanchego/version"
Expand Down
2 changes: 1 addition & 1 deletion graft/coreth/params/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
"math/big"

"github.com/ava-labs/avalanchego/graft/coreth/params/extras"
"github.com/ava-labs/avalanchego/graft/coreth/utils"
"github.com/ava-labs/avalanchego/graft/evm/utils"
"github.com/ava-labs/libevm/libevm"
ethparams "github.com/ava-labs/libevm/params"
)
Expand Down
2 changes: 1 addition & 1 deletion graft/coreth/params/config_extra.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"math/big"

"github.com/ava-labs/avalanchego/graft/coreth/params/extras"
"github.com/ava-labs/avalanchego/graft/coreth/utils"
"github.com/ava-labs/avalanchego/graft/evm/utils"
"github.com/ava-labs/avalanchego/upgrade"
)

Expand Down
2 changes: 1 addition & 1 deletion graft/coreth/params/config_extra_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/stretchr/testify/require"

"github.com/ava-labs/avalanchego/graft/coreth/params/extras"
"github.com/ava-labs/avalanchego/graft/coreth/utils"
"github.com/ava-labs/avalanchego/graft/evm/utils"
"github.com/ava-labs/avalanchego/upgrade/upgradetest"
)

Expand Down
2 changes: 1 addition & 1 deletion graft/coreth/params/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import (
"time"

"github.com/ava-labs/avalanchego/graft/coreth/params/extras"
"github.com/ava-labs/avalanchego/graft/coreth/utils"
"github.com/ava-labs/avalanchego/graft/evm/utils"
ethparams "github.com/ava-labs/libevm/params"
)

Expand Down
2 changes: 1 addition & 1 deletion graft/coreth/params/extras/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

"github.com/ava-labs/libevm/common"

"github.com/ava-labs/avalanchego/graft/coreth/utils"
"github.com/ava-labs/avalanchego/graft/evm/utils"
"github.com/ava-labs/avalanchego/snow"

ethparams "github.com/ava-labs/libevm/params"
Expand Down
2 changes: 1 addition & 1 deletion graft/coreth/params/extras/config_extra_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/stretchr/testify/require"

"github.com/ava-labs/avalanchego/graft/coreth/utils"
"github.com/ava-labs/avalanchego/graft/evm/utils"
)

func TestIsTimestampForked(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion graft/coreth/params/extras/network_upgrades.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"reflect"
"strconv"

"github.com/ava-labs/avalanchego/graft/coreth/utils"
"github.com/ava-labs/avalanchego/graft/evm/utils"
"github.com/ava-labs/avalanchego/upgrade"

ethparams "github.com/ava-labs/libevm/params"
Expand Down
2 changes: 1 addition & 1 deletion graft/coreth/params/extras/precompile_upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

"github.com/ava-labs/avalanchego/graft/coreth/precompile/modules"
"github.com/ava-labs/avalanchego/graft/coreth/precompile/precompileconfig"
"github.com/ava-labs/avalanchego/graft/coreth/utils"
"github.com/ava-labs/avalanchego/graft/evm/utils"

ethparams "github.com/ava-labs/libevm/params"
)
Expand Down
2 changes: 1 addition & 1 deletion graft/coreth/plugin/evm/atomic/vm/block_extension.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/customtypes"
"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/extension"
"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/upgrade/ap5"
"github.com/ava-labs/avalanchego/graft/coreth/utils"
"github.com/ava-labs/avalanchego/graft/evm/utils"

safemath "github.com/ava-labs/avalanchego/utils/math"
)
Expand Down
2 changes: 1 addition & 1 deletion graft/coreth/plugin/evm/atomic/vm/export_tx_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"github.com/ava-labs/avalanchego/graft/coreth/params/extras/extrastest"
"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/atomic"
"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/vmtest"
"github.com/ava-labs/avalanchego/graft/coreth/utils"
"github.com/ava-labs/avalanchego/graft/evm/utils"
"github.com/ava-labs/avalanchego/ids"
"github.com/ava-labs/avalanchego/snow/snowtest"
"github.com/ava-labs/avalanchego/upgrade/upgradetest"
Expand Down
2 changes: 1 addition & 1 deletion graft/coreth/plugin/evm/atomic/vm/import_tx_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/atomic"
"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/upgrade/ap0"
"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/vmtest"
"github.com/ava-labs/avalanchego/graft/coreth/utils"
"github.com/ava-labs/avalanchego/graft/evm/utils"
"github.com/ava-labs/avalanchego/ids"
"github.com/ava-labs/avalanchego/snow/snowtest"
"github.com/ava-labs/avalanchego/upgrade/upgradetest"
Expand Down
2 changes: 1 addition & 1 deletion graft/coreth/plugin/evm/atomic/vm/tx_gossip_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/ava-labs/avalanchego/database/memdb"
"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/atomic"
"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/vmtest"
"github.com/ava-labs/avalanchego/graft/coreth/utils/utilstest"
"github.com/ava-labs/avalanchego/graft/evm/utils/utilstest"
"github.com/ava-labs/avalanchego/ids"
"github.com/ava-labs/avalanchego/network/p2p"
"github.com/ava-labs/avalanchego/network/p2p/gossip"
Expand Down
2 changes: 1 addition & 1 deletion graft/coreth/plugin/evm/atomic/vm/tx_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

"github.com/ava-labs/avalanchego/graft/coreth/params/extras"
"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/atomic"
"github.com/ava-labs/avalanchego/graft/coreth/utils"
"github.com/ava-labs/avalanchego/graft/evm/utils"
"github.com/ava-labs/avalanchego/ids"
"github.com/ava-labs/avalanchego/snow"
"github.com/ava-labs/avalanchego/upgrade/upgradetest"
Expand Down
4 changes: 2 additions & 2 deletions graft/coreth/plugin/evm/atomic/vm/vm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ import (
"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/message"
"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/upgrade/ap5"
"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/vmerrors"
"github.com/ava-labs/avalanchego/graft/coreth/utils"
"github.com/ava-labs/avalanchego/graft/coreth/utils/rpc"
"github.com/ava-labs/avalanchego/graft/evm/utils"
"github.com/ava-labs/avalanchego/graft/evm/utils/rpc"
"github.com/ava-labs/avalanchego/ids"
"github.com/ava-labs/avalanchego/network/p2p"
"github.com/ava-labs/avalanchego/snow"
Expand Down
2 changes: 1 addition & 1 deletion graft/coreth/plugin/evm/atomic/vm/vm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/upgrade/ap0"
"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/upgrade/ap1"
"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/vmtest"
"github.com/ava-labs/avalanchego/graft/coreth/utils/utilstest"
"github.com/ava-labs/avalanchego/graft/evm/utils/utilstest"
"github.com/ava-labs/avalanchego/ids"
"github.com/ava-labs/avalanchego/snow"
"github.com/ava-labs/avalanchego/upgrade/upgradetest"
Expand Down
2 changes: 1 addition & 1 deletion graft/coreth/plugin/evm/config/default_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/ava-labs/libevm/common"

"github.com/ava-labs/avalanchego/graft/coreth/utils"
"github.com/ava-labs/avalanchego/graft/evm/utils"
)

const defaultCommitInterval = 4096
Expand Down
2 changes: 1 addition & 1 deletion graft/coreth/plugin/evm/customheader/base_fee_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/upgrade/ap4"
"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/upgrade/ap5"
"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/upgrade/etna"
"github.com/ava-labs/avalanchego/graft/coreth/utils"
"github.com/ava-labs/avalanchego/graft/evm/utils"
"github.com/ava-labs/avalanchego/vms/components/gas"
"github.com/ava-labs/avalanchego/vms/evm/acp176"
)
Expand Down
2 changes: 1 addition & 1 deletion graft/coreth/plugin/evm/customheader/extra_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/upgrade/ap3"
"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/upgrade/ap4"
"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/upgrade/ap5"
"github.com/ava-labs/avalanchego/graft/coreth/utils"
"github.com/ava-labs/avalanchego/graft/evm/utils"
"github.com/ava-labs/avalanchego/vms/components/gas"
"github.com/ava-labs/avalanchego/vms/evm/acp176"
)
Expand Down
2 changes: 1 addition & 1 deletion graft/coreth/plugin/evm/customheader/gas_limit_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/upgrade/ap1"
"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/upgrade/ap5"
"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/upgrade/cortina"
"github.com/ava-labs/avalanchego/graft/coreth/utils"
"github.com/ava-labs/avalanchego/graft/evm/utils"
"github.com/ava-labs/avalanchego/utils/math"
"github.com/ava-labs/avalanchego/vms/components/gas"
"github.com/ava-labs/avalanchego/vms/evm/acp176"
Expand Down
4 changes: 2 additions & 2 deletions graft/coreth/plugin/evm/customheader/min_delay_excess_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (

"github.com/ava-labs/avalanchego/graft/coreth/params/extras"
"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/customtypes"
"github.com/ava-labs/avalanchego/graft/coreth/utils"
"github.com/ava-labs/avalanchego/graft/coreth/utils/utilstest"
"github.com/ava-labs/avalanchego/graft/evm/utils"
"github.com/ava-labs/avalanchego/graft/evm/utils/utilstest"
"github.com/ava-labs/avalanchego/vms/evm/acp226"
)

Expand Down
2 changes: 1 addition & 1 deletion graft/coreth/plugin/evm/customheader/time_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

"github.com/ava-labs/avalanchego/graft/coreth/params/extras"
"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/customtypes"
"github.com/ava-labs/avalanchego/graft/coreth/utils"
"github.com/ava-labs/avalanchego/graft/evm/utils"
"github.com/ava-labs/avalanchego/vms/evm/acp226"
)

Expand Down
4 changes: 2 additions & 2 deletions graft/coreth/plugin/evm/customtypes/block_ext_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
"github.com/google/go-cmp/cmp/cmpopts"
"github.com/stretchr/testify/require"

"github.com/ava-labs/avalanchego/graft/coreth/utils"
"github.com/ava-labs/avalanchego/graft/coreth/utils/utilstest"
"github.com/ava-labs/avalanchego/graft/evm/utils"
"github.com/ava-labs/avalanchego/graft/evm/utils/utilstest"
"github.com/ava-labs/avalanchego/vms/evm/acp226"
)

Expand Down
2 changes: 1 addition & 1 deletion graft/coreth/plugin/evm/customtypes/header_ext_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/ava-labs/libevm/rlp"
"github.com/stretchr/testify/require"

"github.com/ava-labs/avalanchego/graft/coreth/utils/utilstest"
"github.com/ava-labs/avalanchego/graft/evm/utils/utilstest"
"github.com/ava-labs/avalanchego/vms/evm/acp226"
)

Expand Down
Loading