fix withdraw test and push back test

zeta-chain · Oct 17, 2024 · 34fe3ea · 34fe3ea
1 parent d09c4d7
commit 34fe3ea
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 25 deletions.
diff --git a/cmd/zetae2e/local/v2.go b/cmd/zetae2e/local/v2.go
@@ -17,26 +17,26 @@ func startV2Tests(eg *errgroup.Group, conf config.Config, deployerRunner *runner
 	// 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.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.TestV2ERC20WithdrawAndCallName,
+		e2etests.TestV2ERC20DepositName,
+		e2etests.TestV2ERC20DepositAndCallName,
+		e2etests.TestV2ERC20WithdrawName,
+		e2etests.TestV2ERC20WithdrawAndCallName,
 		e2etests.TestV2ERC20DepositAndCallNoMessageName,
 	))
 
@@ -50,10 +50,10 @@ func startV2Tests(eg *errgroup.Group, conf config.Config, deployerRunner *runner
 			deployerRunner,
 			verbose,
 			e2etests.TestV2ETHDepositName, // necessary to pay fees on ZEVM and withdraw
-			//e2etests.TestV2ETHDepositAndCallRevertName,
-			//e2etests.TestV2ETHDepositAndCallRevertWithCallName,
-			//e2etests.TestV2ETHWithdrawAndCallRevertName,
-			//e2etests.TestV2ETHWithdrawAndCallRevertWithCallName,
+			e2etests.TestV2ETHDepositAndCallRevertName,
+			e2etests.TestV2ETHDepositAndCallRevertWithCallName,
+			e2etests.TestV2ETHWithdrawAndCallRevertName,
+			e2etests.TestV2ETHWithdrawAndCallRevertWithCallName,
 		),
 	)
 
@@ -69,11 +69,11 @@ func startV2Tests(eg *errgroup.Group, conf config.Config, deployerRunner *runner
 			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,
+			e2etests.TestOperationAddLiquidityERC20Name,
+			e2etests.TestV2ERC20DepositAndCallRevertName,
+			e2etests.TestV2ERC20DepositAndCallRevertWithCallName,
+			e2etests.TestV2ERC20WithdrawAndCallRevertName,
+			e2etests.TestV2ERC20WithdrawAndCallRevertWithCallName,
 		),
 	)
 }

diff --git a/x/crosschain/keeper/v2_zevm_inbound.go b/x/crosschain/keeper/v2_zevm_inbound.go
@@ -361,13 +361,13 @@ func (k Keeper) newWithdrawAndCallInbound(
 		txOrigin,
 		toAddr,
 		foreignCoin.ForeignChainId,
-		math.ZeroUint(),
+		math.NewUintFromBigInt(event.Value),
 		hex.EncodeToString(event.Message),
 		event.Raw.TxHash.String(),
 		event.Raw.BlockNumber,
 		gasLimit,
-		coin.CoinType_NoAssetCall,
-		"",
+		foreignCoin.CoinType,
+		foreignCoin.Asset,
 		event.Raw.Index,
 		types.ProtocolContractVersion_V2,
 		event.CallOptions.IsArbitraryCall,