test event emitting

zeta-chain · Nov 12, 2024 · d2f4a96 · d2f4a96
1 parent 470ce61
commit d2f4a96
Show file tree

Hide file tree

Showing 7 changed files with 213 additions and 36 deletions.
diff --git a/cmd/zetae2e/local/v2.go b/cmd/zetae2e/local/v2.go
@@ -15,21 +15,21 @@ 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,
-	//	e2etests.TestDepositAndWithdrawName,
-	//))
+	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,
+		e2etests.TestDepositAndWithdrawName,
+	))
 	//
 	//// Test happy paths for erc20 token workflow
 	//eg.Go(v2TestRoutine(conf, "erc20", conf.AdditionalAccounts.UserV2ERC20, color.FgHiBlue, deployerRunner, verbose,
@@ -44,22 +44,22 @@ func startV2Tests(eg *errgroup.Group, conf config.Config, deployerRunner *runner
 	//))
 	//
 	//// Test revert cases for gas token workflow
-	eg.Go(
-		v2TestRoutine(
-			conf,
-			"eth-revert",
-			conf.AdditionalAccounts.UserV2EtherRevert,
-			color.FgHiYellow,
-			deployerRunner,
-			verbose,
-			//e2etests.TestV2ETHDepositName, // necessary to pay fees on ZEVM and withdraw
-			e2etests.TestV2ETHDepositAndCallRevertName,
-			//e2etests.TestV2ETHDepositAndCallRevertWithCallName,
-			//e2etests.TestV2ETHWithdrawAndCallRevertName,
-			//e2etests.TestV2ETHWithdrawAndCallRevertWithCallName,
-			//e2etests.TestDepositAndCallOutOfGasName,
-		),
-	)
+	//eg.Go(
+	//	v2TestRoutine(
+	//		conf,
+	//		"eth-revert",
+	//		conf.AdditionalAccounts.UserV2EtherRevert,
+	//		color.FgHiYellow,
+	//		deployerRunner,
+	//		verbose,
+	//		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(

diff --git a/e2e/e2etests/test_v2_eth_deposit_and_call_revert.go b/e2e/e2etests/test_v2_eth_deposit_and_call_revert.go
@@ -29,7 +29,7 @@ func TestV2ETHDepositAndCallRevert(r *runner.E2ERunner, args []string) {
 	// perform the deposit
 	tx := r.V2ETHDepositAndCall(r.TestDAppV2ZEVMAddr, amount, []byte("revert"), gatewayevm.RevertOptions{
 		RevertAddress:    revertAddress,
-		OnRevertGasLimit: big.NewInt(7000000),
+		OnRevertGasLimit: big.NewInt(0),
 	})
 
 	// wait for the cctx to be mined

diff --git a/pkg/contracts/testdappv2/TestDAppV2.abi b/pkg/contracts/testdappv2/TestDAppV2.abi
@@ -1,4 +1,23 @@
 [
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "string",
+        "name": "",
+        "type": "string"
+      },
+      {
+        "indexed": false,
+        "internalType": "string",
+        "name": "",
+        "type": "string"
+      }
+    ],
+    "name": "HelloEvent",
+    "type": "event"
+  },
   {
     "inputs": [],
     "name": "NO_MESSAGE_CALL",

diff --git a/pkg/contracts/testdappv2/TestDAppV2.bin b/pkg/contracts/testdappv2/TestDAppV2.bin
diff --git a/pkg/contracts/testdappv2/TestDAppV2.go b/pkg/contracts/testdappv2/TestDAppV2.go