simple call implementation

cmd/zetae2e/local/local.go

@@ -346,12 +346,12 @@ func localE2ETest(cmd *cobra.Command, _ []string) {
 			//e2etests.TestV2ETHDepositAndCallName,
 			//e2etests.TestV2ETHWithdrawName,
 			//e2etests.TestV2ETHWithdrawAndCallName,
-			e2etests.TestV2ERC20DepositName,
+			//e2etests.TestV2ERC20DepositName,
 			//e2etests.TestV2ERC20DepositAndCallName,
 			//e2etests.TestV2ERC20WithdrawName,
-			e2etests.TestV2ERC20WithdrawAndCallName,
-			//e2etests.TestV2ZEVMToEVMCallName,
-			//e2etests.TestV2EVMToZEVMCallName,
+			//e2etests.TestV2ERC20WithdrawAndCallName,
+			e2etests.TestV2ZEVMToEVMCallName,
+			e2etests.TestV2EVMToZEVMCallName,
 		))
 	}
 

docs/openapi/openapi.swagger.yaml

@@ -57071,11 +57071,13 @@ definitions:
       - Gas
       - ERC20
       - Cmd
+      - NoAssetCall
     default: Zeta
     title: |-
       - Gas: Ether, BNB, Matic, Klay, BTC, etc
        - ERC20: ERC20 token
-       - Cmd: not a real coin, rather a command
+       - Cmd: not asset, used for admin command
+       - NoAssetCall: no asset, used for contract call
   crosschainCctxStatus:
     type: string
     enum:

e2e/e2etests/test_v2_evm_to_zevm_call.go

@@ -1,24 +1,28 @@
 package e2etests
 
 import (
+	"math/big"
+
 	"github.com/stretchr/testify/require"
 
 	"github.com/zeta-chain/zetacore/e2e/runner"
 	"github.com/zeta-chain/zetacore/e2e/utils"
 	crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types"
 )
 
+const payloadMessageZEVMCall = "this is a test ZEVM call payload"
+
 func TestV2EVMToZEVMCall(r *runner.E2ERunner, args []string) {
 	require.Len(r, args, 0)
 
-	// TODO: set payload
-	payload := []byte("")
-
 	// perform the withdraw
-	tx := r.V2EVMToZEMVCall(r.EVMAddress(), payload)
+	tx := r.V2EVMToZEMVCall(r.TestDAppV2ZEVMAddr, []byte(payloadMessageZEVMCall))
 
 	// wait for the cctx to be mined
 	cctx := utils.WaitCctxMinedByInboundHash(r.Ctx, tx.Hash().Hex(), r.CctxClient, r.Logger, r.CctxTimeout)
 	r.Logger.CCTX(*cctx, "call")
 	require.Equal(r, crosschaintypes.CctxStatus_OutboundMined, cctx.CctxStatus.Status)
+
+	// check the payload was received on the contract
+	r.AssertTestDAppZEVMValues(true, payloadMessageZEVMCall, big.NewInt(0))
 }

e2e/e2etests/test_v2_zevm_to_evm_call.go

@@ -1,24 +1,31 @@
 package e2etests
 
 import (
+	"math/big"
+
 	"github.com/stretchr/testify/require"
 
 	"github.com/zeta-chain/zetacore/e2e/runner"
 	"github.com/zeta-chain/zetacore/e2e/utils"
 	crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types"
 )
 
+const payloadMessageEVMCall = "this is a test EVM call payload"
+
 func TestV2ZEVMToEVMCall(r *runner.E2ERunner, args []string) {
 	require.Len(r, args, 0)
 
-	// TODO: set payload
-	payload := []byte("")
+	// Necessary approval for fee payment
+	r.ApproveETHZRC20(r.GatewayZEVMAddr)
 
 	// perform the withdraw
-	tx := r.V2ZEVMToEMVCall(r.EVMAddress(), payload)
+	tx := r.V2ZEVMToEMVCall(r.TestDAppV2EVMAddr, r.EncodeSimpleCall(payloadMessageEVMCall))
 
 	// wait for the cctx to be mined
 	cctx := utils.WaitCctxMinedByInboundHash(r.Ctx, tx.Hash().Hex(), r.CctxClient, r.Logger, r.CctxTimeout)
 	r.Logger.CCTX(*cctx, "call")
 	require.Equal(r, crosschaintypes.CctxStatus_OutboundMined, cctx.CctxStatus.Status)
+
+	// check the payload was received on the contract
+	r.AssertTestDAppEVMValues(true, payloadMessageEVMCall, big.NewInt(0))
 }

