changelog and add test back

zeta-chain · Nov 6, 2024 · 973261f · 973261f
1 parent 321cfe3
commit 973261f
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 50 deletions.
diff --git a/changelog.md b/changelog.md
@@ -10,6 +10,10 @@
 ### Tests
 * [3075](https://github.com/zeta-chain/node/pull/3075) - ton: withdraw concurrent, deposit & revert.
 
+### Fixes
+
+* [3106](https://github.com/zeta-chain/node/pull/3106) - prevent blocked CCTX on out of gas during omnichain calls
+
 ## v21.0.0
 
 ### Features

diff --git a/cmd/zetae2e/local/v2.go b/cmd/zetae2e/local/v2.go
@@ -14,32 +14,32 @@ import (
 
 // startV2Tests starts v2 related tests in parallel
 func startV2Tests(eg *errgroup.Group, conf config.Config, deployerRunner *runner.E2ERunner, verbose bool) {
-	//// Test happy paths for gas token workflow
-	//eg.Go(v2TestRoutine(conf, "eth", conf.AdditionalAccounts.UserV2Ether, color.FgHiGreen, deployerRunner, verbose,
-	//	e2etests.TestV2ETHDepositName,
-	//	e2etests.TestV2ETHDepositAndCallName,
-	//	e2etests.TestV2ETHWithdrawName,
-	//	e2etests.TestV2ETHWithdrawAndArbitraryCallName,
-	//	e2etests.TestV2ETHWithdrawAndCallName,
-	//	e2etests.TestV2ETHWithdrawAndCallThroughContractName,
-	//	e2etests.TestV2ZEVMToEVMArbitraryCallName,
-	//	e2etests.TestV2ZEVMToEVMCallName,
-	//	e2etests.TestV2ZEVMToEVMCallThroughContractName,
-	//	e2etests.TestV2EVMToZEVMCallName,
-	//	e2etests.TestV2ETHDepositAndCallNoMessageName,
-	//	e2etests.TestV2ETHWithdrawAndCallNoMessageName,
-	//))
-	//
-	//// Test happy paths for erc20 token workflow
-	//eg.Go(v2TestRoutine(conf, "erc20", conf.AdditionalAccounts.UserV2ERC20, color.FgHiBlue, deployerRunner, verbose,
-	//	e2etests.TestV2ETHDepositName, // necessary to pay fees on ZEVM
-	//	e2etests.TestV2ERC20DepositName,
-	//	e2etests.TestV2ERC20DepositAndCallName,
-	//	e2etests.TestV2ERC20WithdrawName,
-	//	e2etests.TestV2ERC20WithdrawAndArbitraryCallName,
-	//	e2etests.TestV2ERC20WithdrawAndCallName,
-	//	e2etests.TestV2ERC20DepositAndCallNoMessageName,
-	//))
+	// Test happy paths for gas token workflow
+	eg.Go(v2TestRoutine(conf, "eth", conf.AdditionalAccounts.UserV2Ether, color.FgHiGreen, deployerRunner, verbose,
+		e2etests.TestV2ETHDepositName,
+		e2etests.TestV2ETHDepositAndCallName,
+		e2etests.TestV2ETHWithdrawName,
+		e2etests.TestV2ETHWithdrawAndArbitraryCallName,
+		e2etests.TestV2ETHWithdrawAndCallName,
+		e2etests.TestV2ETHWithdrawAndCallThroughContractName,
+		e2etests.TestV2ZEVMToEVMArbitraryCallName,
+		e2etests.TestV2ZEVMToEVMCallName,
+		e2etests.TestV2ZEVMToEVMCallThroughContractName,
+		e2etests.TestV2EVMToZEVMCallName,
+		e2etests.TestV2ETHDepositAndCallNoMessageName,
+		e2etests.TestV2ETHWithdrawAndCallNoMessageName,
+	))
+
+	// Test happy paths for erc20 token workflow
+	eg.Go(v2TestRoutine(conf, "erc20", conf.AdditionalAccounts.UserV2ERC20, color.FgHiBlue, deployerRunner, verbose,
+		e2etests.TestV2ETHDepositName, // necessary to pay fees on ZEVM
+		e2etests.TestV2ERC20DepositName,
+		e2etests.TestV2ERC20DepositAndCallName,
+		e2etests.TestV2ERC20WithdrawName,
+		e2etests.TestV2ERC20WithdrawAndArbitraryCallName,
+		e2etests.TestV2ERC20WithdrawAndCallName,
+		e2etests.TestV2ERC20DepositAndCallNoMessageName,
+	))
 
 	// Test revert cases for gas token workflow
 	eg.Go(
@@ -50,34 +50,34 @@ func startV2Tests(eg *errgroup.Group, conf config.Config, deployerRunner *runner
 			color.FgHiYellow,
 			deployerRunner,
 			verbose,
-			//e2etests.TestV2ETHDepositName, // necessary to pay fees on ZEVM and withdraw
-			//e2etests.TestV2ETHDepositAndCallRevertName,
-			//e2etests.TestV2ETHDepositAndCallRevertWithCallName,
-			//e2etests.TestV2ETHWithdrawAndCallRevertName,
-			//e2etests.TestV2ETHWithdrawAndCallRevertWithCallName,
+			e2etests.TestV2ETHDepositName, // necessary to pay fees on ZEVM and withdraw
+			e2etests.TestV2ETHDepositAndCallRevertName,
+			e2etests.TestV2ETHDepositAndCallRevertWithCallName,
+			e2etests.TestV2ETHWithdrawAndCallRevertName,
+			e2etests.TestV2ETHWithdrawAndCallRevertWithCallName,
 			e2etests.TestDepositAndCallOutOfGasName,
 		),
 	)
 
-	//// Test revert cases for erc20 token workflow
-	//eg.Go(
-	//	v2TestRoutine(
-	//		conf,
-	//		"erc20-revert",
-	//		conf.AdditionalAccounts.UserV2ERC20Revert,
-	//		color.FgHiRed,
-	//		deployerRunner,
-	//		verbose,
-	//		e2etests.TestV2ETHDepositName,   // necessary to pay fees on ZEVM
-	//		e2etests.TestV2ERC20DepositName, // necessary to have assets to withdraw
-	//		e2etests.TestOperationAddLiquidityETHName, // liquidity with gas and ERC20 are necessary for reverts
-	//		e2etests.TestOperationAddLiquidityERC20Name,
-	//		e2etests.TestV2ERC20DepositAndCallRevertName,
-	//		e2etests.TestV2ERC20DepositAndCallRevertWithCallName,
-	//		e2etests.TestV2ERC20WithdrawAndCallRevertName,
-	//		e2etests.TestV2ERC20WithdrawAndCallRevertWithCallName,
-	//	),
-	//)
+	// Test revert cases for erc20 token workflow
+	eg.Go(
+		v2TestRoutine(
+			conf,
+			"erc20-revert",
+			conf.AdditionalAccounts.UserV2ERC20Revert,
+			color.FgHiRed,
+			deployerRunner,
+			verbose,
+			e2etests.TestV2ETHDepositName,   // necessary to pay fees on ZEVM
+			e2etests.TestV2ERC20DepositName, // necessary to have assets to withdraw
+			e2etests.TestOperationAddLiquidityETHName, // liquidity with gas and ERC20 are necessary for reverts
+			e2etests.TestOperationAddLiquidityERC20Name,
+			e2etests.TestV2ERC20DepositAndCallRevertName,
+			e2etests.TestV2ERC20DepositAndCallRevertWithCallName,
+			e2etests.TestV2ERC20WithdrawAndCallRevertName,
+			e2etests.TestV2ERC20WithdrawAndCallRevertWithCallName,
+		),
+	)
 }
 
 // v2TestRoutine runs v2 related e2e tests