From 009c7c307aa460959871874126d0701bcf19954d Mon Sep 17 00:00:00 2001 From: Geoff Stuart Date: Tue, 3 Dec 2024 18:08:10 -0500 Subject: [PATCH] Fix --- abi-bindings/go/packer/packer_test.go | 6 ++--- cmd/teleporter-cli/event.go | 2 +- cmd/teleporter-cli/message.go | 2 +- cmd/teleporter-cli/root.go | 2 +- cmd/teleporter-cli/transaction.go | 2 +- go.mod | 1 - go.sum | 2 -- tests/flows/governance/validator_set_sig.go | 8 +++---- tests/flows/ictt/erc20_home_erc20_remote.go | 8 +++---- .../ictt/erc20_home_erc20_remote_multihop.go | 6 ++--- .../erc20_home_erc20_remote_send_and_call.go | 8 +++---- tests/flows/ictt/erc20_home_native_remote.go | 8 +++---- .../ictt/erc20_home_native_remote_multihop.go | 6 ++--- tests/flows/ictt/native_home_erc20_remote.go | 8 +++---- .../ictt/native_home_erc20_remote_multihop.go | 6 ++--- tests/flows/ictt/native_home_native_remote.go | 8 +++---- .../native_home_native_remote_multihop.go | 6 ++--- .../ictt/registration_and_collateral_check.go | 6 ++--- .../ictt/transparent_proxy_upgradeability.go | 10 ++++----- tests/flows/teleporter/add_fee_amount.go | 6 ++--- tests/flows/teleporter/basic_send_receive.go | 6 ++--- .../deliver_to_nonexistent_contract.go | 6 ++--- .../teleporter/deliver_to_wrong_chain.go | 6 ++--- tests/flows/teleporter/insufficient_gas.go | 4 ++-- .../registry/check_upgrade_access.go | 6 ++--- .../teleporter/registry/pause_teleporter.go | 4 ++-- .../registry/teleporter_registry.go | 4 ++-- tests/flows/teleporter/relay_message_twice.go | 6 ++--- .../teleporter/relayer_modifies_message.go | 10 ++++----- .../teleporter/resubmit_altered_message.go | 6 ++--- .../teleporter/retry_successful_execution.go | 6 ++--- .../teleporter/send_specific_receipts.go | 10 ++++----- .../teleporter/teleporter_message_ids.go | 6 ++--- tests/flows/teleporter/unallowed_relayer.go | 6 ++--- tests/flows/teleporter/validator_churn.go | 8 +++---- .../validator-manager/erc20_token_staking.go | 10 ++++----- .../validator-manager/native_token_staking.go | 8 +++---- tests/flows/validator-manager/poa_to_pos.go | 10 ++++----- tests/network/network.go | 6 ++--- .../governance/governance_suite_test.go | 4 ++-- tests/suites/ictt/ictt_suite_test.go | 8 +++---- .../teleporter/teleporter_suite_test.go | 10 ++++----- .../validator_manager_suite_test.go | 4 ++-- tests/utils/chain.go | 6 ++--- tests/utils/erc20.go | 4 ++-- tests/utils/governance.go | 4 ++-- tests/utils/ictt.go | 22 +++++++++---------- tests/utils/proxy.go | 6 ++--- tests/utils/teleporter.go | 16 +++++++------- tests/utils/token_scaling.go | 4 ++-- tests/utils/validator_manager.go | 18 +++++++-------- .../contractDeploymentTools.go | 2 +- 52 files changed, 172 insertions(+), 175 deletions(-) diff --git a/abi-bindings/go/packer/packer_test.go b/abi-bindings/go/packer/packer_test.go index 196f64976..d13b7fbc6 100644 --- a/abi-bindings/go/packer/packer_test.go +++ b/abi-bindings/go/packer/packer_test.go @@ -13,9 +13,9 @@ import ( "reflect" "testing" - validatorsetsig "github.com/ava-labs/teleporter/abi-bindings/go/governance/ValidatorSetSig" - teleportermessenger "github.com/ava-labs/teleporter/abi-bindings/go/teleporter/TeleporterMessenger" - teleporterregistry "github.com/ava-labs/teleporter/abi-bindings/go/teleporter/registry/TeleporterRegistry" + validatorsetsig "github.com/ava-labs/icm-contracts/abi-bindings/go/governance/ValidatorSetSig" + teleportermessenger "github.com/ava-labs/icm-contracts/abi-bindings/go/teleporter/TeleporterMessenger" + teleporterregistry "github.com/ava-labs/icm-contracts/abi-bindings/go/teleporter/registry/TeleporterRegistry" "github.com/stretchr/testify/require" "golang.org/x/tools/go/packages" diff --git a/cmd/teleporter-cli/event.go b/cmd/teleporter-cli/event.go index a6badb9e3..4b023b235 100644 --- a/cmd/teleporter-cli/event.go +++ b/cmd/teleporter-cli/event.go @@ -4,7 +4,7 @@ package main import ( - teleportermessenger "github.com/ava-labs/teleporter/abi-bindings/go/teleporter/TeleporterMessenger" + teleportermessenger "github.com/ava-labs/icm-contracts/abi-bindings/go/teleporter/TeleporterMessenger" "github.com/ethereum/go-ethereum/common" "github.com/spf13/cobra" "go.uber.org/zap" diff --git a/cmd/teleporter-cli/message.go b/cmd/teleporter-cli/message.go index 435e367bd..4aa8b84fe 100644 --- a/cmd/teleporter-cli/message.go +++ b/cmd/teleporter-cli/message.go @@ -6,7 +6,7 @@ package main import ( "encoding/hex" - teleportermessenger "github.com/ava-labs/teleporter/abi-bindings/go/teleporter/TeleporterMessenger" + teleportermessenger "github.com/ava-labs/icm-contracts/abi-bindings/go/teleporter/TeleporterMessenger" "github.com/spf13/cobra" "go.uber.org/zap" ) diff --git a/cmd/teleporter-cli/root.go b/cmd/teleporter-cli/root.go index b6fef09ac..9401c2896 100644 --- a/cmd/teleporter-cli/root.go +++ b/cmd/teleporter-cli/root.go @@ -7,8 +7,8 @@ import ( "os" "github.com/ava-labs/avalanchego/utils/logging" + teleportermessenger "github.com/ava-labs/icm-contracts/abi-bindings/go/teleporter/TeleporterMessenger" "github.com/ava-labs/subnet-evm/accounts/abi" - teleportermessenger "github.com/ava-labs/teleporter/abi-bindings/go/teleporter/TeleporterMessenger" "github.com/spf13/cobra" ) diff --git a/cmd/teleporter-cli/transaction.go b/cmd/teleporter-cli/transaction.go index ad7316eb5..42ed90b62 100644 --- a/cmd/teleporter-cli/transaction.go +++ b/cmd/teleporter-cli/transaction.go @@ -8,11 +8,11 @@ import ( "encoding/json" warpPayload "github.com/ava-labs/avalanchego/vms/platformvm/warp/payload" + teleportermessenger "github.com/ava-labs/icm-contracts/abi-bindings/go/teleporter/TeleporterMessenger" "github.com/ava-labs/subnet-evm/core/types" "github.com/ava-labs/subnet-evm/eth/tracers" "github.com/ava-labs/subnet-evm/ethclient" "github.com/ava-labs/subnet-evm/precompile/contracts/warp" - teleportermessenger "github.com/ava-labs/teleporter/abi-bindings/go/teleporter/TeleporterMessenger" "github.com/ethereum/go-ethereum/common" "github.com/spf13/cobra" ) diff --git a/go.mod b/go.mod index 00e7908f3..08129c6a9 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,6 @@ require ( require ( github.com/ava-labs/awm-relayer v1.4.1-0.20241122202209-75359d908260 github.com/ava-labs/subnet-evm v0.6.12 - github.com/ava-labs/teleporter v1.0.8-0.20241122194201-a6e92843c3b1 github.com/ethereum/go-ethereum v1.13.14 github.com/onsi/ginkgo/v2 v2.22.0 github.com/onsi/gomega v1.36.0 diff --git a/go.sum b/go.sum index 445a226e0..075cebcf9 100644 --- a/go.sum +++ b/go.sum @@ -66,8 +66,6 @@ github.com/ava-labs/coreth v0.13.9-rc.1 h1:qIICpC/OZGYUP37QnLgIqqwGmxnLwLpZaUlqJ github.com/ava-labs/coreth v0.13.9-rc.1/go.mod h1:7aMsRIo/3GBE44qWZMjnfqdqfcfZ5yShTTm2LObLaYo= github.com/ava-labs/subnet-evm v0.6.12 h1:jL3FmjdFcNfS0qwbehwN6DkAg9y7zexB1riiGBxRsM0= github.com/ava-labs/subnet-evm v0.6.12/go.mod h1:vffwL4UqAh7ibpWjveUuUhamm3a9w75q92bG5vXdX5k= -github.com/ava-labs/teleporter v1.0.8-0.20241122194201-a6e92843c3b1 h1:y1zjdfGlfTZQoPyUyPjsu9FjDK8w19OWUTpgVzQSh0w= -github.com/ava-labs/teleporter v1.0.8-0.20241122194201-a6e92843c3b1/go.mod h1:45NrpvVlms+xHL/rFZT7VrRJqajT7UUW78lzBe3hAzU= 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/flows/governance/validator_set_sig.go b/tests/flows/governance/validator_set_sig.go index 8031d7951..662c5bc77 100644 --- a/tests/flows/governance/validator_set_sig.go +++ b/tests/flows/governance/validator_set_sig.go @@ -4,11 +4,11 @@ import ( "context" "math/big" + validatorsetsig "github.com/ava-labs/icm-contracts/abi-bindings/go/governance/ValidatorSetSig" + exampleerc20 "github.com/ava-labs/icm-contracts/abi-bindings/go/mocks/ExampleERC20" + localnetwork "github.com/ava-labs/icm-contracts/tests/network" + "github.com/ava-labs/icm-contracts/tests/utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" - validatorsetsig "github.com/ava-labs/teleporter/abi-bindings/go/governance/ValidatorSetSig" - exampleerc20 "github.com/ava-labs/teleporter/abi-bindings/go/mocks/ExampleERC20" - localnetwork "github.com/ava-labs/teleporter/tests/network" - "github.com/ava-labs/teleporter/tests/utils" . "github.com/onsi/gomega" ) diff --git a/tests/flows/ictt/erc20_home_erc20_remote.go b/tests/flows/ictt/erc20_home_erc20_remote.go index c559219fa..e22aaca1d 100644 --- a/tests/flows/ictt/erc20_home_erc20_remote.go +++ b/tests/flows/ictt/erc20_home_erc20_remote.go @@ -4,11 +4,11 @@ import ( "context" "math/big" + erc20tokenhome "github.com/ava-labs/icm-contracts/abi-bindings/go/ictt/TokenHome/ERC20TokenHome" + erc20tokenremote "github.com/ava-labs/icm-contracts/abi-bindings/go/ictt/TokenRemote/ERC20TokenRemote" + localnetwork "github.com/ava-labs/icm-contracts/tests/network" + "github.com/ava-labs/icm-contracts/tests/utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" - erc20tokenhome "github.com/ava-labs/teleporter/abi-bindings/go/ictt/TokenHome/ERC20TokenHome" - erc20tokenremote "github.com/ava-labs/teleporter/abi-bindings/go/ictt/TokenRemote/ERC20TokenRemote" - localnetwork "github.com/ava-labs/teleporter/tests/network" - "github.com/ava-labs/teleporter/tests/utils" "github.com/ethereum/go-ethereum/crypto" . "github.com/onsi/gomega" ) diff --git a/tests/flows/ictt/erc20_home_erc20_remote_multihop.go b/tests/flows/ictt/erc20_home_erc20_remote_multihop.go index 0e759934c..4c79de66f 100644 --- a/tests/flows/ictt/erc20_home_erc20_remote_multihop.go +++ b/tests/flows/ictt/erc20_home_erc20_remote_multihop.go @@ -4,10 +4,10 @@ import ( "context" "math/big" + erc20tokenhome "github.com/ava-labs/icm-contracts/abi-bindings/go/ictt/TokenHome/ERC20TokenHome" + localnetwork "github.com/ava-labs/icm-contracts/tests/network" + "github.com/ava-labs/icm-contracts/tests/utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" - erc20tokenhome "github.com/ava-labs/teleporter/abi-bindings/go/ictt/TokenHome/ERC20TokenHome" - localnetwork "github.com/ava-labs/teleporter/tests/network" - "github.com/ava-labs/teleporter/tests/utils" "github.com/ethereum/go-ethereum/crypto" . "github.com/onsi/gomega" ) diff --git a/tests/flows/ictt/erc20_home_erc20_remote_send_and_call.go b/tests/flows/ictt/erc20_home_erc20_remote_send_and_call.go index b2dd8db86..bcacc9704 100644 --- a/tests/flows/ictt/erc20_home_erc20_remote_send_and_call.go +++ b/tests/flows/ictt/erc20_home_erc20_remote_send_and_call.go @@ -4,11 +4,11 @@ import ( "context" "math/big" + erc20tokenhome "github.com/ava-labs/icm-contracts/abi-bindings/go/ictt/TokenHome/ERC20TokenHome" + erc20tokenremote "github.com/ava-labs/icm-contracts/abi-bindings/go/ictt/TokenRemote/ERC20TokenRemote" + localnetwork "github.com/ava-labs/icm-contracts/tests/network" + "github.com/ava-labs/icm-contracts/tests/utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" - erc20tokenhome "github.com/ava-labs/teleporter/abi-bindings/go/ictt/TokenHome/ERC20TokenHome" - erc20tokenremote "github.com/ava-labs/teleporter/abi-bindings/go/ictt/TokenRemote/ERC20TokenRemote" - localnetwork "github.com/ava-labs/teleporter/tests/network" - "github.com/ava-labs/teleporter/tests/utils" "github.com/ethereum/go-ethereum/crypto" . "github.com/onsi/gomega" ) diff --git a/tests/flows/ictt/erc20_home_native_remote.go b/tests/flows/ictt/erc20_home_native_remote.go index 18a60ce34..03bac1b23 100644 --- a/tests/flows/ictt/erc20_home_native_remote.go +++ b/tests/flows/ictt/erc20_home_native_remote.go @@ -4,11 +4,11 @@ import ( "context" "math/big" + erc20tokenhome "github.com/ava-labs/icm-contracts/abi-bindings/go/ictt/TokenHome/ERC20TokenHome" + nativetokenremote "github.com/ava-labs/icm-contracts/abi-bindings/go/ictt/TokenRemote/NativeTokenRemote" + localnetwork "github.com/ava-labs/icm-contracts/tests/network" + "github.com/ava-labs/icm-contracts/tests/utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" - erc20tokenhome "github.com/ava-labs/teleporter/abi-bindings/go/ictt/TokenHome/ERC20TokenHome" - nativetokenremote "github.com/ava-labs/teleporter/abi-bindings/go/ictt/TokenRemote/NativeTokenRemote" - localnetwork "github.com/ava-labs/teleporter/tests/network" - "github.com/ava-labs/teleporter/tests/utils" "github.com/ethereum/go-ethereum/crypto" . "github.com/onsi/gomega" ) diff --git a/tests/flows/ictt/erc20_home_native_remote_multihop.go b/tests/flows/ictt/erc20_home_native_remote_multihop.go index 3a55e1df2..204694553 100644 --- a/tests/flows/ictt/erc20_home_native_remote_multihop.go +++ b/tests/flows/ictt/erc20_home_native_remote_multihop.go @@ -4,10 +4,10 @@ import ( "context" "math/big" + erc20tokenhome "github.com/ava-labs/icm-contracts/abi-bindings/go/ictt/TokenHome/ERC20TokenHome" + localnetwork "github.com/ava-labs/icm-contracts/tests/network" + "github.com/ava-labs/icm-contracts/tests/utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" - erc20tokenhome "github.com/ava-labs/teleporter/abi-bindings/go/ictt/TokenHome/ERC20TokenHome" - localnetwork "github.com/ava-labs/teleporter/tests/network" - "github.com/ava-labs/teleporter/tests/utils" "github.com/ethereum/go-ethereum/crypto" . "github.com/onsi/gomega" ) diff --git a/tests/flows/ictt/native_home_erc20_remote.go b/tests/flows/ictt/native_home_erc20_remote.go index f95640bd8..a1c937136 100644 --- a/tests/flows/ictt/native_home_erc20_remote.go +++ b/tests/flows/ictt/native_home_erc20_remote.go @@ -4,11 +4,11 @@ import ( "context" "math/big" + nativetokenhome "github.com/ava-labs/icm-contracts/abi-bindings/go/ictt/TokenHome/NativeTokenHome" + erc20tokenremote "github.com/ava-labs/icm-contracts/abi-bindings/go/ictt/TokenRemote/ERC20TokenRemote" + localnetwork "github.com/ava-labs/icm-contracts/tests/network" + "github.com/ava-labs/icm-contracts/tests/utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" - nativetokenhome "github.com/ava-labs/teleporter/abi-bindings/go/ictt/TokenHome/NativeTokenHome" - erc20tokenremote "github.com/ava-labs/teleporter/abi-bindings/go/ictt/TokenRemote/ERC20TokenRemote" - localnetwork "github.com/ava-labs/teleporter/tests/network" - "github.com/ava-labs/teleporter/tests/utils" "github.com/ethereum/go-ethereum/crypto" . "github.com/onsi/gomega" ) diff --git a/tests/flows/ictt/native_home_erc20_remote_multihop.go b/tests/flows/ictt/native_home_erc20_remote_multihop.go index 628878f8b..3f7aeeaf5 100644 --- a/tests/flows/ictt/native_home_erc20_remote_multihop.go +++ b/tests/flows/ictt/native_home_erc20_remote_multihop.go @@ -4,10 +4,10 @@ import ( "context" "math/big" + nativetokenhome "github.com/ava-labs/icm-contracts/abi-bindings/go/ictt/TokenHome/NativeTokenHome" + localnetwork "github.com/ava-labs/icm-contracts/tests/network" + "github.com/ava-labs/icm-contracts/tests/utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" - nativetokenhome "github.com/ava-labs/teleporter/abi-bindings/go/ictt/TokenHome/NativeTokenHome" - localnetwork "github.com/ava-labs/teleporter/tests/network" - "github.com/ava-labs/teleporter/tests/utils" "github.com/ethereum/go-ethereum/crypto" . "github.com/onsi/gomega" diff --git a/tests/flows/ictt/native_home_native_remote.go b/tests/flows/ictt/native_home_native_remote.go index a44c41b71..82791ec1f 100644 --- a/tests/flows/ictt/native_home_native_remote.go +++ b/tests/flows/ictt/native_home_native_remote.go @@ -4,10 +4,10 @@ import ( "context" "math/big" - nativetokenhome "github.com/ava-labs/teleporter/abi-bindings/go/ictt/TokenHome/NativeTokenHome" - nativetokenremote "github.com/ava-labs/teleporter/abi-bindings/go/ictt/TokenRemote/NativeTokenRemote" - localnetwork "github.com/ava-labs/teleporter/tests/network" - "github.com/ava-labs/teleporter/tests/utils" + nativetokenhome "github.com/ava-labs/icm-contracts/abi-bindings/go/ictt/TokenHome/NativeTokenHome" + nativetokenremote "github.com/ava-labs/icm-contracts/abi-bindings/go/ictt/TokenRemote/NativeTokenRemote" + localnetwork "github.com/ava-labs/icm-contracts/tests/network" + "github.com/ava-labs/icm-contracts/tests/utils" "github.com/ethereum/go-ethereum/crypto" . "github.com/onsi/gomega" ) diff --git a/tests/flows/ictt/native_home_native_remote_multihop.go b/tests/flows/ictt/native_home_native_remote_multihop.go index ac0400cc7..4a89d9fc4 100644 --- a/tests/flows/ictt/native_home_native_remote_multihop.go +++ b/tests/flows/ictt/native_home_native_remote_multihop.go @@ -4,9 +4,9 @@ import ( "context" "math/big" - nativetokenhome "github.com/ava-labs/teleporter/abi-bindings/go/ictt/TokenHome/NativeTokenHome" - localnetwork "github.com/ava-labs/teleporter/tests/network" - "github.com/ava-labs/teleporter/tests/utils" + nativetokenhome "github.com/ava-labs/icm-contracts/abi-bindings/go/ictt/TokenHome/NativeTokenHome" + localnetwork "github.com/ava-labs/icm-contracts/tests/network" + "github.com/ava-labs/icm-contracts/tests/utils" "github.com/ethereum/go-ethereum/crypto" . "github.com/onsi/gomega" ) diff --git a/tests/flows/ictt/registration_and_collateral_check.go b/tests/flows/ictt/registration_and_collateral_check.go index bf669966b..42c00a44c 100644 --- a/tests/flows/ictt/registration_and_collateral_check.go +++ b/tests/flows/ictt/registration_and_collateral_check.go @@ -4,10 +4,10 @@ import ( "context" "math/big" + erc20tokenhome "github.com/ava-labs/icm-contracts/abi-bindings/go/ictt/TokenHome/ERC20TokenHome" + localnetwork "github.com/ava-labs/icm-contracts/tests/network" + "github.com/ava-labs/icm-contracts/tests/utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" - erc20tokenhome "github.com/ava-labs/teleporter/abi-bindings/go/ictt/TokenHome/ERC20TokenHome" - localnetwork "github.com/ava-labs/teleporter/tests/network" - "github.com/ava-labs/teleporter/tests/utils" "github.com/ethereum/go-ethereum/crypto" . "github.com/onsi/gomega" ) diff --git a/tests/flows/ictt/transparent_proxy_upgradeability.go b/tests/flows/ictt/transparent_proxy_upgradeability.go index 357824cac..606958fbe 100644 --- a/tests/flows/ictt/transparent_proxy_upgradeability.go +++ b/tests/flows/ictt/transparent_proxy_upgradeability.go @@ -4,12 +4,12 @@ import ( "context" "math/big" + erc20tokenhome "github.com/ava-labs/icm-contracts/abi-bindings/go/ictt/TokenHome/ERC20TokenHome" + erc20tokenhomeupgradeable "github.com/ava-labs/icm-contracts/abi-bindings/go/ictt/TokenHome/ERC20TokenHomeUpgradeable" + erc20tokenremote "github.com/ava-labs/icm-contracts/abi-bindings/go/ictt/TokenRemote/ERC20TokenRemote" + localnetwork "github.com/ava-labs/icm-contracts/tests/network" + "github.com/ava-labs/icm-contracts/tests/utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" - erc20tokenhome "github.com/ava-labs/teleporter/abi-bindings/go/ictt/TokenHome/ERC20TokenHome" - erc20tokenhomeupgradeable "github.com/ava-labs/teleporter/abi-bindings/go/ictt/TokenHome/ERC20TokenHomeUpgradeable" - erc20tokenremote "github.com/ava-labs/teleporter/abi-bindings/go/ictt/TokenRemote/ERC20TokenRemote" - localnetwork "github.com/ava-labs/teleporter/tests/network" - "github.com/ava-labs/teleporter/tests/utils" "github.com/ethereum/go-ethereum/crypto" . "github.com/onsi/gomega" ) diff --git a/tests/flows/teleporter/add_fee_amount.go b/tests/flows/teleporter/add_fee_amount.go index f15c69cc8..f87961aab 100644 --- a/tests/flows/teleporter/add_fee_amount.go +++ b/tests/flows/teleporter/add_fee_amount.go @@ -4,10 +4,10 @@ import ( "context" "math/big" + teleportermessenger "github.com/ava-labs/icm-contracts/abi-bindings/go/teleporter/TeleporterMessenger" + localnetwork "github.com/ava-labs/icm-contracts/tests/network" + "github.com/ava-labs/icm-contracts/tests/utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" - teleportermessenger "github.com/ava-labs/teleporter/abi-bindings/go/teleporter/TeleporterMessenger" - localnetwork "github.com/ava-labs/teleporter/tests/network" - "github.com/ava-labs/teleporter/tests/utils" "github.com/ethereum/go-ethereum/common" . "github.com/onsi/gomega" ) diff --git a/tests/flows/teleporter/basic_send_receive.go b/tests/flows/teleporter/basic_send_receive.go index 0387e9699..e3dbd2f02 100644 --- a/tests/flows/teleporter/basic_send_receive.go +++ b/tests/flows/teleporter/basic_send_receive.go @@ -4,10 +4,10 @@ import ( "context" "math/big" + teleportermessenger "github.com/ava-labs/icm-contracts/abi-bindings/go/teleporter/TeleporterMessenger" + localnetwork "github.com/ava-labs/icm-contracts/tests/network" + "github.com/ava-labs/icm-contracts/tests/utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" - teleportermessenger "github.com/ava-labs/teleporter/abi-bindings/go/teleporter/TeleporterMessenger" - localnetwork "github.com/ava-labs/teleporter/tests/network" - "github.com/ava-labs/teleporter/tests/utils" "github.com/ethereum/go-ethereum/common" . "github.com/onsi/gomega" ) diff --git a/tests/flows/teleporter/deliver_to_nonexistent_contract.go b/tests/flows/teleporter/deliver_to_nonexistent_contract.go index 7d4ac61a4..b2184fedd 100644 --- a/tests/flows/teleporter/deliver_to_nonexistent_contract.go +++ b/tests/flows/teleporter/deliver_to_nonexistent_contract.go @@ -4,10 +4,10 @@ import ( "context" "math/big" + testmessenger "github.com/ava-labs/icm-contracts/abi-bindings/go/teleporter/tests/TestMessenger" + localnetwork "github.com/ava-labs/icm-contracts/tests/network" + "github.com/ava-labs/icm-contracts/tests/utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" - testmessenger "github.com/ava-labs/teleporter/abi-bindings/go/teleporter/tests/TestMessenger" - localnetwork "github.com/ava-labs/teleporter/tests/network" - "github.com/ava-labs/teleporter/tests/utils" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/log" diff --git a/tests/flows/teleporter/deliver_to_wrong_chain.go b/tests/flows/teleporter/deliver_to_wrong_chain.go index fc905dc0e..d6d1f50b1 100644 --- a/tests/flows/teleporter/deliver_to_wrong_chain.go +++ b/tests/flows/teleporter/deliver_to_wrong_chain.go @@ -4,10 +4,10 @@ import ( "context" "math/big" + teleportermessenger "github.com/ava-labs/icm-contracts/abi-bindings/go/teleporter/TeleporterMessenger" + localnetwork "github.com/ava-labs/icm-contracts/tests/network" + "github.com/ava-labs/icm-contracts/tests/utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" - teleportermessenger "github.com/ava-labs/teleporter/abi-bindings/go/teleporter/TeleporterMessenger" - localnetwork "github.com/ava-labs/teleporter/tests/network" - "github.com/ava-labs/teleporter/tests/utils" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/log" . "github.com/onsi/gomega" diff --git a/tests/flows/teleporter/insufficient_gas.go b/tests/flows/teleporter/insufficient_gas.go index f595e6914..a229bc141 100644 --- a/tests/flows/teleporter/insufficient_gas.go +++ b/tests/flows/teleporter/insufficient_gas.go @@ -4,9 +4,9 @@ import ( "context" "math/big" + localnetwork "github.com/ava-labs/icm-contracts/tests/network" + "github.com/ava-labs/icm-contracts/tests/utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" - localnetwork "github.com/ava-labs/teleporter/tests/network" - "github.com/ava-labs/teleporter/tests/utils" . "github.com/onsi/gomega" ) diff --git a/tests/flows/teleporter/registry/check_upgrade_access.go b/tests/flows/teleporter/registry/check_upgrade_access.go index ae80cbe30..4d92577c9 100644 --- a/tests/flows/teleporter/registry/check_upgrade_access.go +++ b/tests/flows/teleporter/registry/check_upgrade_access.go @@ -4,10 +4,10 @@ import ( "context" "math/big" + "github.com/ava-labs/icm-contracts/tests/flows" + localnetwork "github.com/ava-labs/icm-contracts/tests/network" + "github.com/ava-labs/icm-contracts/tests/utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" - "github.com/ava-labs/teleporter/tests/flows" - localnetwork "github.com/ava-labs/teleporter/tests/network" - "github.com/ava-labs/teleporter/tests/utils" "github.com/ethereum/go-ethereum/crypto" . "github.com/onsi/gomega" diff --git a/tests/flows/teleporter/registry/pause_teleporter.go b/tests/flows/teleporter/registry/pause_teleporter.go index 470fc2fcd..b1bef12ac 100644 --- a/tests/flows/teleporter/registry/pause_teleporter.go +++ b/tests/flows/teleporter/registry/pause_teleporter.go @@ -3,9 +3,9 @@ package registry import ( "context" + localnetwork "github.com/ava-labs/icm-contracts/tests/network" + "github.com/ava-labs/icm-contracts/tests/utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" - localnetwork "github.com/ava-labs/teleporter/tests/network" - "github.com/ava-labs/teleporter/tests/utils" . "github.com/onsi/gomega" ) diff --git a/tests/flows/teleporter/registry/teleporter_registry.go b/tests/flows/teleporter/registry/teleporter_registry.go index c4b815db0..ba671753a 100644 --- a/tests/flows/teleporter/registry/teleporter_registry.go +++ b/tests/flows/teleporter/registry/teleporter_registry.go @@ -3,9 +3,9 @@ package registry import ( "context" + localnetwork "github.com/ava-labs/icm-contracts/tests/network" + "github.com/ava-labs/icm-contracts/tests/utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" - localnetwork "github.com/ava-labs/teleporter/tests/network" - "github.com/ava-labs/teleporter/tests/utils" "github.com/ethereum/go-ethereum/common" . "github.com/onsi/gomega" ) diff --git a/tests/flows/teleporter/relay_message_twice.go b/tests/flows/teleporter/relay_message_twice.go index ecb672bda..4a793eb9e 100644 --- a/tests/flows/teleporter/relay_message_twice.go +++ b/tests/flows/teleporter/relay_message_twice.go @@ -4,10 +4,10 @@ import ( "context" "math/big" + teleportermessenger "github.com/ava-labs/icm-contracts/abi-bindings/go/teleporter/TeleporterMessenger" + localnetwork "github.com/ava-labs/icm-contracts/tests/network" + "github.com/ava-labs/icm-contracts/tests/utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" - teleportermessenger "github.com/ava-labs/teleporter/abi-bindings/go/teleporter/TeleporterMessenger" - localnetwork "github.com/ava-labs/teleporter/tests/network" - "github.com/ava-labs/teleporter/tests/utils" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/log" diff --git a/tests/flows/teleporter/relayer_modifies_message.go b/tests/flows/teleporter/relayer_modifies_message.go index 27febf628..2c1b5fc45 100644 --- a/tests/flows/teleporter/relayer_modifies_message.go +++ b/tests/flows/teleporter/relayer_modifies_message.go @@ -7,15 +7,15 @@ import ( avalancheWarp "github.com/ava-labs/avalanchego/vms/platformvm/warp" warpPayload "github.com/ava-labs/avalanchego/vms/platformvm/warp/payload" + teleportermessenger "github.com/ava-labs/icm-contracts/abi-bindings/go/teleporter/TeleporterMessenger" + "github.com/ava-labs/icm-contracts/tests/interfaces" + localnetwork "github.com/ava-labs/icm-contracts/tests/network" + "github.com/ava-labs/icm-contracts/tests/utils" + gasUtils "github.com/ava-labs/icm-contracts/utils/gas-utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" "github.com/ava-labs/subnet-evm/core/types" "github.com/ava-labs/subnet-evm/precompile/contracts/warp" predicateutils "github.com/ava-labs/subnet-evm/predicate" - teleportermessenger "github.com/ava-labs/teleporter/abi-bindings/go/teleporter/TeleporterMessenger" - "github.com/ava-labs/teleporter/tests/interfaces" - localnetwork "github.com/ava-labs/teleporter/tests/network" - "github.com/ava-labs/teleporter/tests/utils" - gasUtils "github.com/ava-labs/teleporter/utils/gas-utils" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/log" diff --git a/tests/flows/teleporter/resubmit_altered_message.go b/tests/flows/teleporter/resubmit_altered_message.go index fab98c08f..a76b3e175 100644 --- a/tests/flows/teleporter/resubmit_altered_message.go +++ b/tests/flows/teleporter/resubmit_altered_message.go @@ -4,10 +4,10 @@ import ( "context" "math/big" + teleportermessenger "github.com/ava-labs/icm-contracts/abi-bindings/go/teleporter/TeleporterMessenger" + localnetwork "github.com/ava-labs/icm-contracts/tests/network" + "github.com/ava-labs/icm-contracts/tests/utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" - teleportermessenger "github.com/ava-labs/teleporter/abi-bindings/go/teleporter/TeleporterMessenger" - localnetwork "github.com/ava-labs/teleporter/tests/network" - "github.com/ava-labs/teleporter/tests/utils" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/log" . "github.com/onsi/gomega" diff --git a/tests/flows/teleporter/retry_successful_execution.go b/tests/flows/teleporter/retry_successful_execution.go index 6be466c4d..7584b8dfa 100644 --- a/tests/flows/teleporter/retry_successful_execution.go +++ b/tests/flows/teleporter/retry_successful_execution.go @@ -4,10 +4,10 @@ import ( "context" "math/big" + testmessenger "github.com/ava-labs/icm-contracts/abi-bindings/go/teleporter/tests/TestMessenger" + localnetwork "github.com/ava-labs/icm-contracts/tests/network" + "github.com/ava-labs/icm-contracts/tests/utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" - testmessenger "github.com/ava-labs/teleporter/abi-bindings/go/teleporter/tests/TestMessenger" - localnetwork "github.com/ava-labs/teleporter/tests/network" - "github.com/ava-labs/teleporter/tests/utils" . "github.com/onsi/gomega" ) diff --git a/tests/flows/teleporter/send_specific_receipts.go b/tests/flows/teleporter/send_specific_receipts.go index a56688aea..bb9a18483 100644 --- a/tests/flows/teleporter/send_specific_receipts.go +++ b/tests/flows/teleporter/send_specific_receipts.go @@ -7,12 +7,12 @@ import ( "math/big" "github.com/ava-labs/avalanchego/ids" + teleportermessenger "github.com/ava-labs/icm-contracts/abi-bindings/go/teleporter/TeleporterMessenger" + "github.com/ava-labs/icm-contracts/tests/interfaces" + localnetwork "github.com/ava-labs/icm-contracts/tests/network" + "github.com/ava-labs/icm-contracts/tests/utils" + teleporterutils "github.com/ava-labs/icm-contracts/utils/teleporter-utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" - teleportermessenger "github.com/ava-labs/teleporter/abi-bindings/go/teleporter/TeleporterMessenger" - "github.com/ava-labs/teleporter/tests/interfaces" - localnetwork "github.com/ava-labs/teleporter/tests/network" - "github.com/ava-labs/teleporter/tests/utils" - teleporterutils "github.com/ava-labs/teleporter/utils/teleporter-utils" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/log" . "github.com/onsi/gomega" diff --git a/tests/flows/teleporter/teleporter_message_ids.go b/tests/flows/teleporter/teleporter_message_ids.go index 3b549811e..a5a03d3ef 100644 --- a/tests/flows/teleporter/teleporter_message_ids.go +++ b/tests/flows/teleporter/teleporter_message_ids.go @@ -7,10 +7,10 @@ import ( "math/big" "github.com/ava-labs/avalanchego/ids" + localnetwork "github.com/ava-labs/icm-contracts/tests/network" + "github.com/ava-labs/icm-contracts/tests/utils" + teleporterutils "github.com/ava-labs/icm-contracts/utils/teleporter-utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" - localnetwork "github.com/ava-labs/teleporter/tests/network" - "github.com/ava-labs/teleporter/tests/utils" - teleporterutils "github.com/ava-labs/teleporter/utils/teleporter-utils" "github.com/ethereum/go-ethereum/common" . "github.com/onsi/gomega" ) diff --git a/tests/flows/teleporter/unallowed_relayer.go b/tests/flows/teleporter/unallowed_relayer.go index 193afc66a..a747e048f 100644 --- a/tests/flows/teleporter/unallowed_relayer.go +++ b/tests/flows/teleporter/unallowed_relayer.go @@ -4,10 +4,10 @@ import ( "context" "math/big" + teleportermessenger "github.com/ava-labs/icm-contracts/abi-bindings/go/teleporter/TeleporterMessenger" + localnetwork "github.com/ava-labs/icm-contracts/tests/network" + "github.com/ava-labs/icm-contracts/tests/utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" - teleportermessenger "github.com/ava-labs/teleporter/abi-bindings/go/teleporter/TeleporterMessenger" - localnetwork "github.com/ava-labs/teleporter/tests/network" - "github.com/ava-labs/teleporter/tests/utils" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/log" . "github.com/onsi/gomega" diff --git a/tests/flows/teleporter/validator_churn.go b/tests/flows/teleporter/validator_churn.go index 9c64549eb..4387fba31 100644 --- a/tests/flows/teleporter/validator_churn.go +++ b/tests/flows/teleporter/validator_churn.go @@ -6,12 +6,12 @@ import ( "time" "github.com/ava-labs/avalanchego/utils/units" + teleportermessenger "github.com/ava-labs/icm-contracts/abi-bindings/go/teleporter/TeleporterMessenger" + poavalidatormanager "github.com/ava-labs/icm-contracts/abi-bindings/go/validator-manager/PoAValidatorManager" + localnetwork "github.com/ava-labs/icm-contracts/tests/network" + "github.com/ava-labs/icm-contracts/tests/utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" subnetEvmUtils "github.com/ava-labs/subnet-evm/tests/utils" - teleportermessenger "github.com/ava-labs/teleporter/abi-bindings/go/teleporter/TeleporterMessenger" - poavalidatormanager "github.com/ava-labs/teleporter/abi-bindings/go/validator-manager/PoAValidatorManager" - localnetwork "github.com/ava-labs/teleporter/tests/network" - "github.com/ava-labs/teleporter/tests/utils" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/log" . "github.com/onsi/gomega" diff --git a/tests/flows/validator-manager/erc20_token_staking.go b/tests/flows/validator-manager/erc20_token_staking.go index 941d65536..69ba61975 100644 --- a/tests/flows/validator-manager/erc20_token_staking.go +++ b/tests/flows/validator-manager/erc20_token_staking.go @@ -8,12 +8,12 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/units" + exampleerc20 "github.com/ava-labs/icm-contracts/abi-bindings/go/mocks/ExampleERC20" + erc20tokenstakingmanager "github.com/ava-labs/icm-contracts/abi-bindings/go/validator-manager/ERC20TokenStakingManager" + iposvalidatormanager "github.com/ava-labs/icm-contracts/abi-bindings/go/validator-manager/interfaces/IPoSValidatorManager" + localnetwork "github.com/ava-labs/icm-contracts/tests/network" + "github.com/ava-labs/icm-contracts/tests/utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" - exampleerc20 "github.com/ava-labs/teleporter/abi-bindings/go/mocks/ExampleERC20" - erc20tokenstakingmanager "github.com/ava-labs/teleporter/abi-bindings/go/validator-manager/ERC20TokenStakingManager" - iposvalidatormanager "github.com/ava-labs/teleporter/abi-bindings/go/validator-manager/interfaces/IPoSValidatorManager" - localnetwork "github.com/ava-labs/teleporter/tests/network" - "github.com/ava-labs/teleporter/tests/utils" . "github.com/onsi/gomega" ) diff --git a/tests/flows/validator-manager/native_token_staking.go b/tests/flows/validator-manager/native_token_staking.go index 99bc1fd8f..4a925aafe 100644 --- a/tests/flows/validator-manager/native_token_staking.go +++ b/tests/flows/validator-manager/native_token_staking.go @@ -8,11 +8,11 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/units" + nativetokenstakingmanager "github.com/ava-labs/icm-contracts/abi-bindings/go/validator-manager/NativeTokenStakingManager" + iposvalidatormanager "github.com/ava-labs/icm-contracts/abi-bindings/go/validator-manager/interfaces/IPoSValidatorManager" + localnetwork "github.com/ava-labs/icm-contracts/tests/network" + "github.com/ava-labs/icm-contracts/tests/utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" - nativetokenstakingmanager "github.com/ava-labs/teleporter/abi-bindings/go/validator-manager/NativeTokenStakingManager" - iposvalidatormanager "github.com/ava-labs/teleporter/abi-bindings/go/validator-manager/interfaces/IPoSValidatorManager" - localnetwork "github.com/ava-labs/teleporter/tests/network" - "github.com/ava-labs/teleporter/tests/utils" . "github.com/onsi/gomega" ) diff --git a/tests/flows/validator-manager/poa_to_pos.go b/tests/flows/validator-manager/poa_to_pos.go index 4d7b228b9..6b94f5671 100644 --- a/tests/flows/validator-manager/poa_to_pos.go +++ b/tests/flows/validator-manager/poa_to_pos.go @@ -7,12 +7,12 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/utils/units" + nativetokenstakingmanager "github.com/ava-labs/icm-contracts/abi-bindings/go/validator-manager/NativeTokenStakingManager" + poavalidatormanager "github.com/ava-labs/icm-contracts/abi-bindings/go/validator-manager/PoAValidatorManager" + iposvalidatormanager "github.com/ava-labs/icm-contracts/abi-bindings/go/validator-manager/interfaces/IPoSValidatorManager" + localnetwork "github.com/ava-labs/icm-contracts/tests/network" + "github.com/ava-labs/icm-contracts/tests/utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" - nativetokenstakingmanager "github.com/ava-labs/teleporter/abi-bindings/go/validator-manager/NativeTokenStakingManager" - poavalidatormanager "github.com/ava-labs/teleporter/abi-bindings/go/validator-manager/PoAValidatorManager" - iposvalidatormanager "github.com/ava-labs/teleporter/abi-bindings/go/validator-manager/interfaces/IPoSValidatorManager" - localnetwork "github.com/ava-labs/teleporter/tests/network" - "github.com/ava-labs/teleporter/tests/utils" "github.com/ethereum/go-ethereum/crypto" . "github.com/onsi/gomega" diff --git a/tests/network/network.go b/tests/network/network.go index ccb95bccc..37f8fbea9 100644 --- a/tests/network/network.go +++ b/tests/network/network.go @@ -25,11 +25,11 @@ import ( pwallet "github.com/ava-labs/avalanchego/wallet/chain/p/wallet" "github.com/ava-labs/avalanchego/wallet/subnet/primary" "github.com/ava-labs/awm-relayer/signature-aggregator/aggregator" + proxyadmin "github.com/ava-labs/icm-contracts/abi-bindings/go/ProxyAdmin" + "github.com/ava-labs/icm-contracts/tests/interfaces" + "github.com/ava-labs/icm-contracts/tests/utils" "github.com/ava-labs/subnet-evm/ethclient" subnetEvmTestUtils "github.com/ava-labs/subnet-evm/tests/utils" - proxyadmin "github.com/ava-labs/teleporter/abi-bindings/go/ProxyAdmin" - "github.com/ava-labs/teleporter/tests/interfaces" - "github.com/ava-labs/teleporter/tests/utils" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" diff --git a/tests/suites/governance/governance_suite_test.go b/tests/suites/governance/governance_suite_test.go index d0c944dc8..28e3e7a6c 100644 --- a/tests/suites/governance/governance_suite_test.go +++ b/tests/suites/governance/governance_suite_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - governanceFlows "github.com/ava-labs/teleporter/tests/flows/governance" - localnetwork "github.com/ava-labs/teleporter/tests/network" + governanceFlows "github.com/ava-labs/icm-contracts/tests/flows/governance" + localnetwork "github.com/ava-labs/icm-contracts/tests/network" "github.com/ethereum/go-ethereum/log" "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/tests/suites/ictt/ictt_suite_test.go b/tests/suites/ictt/ictt_suite_test.go index 61ae87ca1..f8a1ea3ed 100644 --- a/tests/suites/ictt/ictt_suite_test.go +++ b/tests/suites/ictt/ictt_suite_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" - icttFlows "github.com/ava-labs/teleporter/tests/flows/ictt" - localnetwork "github.com/ava-labs/teleporter/tests/network" - "github.com/ava-labs/teleporter/tests/utils" - deploymentUtils "github.com/ava-labs/teleporter/utils/deployment-utils" + icttFlows "github.com/ava-labs/icm-contracts/tests/flows/ictt" + localnetwork "github.com/ava-labs/icm-contracts/tests/network" + "github.com/ava-labs/icm-contracts/tests/utils" + deploymentUtils "github.com/ava-labs/icm-contracts/utils/deployment-utils" "github.com/ethereum/go-ethereum/log" "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/tests/suites/teleporter/teleporter_suite_test.go b/tests/suites/teleporter/teleporter_suite_test.go index c0ac711ca..d2a9a9ea1 100644 --- a/tests/suites/teleporter/teleporter_suite_test.go +++ b/tests/suites/teleporter/teleporter_suite_test.go @@ -10,11 +10,11 @@ import ( "time" "github.com/ava-labs/avalanchego/utils/units" - teleporterFlows "github.com/ava-labs/teleporter/tests/flows/teleporter" - registryFlows "github.com/ava-labs/teleporter/tests/flows/teleporter/registry" - "github.com/ava-labs/teleporter/tests/network" - "github.com/ava-labs/teleporter/tests/utils" - deploymentUtils "github.com/ava-labs/teleporter/utils/deployment-utils" + teleporterFlows "github.com/ava-labs/icm-contracts/tests/flows/teleporter" + registryFlows "github.com/ava-labs/icm-contracts/tests/flows/teleporter/registry" + "github.com/ava-labs/icm-contracts/tests/network" + "github.com/ava-labs/icm-contracts/tests/utils" + deploymentUtils "github.com/ava-labs/icm-contracts/utils/deployment-utils" "github.com/ethereum/go-ethereum/log" "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/tests/suites/validator-manager/validator_manager_suite_test.go b/tests/suites/validator-manager/validator_manager_suite_test.go index 5013682f5..765f2919d 100644 --- a/tests/suites/validator-manager/validator_manager_suite_test.go +++ b/tests/suites/validator-manager/validator_manager_suite_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - validatorManagerFlows "github.com/ava-labs/teleporter/tests/flows/validator-manager" - localnetwork "github.com/ava-labs/teleporter/tests/network" + validatorManagerFlows "github.com/ava-labs/icm-contracts/tests/flows/validator-manager" + localnetwork "github.com/ava-labs/icm-contracts/tests/network" "github.com/ethereum/go-ethereum/log" "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/tests/utils/chain.go b/tests/utils/chain.go index a00e43725..1ae49fc9f 100644 --- a/tests/utils/chain.go +++ b/tests/utils/chain.go @@ -28,6 +28,9 @@ import ( "github.com/ava-labs/awm-relayer/signature-aggregator/aggregator" sigAggConfig "github.com/ava-labs/awm-relayer/signature-aggregator/config" "github.com/ava-labs/awm-relayer/signature-aggregator/metrics" + nativeMinter "github.com/ava-labs/icm-contracts/abi-bindings/go/INativeMinter" + "github.com/ava-labs/icm-contracts/tests/interfaces" + gasUtils "github.com/ava-labs/icm-contracts/utils/gas-utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" "github.com/ava-labs/subnet-evm/core/types" "github.com/ava-labs/subnet-evm/eth/tracers" @@ -36,9 +39,6 @@ import ( "github.com/ava-labs/subnet-evm/precompile/contracts/nativeminter" "github.com/ava-labs/subnet-evm/precompile/contracts/warp" subnetEvmUtils "github.com/ava-labs/subnet-evm/tests/utils" - nativeMinter "github.com/ava-labs/teleporter/abi-bindings/go/INativeMinter" - "github.com/ava-labs/teleporter/tests/interfaces" - gasUtils "github.com/ava-labs/teleporter/utils/gas-utils" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/crypto" diff --git a/tests/utils/erc20.go b/tests/utils/erc20.go index cf82a7c8b..f22786c03 100644 --- a/tests/utils/erc20.go +++ b/tests/utils/erc20.go @@ -5,9 +5,9 @@ import ( "crypto/ecdsa" "math/big" + exampleerc20 "github.com/ava-labs/icm-contracts/abi-bindings/go/mocks/ExampleERC20" + "github.com/ava-labs/icm-contracts/tests/interfaces" "github.com/ava-labs/subnet-evm/accounts/abi/bind" - exampleerc20 "github.com/ava-labs/teleporter/abi-bindings/go/mocks/ExampleERC20" - "github.com/ava-labs/teleporter/tests/interfaces" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/log" diff --git a/tests/utils/governance.go b/tests/utils/governance.go index 0e9b84db4..7a463ade4 100644 --- a/tests/utils/governance.go +++ b/tests/utils/governance.go @@ -7,10 +7,10 @@ import ( avalancheWarp "github.com/ava-labs/avalanchego/vms/platformvm/warp" "github.com/ava-labs/avalanchego/vms/platformvm/warp/payload" "github.com/ava-labs/awm-relayer/signature-aggregator/aggregator" + validatorsetsig "github.com/ava-labs/icm-contracts/abi-bindings/go/governance/ValidatorSetSig" + "github.com/ava-labs/icm-contracts/tests/interfaces" "github.com/ava-labs/subnet-evm/accounts/abi/bind" "github.com/ava-labs/subnet-evm/core/types" - validatorsetsig "github.com/ava-labs/teleporter/abi-bindings/go/governance/ValidatorSetSig" - "github.com/ava-labs/teleporter/tests/interfaces" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/log" . "github.com/onsi/gomega" diff --git a/tests/utils/ictt.go b/tests/utils/ictt.go index 946f73d66..e091e7643 100644 --- a/tests/utils/ictt.go +++ b/tests/utils/ictt.go @@ -11,19 +11,19 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/awm-relayer/signature-aggregator/aggregator" + erc20tokenhome "github.com/ava-labs/icm-contracts/abi-bindings/go/ictt/TokenHome/ERC20TokenHome" + nativetokenhome "github.com/ava-labs/icm-contracts/abi-bindings/go/ictt/TokenHome/NativeTokenHome" + tokenhome "github.com/ava-labs/icm-contracts/abi-bindings/go/ictt/TokenHome/TokenHome" + erc20tokenremote "github.com/ava-labs/icm-contracts/abi-bindings/go/ictt/TokenRemote/ERC20TokenRemote" + nativetokenremote "github.com/ava-labs/icm-contracts/abi-bindings/go/ictt/TokenRemote/NativeTokenRemote" + tokenremote "github.com/ava-labs/icm-contracts/abi-bindings/go/ictt/TokenRemote/TokenRemote" + wrappednativetoken "github.com/ava-labs/icm-contracts/abi-bindings/go/ictt/WrappedNativeToken" + exampleerc20 "github.com/ava-labs/icm-contracts/abi-bindings/go/ictt/mocks/ExampleERC20Decimals" + mockERC20SACR "github.com/ava-labs/icm-contracts/abi-bindings/go/ictt/mocks/MockERC20SendAndCallReceiver" + mockNSACR "github.com/ava-labs/icm-contracts/abi-bindings/go/ictt/mocks/MockNativeSendAndCallReceiver" + "github.com/ava-labs/icm-contracts/tests/interfaces" "github.com/ava-labs/subnet-evm/accounts/abi/bind" "github.com/ava-labs/subnet-evm/core/types" - erc20tokenhome "github.com/ava-labs/teleporter/abi-bindings/go/ictt/TokenHome/ERC20TokenHome" - nativetokenhome "github.com/ava-labs/teleporter/abi-bindings/go/ictt/TokenHome/NativeTokenHome" - tokenhome "github.com/ava-labs/teleporter/abi-bindings/go/ictt/TokenHome/TokenHome" - erc20tokenremote "github.com/ava-labs/teleporter/abi-bindings/go/ictt/TokenRemote/ERC20TokenRemote" - nativetokenremote "github.com/ava-labs/teleporter/abi-bindings/go/ictt/TokenRemote/NativeTokenRemote" - tokenremote "github.com/ava-labs/teleporter/abi-bindings/go/ictt/TokenRemote/TokenRemote" - wrappednativetoken "github.com/ava-labs/teleporter/abi-bindings/go/ictt/WrappedNativeToken" - exampleerc20 "github.com/ava-labs/teleporter/abi-bindings/go/ictt/mocks/ExampleERC20Decimals" - mockERC20SACR "github.com/ava-labs/teleporter/abi-bindings/go/ictt/mocks/MockERC20SendAndCallReceiver" - mockNSACR "github.com/ava-labs/teleporter/abi-bindings/go/ictt/mocks/MockNativeSendAndCallReceiver" - "github.com/ava-labs/teleporter/tests/interfaces" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/log" diff --git a/tests/utils/proxy.go b/tests/utils/proxy.go index becee3a35..54e0d9f07 100644 --- a/tests/utils/proxy.go +++ b/tests/utils/proxy.go @@ -4,10 +4,10 @@ import ( "context" "crypto/ecdsa" + proxyadmin "github.com/ava-labs/icm-contracts/abi-bindings/go/ProxyAdmin" + transparentupgradeableproxy "github.com/ava-labs/icm-contracts/abi-bindings/go/TransparentUpgradeableProxy" + "github.com/ava-labs/icm-contracts/tests/interfaces" "github.com/ava-labs/subnet-evm/accounts/abi/bind" - proxyadmin "github.com/ava-labs/teleporter/abi-bindings/go/ProxyAdmin" - transparentupgradeableproxy "github.com/ava-labs/teleporter/abi-bindings/go/TransparentUpgradeableProxy" - "github.com/ava-labs/teleporter/tests/interfaces" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" . "github.com/onsi/gomega" diff --git a/tests/utils/teleporter.go b/tests/utils/teleporter.go index 071be6365..c24c28e63 100644 --- a/tests/utils/teleporter.go +++ b/tests/utils/teleporter.go @@ -10,19 +10,19 @@ import ( avalancheWarp "github.com/ava-labs/avalanchego/vms/platformvm/warp" "github.com/ava-labs/avalanchego/vms/platformvm/warp/payload" "github.com/ava-labs/awm-relayer/signature-aggregator/aggregator" + validatorsetsig "github.com/ava-labs/icm-contracts/abi-bindings/go/governance/ValidatorSetSig" + exampleerc20 "github.com/ava-labs/icm-contracts/abi-bindings/go/mocks/ExampleERC20" + teleportermessenger "github.com/ava-labs/icm-contracts/abi-bindings/go/teleporter/TeleporterMessenger" + teleporterregistry "github.com/ava-labs/icm-contracts/abi-bindings/go/teleporter/registry/TeleporterRegistry" + testmessenger "github.com/ava-labs/icm-contracts/abi-bindings/go/teleporter/tests/TestMessenger" + "github.com/ava-labs/icm-contracts/tests/interfaces" + deploymentUtils "github.com/ava-labs/icm-contracts/utils/deployment-utils" + gasUtils "github.com/ava-labs/icm-contracts/utils/gas-utils" "github.com/ava-labs/subnet-evm/accounts/abi/bind" "github.com/ava-labs/subnet-evm/core/types" "github.com/ava-labs/subnet-evm/precompile/contracts/warp" predicateutils "github.com/ava-labs/subnet-evm/predicate" "github.com/ava-labs/subnet-evm/rpc" - validatorsetsig "github.com/ava-labs/teleporter/abi-bindings/go/governance/ValidatorSetSig" - exampleerc20 "github.com/ava-labs/teleporter/abi-bindings/go/mocks/ExampleERC20" - teleportermessenger "github.com/ava-labs/teleporter/abi-bindings/go/teleporter/TeleporterMessenger" - teleporterregistry "github.com/ava-labs/teleporter/abi-bindings/go/teleporter/registry/TeleporterRegistry" - testmessenger "github.com/ava-labs/teleporter/abi-bindings/go/teleporter/tests/TestMessenger" - "github.com/ava-labs/teleporter/tests/interfaces" - deploymentUtils "github.com/ava-labs/teleporter/utils/deployment-utils" - gasUtils "github.com/ava-labs/teleporter/utils/gas-utils" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/crypto" diff --git a/tests/utils/token_scaling.go b/tests/utils/token_scaling.go index 7c09bbec6..7cf86a9d1 100644 --- a/tests/utils/token_scaling.go +++ b/tests/utils/token_scaling.go @@ -4,9 +4,9 @@ import ( "math/big" "github.com/ava-labs/avalanchego/ids" + erc20tokenhome "github.com/ava-labs/icm-contracts/abi-bindings/go/ictt/TokenHome/ERC20TokenHome" + nativetokenhome "github.com/ava-labs/icm-contracts/abi-bindings/go/ictt/TokenHome/NativeTokenHome" "github.com/ava-labs/subnet-evm/accounts/abi/bind" - erc20tokenhome "github.com/ava-labs/teleporter/abi-bindings/go/ictt/TokenHome/ERC20TokenHome" - nativetokenhome "github.com/ava-labs/teleporter/abi-bindings/go/ictt/TokenHome/NativeTokenHome" "github.com/ethereum/go-ethereum/common" . "github.com/onsi/gomega" diff --git a/tests/utils/validator_manager.go b/tests/utils/validator_manager.go index 395b76a10..c307f54a6 100644 --- a/tests/utils/validator_manager.go +++ b/tests/utils/validator_manager.go @@ -24,21 +24,21 @@ import ( "github.com/ava-labs/avalanchego/vms/secp256k1fx" pwallet "github.com/ava-labs/avalanchego/wallet/chain/p/wallet" "github.com/ava-labs/awm-relayer/signature-aggregator/aggregator" + proxyadmin "github.com/ava-labs/icm-contracts/abi-bindings/go/ProxyAdmin" + exampleerc20 "github.com/ava-labs/icm-contracts/abi-bindings/go/mocks/ExampleERC20" + erc20tokenstakingmanager "github.com/ava-labs/icm-contracts/abi-bindings/go/validator-manager/ERC20TokenStakingManager" + examplerewardcalculator "github.com/ava-labs/icm-contracts/abi-bindings/go/validator-manager/ExampleRewardCalculator" + nativetokenstakingmanager "github.com/ava-labs/icm-contracts/abi-bindings/go/validator-manager/NativeTokenStakingManager" + poavalidatormanager "github.com/ava-labs/icm-contracts/abi-bindings/go/validator-manager/PoAValidatorManager" + iposvalidatormanager "github.com/ava-labs/icm-contracts/abi-bindings/go/validator-manager/interfaces/IPoSValidatorManager" + ivalidatormanager "github.com/ava-labs/icm-contracts/abi-bindings/go/validator-manager/interfaces/IValidatorManager" + "github.com/ava-labs/icm-contracts/tests/interfaces" "github.com/ava-labs/subnet-evm/accounts/abi/bind" "github.com/ava-labs/subnet-evm/core/types" "github.com/ava-labs/subnet-evm/precompile/contracts/warp" predicateutils "github.com/ava-labs/subnet-evm/predicate" subnetEvmUtils "github.com/ava-labs/subnet-evm/tests/utils" "github.com/ava-labs/subnet-evm/warp/messages" - proxyadmin "github.com/ava-labs/teleporter/abi-bindings/go/ProxyAdmin" - exampleerc20 "github.com/ava-labs/teleporter/abi-bindings/go/mocks/ExampleERC20" - erc20tokenstakingmanager "github.com/ava-labs/teleporter/abi-bindings/go/validator-manager/ERC20TokenStakingManager" - examplerewardcalculator "github.com/ava-labs/teleporter/abi-bindings/go/validator-manager/ExampleRewardCalculator" - nativetokenstakingmanager "github.com/ava-labs/teleporter/abi-bindings/go/validator-manager/NativeTokenStakingManager" - poavalidatormanager "github.com/ava-labs/teleporter/abi-bindings/go/validator-manager/PoAValidatorManager" - iposvalidatormanager "github.com/ava-labs/teleporter/abi-bindings/go/validator-manager/interfaces/IPoSValidatorManager" - ivalidatormanager "github.com/ava-labs/teleporter/abi-bindings/go/validator-manager/interfaces/IValidatorManager" - "github.com/ava-labs/teleporter/tests/interfaces" "github.com/ethereum/go-ethereum/common" "google.golang.org/protobuf/proto" diff --git a/utils/contract-deployment/contractDeploymentTools.go b/utils/contract-deployment/contractDeploymentTools.go index 36455078f..e333d63a9 100644 --- a/utils/contract-deployment/contractDeploymentTools.go +++ b/utils/contract-deployment/contractDeploymentTools.go @@ -9,7 +9,7 @@ import ( "os" "strconv" - deploymentUtils "github.com/ava-labs/teleporter/utils/deployment-utils" + deploymentUtils "github.com/ava-labs/icm-contracts/utils/deployment-utils" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" )