e2e/runner/v2_setup_zeta.go

@@ -82,6 +82,7 @@ func (r *E2ERunner) UpdateChainParamsERC20CustodyContract() {
 	require.NoError(r, err)
 
 	evmChainID, err := r.EVMClient.ChainID(r.Ctx)
+	require.NoError(r, err)
 
 	// find old chain params
 	var (

pkg/contracts/testdappv2/TestDAppV2.sol

@@ -54,6 +54,7 @@ contract TestDAppV2 {
         require(!isRevertMessage(bytes(message)));
 
         lastMessage = message;
+        lastAmount = 0;
     }
 
     function isRevertMessage(bytes memory message) internal pure returns (bool) {

typescript/zetachain/zetacore/pkg/coin/coin_pb.d.ts

@@ -27,10 +27,17 @@ export declare enum CoinType {
   ERC20 = 2,
 
   /**
-   * not a real coin, rather a command
+   * not asset, used for admin command
    *
    * @generated from enum value: Cmd = 3;
    */
   Cmd = 3,
+
+  /**
+   * no asset, used for contract call
+   *
+   * @generated from enum value: NoAssetCall = 4;
+   */
+  NoAssetCall = 4,
 }
 

x/fungible/keeper/deposits.go

@@ -41,7 +41,11 @@ func (k Keeper) ZRC20DepositAndCallContract(
 	var found bool
 
 	// get foreign coin
-	if coinType == coin.CoinType_Gas {
+	// retrieve the gas token of the chain for no asset call
+	// this simplify the current workflow and allow to pause calls by pausing the gas token
+	// TODO: refactor this logic and create specific workflow for no asset call
+	// https://github.com/zeta-chain/node/issues/2627
+	if coinType == coin.CoinType_Gas || coinType == coin.CoinType_NoAssetCall {
 		foreignCoin, found = k.GetGasCoinForForeignCoin(ctx, senderChainID)
 		if !found {
 			return nil, false, crosschaintypes.ErrGasCoinNotFound
@@ -74,7 +78,7 @@ func (k Keeper) ZRC20DepositAndCallContract(
 
 	// handle the deposit for protocol contract version 2
 	if protocolContractVersion == crosschaintypes.ProtocolContractVersion_V2 {
-		return k.ProcessV2Deposit(ctx, from, senderChainID, zrc20Contract, to, amount, message)
+		return k.ProcessV2Deposit(ctx, from, senderChainID, zrc20Contract, to, amount, message, coinType)
 	}
 
 	// check if the receiver is a contract

x/fungible/keeper/v2_deposits.go

@@ -7,6 +7,8 @@ import (
 	ethcommon "github.com/ethereum/go-ethereum/common"
 	evmtypes "github.com/evmos/ethermint/x/evm/types"
 	"github.com/zeta-chain/protocol-contracts/v2/pkg/systemcontract.sol"
+
+	"github.com/zeta-chain/zetacore/pkg/coin"
 )
 
 // ProcessV2Deposit handles a deposit from an inbound tx with protocol version 2
@@ -20,14 +22,22 @@ func (k Keeper) ProcessV2Deposit(
 	to ethcommon.Address,
 	amount *big.Int,
 	message []byte,
+	coinType coin.CoinType,
 ) (*evmtypes.MsgEthereumTxResponse, bool, error) {
-	// simple deposit
 	if len(message) == 0 {
 		// simple deposit
 		res, err := k.DepositZRC20(ctx, zrc20Addr, to, amount)
 		return res, false, err
+	} else if coinType == coin.CoinType_NoAssetCall {
+		// simple call
+		context := systemcontract.ZContext{
+			Origin:  from,
+			Sender:  ethcommon.Address{},
+			ChainID: big.NewInt(senderChainID),
+		}
+		res, err := k.CallExecute(ctx, context, zrc20Addr, amount, to, message)
+		return res, true, err
 	}
-
 	// deposit and call
 	context := systemcontract.ZContext{
 		Origin:  from,

x/fungible/keeper/v2_deposits_test.go

@@ -5,6 +5,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/stretchr/testify/require"
 	"github.com/zeta-chain/zetacore/pkg/chains"
+	"github.com/zeta-chain/zetacore/pkg/coin"
 	"github.com/zeta-chain/zetacore/pkg/contracts/testdappv2"
 	keepertest "github.com/zeta-chain/zetacore/testutil/keeper"
 	"github.com/zeta-chain/zetacore/testutil/sample"
@@ -101,6 +102,7 @@ func TestKeeper_ProcessV2Deposit(t *testing.T) {
 			receiver,
 			big.NewInt(42),
 			[]byte{},
+			coin.CoinType_Gas,
 		)
 
 		// ASSERT
@@ -135,6 +137,7 @@ func TestKeeper_ProcessV2Deposit(t *testing.T) {
 			testDapp,
 			big.NewInt(82),
 			[]byte("foo"),
+			coin.CoinType_Gas,
 		)
 
 		// ASSERT

x/fungible/keeper/v2_evm.go

@@ -65,3 +65,53 @@ func (k Keeper) CallDepositAndCallZRC20(
 		message,
 	)
 }
+
+// CallExecute calls the execute function on the gateway contract
+// function execute(
+//
+//	zContext calldata context,
+//	address zrc20,
+//	uint256 amount,
+//	address target,
+//	bytes calldata message
+//
+// )
+func (k Keeper) CallExecute(
+	ctx sdk.Context,
+	context systemcontract.ZContext,
+	zrc20 common.Address,
+	amount *big.Int,
+	target common.Address,
+	message []byte,
+) (*evmtypes.MsgEthereumTxResponse, error) {
+	gatewayABI, err := gatewayzevm.GatewayZEVMMetaData.GetAbi()
+	if err != nil {
+		return nil, err
+	}
+
+	systemContract, found := k.GetSystemContract(ctx)
+	if !found {
+		return nil, types.ErrSystemContractNotFound
+	}
+	gatewayAddr := common.HexToAddress(systemContract.Gateway)
+	if gatewayAddr == (common.Address{}) {
+		return nil, types.ErrGatewayContractNotSet
+	}
+
+	return k.CallEVM(
+		ctx,
+		*gatewayABI,
+		types.ModuleAddressEVM,
+		gatewayAddr,
+		BigIntZero,
+		nil,
+		true,
+		false,
+		"execute",
+		context,
+		zrc20,
+		amount,
+		target,
+		message,
+	)
+}

zetaclient/chains/evm/cctx.go

@@ -57,6 +57,10 @@ func ParseOutboundTypeFromCCTX(cctx types.CrossChainTx) OutboundTypes {
 				return OutboundTypeERC20WithdrawAndCall
 			}
 		}
+	case coin.CoinType_NoAssetCall:
+		if cctx.CctxStatus.Status == types.CctxStatus_PendingOutbound {
+			return OutboundTypeCall
+		}
 	}
 
 	return OutboundTypeUnknown

zetaclient/chains/evm/observer/inbound.go

@@ -220,11 +220,17 @@ func (ob *Observer) ObserveInbound(ctx context.Context, sampledLogger zerolog.Lo
 	// query the gateway logs
 	// TODO: refactor in a more declarative design. Example: storing the list of contract and events to listen in an array
 	// https://github.com/zeta-chain/node/issues/2493
-	lastScannedGateway, err := ob.ObserveGateway(ctx, startBlock, toBlock)
+	lastScannedGatewayDeposit, err := ob.ObserveGatewayDeposit(ctx, startBlock, toBlock)
 	if err != nil {
 		ob.Logger().Inbound.Error().
 			Err(err).
-			Msgf("ObserveInbound: error observing events from Gateway contract")
+			Msgf("ObserveInbound: error observing deposit events from Gateway contract")
+	}
+	lastScannedGatewayCall, err := ob.ObserveGatewayCall(ctx, startBlock, toBlock)
+	if err != nil {
+		ob.Logger().Inbound.Error().
+			Err(err).
+			Msgf("ObserveInbound: error observing call events from Gateway contract")
 	}
 
 	// note: using lowest height for all 3 events is not perfect, but it's simple and good enough
@@ -235,8 +241,11 @@ func (ob *Observer) ObserveInbound(ctx context.Context, sampledLogger zerolog.Lo
 	if lastScannedTssRecvd < lastScannedLowest {
 		lastScannedLowest = lastScannedTssRecvd
 	}
-	if lastScannedGateway < lastScannedLowest {
-		lastScannedLowest = lastScannedGateway
+	if lastScannedGatewayDeposit < lastScannedLowest {
+		lastScannedLowest = lastScannedGatewayDeposit
+	}
+	if lastScannedGatewayCall < lastScannedLowest {
+		lastScannedLowest = lastScannedGatewayCall
 	}
 
 	// update last scanned block height for all 3 events (ZetaSent, Deposited, TssRecvd), ignore db error