Merge branch 'develop' into refactor/minimize-apis

.github/workflows/e2e.yml

@@ -32,7 +32,7 @@ jobs:
   # forked pull request will fall back to slow build
   build-zetanode:
     runs-on: ubuntu-22.04
-    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'zeta-chain/node'
+    if: (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'zeta-chain/node') && github.actor != 'dependabot[bot]'
     env:
       DOCKER_IMAGE: ghcr.io/${{ github.repository_owner }}/zetanode
       DOCKER_TAG: ${{ github.ref == 'refs/heads/develop' && 'develop' || github.sha }}
@@ -120,8 +120,7 @@ jobs:
       TSS_MIGRATION_TESTS: ${{ steps.matrix-conditionals.outputs.TSS_MIGRATION_TESTS }}
       SOLANA_TESTS: ${{ steps.matrix-conditionals.outputs.SOLANA_TESTS }}
       TON_TESTS: ${{ steps.matrix-conditionals.outputs.TON_TESTS }}
-      V2_TESTS: ${{ steps.matrix-conditionals.outputs.V2_TESTS }}
-      V2_MIGRATION_TESTS: ${{ steps.matrix-conditionals.outputs.V2_MIGRATION_TESTS }}
+      LEGACY_TESTS: ${{ steps.matrix-conditionals.outputs.LEGACY_TESTS }}
       ENABLE_MONITORING: ${{ steps.matrix-conditionals.outputs.ENABLE_MONITORING }}
     steps:
       # use api rather than event context to avoid race conditions (label added after push)
@@ -153,8 +152,7 @@ jobs:
               core.setOutput('TSS_MIGRATION_TESTS', labels.includes('TSS_MIGRATION_TESTS'));
               core.setOutput('SOLANA_TESTS', labels.includes('SOLANA_TESTS'));
               core.setOutput('TON_TESTS', labels.includes('TON_TESTS'));
-              core.setOutput('V2_TESTS', labels.includes('V2_TESTS')); // for v2 tests, TODO: remove this once we fully migrate to v2 (https://github.com/zeta-chain/node/issues/2627)
-              core.setOutput('V2_MIGRATION_TESTS', labels.includes('V2_MIGRATION_TESTS')); // for v2 tests, TODO: remove this once we fully migrate to v2 (https://github.com/zeta-chain/node/issues/2627)
+              core.setOutput('LEGACY_TESTS', labels.includes('LEGACY_TESTS'));
               core.setOutput('ENABLE_MONITORING', labels.includes('ENABLE_MONITORING'));
             } else if (context.eventName === 'merge_group') {
               // default mergequeue tests
@@ -183,7 +181,7 @@ jobs:
               core.setOutput('STATEFUL_DATA_TESTS', true);
               core.setOutput('SOLANA_TESTS', true);
               core.setOutput('TON_TESTS', true);
-              core.setOutput('V2_TESTS', true); // for v2 tests, TODO: remove this once we fully migrate to v2 (https://github.com/zeta-chain/node/issues/2627)
+              core.setOutput('LEGACY_TESTS', true);
             } else if (context.eventName === 'schedule') {
               core.setOutput('DEFAULT_TESTS', true);
               core.setOutput('UPGRADE_TESTS', true);
@@ -195,7 +193,7 @@ jobs:
               core.setOutput('TSS_MIGRATION_TESTS', true);
               core.setOutput('SOLANA_TESTS', true);
               core.setOutput('TON_TESTS', true);
-              core.setOutput('V2_TESTS', true); // for v2 tests, TODO: remove this once we fully migrate to v2 (https://github.com/zeta-chain/node/issues/2627)
+              core.setOutput('LEGACY_TESTS', true);
             } else if (context.eventName === 'workflow_dispatch') {
               const makeTargets = context.payload.inputs['make-targets'].split(',');
               core.setOutput('DEFAULT_TESTS', makeTargets.includes('default-test'));
@@ -208,8 +206,7 @@ jobs:
               core.setOutput('TSS_MIGRATION_TESTS', makeTargets.includes('tss-migration-test'));
               core.setOutput('SOLANA_TESTS', makeTargets.includes('solana-test'));
               core.setOutput('TON_TESTS', makeTargets.includes('ton-test'));
-              core.setOutput('V2_TESTS', makeTargets.includes('v2-test')); // for v2 tests, TODO: remove this once we fully migrate to v2 (https://github.com/zeta-chain/node/issues/2627)
-              core.setOutput('V2_MIGRATION_TESTS', makeTargets.includes('v2-migration-test')); // for v2 tests, TODO: remove this once we fully migrate to v2 (https://github.com/zeta-chain/node/issues/2627)
+              core.setOutput('LEGACY_TESTS', makeTargets.includes('legacy-test'));
               core.setOutput('ENABLE_MONITORING', context.payload.inputs['enable-monitoring']);
             }
 
