Skip to content

refactor: use upstream core/types #875

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
Parent: chore(all): libevm phase 2.5
merged 24 commits into from
Mar 14, 2025
Merged

refactor: use upstream core/types #875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
561d2d8
refactor(core/types): use identical `Account` and `GenesisAlloc` types
ARR4N Mar 13, 2025
4736830
refactor(core/types): use identical `Empty*Hash` variables and `TrieR…
ARR4N Mar 13, 2025
b8ef0c1
refactor(core/types): move `ethtypes.Log` alias to `imports.go`
ARR4N Mar 13, 2025
21753da
refactor(core/types): move multi-coin functionality to `_ext.go` file
ARR4N Mar 13, 2025
51afc6f
refactor(core/types): delete `hashing.go` except for `rlpHash()`
ARR4N Mar 13, 2025
7e122b9
refactor: use upstream `core/types`
ARR4N Mar 14, 2025
1a64fcc
chore: bump `fjl/gencodec` version
ARR4N Mar 14, 2025
0f1a41d
chore: `go mod tidy`
ARR4N Mar 14, 2025
7db48fe
chore: update generated mocks
ARR4N Mar 14, 2025
f004995
Merge branch 'arr4n/remove-libevm-type-identities' into arr4n/upstrea…
ARR4N Mar 14, 2025
9d9385f
chore: re-generate `fjl/gencodec` outputs
ARR4N Mar 14, 2025
fca1fd2
refactor: use upstream `core/types` in tests
ARR4N Mar 14, 2025
47252a3
chore: placate the linter
ARR4N Mar 14, 2025
ca84c13
fix: keep aliases still used by `avalanchego`
ARR4N Mar 14, 2025
5575d9f
fix: changes forgotten in last commit
ARR4N Mar 14, 2025
da24004
fix: use `imports.go` from parent in PR chain
ARR4N Mar 14, 2025
eae37a3
fix: keep all aliases still used by `avalanchego`
ARR4N Mar 14, 2025
632aca3
fix(rpc): `_` import local `types` for registration side effect
ARR4N Mar 14, 2025
6a41a52
Merge branch 'libevm' into arr4n/remove-libevm-type-identities
ARR4N Mar 14, 2025
89d0f3b
Merge branch 'arr4n/remove-libevm-type-identities' into arr4n/upstrea…
ARR4N Mar 14, 2025
c2c0f1d
chore: remove newline + invalid `[]` in doc
ARR4N Mar 14, 2025
554ccf6
Merge branch 'libevm' into arr4n/upstream-core-types
ARR4N Mar 14, 2025
f6ec7e1
Merge branch 'libevm' into arr4n/upstream-core-types
ARR4N Mar 14, 2025
b0a2994
refactor: delete `core/types` aliases by depending on updated `avalan…
ARR4N Mar 14, 2025
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 accounts/abi/bind/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ import (
"io"
"math/big"

"github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/libevm/accounts"
"github.com/ava-labs/libevm/accounts/external"
"github.com/ava-labs/libevm/accounts/keystore"
"github.com/ava-labs/libevm/common"
"github.com/ava-labs/libevm/core/types"
"github.com/ava-labs/libevm/crypto"
"github.com/ava-labs/libevm/log"
)
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/bind/backend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ import (
"errors"
"math/big"

"github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/coreth/interfaces"
"github.com/ava-labs/libevm/common"
"github.com/ava-labs/libevm/core/types"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/bind/backends/simulated.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ import (
"context"

"github.com/ava-labs/coreth/accounts/abi/bind"
"github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/coreth/ethclient/simulated"
"github.com/ava-labs/coreth/interfaces"
"github.com/ava-labs/libevm/common"
"github.com/ava-labs/libevm/core/types"
)

// Verify that SimulatedBackend implements required interfaces
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/bind/base.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ import (
"sync"

"github.com/ava-labs/coreth/accounts/abi"
"github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/coreth/interfaces"
"github.com/ava-labs/coreth/nativeasset"
"github.com/ava-labs/coreth/rpc"
"github.com/ava-labs/libevm/common"
"github.com/ava-labs/libevm/core/types"
"github.com/ava-labs/libevm/crypto"
"github.com/ava-labs/libevm/event"
)
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/bind/base_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ import (

"github.com/ava-labs/coreth/accounts/abi"
"github.com/ava-labs/coreth/accounts/abi/bind"
"github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/coreth/interfaces"
"github.com/ava-labs/coreth/nativeasset"
"github.com/ava-labs/libevm/common"
"github.com/ava-labs/libevm/common/hexutil"
"github.com/ava-labs/libevm/core/types"
"github.com/ava-labs/libevm/crypto"
"github.com/ava-labs/libevm/rlp"
"github.com/stretchr/testify/assert"
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/bind/bind_extra_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ import (
"github.com/ava-labs/coreth/accounts/abi"
"github.com/ava-labs/coreth/accounts/abi/bind"
"github.com/ava-labs/coreth/accounts/abi/bind/backends"
"github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/coreth/eth/ethconfig"
"github.com/ava-labs/coreth/ethclient/simulated"
"github.com/ava-labs/coreth/node"
"github.com/ava-labs/coreth/params"
"github.com/ava-labs/libevm/common"
"github.com/ava-labs/libevm/core/types"
"github.com/ava-labs/libevm/crypto"
)

Expand Down
50 changes: 25 additions & 25 deletions accounts/abi/bind/bind_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ var bindTests = []struct {

"github.com/ava-labs/coreth/accounts/abi/bind"
"github.com/ava-labs/coreth/accounts/abi/bind/backends"
"github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/libevm/core/types"
"github.com/ava-labs/libevm/crypto"
`,
`
Expand Down Expand Up @@ -355,7 +355,7 @@ var bindTests = []struct {

"github.com/ava-labs/coreth/accounts/abi/bind"
"github.com/ava-labs/coreth/accounts/abi/bind/backends"
"github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/libevm/core/types"
"github.com/ava-labs/libevm/crypto"
`,
`
Expand Down Expand Up @@ -401,7 +401,7 @@ var bindTests = []struct {

"github.com/ava-labs/coreth/accounts/abi/bind"
"github.com/ava-labs/coreth/accounts/abi/bind/backends"
"github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/libevm/core/types"
"github.com/ava-labs/libevm/crypto"
`,
`
Expand Down Expand Up @@ -459,7 +459,7 @@ var bindTests = []struct {
"github.com/ava-labs/coreth/accounts/abi/bind"
"github.com/ava-labs/coreth/accounts/abi/bind/backends"
"github.com/ava-labs/libevm/common"
"github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/libevm/core/types"
"github.com/ava-labs/libevm/crypto"
`,
`
Expand Down Expand Up @@ -507,7 +507,7 @@ var bindTests = []struct {

"github.com/ava-labs/coreth/accounts/abi/bind"
"github.com/ava-labs/coreth/accounts/abi/bind/backends"
"github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/libevm/core/types"
"github.com/ava-labs/libevm/crypto"
`,
`
Expand Down Expand Up @@ -574,7 +574,7 @@ var bindTests = []struct {

"github.com/ava-labs/coreth/accounts/abi/bind"
"github.com/ava-labs/coreth/accounts/abi/bind/backends"
"github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/libevm/core/types"
"github.com/ava-labs/libevm/crypto"
`,
`
Expand Down Expand Up @@ -620,7 +620,7 @@ var bindTests = []struct {
"github.com/ava-labs/coreth/accounts/abi/bind"
"github.com/ava-labs/coreth/accounts/abi/bind/backends"
"github.com/ava-labs/libevm/common"
"github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/libevm/core/types"
`,
`
// Create a simulator and wrap a non-deployed contract
Expand Down Expand Up @@ -659,7 +659,7 @@ var bindTests = []struct {
"github.com/ava-labs/coreth/accounts/abi/bind"
"github.com/ava-labs/coreth/accounts/abi/bind/backends"
"github.com/ava-labs/libevm/common"
"github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/libevm/core/types"
`,
`
// Create a simulator and wrap a non-deployed contract
Expand Down Expand Up @@ -706,7 +706,7 @@ var bindTests = []struct {

"github.com/ava-labs/coreth/accounts/abi/bind"
"github.com/ava-labs/coreth/accounts/abi/bind/backends"
"github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/libevm/core/types"
"github.com/ava-labs/libevm/crypto"
`,
`
Expand Down Expand Up @@ -756,7 +756,7 @@ var bindTests = []struct {
"github.com/ava-labs/coreth/accounts/abi/bind"
"github.com/ava-labs/coreth/accounts/abi/bind/backends"
"github.com/ava-labs/libevm/common"
"github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/libevm/core/types"
"github.com/ava-labs/libevm/crypto"
`,
`
Expand Down Expand Up @@ -831,7 +831,7 @@ var bindTests = []struct {

"github.com/ava-labs/coreth/accounts/abi/bind"
"github.com/ava-labs/coreth/accounts/abi/bind/backends"
"github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/libevm/core/types"
"github.com/ava-labs/libevm/crypto"
`,
`
Expand Down Expand Up @@ -925,7 +925,7 @@ var bindTests = []struct {
"github.com/ava-labs/coreth/accounts/abi/bind"
"github.com/ava-labs/coreth/accounts/abi/bind/backends"
"github.com/ava-labs/libevm/common"
"github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/libevm/core/types"
"github.com/ava-labs/libevm/crypto"
`,
`
Expand Down Expand Up @@ -1115,7 +1115,7 @@ var bindTests = []struct {

"github.com/ava-labs/coreth/accounts/abi/bind"
"github.com/ava-labs/coreth/accounts/abi/bind/backends"
"github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/libevm/core/types"
"github.com/ava-labs/libevm/crypto"
`,
`
Expand Down Expand Up @@ -1250,7 +1250,7 @@ var bindTests = []struct {

"github.com/ava-labs/coreth/accounts/abi/bind"
"github.com/ava-labs/coreth/accounts/abi/bind/backends"
"github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/libevm/core/types"
"github.com/ava-labs/libevm/crypto"
`,

Expand Down Expand Up @@ -1392,7 +1392,7 @@ var bindTests = []struct {

"github.com/ava-labs/coreth/accounts/abi/bind"
"github.com/ava-labs/coreth/accounts/abi/bind/backends"
"github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/libevm/core/types"
"github.com/ava-labs/libevm/crypto"
`,
`
Expand Down Expand Up @@ -1458,7 +1458,7 @@ var bindTests = []struct {

"github.com/ava-labs/coreth/accounts/abi/bind"
"github.com/ava-labs/coreth/accounts/abi/bind/backends"
"github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/libevm/core/types"
"github.com/ava-labs/libevm/crypto"
`,
`
Expand Down Expand Up @@ -1568,7 +1568,7 @@ var bindTests = []struct {
"github.com/ava-labs/coreth/accounts/abi/bind"
"github.com/ava-labs/coreth/accounts/abi/bind/backends"
"github.com/ava-labs/libevm/crypto"
"github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/libevm/core/types"
`,
`
// Initialize test accounts
Expand Down Expand Up @@ -1631,7 +1631,7 @@ var bindTests = []struct {
"github.com/ava-labs/coreth/accounts/abi/bind"
"github.com/ava-labs/coreth/accounts/abi/bind/backends"
"github.com/ava-labs/libevm/crypto"
"github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/libevm/core/types"
`,
`
key, _ := crypto.GenerateKey()
Expand Down Expand Up @@ -1692,7 +1692,7 @@ var bindTests = []struct {

"github.com/ava-labs/coreth/accounts/abi/bind"
"github.com/ava-labs/coreth/accounts/abi/bind/backends"
"github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/libevm/core/types"
"github.com/ava-labs/libevm/crypto"
`,
`
Expand Down Expand Up @@ -1753,7 +1753,7 @@ var bindTests = []struct {

"github.com/ava-labs/coreth/accounts/abi/bind"
"github.com/ava-labs/coreth/accounts/abi/bind/backends"
"github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/libevm/core/types"
"github.com/ava-labs/libevm/crypto"
`,
`
Expand Down Expand Up @@ -1841,7 +1841,7 @@ var bindTests = []struct {

"github.com/ava-labs/coreth/accounts/abi/bind"
"github.com/ava-labs/coreth/accounts/abi/bind/backends"
"github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/libevm/core/types"
"github.com/ava-labs/libevm/crypto"
`,
`
Expand Down Expand Up @@ -1911,7 +1911,7 @@ var bindTests = []struct {

"github.com/ava-labs/coreth/accounts/abi/bind"
"github.com/ava-labs/coreth/accounts/abi/bind/backends"
"github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/libevm/core/types"
"github.com/ava-labs/libevm/crypto"
`,
`
Expand Down Expand Up @@ -1963,7 +1963,7 @@ var bindTests = []struct {

"github.com/ava-labs/coreth/accounts/abi/bind"
"github.com/ava-labs/coreth/accounts/abi/bind/backends"
"github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/libevm/core/types"
"github.com/ava-labs/libevm/crypto"
`,
tester: `
Expand Down Expand Up @@ -2011,7 +2011,7 @@ var bindTests = []struct {

"github.com/ava-labs/coreth/accounts/abi/bind"
"github.com/ava-labs/coreth/accounts/abi/bind/backends"
"github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/libevm/core/types"
"github.com/ava-labs/libevm/crypto"
`,
tester: `
Expand Down Expand Up @@ -2052,7 +2052,7 @@ var bindTests = []struct {

"github.com/ava-labs/coreth/accounts/abi/bind"
"github.com/ava-labs/coreth/accounts/abi/bind/backends"
"github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/libevm/core/types"
"github.com/ava-labs/libevm/crypto"
`,
tester: `
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/bind/template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ import (

"github.com/ava-labs/coreth/accounts/abi"
"github.com/ava-labs/coreth/accounts/abi/bind"
"github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/libevm/core/types"
"github.com/ava-labs/coreth/interfaces"
"github.com/ava-labs/libevm/common"
"github.com/ava-labs/libevm/event"
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/bind/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ import (
"errors"
"time"

"github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/coreth/interfaces"
"github.com/ava-labs/libevm/common"
"github.com/ava-labs/libevm/core/types"
"github.com/ava-labs/libevm/log"
)

Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/bind/util_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ import (
"time"

"github.com/ava-labs/coreth/accounts/abi/bind"
"github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/coreth/ethclient/simulated"
"github.com/ava-labs/coreth/params"
"github.com/ava-labs/libevm/common"
"github.com/ava-labs/libevm/core/types"
"github.com/ava-labs/libevm/crypto"
)

Expand Down
2 changes: 1 addition & 1 deletion consensus/consensus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ import (
"math/big"

"github.com/ava-labs/coreth/core/state"
"github.com/ava-labs/coreth/core/types"
"github.com/ava-labs/coreth/params"
"github.com/ava-labs/libevm/common"
"github.com/ava-labs/libevm/core/types"
)

// ChainHeaderReader defines a small collection of methods needed to access the local
Expand Down
Loading
Loading