From 30d60d144f1debff5078b661fb7b18f6b1005116 Mon Sep 17 00:00:00 2001 From: lumtis Date: Mon, 30 Sep 2024 13:31:55 +0200 Subject: [PATCH] refactor setup to use custody v2 directly --- cmd/zetae2e/local/local.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cmd/zetae2e/local/local.go b/cmd/zetae2e/local/local.go index 995d498ca9..4a7fbef39c 100644 --- a/cmd/zetae2e/local/local.go +++ b/cmd/zetae2e/local/local.go @@ -219,6 +219,12 @@ func localE2ETest(cmd *cobra.Command, _ []string) { deployerRunner.SetZEVMZRC20s() + // Update the chain params to use v2 contract for ERC20Custody + // TODO: this function should be removed and the chain params should be directly set to use v2 contract + // https://github.com/zeta-chain/node/issues/2627 + deployerRunner.UpdateChainParamsV2Contracts() + deployerRunner.ERC20CustodyAddr = deployerRunner.ERC20CustodyV2Addr + if testSolana { deployerRunner.SetSolanaContracts(conf.AdditionalAccounts.UserSolana.SolanaPrivateKey.String()) } @@ -406,12 +412,6 @@ func localE2ETest(cmd *cobra.Command, _ []string) { eg.Go(tonTestRoutine(conf, deployerRunner, verbose, tonTests...)) } - if testV2 { - // update the ERC20 custody contract for v2 tests - // note: not run in testV2Migration because it is already run in the migration process - deployerRunner.UpdateChainParamsV2Contracts() - } - // upgrade gateways if upgradeGateways { deployerRunner.UpgradeGateways()