From 238d99559d3c404f6e40eea60839958504ef6b6d Mon Sep 17 00:00:00 2001 From: Ian Suvak Date: Thu, 20 Feb 2025 16:08:28 -0500 Subject: [PATCH] bump avago and subnet-evm --- go.mod | 6 +++--- go.sum | 12 ++++++------ tests/network/network.go | 10 ++++++++-- tests/utils/chain.go | 4 +++- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index b145695b0..495fbac75 100644 --- a/go.mod +++ b/go.mod @@ -3,12 +3,12 @@ module github.com/ava-labs/icm-contracts go 1.23.6 require ( - github.com/ava-labs/avalanchego v1.12.2 + github.com/ava-labs/avalanchego v1.12.3-0.20250219205418-195557d25676 github.com/supranational/blst v0.3.13 // indirect ) require ( - github.com/ava-labs/subnet-evm v0.7.1 + github.com/ava-labs/subnet-evm v0.7.2-0.20250218163755-6d2521c6bddd github.com/ethereum/go-ethereum v1.13.14 github.com/onsi/ginkgo/v2 v2.22.2 github.com/onsi/gomega v1.36.2 @@ -24,7 +24,7 @@ require ( github.com/DataDog/zstd v1.5.2 // indirect github.com/NYTimes/gziphandler v1.1.1 // indirect github.com/VictoriaMetrics/fastcache v1.12.1 // indirect - github.com/ava-labs/coreth v0.14.1-rc.1 // indirect + github.com/ava-labs/coreth v0.14.1-rc.1.0.20250219185827-6a9db205a450 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bits-and-blooms/bitset v1.10.0 // indirect github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect diff --git a/go.sum b/go.sum index ec0e09976..250a12970 100644 --- a/go.sum +++ b/go.sum @@ -58,12 +58,12 @@ github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= -github.com/ava-labs/avalanchego v1.12.2 h1:vZroUgB5xMMczDQnw9etDD1XhZsejFlKky+ZZv8wOKc= -github.com/ava-labs/avalanchego v1.12.2/go.mod h1:uEDLbAUPcGCfDWW680rVfysEofUe/jWte5qQk0j5hMs= -github.com/ava-labs/coreth v0.14.1-rc.1 h1:U72XlRm/fKyASmjThsWzfO/ZRvu1kaONFaX+KdJNxIc= -github.com/ava-labs/coreth v0.14.1-rc.1/go.mod h1:lxDSXLcrszMo0N/PVJzfZ//H+bRwXF/KQWtpEYgXZqM= -github.com/ava-labs/subnet-evm v0.7.1 h1:wXau+6Aj24hqqlN3wY14OKB4GJobWFhM3MzqFhg3WeU= -github.com/ava-labs/subnet-evm v0.7.1/go.mod h1:jpAX6cNfMuUyoeP2/l9Z0ojDy2K/XbZq5y+E0jPXy38= +github.com/ava-labs/avalanchego v1.12.3-0.20250219205418-195557d25676 h1:uU6L5wAoMsMNIdw0HnrR5p+TcJiudh5RBcRWx/qUfNY= +github.com/ava-labs/avalanchego v1.12.3-0.20250219205418-195557d25676/go.mod h1:DfZ1/FHFxr1XnpDMfbMmex8bKxAtIISCGASdMUNFXtY= +github.com/ava-labs/coreth v0.14.1-rc.1.0.20250219185827-6a9db205a450 h1:xSoL6plkPrb2w21v4JRnQg3BIJSg2svBHXyil09RMAg= +github.com/ava-labs/coreth v0.14.1-rc.1.0.20250219185827-6a9db205a450/go.mod h1:AEQcF8MWrKH0sS114wEZlkSfeGF5F66xTbQYqqimNLI= +github.com/ava-labs/subnet-evm v0.7.2-0.20250218163755-6d2521c6bddd h1:cEiaJyRkF+E+aFu5EmwiE8A0jlfMymqrpt0sDlLgXuA= +github.com/ava-labs/subnet-evm v0.7.2-0.20250218163755-6d2521c6bddd/go.mod h1:4ZWBSj9JALAtaUOPrI1P78C6vBMUpK0iiD6zaA9K2VA= github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= diff --git a/tests/network/network.go b/tests/network/network.go index 835cc624f..85ee617ae 100644 --- a/tests/network/network.go +++ b/tests/network/network.go @@ -433,7 +433,10 @@ func (n *LocalNetwork) GetL1Info(subnetID ids.ID) interfaces.L1TestInfo { if l1.SubnetID == subnetID { var nodeURIs []string for _, nodeID := range l1.ValidatorIDs { - uri, err := n.Network.GetURIForNodeID(nodeID) + node, err := n.Network.GetNode(nodeID) + Expect(err).Should(BeNil()) + + uri, _, err := node.GetLocalURI(context.Background()) Expect(err).Should(BeNil()) nodeURIs = append(nodeURIs, uri) @@ -468,7 +471,10 @@ func (n *LocalNetwork) GetL1Infos() []interfaces.L1TestInfo { for i, l1 := range n.Network.Subnets { var nodeURIs []string for _, nodeID := range l1.ValidatorIDs { - uri, err := n.Network.GetURIForNodeID(nodeID) + node, err := n.Network.GetNode(nodeID) + Expect(err).Should(BeNil()) + + uri, _, err := node.GetLocalURI(context.Background()) Expect(err).Should(BeNil()) nodeURIs = append(nodeURIs, uri) diff --git a/tests/utils/chain.go b/tests/utils/chain.go index 54f97ff76..0a9911b32 100644 --- a/tests/utils/chain.go +++ b/tests/utils/chain.go @@ -652,7 +652,9 @@ func SetupProposerVM(ctx context.Context, fundedKey *ecdsa.PrivateKey, network * chainID := l1Details.Chains[0].ChainID - nodeURI, err := network.GetURIForNodeID(l1Details.ValidatorIDs[0]) + node, err := network.GetNode(l1Details.ValidatorIDs[0]) + Expect(err).Should(BeNil()) + nodeURI, _, err := node.GetLocalURI(context.Background()) Expect(err).Should(BeNil()) uri := HttpToWebsocketURI(nodeURI, chainID.String())