fix: abort cctx on dust amount in revert outbound (Bitcoin and Solana)

changelog.md

@@ -24,6 +24,7 @@
 * [3041](https://github.com/zeta-chain/node/pull/3041) - replace libp2p public DHT with private gossip peer discovery and connection gater for inbound connections
 * [3106](https://github.com/zeta-chain/node/pull/3106) - prevent blocked CCTX on out of gas during omnichain calls
 * [3139](https://github.com/zeta-chain/node/pull/3139) - fix config resolution in orchestrator
+* [3149](https://github.com/zeta-chain/node/pull/3149) - abort the cctx if dust amount is dected in the revert outbound
 
 ## v21.0.0
 

cmd/zetae2e/local/local.go

@@ -433,7 +433,8 @@ func localE2ETest(cmd *cobra.Command, _ []string) {
 			e2etests.TestSolanaDepositName,
 			e2etests.TestSolanaWithdrawName,
 			e2etests.TestSolanaDepositAndCallName,
-			e2etests.TestSolanaDepositAndCallRefundName,
+			e2etests.TestSolanaDepositAndCallRevertName,
+			e2etests.TestSolanaDepositAndCallRevertWithDustName,
 			e2etests.TestSolanaDepositRestrictedName,
 			e2etests.TestSolanaWithdrawRestrictedName,
 			// TODO move under admin tests

e2e/e2etests/e2etests.go

@@ -55,16 +55,17 @@ const (
 	/*
 	 * Solana tests
 	 */
-	TestSolanaDepositName                   = "solana_deposit"
-	TestSolanaWithdrawName                  = "solana_withdraw"
-	TestSolanaDepositAndCallName            = "solana_deposit_and_call"
-	TestSolanaDepositAndCallRefundName      = "solana_deposit_and_call_refund"
-	TestSolanaDepositRestrictedName         = "solana_deposit_restricted"
-	TestSolanaWithdrawRestrictedName        = "solana_withdraw_restricted"
-	TestSPLDepositName                      = "spl_deposit"
-	TestSPLDepositAndCallName               = "spl_deposit_and_call"
-	TestSPLWithdrawName                     = "spl_withdraw"
-	TestSPLWithdrawAndCreateReceiverAtaName = "spl_withdraw_and_create_receiver_ata"
+	TestSolanaDepositName                      = "solana_deposit"
+	TestSolanaWithdrawName                     = "solana_withdraw"
+	TestSolanaDepositAndCallName               = "solana_deposit_and_call"
+	TestSolanaDepositAndCallRevertName         = "solana_deposit_and_call_revert"
+	TestSolanaDepositAndCallRevertWithDustName = "solana_deposit_and_call_revert_with_dust"
+	TestSolanaDepositRestrictedName            = "solana_deposit_restricted"
+	TestSolanaWithdrawRestrictedName           = "solana_withdraw_restricted"
+	TestSPLDepositName                         = "spl_deposit"
+	TestSPLDepositAndCallName                  = "spl_deposit_and_call"
+	TestSPLWithdrawName                        = "spl_withdraw"
+	TestSPLWithdrawAndCreateReceiverAtaName    = "spl_withdraw_and_create_receiver_ata"
 
 	/**
 	 * TON tests
@@ -453,12 +454,18 @@ var AllE2ETests = []runner.E2ETest{
 		TestSPLWithdrawAndCreateReceiverAta,
 	),
 	runner.NewE2ETest(
-		TestSolanaDepositAndCallRefundName,
-		"deposit SOL into ZEVM and call a contract that reverts; should refund",
+		TestSolanaDepositAndCallRevertName,
+		"deposit SOL into ZEVM and call a contract that reverts",
 		[]runner.ArgDefinition{
 			{Description: "amount in lamport", DefaultValue: "1200000"},
 		},
-		TestSolanaDepositAndCallRefund,
+		TestSolanaDepositAndCallRevert,
+	),
+	runner.NewE2ETest(
+		TestSolanaDepositAndCallRevertWithDustName,
+		"deposit SOL into ZEVM; revert with dust amount that aborts the CCTX",
+		[]runner.ArgDefinition{},
+		TestSolanaDepositAndCallRevertWithDust,
 	),
 	runner.NewE2ETest(
 		TestSolanaDepositRestrictedName,

e2e/e2etests/test_bitcoin_deposit_and_call_revert_with_dust.go

@@ -5,9 +5,7 @@ import (
 
 	"github.com/zeta-chain/node/e2e/runner"
 	"github.com/zeta-chain/node/e2e/utils"
-	"github.com/zeta-chain/node/pkg/constant"
 	"github.com/zeta-chain/node/testutil/sample"
-	crosschaintypes "github.com/zeta-chain/node/x/crosschain/types"
 	zetabitcoin "github.com/zeta-chain/node/zetaclient/chains/bitcoin"
 )
 
@@ -38,16 +36,12 @@ func TestBitcoinDepositAndCallRevertWithDust(r *runner.E2ERunner, args []string)
 	// Send BTC to TSS address with a dummy memo
 	// zetacore should revert cctx if call is made on a non-existing address
 	nonExistReceiver := sample.EthAddress()
-	badMemo := append(nonExistReceiver.Bytes(), []byte("gibberish-memo")...)
-	txHash, err := r.SendToTSSFromDeployerWithMemo(amount, utxos, badMemo)
+	anyMemo := append(nonExistReceiver.Bytes(), []byte("gibberish-memo")...)
+	txHash, err := r.SendToTSSFromDeployerWithMemo(amount, utxos, anyMemo)
 	require.NoError(r, err)
 	require.NotEmpty(r, txHash)
 
-	// wait for the cctx to be mined
-	cctx := utils.WaitCctxMinedByInboundHash(r.Ctx, txHash.String(), r.CctxClient, r.Logger, r.CctxTimeout)
-	r.Logger.CCTX(*cctx, "deposit_and_revert")
-	utils.RequireCCTXStatus(r, cctx, crosschaintypes.CctxStatus_Reverted)
-
-	// check the test was effective: the revert outbound amount is less than the dust amount
-	require.Less(r, cctx.GetCurrentOutboundParam().Amount.Uint64(), uint64(constant.BTCWithdrawalDustAmount))
+	// ASSERT
+	// Now we want to make sure the cctx is aborted.
+	utils.WaitCctxAbortedByInboundHash(r.Ctx, r, txHash.String(), r.CctxClient)
 }

e2e/e2etests/test_solana_deposit_and_call_revert_with_dust.go

@@ -0,0 +1,30 @@
+package e2etests
+
+import (
+	"math/big"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/zeta-chain/node/e2e/runner"
+	"github.com/zeta-chain/node/e2e/utils"
+	"github.com/zeta-chain/node/pkg/constant"
+	"github.com/zeta-chain/node/testutil/sample"
+)
+
+// TestSolanaDepositAndCallRevertWithDust tests Solana deposit and call that reverts with a dust amount in the revert outbound.
+func TestSolanaDepositAndCallRevertWithDust(r *runner.E2ERunner, args []string) {
+	require.Len(r, args, 0)
+
+	// deposit the rent exempt amount which will result in a dust amount (after fee deduction) in the revert outbound
+	depositAmount := big.NewInt(constant.SolanaWalletRentExempt)
+
+	// ACT
+	// execute the deposit and call transaction
+	nonExistReceiver := sample.EthAddress()
+	data := []byte("dust lamports should abort cctx")
+	sig := r.SOLDepositAndCall(nil, nonExistReceiver, depositAmount, data)
+
+	// ASSERT
+	// Now we want to make sure cctx is aborted.
+	utils.WaitCctxAbortedByInboundHash(r.Ctx, r, sig.String(), r.CctxClient)
+}

e2e/e2etests/test_solana_deposit_refund.go

@@ -9,8 +9,8 @@ import (
 	crosschaintypes "github.com/zeta-chain/node/x/crosschain/types"
 )
 
-// TestSolanaDepositAndCallRefund tests deposit of lamports calling a example contract
-func TestSolanaDepositAndCallRefund(r *runner.E2ERunner, args []string) {
+// TestSolanaDepositAndCallRevert tests deposit of lamports calling a example contract that reverts.
+func TestSolanaDepositAndCallRevert(r *runner.E2ERunner, args []string) {
 	require.Len(r, args, 1)
 
 	// parse deposit amount (in lamports)

e2e/utils/zetacore.go

@@ -227,6 +227,20 @@ func WaitCctxRevertedByInboundHash(
 	return cctxs[0]
 }
 
+// WaitCctxAbortedByInboundHash waits until cctx is aborted by inbound hash.
+func WaitCctxAbortedByInboundHash(
+	ctx context.Context,
+	t require.TestingT,
+	hash string,
+	c CCTXClient,
+) crosschaintypes.CrossChainTx {
+	// wait for cctx to be aborted
+	cctxs := WaitCctxByInboundHash(ctx, t, hash, c, MatchStatus(crosschaintypes.CctxStatus_Aborted))
+	require.Len(t, cctxs, 1)
+
+	return cctxs[0]
+}
+
 // WaitCctxByInboundHash waits until cctx appears by inbound hash.
 func WaitCctxByInboundHash(
 	ctx context.Context,

x/crosschain/keeper/cctx_orchestrator_validate_outbound.go

@@ -182,6 +182,7 @@
 			return cosmoserrors.Wrap(err, "AddRevertOutbound")
 		}
 
+		// pay revert outbound gas fee
 		err = k.PayGasAndUpdateCctx(
 			ctx,
 			cctx.InboundParams.SenderChainId,
@@ -192,6 +193,18 @@
 		if err != nil {
 			return err
 		}
+
+		// validate data of the revert outbound
+		err = k.validateZRC20Withdrawal(
+			ctx,
+			cctx.GetCurrentOutboundParam().ReceiverChainId,
+			cctx.GetCurrentOutboundParam().Amount.BigInt(),
+			[]byte(cctx.GetCurrentOutboundParam().Receiver),
+		)
+		if err != nil {
+			return err
+		}
+
 		err = k.SetObserverOutboundInfo(ctx, cctx.InboundParams.SenderChainId, cctx)
 		if err != nil {
 			return err