@@ -258,12 +255,9 @@ jobs:
           - make-target: "start-ton-test"
             runs-on: ubuntu-20.04
             run: ${{ needs.matrix-conditionals.outputs.TON_TESTS == 'true' }}
-          - make-target: "start-v2-test"
+          - make-target: "start-legacy-test"
             runs-on: ubuntu-20.04
-            run: ${{ needs.matrix-conditionals.outputs.V2_TESTS == 'true' }}
-          - make-target: "start-upgrade-v2-migration-test"
-            runs-on: ubuntu-20.04
-            run: ${{ needs.matrix-conditionals.outputs.V2_MIGRATION_TESTS == 'true' }}
+            run: ${{ needs.matrix-conditionals.outputs.LEGACY_TESTS == 'true' }}
     name: ${{ matrix.make-target }}
     uses: ./.github/workflows/reusable-e2e.yml
     with:

Makefile

@@ -312,9 +312,9 @@ start-ton-test: e2e-images
 	export E2E_ARGS="--skip-regular --test-ton" && \
 	cd contrib/localnet/ && $(DOCKER_COMPOSE) --profile ton up -d
 
-start-v2-test: e2e-images
-	@echo "--> Starting e2e smart contracts v2 test"
-	export E2E_ARGS="--skip-regular --test-v2" && \
+start-legacy-test: e2e-images
+	@echo "--> Starting e2e smart contracts legacy test"
+	export E2E_ARGS="--skip-regular --test-legacy" && \
 	cd contrib/localnet/ && $(DOCKER_COMPOSE) up -d
 
 ###############################################################################
@@ -362,16 +362,6 @@ start-upgrade-test-admin: zetanode-upgrade
 	export E2E_ARGS="--skip-regular --test-admin" && \
 	cd contrib/localnet/ && $(DOCKER_COMPOSE) --profile upgrade -f docker-compose-upgrade.yml up -d
 
-# this test upgrades from v18 and execute the v2 contracts migration process
-# this tests is part of upgrade test part because it should run the upgrade from v18 to fully replicate the upgrade process
-start-upgrade-v2-migration-test: zetanode-upgrade
-	@echo "--> Starting v2 migration upgrade test"
-	export LOCALNET_MODE=upgrade && \
-	export UPGRADE_HEIGHT=90 && \
-	export E2E_ARGS="--test-v2-migration" && \
-	cd contrib/localnet/ && $(DOCKER_COMPOSE) --profile upgrade -f docker-compose-upgrade.yml up -d
-
-
 start-upgrade-import-mainnet-test: zetanode-upgrade
 	@echo "--> Starting import-data upgrade test"
 	export LOCALNET_MODE=upgrade && \

changelog.md

