Skip to content

Commit 0160c98

Browse files
StephenButtolphStephenButtolph
authored
Update coreth to v0.15.1-rc.0 (#3875)
1 parent 71f7acb commit 0160c98

File tree

15 files changed

+36
-32
lines changed

15 files changed

+36
-32
lines changed

‎go.mod

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ require (
1414
github.com/NYTimes/gziphandler v1.1.1
1515
github.com/StephenButtolph/canoto v0.15.0
1616
github.com/antithesishq/antithesis-sdk-go v0.3.8
17-
github.com/ava-labs/coreth v0.15.0-rc.1
17+
github.com/ava-labs/coreth v0.15.1-rc.0
1818
github.com/ava-labs/ledger-avalanche/go v0.0.0-20241009183145-e6f90a8a1a60
19+
github.com/ava-labs/libevm v1.13.14-0.2.0.release
1920
github.com/btcsuite/btcd/btcutil v1.1.3
2021
github.com/cockroachdb/pebble v0.0.0-20230928194634-aa077af62593
2122
github.com/compose-spec/compose-go v1.20.2
2223
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0
23-
github.com/ethereum/go-ethereum v1.13.14
2424
github.com/google/btree v1.1.2
2525
github.com/google/renameio/v2 v2.0.0
2626
github.com/google/uuid v1.6.0
@@ -82,8 +82,8 @@ require (
8282
require (
8383
github.com/FactomProject/basen v0.0.0-20150613233007-fe3947df716e // indirect
8484
github.com/FactomProject/btcutilecc v0.0.0-20130527213604-d3a63a5752ec // indirect
85+
github.com/Microsoft/go-winio v0.6.1 // indirect
8586
github.com/VictoriaMetrics/fastcache v1.12.1 // indirect
86-
github.com/ava-labs/libevm v0.0.0-20250320152422-7be6bee7ab32 // indirect
8787
github.com/beorn7/perks v1.0.1 // indirect
8888
github.com/bits-and-blooms/bitset v1.10.0 // indirect
8989
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
@@ -121,6 +121,7 @@ require (
121121
github.com/go-openapi/swag v0.22.3 // indirect
122122
github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
123123
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
124+
github.com/gofrs/flock v0.8.1 // indirect
124125
github.com/gogo/protobuf v1.3.2 // indirect
125126
github.com/golang/protobuf v1.5.4 // indirect
126127
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
@@ -185,7 +186,7 @@ require (
185186
golang.org/x/oauth2 v0.21.0 // indirect
186187
golang.org/x/sys v0.30.0 // indirect
187188
golang.org/x/text v0.22.0 // indirect
188-
golang.org/x/tools v0.28.0 // indirect
189+
golang.org/x/tools v0.29.0 // indirect
189190
google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 // indirect
190191
gopkg.in/inf.v0 v0.9.1 // indirect
191192
gopkg.in/ini.v1 v1.67.0 // indirect

‎go.sum

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ github.com/FactomProject/basen v0.0.0-20150613233007-fe3947df716e/go.mod h1:kGUq
5050
github.com/FactomProject/btcutilecc v0.0.0-20130527213604-d3a63a5752ec h1:1Qb69mGp/UtRPn422BH4/Y4Q3SLUrD9KHuDkm8iodFc=
5151
github.com/FactomProject/btcutilecc v0.0.0-20130527213604-d3a63a5752ec/go.mod h1:CD8UlnlLDiqb36L110uqiP2iSflVjx9g/3U9hCI4q2U=
5252
github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY=
53+
github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
54+
github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
5355
github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I=
5456
github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
5557
github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0=
@@ -66,12 +68,12 @@ github.com/antithesishq/antithesis-sdk-go v0.3.8/go.mod h1:IUpT2DPAKh6i/YhSbt6Gl
6668
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
6769
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
6870
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
69-
github.com/ava-labs/coreth v0.15.0-rc.1 h1:L+VOtS559IJvvONOIes4ZlJp0McZgzOBrunb0V0vBPE=
70-
github.com/ava-labs/coreth v0.15.0-rc.1/go.mod h1:u0XBMX0HHg87vodvqKuSywwq5MMYrKstWAUZaTKyTDE=
71+
github.com/ava-labs/coreth v0.15.1-rc.0 h1:ahuIyp1hb4xiZ3DTA9uKIpVBMpMyXO3VHvwcxQUboSo=
72+
github.com/ava-labs/coreth v0.15.1-rc.0/go.mod h1:BDKMO8sL2wuvWbtMRzJAsJrleQULHA+CHRbkh5hRG5o=
7173
github.com/ava-labs/ledger-avalanche/go v0.0.0-20241009183145-e6f90a8a1a60 h1:EL66gtXOAwR/4KYBjOV03LTWgkEXvLePribLlJNu4g0=
7274
github.com/ava-labs/ledger-avalanche/go v0.0.0-20241009183145-e6f90a8a1a60/go.mod h1:/7qKobTfbzBu7eSTVaXMTr56yTYk4j2Px6/8G+idxHo=
73-
github.com/ava-labs/libevm v0.0.0-20250320152422-7be6bee7ab32 h1:l8Q4JyvTY+22e6lMLcd6WamMYFJc36MfJmeKflis7nQ=
74-
github.com/ava-labs/libevm v0.0.0-20250320152422-7be6bee7ab32/go.mod h1:+Iol+sVQ1KyoBsHf3veyrBmHCXr3xXRWq6ZXkgVfNLU=
75+
github.com/ava-labs/libevm v1.13.14-0.2.0.release h1:uKGCc5/ceeBbfAPRVtBUxbQt50WzB2pEDb8Uy93ePgQ=
76+
github.com/ava-labs/libevm v1.13.14-0.2.0.release/go.mod h1:+Iol+sVQ1KyoBsHf3veyrBmHCXr3xXRWq6ZXkgVfNLU=
7577
github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=
7678
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
7779
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
@@ -196,8 +198,6 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7
196198
github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw=
197199
github.com/ethereum/c-kzg-4844 v0.4.0 h1:3MS1s4JtA868KpJxroZoepdV0ZKBp3u/O5HcZ7R3nlY=
198200
github.com/ethereum/c-kzg-4844 v0.4.0/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0=
199-
github.com/ethereum/go-ethereum v1.13.14 h1:EwiY3FZP94derMCIam1iW4HFVrSgIcpsu0HwTQtm6CQ=
200-
github.com/ethereum/go-ethereum v1.13.14/go.mod h1:TN8ZiHrdJwSe8Cb6x+p0hs5CxhJZPbqB7hHkaUXcmIU=
201201
github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8=
202202
github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
203203
github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4=
@@ -250,6 +250,8 @@ github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4
250250
github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
251251
github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
252252
github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
253+
github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw=
254+
github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
253255
github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s=
254256
github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4=
255257
github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
@@ -309,8 +311,8 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
309311
github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
310312
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
311313
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
312-
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
313-
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
314+
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
315+
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
314316
github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
315317
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
316318
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
@@ -965,8 +967,8 @@ golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4f
965967
golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
966968
golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
967969
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
968-
golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8=
969-
golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw=
970+
golang.org/x/tools v0.29.0 h1:Xx0h3TtM9rzQpQuR4dKLrdglAmCEN5Oi+P74JdhdzXE=
971+
golang.org/x/tools v0.29.0/go.mod h1:KMQVMRsVxU6nHCFXrBPhDB8XncLNLM0lIy/F14RP588=
970972
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
971973
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
972974
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎tests/e2e/c/dynamic_fees.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import (
88
"strings"
99
"time"
1010

11-
"github.com/ava-labs/coreth/core/types"
1211
"github.com/ava-labs/coreth/params"
1312
"github.com/ava-labs/coreth/plugin/evm/upgrade/acp176"
1413
"github.com/ava-labs/coreth/plugin/evm/upgrade/cortina"
15-
"github.com/ethereum/go-ethereum/accounts/abi"
16-
"github.com/ethereum/go-ethereum/common"
14+
"github.com/ava-labs/libevm/accounts/abi"
15+
"github.com/ava-labs/libevm/common"
16+
"github.com/ava-labs/libevm/core/types"
1717
"github.com/onsi/ginkgo/v2"
1818
"github.com/stretchr/testify/require"
1919
"go.uber.org/zap"

‎tests/e2e/c/interchain_workflow.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package c
66
import (
77
"math/big"
88

9-
"github.com/ava-labs/coreth/core/types"
9+
"github.com/ava-labs/libevm/core/types"
1010
"github.com/onsi/ginkgo/v2"
1111
"github.com/stretchr/testify/require"
1212

‎tests/fixture/e2e/helpers.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ import (
1313
"strings"
1414
"time"
1515

16-
"github.com/ava-labs/coreth/core/types"
1716
"github.com/ava-labs/coreth/ethclient"
18-
"github.com/ava-labs/coreth/interfaces"
17+
"github.com/ava-labs/libevm/core/types"
1918
"github.com/stretchr/testify/require"
2019
"go.uber.org/zap"
2120

@@ -29,6 +28,8 @@ import (
2928
"github.com/ava-labs/avalanchego/wallet/chain/p/builder"
3029
"github.com/ava-labs/avalanchego/wallet/subnet/primary"
3130
"github.com/ava-labs/avalanchego/wallet/subnet/primary/common"
31+
32+
ethereum "github.com/ava-labs/libevm"
3233
)
3334

3435
const (
@@ -178,7 +179,7 @@ func SendEthTransaction(tc tests.TestContext, ethClient ethclient.Client, signed
178179
tc.Eventually(func() bool {
179180
var err error
180181
receipt, err = ethClient.TransactionReceipt(tc.DefaultContext(), txID)
181-
if errors.Is(err, interfaces.NotFound) {
182+
if errors.Is(err, ethereum.NotFound) {
182183
return false // Transaction is still pending
183184
}
184185
require.NoError(err)

‎utils/crypto/secp256k1/secp256k1.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88
"fmt"
99
"strings"
1010

11+
"github.com/ava-labs/libevm/common"
12+
"github.com/ava-labs/libevm/crypto"
1113
"github.com/decred/dcrd/dcrec/secp256k1/v4/ecdsa"
12-
"github.com/ethereum/go-ethereum/common"
13-
"github.com/ethereum/go-ethereum/crypto"
1414

1515
"github.com/ava-labs/avalanchego/cache"
1616
"github.com/ava-labs/avalanchego/ids"

‎vms/secp256k1fx/keychain.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"fmt"
99
"strings"
1010

11-
"github.com/ethereum/go-ethereum/common"
11+
"github.com/ava-labs/libevm/common"
1212

1313
"github.com/ava-labs/avalanchego/ids"
1414
"github.com/ava-labs/avalanchego/utils/crypto/keychain"

‎wallet/chain/c/backend.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"github.com/ava-labs/avalanchego/vms/components/avax"
1818
"github.com/ava-labs/avalanchego/wallet/subnet/primary/common"
1919

20-
ethcommon "github.com/ethereum/go-ethereum/common"
20+
ethcommon "github.com/ava-labs/libevm/common"
2121
)
2222

2323
var (

‎wallet/chain/c/builder.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"github.com/ava-labs/avalanchego/vms/secp256k1fx"
1919
"github.com/ava-labs/avalanchego/wallet/subnet/primary/common"
2020

21-
ethcommon "github.com/ethereum/go-ethereum/common"
21+
ethcommon "github.com/ava-labs/libevm/common"
2222
)
2323

2424
const avaxConversionRateInt = 1_000_000_000

‎wallet/chain/c/builder_with_options.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/ava-labs/avalanchego/vms/secp256k1fx"
1313
"github.com/ava-labs/avalanchego/wallet/subnet/primary/common"
1414

15-
ethcommon "github.com/ethereum/go-ethereum/common"
15+
ethcommon "github.com/ava-labs/libevm/common"
1616
)
1717

1818
var _ Builder = (*builderWithOptions)(nil)

‎wallet/chain/c/signer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"fmt"
1010

1111
"github.com/ava-labs/coreth/plugin/evm/atomic"
12-
"github.com/ethereum/go-ethereum/common"
12+
"github.com/ava-labs/libevm/common"
1313

1414
"github.com/ava-labs/avalanchego/database"
1515
"github.com/ava-labs/avalanchego/ids"

‎wallet/chain/c/wallet.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"github.com/ava-labs/avalanchego/vms/secp256k1fx"
1818
"github.com/ava-labs/avalanchego/wallet/subnet/primary/common"
1919

20-
ethcommon "github.com/ethereum/go-ethereum/common"
20+
ethcommon "github.com/ava-labs/libevm/common"
2121
)
2222

2323
var _ Wallet = (*wallet)(nil)

‎wallet/chain/c/wallet_with_options.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/ava-labs/avalanchego/vms/secp256k1fx"
1111
"github.com/ava-labs/avalanchego/wallet/subnet/primary/common"
1212

13-
ethcommon "github.com/ethereum/go-ethereum/common"
13+
ethcommon "github.com/ava-labs/libevm/common"
1414
)
1515

1616
var _ Wallet = (*walletWithOptions)(nil)

‎wallet/subnet/primary/api.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
pbuilder "github.com/ava-labs/avalanchego/wallet/chain/p/builder"
2929
xbuilder "github.com/ava-labs/avalanchego/wallet/chain/x/builder"
3030
walletcommon "github.com/ava-labs/avalanchego/wallet/subnet/primary/common"
31-
ethcommon "github.com/ethereum/go-ethereum/common"
31+
ethcommon "github.com/ava-labs/libevm/common"
3232
)
3333

3434
const (

‎wallet/subnet/primary/common/options.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/ava-labs/avalanchego/utils/set"
1313
"github.com/ava-labs/avalanchego/vms/secp256k1fx"
1414

15-
ethcommon "github.com/ethereum/go-ethereum/common"
15+
ethcommon "github.com/ava-labs/libevm/common"
1616
)
1717

1818
const defaultPollFrequency = 100 * time.Millisecond

0 commit comments

Comments
 (0)