feat: zevm message passing

app/ante/ante.go

@@ -26,7 +26,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/authz"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 	tmlog "github.com/tendermint/tendermint/libs/log"
-	cctxtypes "github.com/zeta-chain/zetacore/x/crosschain/types"
+	crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types"
 	observertypes "github.com/zeta-chain/zetacore/x/observer/types"
 )
 
@@ -168,10 +168,10 @@ func IsSystemTx(tx sdk.Tx, isAuthorizedSigner func(string) bool) bool {
 		}
 	}
 	switch innerMsg.(type) {
-	case *cctxtypes.MsgVoteGasPrice,
-		*cctxtypes.MsgVoteOnObservedInboundTx,
-		*cctxtypes.MsgVoteOnObservedOutboundTx,
-		*cctxtypes.MsgAddToOutTxTracker,
+	case *crosschaintypes.MsgVoteGasPrice,
+		*crosschaintypes.MsgVoteOnObservedInboundTx,
+		*crosschaintypes.MsgVoteOnObservedOutboundTx,
+		*crosschaintypes.MsgAddToOutTxTracker,
 		*observertypes.MsgVoteBlockHeader,
 		*observertypes.MsgVoteTSS,
 		*observertypes.MsgAddBlameVote:

changelog.md

@@ -54,6 +54,7 @@
 * [1954](https://github.com/zeta-chain/node/pull/1954) - add metric for concurrent keysigns
 * [2006](https://github.com/zeta-chain/node/pull/2006) - add Amoy testnet static chain information
 * [2046](https://github.com/zeta-chain/node/pull/2046) - add state variable in crosschain for rate limiter flags
+* [2034](https://github.com/zeta-chain/node/pull/2034) - add support for zEVM message passing
 
 ### Tests
 

cmd/zetae2e/config/config.go

@@ -106,7 +106,7 @@ func ExportContractsFromRunner(r *runner.E2ERunner, conf config.Config) config.C
 	conf.Contracts.ZEVM.WZetaAddr = r.WZetaAddr.Hex()
 	conf.Contracts.ZEVM.ZEVMSwapAppAddr = r.ZEVMSwapAppAddr.Hex()
 	conf.Contracts.ZEVM.ContextAppAddr = r.ContextAppAddr.Hex()
-	conf.Contracts.ZEVM.TestDappAddr = r.TestDAppAddr.Hex()
+	conf.Contracts.ZEVM.TestDappAddr = r.EvmTestDAppAddr.Hex()
 
 	return conf
 }

cmd/zetae2e/config/contracts.go

@@ -7,9 +7,9 @@ import (
 	"github.com/zeta-chain/protocol-contracts/pkg/contracts/evm/erc20custody.sol"
 	zetaeth "github.com/zeta-chain/protocol-contracts/pkg/contracts/evm/zeta.eth.sol"
 	zetaconnectoreth "github.com/zeta-chain/protocol-contracts/pkg/contracts/evm/zetaconnector.eth.sol"
-	"github.com/zeta-chain/protocol-contracts/pkg/contracts/zevm/connectorzevm.sol"
 	"github.com/zeta-chain/protocol-contracts/pkg/contracts/zevm/systemcontract.sol"
 	"github.com/zeta-chain/protocol-contracts/pkg/contracts/zevm/wzeta.sol"
+	connectorzevm "github.com/zeta-chain/protocol-contracts/pkg/contracts/zevm/zetaconnectorzevm.sol"
 	"github.com/zeta-chain/protocol-contracts/pkg/contracts/zevm/zrc20.sol"
 	"github.com/zeta-chain/protocol-contracts/pkg/uniswap/v2-core/contracts/uniswapv2factory.sol"
 	uniswapv2router "github.com/zeta-chain/protocol-contracts/pkg/uniswap/v2-periphery/contracts/uniswapv2router02.sol"
@@ -181,7 +181,7 @@ func setContractsFromConfig(r *runner.E2ERunner, conf config.Config) error {
 		if !ethcommon.IsHexAddress(c) {
 			return fmt.Errorf("invalid TestDappAddr: %s", c)
 		}
-		r.TestDAppAddr = ethcommon.HexToAddress(c)
+		r.EvmTestDAppAddr = ethcommon.HexToAddress(c)
 	}
 
 	return nil

cmd/zetae2e/local/local.go

@@ -253,6 +253,10 @@ func localE2ETest(cmd *cobra.Command, _ []string) {
 		}
 		zetaAdvancedTests := []string{
 			e2etests.TestZetaDepositRestrictedName,
+			e2etests.TestMessagePassingZEVMToEVMName,
+			e2etests.TestMessagePassingEVMtoZEVMName,
+			e2etests.TestMessagePassingEVMtoZEVMRevertName,
+			e2etests.TestMessagePassingZEVMtoEVMRevertName,
 		}
 		bitcoinTests := []string{
 			e2etests.TestBitcoinWithdrawSegWitName,

e2e/e2etests/e2etests.go

@@ -25,6 +25,11 @@ const (
 	TestCrosschainSwapName                = "crosschain_swap"
 	TestMessagePassingRevertFailName      = "message_passing_revert_fail"
 	TestMessagePassingRevertSuccessName   = "message_passing_revert_success"
+	TestMessagePassingEVMtoZEVMName       = "message_passing_zevm"
+	TestMessagePassingZEVMToEVMName       = "message_passing_zevm_to_evm"
+
+	TestMessagePassingZEVMtoEVMRevertName = "message_passing_zevm_to_evm_revert"
+	TestMessagePassingEVMtoZEVMRevertName = "message_passing_revert_zevm"
 	TestERC20DepositAndCallRefundName     = "erc20_deposit_and_call_refund"
 	TestEtherDepositAndCallName           = "eth_deposit_and_call"
 	TestDepositEtherLiquidityCapName      = "deposit_eth_liquidity_cap"
@@ -372,4 +377,36 @@ var AllE2ETests = []runner.E2ETest{
 		[]runner.ArgDefinition{},
 		TestUpdateBytecodeConnector,
 	),
+	runner.NewE2ETest(
+		TestMessagePassingZEVMToEVMName,
+		"zevm -> evm message passing contract call",
+		[]runner.ArgDefinition{
+			runner.ArgDefinition{Description: "amount in azeta", DefaultValue: "10000000000000000007"},
+		},
+		TestMessagePassingZEVMtoEVM,
+	),
+	runner.NewE2ETest(
+		TestMessagePassingZEVMtoEVMRevertName,
+		"zevm -> evm message passing contract call reverts",
+		[]runner.ArgDefinition{
+			runner.ArgDefinition{Description: "amount in azeta", DefaultValue: "10000000000000000006"},
+		},
+		TestMessagePassingZEVMtoEVMRevert,
+	),
+	runner.NewE2ETest(
+		TestMessagePassingEVMtoZEVMName,
+		"evm -> zevm message passing contract call ",
+		[]runner.ArgDefinition{
+			runner.ArgDefinition{Description: "amount in azeta", DefaultValue: "10000000000000000009"},
+		},
+		TestMessagePassingEVMtoZEVM,
+	),
+	runner.NewE2ETest(
+		TestMessagePassingEVMtoZEVMRevertName,
+		"evm -> zevm message passing and revert back to evm",
+		[]runner.ArgDefinition{
+			runner.ArgDefinition{Description: "amount in azeta", DefaultValue: "10000000000000000008"},
+		},
+		TestMessagePassingEVMtoZEVMRevert,
+	),
 }

e2e/e2etests/test_eth_deposit.go

@@ -139,6 +139,7 @@ func TestEtherDepositAndCall(r *runner.E2ERunner, args []string) {
 	if receipt.Status == 0 {
 		panic("tx failed")
 	}
+
 	cctx = utils.WaitCctxMinedByInTxHash(r.Ctx, signedTx.Hash().Hex(), r.CctxClient, r.Logger, r.CctxTimeout)
 	if cctx.CctxStatus.Status != types.CctxStatus_Reverted {
 		panic(fmt.Sprintf("expected cctx status to be reverted; got %s", cctx.CctxStatus.Status))

e2e/e2etests/test_message_passing.go

@@ -190,7 +190,7 @@ func TestMessagePassingRevertSuccess(r *runner.E2ERunner, args []string) {
 
 	auth := r.EVMAuth
 
-	tx, err := r.ZetaEth.Approve(auth, r.TestDAppAddr, amount)
+	tx, err := r.ZetaEth.Approve(auth, r.EvmTestDAppAddr, amount)
 	if err != nil {
 		panic(err)
 	}
@@ -202,8 +202,8 @@ func TestMessagePassingRevertSuccess(r *runner.E2ERunner, args []string) {
 	}
 	r.Logger.Info("Approve tx receipt: %d", receipt.Status)
 
-	r.Logger.Info("Calling TestDApp.SendHello on contract address %s", r.TestDAppAddr.Hex())
-	testDApp, err := testdapp.NewTestDApp(r.TestDAppAddr, r.EVMClient)
+	r.Logger.Info("Calling TestDApp.SendHello on contract address %s", r.EvmTestDAppAddr.Hex())
+	testDApp, err := testdapp.NewTestDApp(r.EvmTestDAppAddr, r.EVMClient)
 	if err != nil {
 		panic(err)
 	}
@@ -216,7 +216,7 @@ func TestMessagePassingRevertSuccess(r *runner.E2ERunner, args []string) {
 	}
 	r.Logger.Info("$$$ Before: SUPPLY OF AZETA: %d", res2.Amount.Amount)
 
-	tx, err = testDApp.SendHelloWorld(auth, r.TestDAppAddr, chainID, amount, true)
+	tx, err = testDApp.SendHelloWorld(auth, r.EvmTestDAppAddr, chainID, amount, true)
 	if err != nil {
 		panic(err)
 	}