From 1ff2e4f1313e5d0a4961cc6dd680b27d9331fa1f Mon Sep 17 00:00:00 2001 From: Ian Suvak Date: Fri, 31 Jan 2025 10:28:58 -0500 Subject: [PATCH 1/6] update avago and subnet-evm --- go.mod | 11 +++----- go.sum | 24 ++++++------------ peers/app_request_network_test.go | 4 +-- peers/info_client.go | 4 --- .../aggregator/aggregator_test.go | 25 ++++++++----------- 5 files changed, 24 insertions(+), 44 deletions(-) diff --git a/go.mod b/go.mod index ae422a19..95b6c527 100644 --- a/go.mod +++ b/go.mod @@ -4,9 +4,9 @@ go 1.22.10 require ( github.com/alexliesenfeld/health v0.8.0 - github.com/ava-labs/avalanchego v1.12.1-0.20241210172525-c7ebd8fbae88 + github.com/ava-labs/avalanchego v1.12.3-0.20250131150857-54ad8e645d65 github.com/ava-labs/icm-contracts v1.0.9-0.20250116150448-9c7dfe812349 - github.com/ava-labs/subnet-evm v0.6.13-0.20241205165027-6c98da796f35 + github.com/ava-labs/subnet-evm v0.7.1 github.com/aws/aws-sdk-go-v2 v1.35.0 github.com/aws/aws-sdk-go-v2/config v1.29.3 github.com/aws/aws-sdk-go-v2/service/kms v1.37.15 @@ -34,7 +34,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.13.9-rc.1 // indirect + github.com/ava-labs/coreth v0.14.1-rc.1 // indirect github.com/aws/aws-sdk-go-v2/credentials v1.17.56 // indirect github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.26 // indirect github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.30 // indirect @@ -95,7 +95,6 @@ require ( github.com/gorilla/mux v1.8.0 // indirect github.com/gorilla/rpc v1.2.0 // indirect github.com/gorilla/websocket v1.5.0 // indirect - github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 // indirect github.com/hashicorp/go-bexpr v0.1.10 // indirect github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect @@ -103,9 +102,6 @@ require ( github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4 // indirect github.com/holiman/bloomfilter/v2 v2.0.3 // indirect github.com/holiman/uint256 v1.2.4 // indirect - github.com/huin/goupnp v1.3.0 // indirect - github.com/jackpal/gateway v1.0.6 // indirect - github.com/jackpal/go-nat-pmp v1.0.2 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.9 // indirect @@ -125,7 +121,6 @@ require ( github.com/mr-tron/base58 v1.2.0 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect - github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d // indirect github.com/olekukonko/tablewriter v0.0.5 // indirect github.com/pelletier/go-toml/v2 v2.0.8 // indirect github.com/pires/go-proxyproto v0.6.2 // indirect diff --git a/go.sum b/go.sum index f5b09d86..ce04d276 100644 --- a/go.sum +++ b/go.sum @@ -60,14 +60,14 @@ 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.1-0.20241210172525-c7ebd8fbae88 h1:tZdtOPFNblKZx+FmJOhqEfxUUscvPhcLHKGZO3BtQ6A= -github.com/ava-labs/avalanchego v1.12.1-0.20241210172525-c7ebd8fbae88/go.mod h1:yhD5dpZyStIVbxQ550EDi5w5SL7DQ/xGE6TIxosb7U0= -github.com/ava-labs/coreth v0.13.9-rc.1 h1:qIICpC/OZGYUP37QnLgIqqwGmxnLwLpZaUlqJNI85vU= -github.com/ava-labs/coreth v0.13.9-rc.1/go.mod h1:7aMsRIo/3GBE44qWZMjnfqdqfcfZ5yShTTm2LObLaYo= +github.com/ava-labs/avalanchego v1.12.3-0.20250131150857-54ad8e645d65 h1:83NePfwbzPqzEi7AQom7/ET9cgWjq3Xs/YTrcEpMFdY= +github.com/ava-labs/avalanchego v1.12.3-0.20250131150857-54ad8e645d65/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/icm-contracts v1.0.9-0.20250116150448-9c7dfe812349 h1:3BRtbao7T3Sf1BeDpAUZ7Db1S6RIDZ0y6LGHH5mbZXo= github.com/ava-labs/icm-contracts v1.0.9-0.20250116150448-9c7dfe812349/go.mod h1:4cb0LRTwy+k1QS8yC0T9ArJJyAylmtI6DKKoK8bAckU= -github.com/ava-labs/subnet-evm v0.6.13-0.20241205165027-6c98da796f35 h1:CbXWon0fwGDEDCCiChx2VeIIwO3UML9+8OUTyNwPsxA= -github.com/ava-labs/subnet-evm v0.6.13-0.20241205165027-6c98da796f35/go.mod h1:SfAF4jjYPkezKWShPY/T31WQdD/UHrDyqy0kxA0LE0w= +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/aws/aws-sdk-go-v2 v1.35.0 h1:jTPxEJyzjSuuz0wB+302hr8Eu9KUI+Zv8zlujMGJpVI= github.com/aws/aws-sdk-go-v2 v1.35.0/go.mod h1:JgstGg0JjWU1KpVJjD5H0y0yyAIpSdKEq556EI6yOOM= github.com/aws/aws-sdk-go-v2/config v1.29.3 h1:a5Ucjxe6iV+LHEBmYA9w40rT5aGxWybx/4l/O/fvJlE= @@ -372,8 +372,6 @@ github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= -github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 h1:RtRsiaGvWxcwd8y3BiRZxsylPT8hLWZ5SPcfI+3IDNk= github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0/go.mod h1:TzP6duP4Py2pHLVPPQp42aoYI92+PCrVotyR5e8Vqlk= github.com/hashicorp/go-bexpr v0.1.10 h1:9kuI5PFotCboP3dkDYFr/wi0gg0QVbSNz5oFRpxn4uE= @@ -394,8 +392,6 @@ github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iU github.com/holiman/uint256 v1.2.4 h1:jUc4Nk8fm9jZabQuqr2JzednajVmBpC+oiTiXZJEApU= github.com/holiman/uint256 v1.2.4/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc= -github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8= github.com/hydrogen18/memlistener v0.0.0-20200120041712-dcc25e7acd91/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= @@ -407,10 +403,6 @@ github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod h1:iz2lgM/1UnEf1kP0L/ github.com/iris-contrib/jade v1.1.3/go.mod h1:H/geBymxJhShH5kecoiOCSssPX7QWYH7UaeZTSWddIk= github.com/iris-contrib/pongo2 v0.0.1/go.mod h1:Ssh+00+3GAZqSQb30AvBRNxBx7rf0GqwkjqxNd0u65g= github.com/iris-contrib/schema v0.0.1/go.mod h1:urYA3uvUNG1TIIjOSCzHr9/LmbQo8LrOcOqfqxa4hXw= -github.com/jackpal/gateway v1.0.6 h1:/MJORKvJEwNVldtGVJC2p2cwCnsSoLn3hl3zxmZT7tk= -github.com/jackpal/gateway v1.0.6/go.mod h1:lTpwd4ACLXmpyiCTRtfiNyVnUmqT9RivzCDQetPfnjA= -github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus= -github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= @@ -507,8 +499,6 @@ github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5Vgl github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= -github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d h1:AREM5mwr4u1ORQBMvzfzBgpsctsbQikCVpvC+tX285E= -github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/go.mod h1:o96djdrsSGy3AWPyBgZMAGfxZNfgntdJG+11KU4QvbU= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= @@ -748,6 +738,8 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4= +golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= diff --git a/peers/app_request_network_test.go b/peers/app_request_network_test.go index acd690d4..62ae2fe3 100644 --- a/peers/app_request_network_test.go +++ b/peers/app_request_network_test.go @@ -49,9 +49,9 @@ func TestCalculateConnectedWeight(t *testing.T) { } func makeValidator(t *testing.T, weight uint64, numNodeIDs int) warp.Validator { - sk, err := bls.NewSecretKey() + localSigner, err := bls.NewSigner() require.NoError(t, err) - pk := bls.PublicFromSecretKey(sk) + pk := localSigner.PublicKey() nodeIDs := make([]ids.NodeID, numNodeIDs) for i := 0; i < numNodeIDs; i++ { diff --git a/peers/info_client.go b/peers/info_client.go index c5be6fd9..ff648e41 100644 --- a/peers/info_client.go +++ b/peers/info_client.go @@ -56,10 +56,6 @@ func (i *InfoAPI) GetNodeVersion(ctx context.Context) (*info.GetNodeVersionReply return i.client.GetNodeVersion(ctx, i.options...) } -func (i *InfoAPI) GetTxFee(ctx context.Context) (*info.GetTxFeeResponse, error) { - return i.client.GetTxFee(ctx, i.options...) -} - func (i *InfoAPI) GetVMs(ctx context.Context) (map[ids.ID][]string, error) { return i.client.GetVMs(ctx, i.options...) } diff --git a/signature-aggregator/aggregator/aggregator_test.go b/signature-aggregator/aggregator/aggregator_test.go index fba03efc..a2ba4cf5 100644 --- a/signature-aggregator/aggregator/aggregator_test.go +++ b/signature-aggregator/aggregator/aggregator_test.go @@ -74,7 +74,7 @@ func instantiateAggregator(t *testing.T) ( // Generate the validator values. type validatorInfo struct { nodeID ids.NodeID - blsSecretKey *bls.SecretKey + blsSigner *bls.LocalSigner blsPublicKey *bls.PublicKey blsPublicKeyBytes []byte } @@ -83,18 +83,18 @@ func (v validatorInfo) Compare(o validatorInfo) int { return bytes.Compare(v.blsPublicKeyBytes, o.blsPublicKeyBytes) } -func makeConnectedValidators(validatorCount int) (*peers.ConnectedCanonicalValidators, []*bls.SecretKey) { +func makeConnectedValidators(validatorCount int) (*peers.ConnectedCanonicalValidators, []*bls.LocalSigner) { validatorValues := make([]validatorInfo, validatorCount) for i := 0; i < validatorCount; i++ { - secretKey, err := bls.NewSecretKey() + localSigner, err := bls.NewSigner() if err != nil { panic(err) } - pubKey := bls.PublicFromSecretKey(secretKey) + pubKey := localSigner.PublicKey() nodeID := ids.GenerateTestNodeID() validatorValues[i] = validatorInfo{ nodeID: nodeID, - blsSecretKey: secretKey, + blsSigner: localSigner, blsPublicKey: pubKey, blsPublicKeyBytes: bls.PublicKeyToUncompressedBytes(pubKey), } @@ -105,10 +105,10 @@ func makeConnectedValidators(validatorCount int) (*peers.ConnectedCanonicalValid // Placeholder for results validatorSet := make([]*warp.Validator, validatorCount) - validatorSecretKeys := make([]*bls.SecretKey, validatorCount) + validatorSigners := make([]*bls.LocalSigner, validatorCount) nodeValidatorIndexMap := make(map[ids.NodeID]int) for i, validator := range validatorValues { - validatorSecretKeys[i] = validator.blsSecretKey + validatorSigners[i] = validator.blsSigner validatorSet[i] = &warp.Validator{ PublicKey: validator.blsPublicKey, PublicKeyBytes: validator.blsPublicKeyBytes, @@ -123,7 +123,7 @@ func makeConnectedValidators(validatorCount int) (*peers.ConnectedCanonicalValid TotalValidatorWeight: uint64(validatorCount), ValidatorSet: validatorSet, NodeValidatorIndexMap: nodeValidatorIndexMap, - }, validatorSecretKeys + }, validatorSigners } func TestCreateSignedMessageFailsWithNoValidators(t *testing.T) { @@ -255,7 +255,7 @@ func TestCreateSignedMessageSucceeds(t *testing.T) { require.NoError(t, err) // the signers: - connectedValidators, validatorSecretKeys := makeConnectedValidators(5) + connectedValidators, validatorSigners := makeConnectedValidators(5) // prime the aggregator: @@ -285,14 +285,11 @@ func TestCreateSignedMessageSucceeds(t *testing.T) { responseChan := make(chan message.InboundMessage, len(appRequests)) for _, appRequest := range appRequests { nodeIDs.Add(appRequest.NodeID) - validatorSecretKey := validatorSecretKeys[connectedValidators.NodeValidatorIndexMap[appRequest.NodeID]] + validatorSigner := validatorSigners[connectedValidators.NodeValidatorIndexMap[appRequest.NodeID]] responseBytes, err := proto.Marshal( &sdk.SignatureResponse{ Signature: bls.SignatureToBytes( - bls.Sign( - validatorSecretKey, - msg.Bytes(), - ), + validatorSigner.Sign(msg.Bytes()), ), }, ) From df44d393bb22a1d7f18503ae4f63385229ed3bff Mon Sep 17 00:00:00 2001 From: Ian Suvak Date: Tue, 4 Feb 2025 12:28:31 -0500 Subject: [PATCH 2/6] update contracts dep and subrepo --- go.mod | 2 +- go.sum | 4 ++-- scripts/versions.sh | 16 +++++++++++++--- tests/contracts/lib/teleporter | 2 +- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 95b6c527..3e8ccc1d 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.22.10 require ( github.com/alexliesenfeld/health v0.8.0 github.com/ava-labs/avalanchego v1.12.3-0.20250131150857-54ad8e645d65 - github.com/ava-labs/icm-contracts v1.0.9-0.20250116150448-9c7dfe812349 + github.com/ava-labs/icm-contracts v1.0.9-0.20250204162938-4b7644721f1b github.com/ava-labs/subnet-evm v0.7.1 github.com/aws/aws-sdk-go-v2 v1.35.0 github.com/aws/aws-sdk-go-v2/config v1.29.3 diff --git a/go.sum b/go.sum index ce04d276..b8742d0e 100644 --- a/go.sum +++ b/go.sum @@ -64,8 +64,8 @@ github.com/ava-labs/avalanchego v1.12.3-0.20250131150857-54ad8e645d65 h1:83NePfw github.com/ava-labs/avalanchego v1.12.3-0.20250131150857-54ad8e645d65/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/icm-contracts v1.0.9-0.20250116150448-9c7dfe812349 h1:3BRtbao7T3Sf1BeDpAUZ7Db1S6RIDZ0y6LGHH5mbZXo= -github.com/ava-labs/icm-contracts v1.0.9-0.20250116150448-9c7dfe812349/go.mod h1:4cb0LRTwy+k1QS8yC0T9ArJJyAylmtI6DKKoK8bAckU= +github.com/ava-labs/icm-contracts v1.0.9-0.20250204162938-4b7644721f1b h1:NV7p2TPxfpc3iG4J/RP5jYP18V5nZoxnor7CwSBfh0Y= +github.com/ava-labs/icm-contracts v1.0.9-0.20250204162938-4b7644721f1b/go.mod h1:ofBEhsFwoTlPWl433zr7j1PzvmQdvgdS3ixg+QYKxac= 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/aws/aws-sdk-go-v2 v1.35.0 h1:jTPxEJyzjSuuz0wB+302hr8Eu9KUI+Zv8zlujMGJpVI= diff --git a/scripts/versions.sh b/scripts/versions.sh index 695b9192..2ce9affc 100755 --- a/scripts/versions.sh +++ b/scripts/versions.sh @@ -13,18 +13,28 @@ function getDepVersion() { grep -m1 "^\s*$1" $BASE_PATH/go.mod | cut -d ' ' -f2 } +function extract_commit() { + local version=$1 + + # Regex for a commit hash (assumed to be a 12+ character hex string) + commit_hash_regex="-([0-9a-f]{12,})$" + + if [[ "$version" =~ $commit_hash_regex ]]; then + # Extract the substring after the last '-' + version=${BASH_REMATCH[1]} + fi + echo "$version" +} + # This needs to be exported to be picked up by the dockerfile. export GO_VERSION=${GO_VERSION:-$(getDepVersion go)} # Don't export them as they're used in the context of other calls AVALANCHEGO_VERSION=${AVALANCHEGO_VERSION:-$(getDepVersion github.com/ava-labs/avalanchego)} # Temporarily hardcode the Avalanchego version until outbound networking relaxation is available -AVALANCHEGO_VERSION=v1.12.0 GINKGO_VERSION=${GINKGO_VERSION:-$(getDepVersion github.com/onsi/ginkgo/v2)} SUBNET_EVM_VERSION=${SUBNET_EVM_VERSION:-$(getDepVersion github.com/ava-labs/subnet-evm)} -# Temporarily hardcode the Subnet EVM version until there is a tagged release -SUBNET_EVM_VERSION=6c98da796f359335f2dcfd1151af191584be8d74 # Set golangci-lint version GOLANGCI_LINT_VERSION=${GOLANGCI_LINT_VERSION:-'v1.60'} diff --git a/tests/contracts/lib/teleporter b/tests/contracts/lib/teleporter index 9c7dfe81..4b764472 160000 --- a/tests/contracts/lib/teleporter +++ b/tests/contracts/lib/teleporter @@ -1 +1 @@ -Subproject commit 9c7dfe81234929851938f0d9aed1bb4b2f1ea788 +Subproject commit 4b7644721f1b2e6a7609833b0b7a4014086050be From 887aa82bda550cca9ab1d32d5da586b31475cf36 Mon Sep 17 00:00:00 2001 From: Ian Suvak Date: Tue, 4 Feb 2025 13:23:47 -0500 Subject: [PATCH 3/6] use extract_commit correctly --- scripts/versions.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/versions.sh b/scripts/versions.sh index 2ce9affc..6dcf4e46 100755 --- a/scripts/versions.sh +++ b/scripts/versions.sh @@ -30,11 +30,9 @@ function extract_commit() { export GO_VERSION=${GO_VERSION:-$(getDepVersion go)} # Don't export them as they're used in the context of other calls -AVALANCHEGO_VERSION=${AVALANCHEGO_VERSION:-$(getDepVersion github.com/ava-labs/avalanchego)} -# Temporarily hardcode the Avalanchego version until outbound networking relaxation is available -GINKGO_VERSION=${GINKGO_VERSION:-$(getDepVersion github.com/onsi/ginkgo/v2)} - -SUBNET_EVM_VERSION=${SUBNET_EVM_VERSION:-$(getDepVersion github.com/ava-labs/subnet-evm)} +AVALANCHEGO_VERSION=${AVALANCHEGO_VERSION:-$(extract_commit "$(getDepVersion github.com/ava-labs/avalanchego)")} +GINKGO_VERSION=${GINKGO_VERSION:-$(extract_commit "$(getDepVersion github.com/onsi/ginkgo/v2)")} +SUBNET_EVM_VERSION=${SUBNET_EVM_VERSION:-$(extract_commit "$(getDepVersion github.com/ava-labs/subnet-evm)")} # Set golangci-lint version GOLANGCI_LINT_VERSION=${GOLANGCI_LINT_VERSION:-'v1.60'} From 4ec234d5571501a1a7531460d6d6fb3fe6666f3b Mon Sep 17 00:00:00 2001 From: Ian Suvak Date: Wed, 5 Feb 2025 09:08:13 -0500 Subject: [PATCH 4/6] bump icm-contracts go.mod dep --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4213b71a..664ee063 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.22.10 require ( github.com/alexliesenfeld/health v0.8.0 github.com/ava-labs/avalanchego v1.12.3-0.20250131150857-54ad8e645d65 - github.com/ava-labs/icm-contracts v1.0.9-0.20250204162938-4b7644721f1b + github.com/ava-labs/icm-contracts v1.0.9-0.20250204232902-ae24f1f2636f github.com/ava-labs/subnet-evm v0.7.1 github.com/aws/aws-sdk-go-v2 v1.36.0 github.com/aws/aws-sdk-go-v2/config v1.29.4 diff --git a/go.sum b/go.sum index 79e7c7b4..45abc5a5 100644 --- a/go.sum +++ b/go.sum @@ -64,8 +64,8 @@ github.com/ava-labs/avalanchego v1.12.3-0.20250131150857-54ad8e645d65 h1:83NePfw github.com/ava-labs/avalanchego v1.12.3-0.20250131150857-54ad8e645d65/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/icm-contracts v1.0.9-0.20250204162938-4b7644721f1b h1:NV7p2TPxfpc3iG4J/RP5jYP18V5nZoxnor7CwSBfh0Y= -github.com/ava-labs/icm-contracts v1.0.9-0.20250204162938-4b7644721f1b/go.mod h1:ofBEhsFwoTlPWl433zr7j1PzvmQdvgdS3ixg+QYKxac= +github.com/ava-labs/icm-contracts v1.0.9-0.20250204232902-ae24f1f2636f h1:24+o/LWyC4e+zI9ySdm6wu87fwRG7x/OMFfacupjWiQ= +github.com/ava-labs/icm-contracts v1.0.9-0.20250204232902-ae24f1f2636f/go.mod h1:ofBEhsFwoTlPWl433zr7j1PzvmQdvgdS3ixg+QYKxac= 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/aws/aws-sdk-go-v2 v1.36.0 h1:b1wM5CcE65Ujwn565qcwgtOTT1aT4ADOHHgglKjG7fk= From 51dbc1d5f24b9b90ea116cfb7a8869c2fc69d4bb Mon Sep 17 00:00:00 2001 From: Ian Suvak Date: Wed, 5 Feb 2025 09:17:01 -0500 Subject: [PATCH 5/6] git mv teleporter icm-contracts and rename TELEPORTER_PATH to ICM_CONTRACTS_PATH --- .gitmodules | 2 +- scripts/abi_bindings.sh | 2 +- scripts/constants.sh | 4 ++-- scripts/e2e_test.sh | 4 ++-- tests/contracts/lib/icm-contracts | 1 + tests/contracts/lib/teleporter | 1 - 6 files changed, 7 insertions(+), 7 deletions(-) create mode 160000 tests/contracts/lib/icm-contracts delete mode 160000 tests/contracts/lib/teleporter diff --git a/.gitmodules b/.gitmodules index a4ea1404..baaf6cb6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,5 +1,5 @@ [submodule "tests/contracts/lib/teleporter"] - path = tests/contracts/lib/teleporter + path = tests/contracts/lib/icm-contracts url = https://github.com/ava-labs/icm-contracts [submodule "tests/contracts/lib/forge-std"] path = tests/contracts/lib/forge-std diff --git a/scripts/abi_bindings.sh b/scripts/abi_bindings.sh index 75fde5d6..137617cb 100755 --- a/scripts/abi_bindings.sh +++ b/scripts/abi_bindings.sh @@ -11,7 +11,7 @@ ICM_RELAYER_PATH=$( source $ICM_RELAYER_PATH/scripts/constants.sh source $ICM_RELAYER_PATH/scripts/versions.sh -source $TELEPORTER_PATH/scripts/utils.sh +source $ICM_CONTRACTS_PATH/scripts/utils.sh setARCH diff --git a/scripts/constants.sh b/scripts/constants.sh index e0be0bc3..418ef9a6 100755 --- a/scripts/constants.sh +++ b/scripts/constants.sh @@ -27,8 +27,8 @@ signature_aggregator_path="$BASE_PATH/build/signature-aggregator" # Set the PATHS GOPATH="$(go env GOPATH)" -TELEPORTER_PATH="$BASE_PATH"/tests/contracts/lib/teleporter -source $TELEPORTER_PATH/scripts/constants.sh +ICM_CONTRACTS_PATH="$BASE_PATH"/tests/contracts/lib/icm-contracts +source $ICM_CONTRACTS_PATH/scripts/constants.sh # Avalabs docker hub repo is avaplatform/icm-relayer. # Here we default to the local image (icm-relayer) as to avoid unintentional pushes diff --git a/scripts/e2e_test.sh b/scripts/e2e_test.sh index 774e68a4..bdb0091a 100755 --- a/scripts/e2e_test.sh +++ b/scripts/e2e_test.sh @@ -38,9 +38,9 @@ cwd=$(pwd) # Install the avalanchego and subnet-evm binaries rm -rf $BASEDIR/avalanchego BASEDIR=$BASEDIR AVALANCHEGO_BUILD_PATH=$BASEDIR/avalanchego ./scripts/install_avalanchego_release.sh -BASEDIR=$BASEDIR "${TELEPORTER_PATH}/scripts/install_subnetevm_release.sh" +BASEDIR=$BASEDIR "${ICM_CONTRACTS_PATH}/scripts/install_subnetevm_release.sh" # Install the signature aggregator binary version that the icm-contracts repo expects for the tests -BASEDIR=$BASEDIR "${TELEPORTER_PATH}/scripts/install_sig_agg_release.sh" +BASEDIR=$BASEDIR "${ICM_CONTRACTS_PATH}/scripts/install_sig_agg_release.sh" cp ${BASEDIR}/subnet-evm/subnet-evm ${BASEDIR}/avalanchego/plugins/srEXiWaHuhNyGwPUi444Tu47ZEDwxTWrbQiuD7FmgSAQ6X7Dy echo "Copied ${BASEDIR}/subnet-evm/subnet-evm binary to ${BASEDIR}/avalanchego/plugins/" diff --git a/tests/contracts/lib/icm-contracts b/tests/contracts/lib/icm-contracts new file mode 160000 index 00000000..ae24f1f2 --- /dev/null +++ b/tests/contracts/lib/icm-contracts @@ -0,0 +1 @@ +Subproject commit ae24f1f2636ff0d895f40a5cb0e657ecddf6b7be diff --git a/tests/contracts/lib/teleporter b/tests/contracts/lib/teleporter deleted file mode 160000 index 4b764472..00000000 --- a/tests/contracts/lib/teleporter +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4b7644721f1b2e6a7609833b0b7a4014086050be From f7363c06f6cecb47cb728e9829c6803ab6d3652a Mon Sep 17 00:00:00 2001 From: Ian Suvak Date: Wed, 5 Feb 2025 10:04:25 -0500 Subject: [PATCH 6/6] remove reference from .gitmodules as well --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index baaf6cb6..ee2dcc15 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ -[submodule "tests/contracts/lib/teleporter"] +[submodule "tests/contracts/lib/icm-contracts"] path = tests/contracts/lib/icm-contracts url = https://github.com/ava-labs/icm-contracts [submodule "tests/contracts/lib/forge-std"]