Skip to content
This repository was archived by the owner on Nov 25, 2025. It is now read-only.

Commit 98f84c5

Browse files
author
Darioush Jalali
authored
use libevm v1.13.14-0.1.0.rc-2 (#694)
1 parent 35736dd commit 98f84c5

File tree

5 files changed

+12
-17
lines changed

5 files changed

+12
-17
lines changed

core/state/statedb_multicoin_test.go

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"github.com/ava-labs/coreth/core/types"
1313
"github.com/ava-labs/libevm/common"
1414
"github.com/ava-labs/libevm/crypto"
15-
"github.com/ava-labs/libevm/rlp"
1615
"github.com/holiman/uint256"
1716
)
1817

@@ -147,16 +146,12 @@ func TestGenerateMultiCoinAccounts(t *testing.T) {
147146

148147
// Get latest snapshot and make sure it has the correct account and storage
149148
snap := snaps.Snapshot(root)
150-
snapAccount, err := snap.AccountRLP(addrHash)
149+
snapAccount, err := snap.Account(addrHash)
151150
if err != nil {
152151
t.Fatal(err)
153152
}
154-
account := new(types.StateAccount)
155-
if err := rlp.DecodeBytes(snapAccount, account); err != nil {
156-
t.Fatal(err)
157-
}
158-
if !types.IsMultiCoin(account) {
159-
t.Fatalf("Expected SnapAccount to return IsMultiCoin: true, found: %v", types.IsMultiCoin(account))
153+
if !types.IsMultiCoin(snapAccount) {
154+
t.Fatalf("Expected SnapAccount to return IsMultiCoin: true, found: false")
160155
}
161156

162157
NormalizeCoinID(&assetID)

core/types/state_account.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,6 @@ type isMultiCoin bool
4848

4949
var IsMultiCoinPayloads = ethtypes.RegisterExtras[isMultiCoin]()
5050

51-
func IsMultiCoin(a *StateAccount) bool {
52-
return bool(IsMultiCoinPayloads.FromStateAccount(a))
51+
func IsMultiCoin(a ethtypes.ExtraPayloadCarrier) bool {
52+
return bool(IsMultiCoinPayloads.FromPayloadCarrier(a))
5353
}

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ go 1.22.8
44

55
require (
66
github.com/VictoriaMetrics/fastcache v1.12.1
7-
github.com/ava-labs/avalanchego v1.11.13-0.20241106174551-4fb3f3c6b195
8-
github.com/ava-labs/libevm v1.13.14-0.1.0-rc.1.0.20241126163706-cd51330a5e2e
7+
github.com/ava-labs/avalanchego v1.12.0-initial-poc.9.0.20241129191047-0a4ba1bb7045
8+
github.com/ava-labs/libevm v1.13.14-0.1.0.rc-2
99
github.com/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233
1010
github.com/davecgh/go-spew v1.1.1
1111
github.com/deckarep/golang-set/v2 v2.1.0

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY
5656
github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah4HI848JfFxHt+iPb26b4zyfspmqY0/8=
5757
github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=
5858
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
59-
github.com/ava-labs/avalanchego v1.11.13-0.20241106174551-4fb3f3c6b195 h1:dyf52xlqlA/9SaiCv29oqbitRAYu7L890zK774xDNrE=
60-
github.com/ava-labs/avalanchego v1.11.13-0.20241106174551-4fb3f3c6b195/go.mod h1:eZ/UmH4rDhhgL/FLqtJZYJ7ka73m88RmLrOoAyZFgD4=
61-
github.com/ava-labs/libevm v1.13.14-0.1.0-rc.1.0.20241126163706-cd51330a5e2e h1:WwDl/jyHr4oJ1VYUi+PEu6l05Vcl4rZv1xXJ0vVP1gI=
62-
github.com/ava-labs/libevm v1.13.14-0.1.0-rc.1.0.20241126163706-cd51330a5e2e/go.mod h1:yBctIV/wnxXTF38h95943jvpuk4aj07TrjbpoGor6LQ=
59+
github.com/ava-labs/avalanchego v1.12.0-initial-poc.9.0.20241129191047-0a4ba1bb7045 h1:oOR9jYAlNm3FgWWatjCZIeOslLlmmbnCrqAErQDHngk=
60+
github.com/ava-labs/avalanchego v1.12.0-initial-poc.9.0.20241129191047-0a4ba1bb7045/go.mod h1:tubX8cWRjtVe6s6sm/2xeljfuhEISuJiVzvOiPiXSuI=
61+
github.com/ava-labs/libevm v1.13.14-0.1.0.rc-2 h1:CVbn0hSsPCl6gCkTCnqwuN4vtJgdVbkCqLXzYAE7qF8=
62+
github.com/ava-labs/libevm v1.13.14-0.1.0.rc-2/go.mod h1:yBctIV/wnxXTF38h95943jvpuk4aj07TrjbpoGor6LQ=
6363
github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=
6464
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
6565
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=

scripts/versions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
set -euo pipefail
77

88
# Don't export them as they're used in the context of other calls
9-
AVALANCHE_VERSION=${AVALANCHE_VERSION:-'4fb3f3c6'}
9+
AVALANCHE_VERSION=${AVALANCHE_VERSION:-'0a4ba1bb'}

0 commit comments

Comments
 (0)