Skip to content

Commit

Permalink
Merge pull request #636 from ava-labs/bump-icm-contracts
Browse files Browse the repository at this point in the history 
bump icm-contracts
  • Loading branch information
@iansuvak
iansuvak authored Jan 23, 2025
2 parents cc7c76b + e0e3f1d commit e80e68c
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 24 deletions.
12 changes: 6 additions & 6 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ 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/icm-contracts v1.0.9-0.20241231155804-0845b3c9fd39
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/aws/aws-sdk-go-v2 v1.33.0
github.com/aws/aws-sdk-go-v2/config v1.29.1
Expand Down Expand Up @@ -160,15 +160,15 @@ require (
go.opentelemetry.io/otel/trace v1.31.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.31.0 // indirect
golang.org/x/crypto v0.32.0 // indirect
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
golang.org/x/net v0.33.0 // indirect
golang.org/x/net v0.34.0 // indirect
golang.org/x/oauth2 v0.23.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/term v0.27.0 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/term v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.28.0 // indirect
golang.org/x/tools v0.29.0 // indirect
gonum.org/v1/gonum v0.11.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
Expand Down
24 changes: 12 additions & 12 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ github.com/ava-labs/avalanchego v1.12.1-0.20241210172525-c7ebd8fbae88 h1:tZdtOPF
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/icm-contracts v1.0.9-0.20241231155804-0845b3c9fd39 h1:gDvyXiHtyGHL2TfyYz48gybEOfsapI3PBXY148EJ2h8=
github.com/ava-labs/icm-contracts v1.0.9-0.20241231155804-0845b3c9fd39/go.mod h1:hZS72/9tbM+9JKdTs/UuGIWF3z+FEVlcGW4B9C8gECs=
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/aws/aws-sdk-go-v2 v1.33.0 h1:Evgm4DI9imD81V0WwD+TN4DCwjUMdc94TrduMLbgZJs=
Expand Down Expand Up @@ -708,8 +708,8 @@ golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
Expand Down Expand Up @@ -793,8 +793,8 @@ golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qx
golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
Expand Down Expand Up @@ -886,12 +886,12 @@ golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
Expand Down Expand Up @@ -965,8 +965,8 @@ golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4f
golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8=
golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw=
golang.org/x/tools v0.29.0 h1:Xx0h3TtM9rzQpQuR4dKLrdglAmCEN5Oi+P74JdhdzXE=
golang.org/x/tools v0.29.0/go.mod h1:KMQVMRsVxU6nHCFXrBPhDB8XncLNLM0lIy/F14RP588=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
Expand Down
4 changes: 3 additions & 1 deletion scripts/e2e_test.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ cwd=$(pwd)
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"
# 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"

cp ${BASEDIR}/subnet-evm/subnet-evm ${BASEDIR}/avalanchego/plugins/srEXiWaHuhNyGwPUi444Tu47ZEDwxTWrbQiuD7FmgSAQ6X7Dy
echo "Copied ${BASEDIR}/subnet-evm/subnet-evm binary to ${BASEDIR}/avalanchego/plugins/"
Expand All @@ -54,7 +56,7 @@ go build -v -o tests/cmd/decider/decider ./tests/cmd/decider/

# Run the tests
echo "Running e2e tests $RUN_E2E"
RUN_E2E=true LOG_LEVEL=${LOG_LEVEL} ./tests/tests.test \
RUN_E2E=true LOG_LEVEL=${LOG_LEVEL} SIG_AGG_PATH=${SIG_AGG_PATH:-"$BASEDIR/icm-services/signature-aggregator"} ./tests/tests.test \
--ginkgo.vv \
--ginkgo.label-filter=${GINKGO_LABEL_FILTER:-""} \
--ginkgo.focus=${GINKGO_FOCUS:-""}
Expand Down
2 changes: 1 addition & 1 deletion tests/contracts/lib/teleporter
Submodule teleporter updated 37 files
+1 −1 .github/workflows/release.yml
+29 −45 abi-bindings/go/validator-manager/ERC20TokenStakingManager/ERC20TokenStakingManager.go
+29 −45 abi-bindings/go/validator-manager/NativeTokenStakingManager/NativeTokenStakingManager.go
+29 −45 abi-bindings/go/validator-manager/PoAValidatorManager/PoAValidatorManager.go
+24 −40 abi-bindings/go/validator-manager/interfaces/IPoSValidatorManager/IPoSValidatorManager.go
+24 −40 abi-bindings/go/validator-manager/interfaces/IValidatorManager/IValidatorManager.go
+6 −6 contracts/teleporter/tests/HandleInitialMessageExecutionTests.t.sol
+5 −5 contracts/teleporter/tests/RetryMessageExecutionTests.t.sol
+1 −1 contracts/validator-manager/PoSValidatorManager.sol
+4 −0 contracts/validator-manager/README.md
+7 −7 contracts/validator-manager/ValidatorManager.sol
+9 −9 contracts/validator-manager/ValidatorMessages.sol
+1 −1 contracts/validator-manager/interfaces/IPoSValidatorManager.sol
+5 −7 contracts/validator-manager/interfaces/IValidatorManager.sol
+2 −2 contracts/validator-manager/tests/PoAValidatorManagerTests.t.sol
+4 −13 contracts/validator-manager/tests/PoSValidatorManagerTests.t.sol
+40 −23 contracts/validator-manager/tests/ValidatorManagerTests.t.sol
+6 −6 contracts/validator-manager/tests/ValidatorMessagesTests.t.sol
+17 −20 go.mod
+34 −36 go.sum
+8 −1 scripts/e2e_test.sh
+122 −0 scripts/install_sig_agg_release.sh
+3 −2 scripts/versions.sh
+3 −3 tests/flows/governance/validator_set_sig.go
+4 −2 tests/flows/teleporter/add_fee_amount.go
+1 −1 tests/flows/teleporter/validator_churn.go
+11 −15 tests/flows/validator-manager/erc20_token_staking.go
+11 −15 tests/flows/validator-manager/native_token_staking.go
+10 −9 tests/flows/validator-manager/poa_to_pos.go
+1 −1 tests/interfaces/subnet_test_info.go
+25 −26 tests/network/network.go
+10 −65 tests/utils/chain.go
+1 −2 tests/utils/governance.go
+4 −5 tests/utils/ictt.go
+176 −0 tests/utils/signature_aggregator.go
+4 −5 tests/utils/teleporter.go
+45 −40 tests/utils/validator_manager.go
8 changes: 4 additions & 4 deletions tests/utils/utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ func CreateDefaultRelayerConfig(
Expect(err).Should(BeNil())

sources[i] = &relayercfg.SourceBlockchain{
SubnetID: l1Info.L1ID.String(),
SubnetID: l1Info.SubnetID.String(),
BlockchainID: l1Info.BlockchainID.String(),
VM: relayercfg.EVM.String(),
RPCEndpoint: config.APIConfig{
Expand Down Expand Up @@ -161,7 +161,7 @@ func CreateDefaultRelayerConfig(

log.Info(
"Creating relayer config for source subnet",
"subnetID", l1Info.L1ID.String(),
"subnetID", l1Info.SubnetID.String(),
"blockchainID", l1Info.BlockchainID.String(),
"host", host,
"port", port,
Expand All @@ -173,7 +173,7 @@ func CreateDefaultRelayerConfig(
Expect(err).Should(BeNil())

destinations[i] = &relayercfg.DestinationBlockchain{
SubnetID: l1Info.L1ID.String(),
SubnetID: l1Info.SubnetID.String(),
BlockchainID: l1Info.BlockchainID.String(),
VM: relayercfg.EVM.String(),
RPCEndpoint: config.APIConfig{
Expand All @@ -184,7 +184,7 @@ func CreateDefaultRelayerConfig(

log.Info(
"Creating relayer config for destination subnet",
"subnetID", l1Info.L1ID.String(),
"subnetID", l1Info.SubnetID.String(),
"blockchainID", l1Info.BlockchainID.String(),
"host", host,
"port", port,
Expand Down

0 comments on commit e80e68c

Please sign in to comment.