@@ -9,6 +9,7 @@
 ### Tests
 
 * [3205](https://github.com/zeta-chain/node/issues/3205) - move Bitcoin revert address test to advanced group to avoid upgrade test failure
+* [3254](https://github.com/zeta-chain/node/pull/3254) - rename v2 E2E tests as evm tests and rename old evm tests as legacy
 
 ## Refactor
 

cmd/zetae2e/config/config.go

@@ -63,6 +63,8 @@ func ExportContractsFromRunner(r *runner.E2ERunner, conf config.Config) config.C
 	conf.Contracts.EVM.CustodyAddr = config.DoubleQuotedString(r.ERC20CustodyAddr.Hex())
 	conf.Contracts.EVM.ERC20 = config.DoubleQuotedString(r.ERC20Addr.Hex())
 	conf.Contracts.EVM.TestDappAddr = config.DoubleQuotedString(r.EvmTestDAppAddr.Hex())
+	conf.Contracts.EVM.Gateway = config.DoubleQuotedString(r.GatewayEVMAddr.Hex())
+	conf.Contracts.EVM.TestDAppV2Addr = config.DoubleQuotedString(r.TestDAppV2EVMAddr.Hex())
 
 	conf.Contracts.ZEVM.SystemContractAddr = config.DoubleQuotedString(r.SystemContractAddr.Hex())
 	conf.Contracts.ZEVM.ETHZRC20Addr = config.DoubleQuotedString(r.ETHZRC20Addr.Hex())
@@ -78,12 +80,6 @@ func ExportContractsFromRunner(r *runner.E2ERunner, conf config.Config) config.C
 	conf.Contracts.ZEVM.ZEVMSwapAppAddr = config.DoubleQuotedString(r.ZEVMSwapAppAddr.Hex())
 	conf.Contracts.ZEVM.ContextAppAddr = config.DoubleQuotedString(r.ContextAppAddr.Hex())
 	conf.Contracts.ZEVM.TestDappAddr = config.DoubleQuotedString(r.ZevmTestDAppAddr.Hex())
-
-	// v2
-	conf.Contracts.EVM.Gateway = config.DoubleQuotedString(r.GatewayEVMAddr.Hex())
-	conf.Contracts.EVM.ERC20CustodyNew = config.DoubleQuotedString(r.ERC20CustodyV2Addr.Hex())
-	conf.Contracts.EVM.TestDAppV2Addr = config.DoubleQuotedString(r.TestDAppV2EVMAddr.Hex())
-
 	conf.Contracts.ZEVM.Gateway = config.DoubleQuotedString(r.GatewayZEVMAddr.Hex())
 	conf.Contracts.ZEVM.TestDAppV2Addr = config.DoubleQuotedString(r.TestDAppV2ZEVMAddr.Hex())
 

cmd/zetae2e/config/contracts.go

@@ -4,15 +4,14 @@ import (
 	"fmt"
 
 	"github.com/gagliardetto/solana-go"
-	"github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/evm/erc20custody.sol"
 	zetaeth "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/evm/zeta.eth.sol"
 	zetaconnectoreth "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/evm/zetaconnector.eth.sol"
 	"github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/zevm/systemcontract.sol"
 	"github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/zevm/wzeta.sol"
 	connectorzevm "github.com/zeta-chain/protocol-contracts/v1/pkg/contracts/zevm/zetaconnectorzevm.sol"
 	"github.com/zeta-chain/protocol-contracts/v1/pkg/uniswap/v2-core/contracts/uniswapv2factory.sol"
 	uniswapv2router "github.com/zeta-chain/protocol-contracts/v1/pkg/uniswap/v2-periphery/contracts/uniswapv2router02.sol"
-	erc20custodyv2 "github.com/zeta-chain/protocol-contracts/v2/pkg/erc20custody.sol"
+	"github.com/zeta-chain/protocol-contracts/v2/pkg/erc20custody.sol"
 	"github.com/zeta-chain/protocol-contracts/v2/pkg/gatewayevm.sol"
 	"github.com/zeta-chain/protocol-contracts/v2/pkg/gatewayzevm.sol"
 	"github.com/zeta-chain/protocol-contracts/v2/pkg/zrc20.sol"
@@ -253,17 +252,6 @@ func setContractsFromConfig(r *runner.E2ERunner, conf config.Config) error {
 		}
 	}
 
-	if c := conf.Contracts.EVM.ERC20CustodyNew; c != "" {
-		r.ERC20CustodyV2Addr, err = c.AsEVMAddress()
-		if err != nil {
-			return fmt.Errorf("invalid ERC20CustodyV2Addr: %w", err)
-		}
-		r.ERC20CustodyV2, err = erc20custodyv2.NewERC20Custody(r.ERC20CustodyV2Addr, r.EVMClient)
-		if err != nil {
-			return err
-		}
-	}
-
 	if c := conf.Contracts.EVM.TestDAppV2Addr; c != "" {
 		r.TestDAppV2EVMAddr, err = c.AsEVMAddress()
 		if err != nil {

cmd/zetae2e/config/local.yml

@@ -6,15 +6,15 @@ default_account:
   solana_address: "37yGiHAnLvWZUNVwu9esp74YQFqxU1qHCbABkDvRddUQ"
   solana_private_key: "4yqSQxDeTBvn86BuxcN5jmZb2gaobFXrBqu8kiE9rZxNkVMe3LfXmFigRsU4sRp7vk4vVP1ZCFiejDKiXBNWvs2C"
 additional_accounts:
-  user_erc20:
+  user_legacy_erc20:
     bech32_address: "zeta1datate7xmwm4uk032f9rmcu0cwy7ch7kg6y6zv"
     evm_address: "0x6F57D5E7c6DBb75e59F1524a3dE38Fc389ec5Fd6"
     private_key: "fda3be1b1517bdf48615bdadacc1e6463d2865868dc8077d2cdcfa4709a16894"
-  user_zeta_test:
+  user_legacy_zeta:
     bech32_address: "zeta1tnp0hvsq4y5mxuhrq9h3jfwulxywpq0ads0rer"
     evm_address: "0x5cC2fBb200A929B372e3016F1925DcF988E081fd"
     private_key: "729a6cdc5c925242e7df92fdeeb94dadbf2d0b9950d4db8f034ab27a3b114ba7"
-  user_zevm_mp_test:
+  user_legacy_zevm_mp:
     bech32_address: "zeta13t3zjxvwec7g38q8mdjga37rpes9zkfvv7tkn2"
     evm_address: "0x8Ae229198eCE3c889C07DB648Ec7C30E6051592c"
     private_key: "105460aebf71b10bfdb710ef5aa6d2932ee6ff6fc317ac9c24e0979903b10a5d"
@@ -31,7 +31,7 @@ additional_accounts:
     evm_address: "0x103FD9224F00ce3013e95629e52DFc31D805D68d"
     private_key: "dd53f191113d18e57bd4a5494a64a020ba7919c815d0a6d34a42ebb2839e9d95"
     solana_private_key: "4yqSQxDeTBvn86BuxcN5jmZb2gaobFXrBqu8kiE9rZxNkVMe3LfXmFigRsU4sRp7vk4vVP1ZCFiejDKiXBNWvs2C"
-  user_ether:
+  user_legacy_ether:
     bech32_address: "zeta134rakuus43xn63yucgxhn88ywj8ewcv6ezn2ga"
     evm_address: "0x8D47Db7390AC4D3D449Cc20D799ce4748F97619A"
     private_key: "098e74a1c2261fa3c1b8cfca8ef2b4ff96c73ce36710d208d1f6535aef42545d"
@@ -51,19 +51,19 @@ additional_accounts:
     bech32_address: "zeta1k4f0l2e9qqjccxnstwj0uaarxvn44lj990she9"
     evm_address: "0xb552FFAb2500258C1A705Ba4Fe77A333275AFE45"
     private_key: "bd6b74387f11b31d21e87c2ae7a23ec269aee08a355dad6c508a6fceb79d1f48"
-  user_v2_ether:
+  user_ether:
     bech32_address: "zeta1erlqlpl5da7a9r3emzw60kax9fxc3h0r3z7c5e"
     evm_address: "0xC8fe0F87f46F7Dd28e39D89Da7Dba62A4D88dde3"
     private_key: "11c25af71c82602a681ce622bf76f4f0fbc3b7f23ce935db6249d1517322f436"
-  user_v2_erc20:
+  user_erc20:
     bech32_address: "zeta12wp6syndml6jd32m7f9mn2wscsxz6cff8nczl4"
     evm_address: "0x5383A8126ddff526C55bF24Bb9a9D0c40c2d6129"
     private_key: "77b0e4dcc29c5c47b6999dabd42abcfdf7750ccc86d6659c1373ec1ea3b4af6c"
-  user_v2_ether_revert:
+  user_ether_revert:
     bech32_address: "zeta1m7m5xd79x9qmlyfpqxcwuac04r3dewfpdcfw5e"
     evm_address: "0xdFb74337c53141bf912101b0Ee770FA8e2DCB921"
     private_key: "be7098604cc40f95d68298a3b4ae13972ac8a3df271ba19ddf169070d30e8ba8"
-  user_v2_erc20_revert:
+  user_erc20_revert:
     bech32_address: "zeta1nry9yeg6njhjrp2ctppa8558vqxal9fxk69zxg"
     evm_address: "0x98c852651A9CAF2185585843d3D287600Ddf9526"
     private_key: "bf9456c679bb5a952a9a137fcfc920e0413efdb97c36de1e57455763084230cb"

cmd/zetae2e/config/localnet.yml

@@ -4,15 +4,15 @@ default_account:
   evm_address: "0xE5C5367B8224807Ac2207d350E60e1b6F27a7ecC"
   private_key: "d87baf7bf6dc560a252596678c12e41f7d1682837f05b29d411bc3f78ae2c263"
 additional_accounts:
-  user_erc20:
+  user_legacy_erc20:
     bech32_address: "zeta1datate7xmwm4uk032f9rmcu0cwy7ch7kg6y6zv"
     evm_address: "0x6F57D5E7c6DBb75e59F1524a3dE38Fc389ec5Fd6"
     private_key: "fda3be1b1517bdf48615bdadacc1e6463d2865868dc8077d2cdcfa4709a16894"
-  user_zeta_test:
+  user_legacy_zeta:
     bech32_address: "zeta1tnp0hvsq4y5mxuhrq9h3jfwulxywpq0ads0rer"
     evm_address: "0x5cC2fBb200A929B372e3016F1925DcF988E081fd"
     private_key: "729a6cdc5c925242e7df92fdeeb94dadbf2d0b9950d4db8f034ab27a3b114ba7"
-  user_zevm_mp_test:
+  user_legacy_zevm_mp:
     bech32_address: "zeta13t3zjxvwec7g38q8mdjga37rpes9zkfvv7tkn2"
     evm_address: "0x8Ae229198eCE3c889C07DB648Ec7C30E6051592c"
     private_key: "105460aebf71b10bfdb710ef5aa6d2932ee6ff6fc317ac9c24e0979903b10a5d"
@@ -29,7 +29,7 @@ additional_accounts:
     evm_address: "0x103FD9224F00ce3013e95629e52DFc31D805D68d"
     private_key: "dd53f191113d18e57bd4a5494a64a020ba7919c815d0a6d34a42ebb2839e9d95"
     solana_private_key: "4yqSQxDeTBvn86BuxcN5jmZb2gaobFXrBqu8kiE9rZxNkVMe3LfXmFigRsU4sRp7vk4vVP1ZCFiejDKiXBNWvs2C"
-  user_ether:
+  user_legacy_ether:
     bech32_address: "zeta134rakuus43xn63yucgxhn88ywj8ewcv6ezn2ga"
     evm_address: "0x8D47Db7390AC4D3D449Cc20D799ce4748F97619A"
     private_key: "098e74a1c2261fa3c1b8cfca8ef2b4ff96c73ce36710d208d1f6535aef42545d"
@@ -49,19 +49,19 @@ additional_accounts:
     bech32_address: "zeta1k4f0l2e9qqjccxnstwj0uaarxvn44lj990she9"
     evm_address: "0xb552FFAb2500258C1A705Ba4Fe77A333275AFE45"
     private_key: "bd6b74387f11b31d21e87c2ae7a23ec269aee08a355dad6c508a6fceb79d1f48"
-  user_v2_ether:
+  user_ether:
     bech32_address: "zeta1erlqlpl5da7a9r3emzw60kax9fxc3h0r3z7c5e"
     evm_address: "0xC8fe0F87f46F7Dd28e39D89Da7Dba62A4D88dde3"
     private_key: "11c25af71c82602a681ce622bf76f4f0fbc3b7f23ce935db6249d1517322f436"
-  user_v2_erc20:
+  user_erc20:
     bech32_address: "zeta12wp6syndml6jd32m7f9mn2wscsxz6cff8nczl4"
     evm_address: "0x5383A8126ddff526C55bF24Bb9a9D0c40c2d6129"
     private_key: "77b0e4dcc29c5c47b6999dabd42abcfdf7750ccc86d6659c1373ec1ea3b4af6c"
-  user_v2_ether_revert:
+  user_ether_revert:
     bech32_address: "zeta1m7m5xd79x9qmlyfpqxcwuac04r3dewfpdcfw5e"
     evm_address: "0xdFb74337c53141bf912101b0Ee770FA8e2DCB921"
     private_key: "be7098604cc40f95d68298a3b4ae13972ac8a3df271ba19ddf169070d30e8ba8"
-  user_v2_erc20_revert:
+  user_erc20_revert:
     bech32_address: "zeta1nry9yeg6njhjrp2ctppa8558vqxal9fxk69zxg"
     evm_address: "0x98c852651A9CAF2185585843d3D287600Ddf9526"
     private_key: "bf9456c679bb5a952a9a137fcfc920e0413efdb97c36de1e57455763084230cb"

cmd/zetae2e/local/admin.go

@@ -38,15 +38,15 @@ func adminTestRoutine(
 
 		// funding the account
 		// we transfer around the total supply of Zeta to the admin for the chain migration test
-		txZetaSend := deployerRunner.SendZetaOnEvm(account.EVMAddress(), 20_500_000_000)
-		txERC20Send := deployerRunner.SendERC20OnEvm(account.EVMAddress(), 1000)
-		adminRunner.WaitForTxReceiptOnEvm(txZetaSend)
-		adminRunner.WaitForTxReceiptOnEvm(txERC20Send)
+		txZetaSend := deployerRunner.LegacySendZetaOnEvm(account.EVMAddress(), 20_500_000_000)
+		txERC20Send := deployerRunner.SendERC20OnEVM(account.EVMAddress(), 1000)
+		adminRunner.WaitForTxReceiptOnEVM(txZetaSend)
+		adminRunner.WaitForTxReceiptOnEVM(txERC20Send)
 
 		// depositing the necessary tokens on ZetaChain
-		txZetaDeposit := adminRunner.DepositZeta()
-		txEtherDeposit := adminRunner.DepositEther()
-		txERC20Deposit := adminRunner.DepositERC20()
+		txZetaDeposit := adminRunner.LegacyDepositZeta()
+		txEtherDeposit := adminRunner.LegacyDepositEther()
+		txERC20Deposit := adminRunner.LegacyDepositERC20()
 		adminRunner.WaitForMinedCCTX(txZetaDeposit)
 		adminRunner.WaitForMinedCCTX(txEtherDeposit)
 		adminRunner.WaitForMinedCCTX(txERC20Deposit)

cmd/zetae2e/local/bitcoin.go

@@ -13,8 +13,8 @@ import (
 	"github.com/zeta-chain/node/testutil"
 )
 
-// initBitcoinTestRunners initializes Bitcoin deposit and withdraw test runners
-func initBitcoinTestRunners(
+// bitcoinTestRoutines returns test routines for deposit and withdraw tests
+func bitcoinTestRoutines(
 	conf config.Config,
 	deployerRunner *runner.E2ERunner,
 	verbose bool,
@@ -93,12 +93,12 @@ func initBitcoinRunner(
 		require.NoError(runner, err)
 
 		// send ERC20 token on EVM
-		txERC20Send := deployerRunner.SendERC20OnEvm(account.EVMAddress(), 1000)
-		runner.WaitForTxReceiptOnEvm(txERC20Send)
+		txERC20Send := deployerRunner.SendERC20OnEVM(account.EVMAddress(), 1000)
+		runner.WaitForTxReceiptOnEVM(txERC20Send)
 
 		// deposit ETH and ERC20 tokens on ZetaChain
-		txEtherDeposit := runner.DepositEther()
-		txERC20Deposit := runner.DepositERC20()
+		txEtherDeposit := runner.LegacyDepositEther()
+		txERC20Deposit := runner.LegacyDepositERC20()
 
 		runner.WaitForMinedCCTX(txEtherDeposit)
 		runner.WaitForMinedCCTX(txERC20Deposit)