Merge branch 'develop' into reliable-block-header

docs/openapi/openapi.swagger.yaml

@@ -50629,6 +50629,10 @@ definitions:
     type: object
   crosschainMsgAddToOutTxTrackerResponse:
     type: object
+    properties:
+      is_removed:
+        type: boolean
+        title: if the tx was removed from the tracker due to no pending cctx
   crosschainMsgCreateTSSVoterResponse:
     type: object
   crosschainMsgGasPriceVoterResponse:

docs/spec/crosschain/messages.md

@@ -4,6 +4,7 @@
 
 AddToOutTxTracker adds a new record to the outbound transaction tracker.
 only the admin policy account and the observer validators are authorized to broadcast this message without proof.
+If no pending cctx is found, the tracker is removed, if there is an existed tracker with the nonce & chainID.
 
 ```proto
 message MsgAddToOutTxTracker {

proto/crosschain/tx.proto

@@ -75,7 +75,9 @@ message MsgAddToOutTxTracker {
   int64 tx_index = 7;
 }
 
-message MsgAddToOutTxTrackerResponse {}
+message MsgAddToOutTxTrackerResponse {
+  bool is_removed = 1; // if the tx was removed from the tracker due to no pending cctx
+}
 
 message MsgRemoveFromOutTxTracker {
   string creator = 1;

typescript/crosschain/tx_pb.d.ts

@@ -322,6 +322,13 @@ export declare class MsgAddToOutTxTracker extends Message<MsgAddToOutTxTracker>
  * @generated from message zetachain.zetacore.crosschain.MsgAddToOutTxTrackerResponse
  */
 export declare class MsgAddToOutTxTrackerResponse extends Message<MsgAddToOutTxTrackerResponse> {
+  /**
+   * if the tx was removed from the tracker due to no pending cctx
+   *
+   * @generated from field: bool is_removed = 1;
+   */
+  isRemoved: boolean;
+
   constructor(data?: PartialMessage<MsgAddToOutTxTrackerResponse>);
 
   static readonly runtime: typeof proto3;

x/crosschain/keeper/cctx_utils.go

@@ -121,3 +121,11 @@ func (k Keeper) GetRevertGasLimit(ctx sdk.Context, cctx types.CrossChainTx) (uin
 
 	return 0, nil
 }
+
+func IsPending(cctx types.CrossChainTx) bool {
+	// pending inbound is not considered a "pending" state because it has not reached consensus yet
+	if cctx.CctxStatus.Status == types.CctxStatus_PendingOutbound || cctx.CctxStatus.Status == types.CctxStatus_PendingRevert {
+		return true
+	}
+	return false
+}

x/crosschain/keeper/keeper_cross_chain_tx.go

@@ -181,7 +181,7 @@ func (k Keeper) CctxAllPending(c context.Context, req *types.QueryAllCctxPending
 	// now query the previous nonces up to 100 prior to find any pending cctx that we might have missed
 	// need this logic because a confirmation of higher nonce will automatically update the p.NonceLow
 	// therefore might mask some lower nonce cctx that is still pending.
-	startNonce := p.NonceLow - 100
+	startNonce := p.NonceLow - 1000
 	if startNonce < 0 {
 		startNonce = 0
 	}

x/crosschain/keeper/msg_server_add_to_outtx_tracker.go

@@ -20,6 +20,7 @@ import (
 
 // AddToOutTxTracker adds a new record to the outbound transaction tracker.
 // only the admin policy account and the observer validators are authorized to broadcast this message without proof.
+// If no pending cctx is found, the tracker is removed, if there is an existed tracker with the nonce & chainID.
 func (k msgServer) AddToOutTxTracker(goCtx context.Context, msg *types.MsgAddToOutTxTracker) (*types.MsgAddToOutTxTrackerResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 	chain := k.zetaObserverKeeper.GetParams(ctx).GetChainFromChainID(msg.ChainId)
@@ -51,6 +52,18 @@ func (k msgServer) AddToOutTxTracker(goCtx context.Context, msg *types.MsgAddToO
 		isProven = true
 	}
 
+	cctx, err := k.CctxByNonce(ctx, &types.QueryGetCctxByNonceRequest{
+		ChainID: msg.ChainId,
+		Nonce:   msg.Nonce,
+	})
+	if err != nil || cctx == nil || cctx.CrossChainTx == nil {
+		return nil, cosmoserrors.Wrap(types.ErrCannotFindCctx, "cannot add out tx: no corresponding cctx found")
+	}
+	if !IsPending(*cctx.CrossChainTx) {
+		k.RemoveOutTxTracker(ctx, msg.ChainId, msg.Nonce)
+		return &types.MsgAddToOutTxTrackerResponse{IsRemoved: true}, nil
+	}
+
 	tracker, found := k.GetOutTxTracker(ctx, msg.ChainId, msg.Nonce)
 	hash := types.TxHashList{
 		TxHash:   msg.TxHash,
@@ -84,7 +97,7 @@ func (k msgServer) AddToOutTxTracker(goCtx context.Context, msg *types.MsgAddToO
 			hash.Proved = true
 			tracker.HashList = append([]*types.TxHashList{&hash}, tracker.HashList...)
 			k.Logger(ctx).Info("Proof'd outbound transaction")
-		} else {
+		} else if len(tracker.HashList) < 2 {
 			tracker.HashList = append(tracker.HashList, &hash)
 		}
 		k.SetOutTxTracker(ctx, tracker)

x/crosschain/keeper/msg_server_add_to_outtx_tracker_test.go

@@ -25,7 +25,7 @@ func TestMsgServer_AddToOutTxTracker(t *testing.T) {
 		txIndex, block, header, headerRLP, _, tx, err := sample.Proof()
 		require.NoError(t, err)
 		setupVerificationParams(zk, ctx, txIndex, chainID, header, headerRLP, block)
-		setupTss(k, ctx)
+		setupTssAndNonceToCctx(k, ctx, chainID, 0)
 		msgServer := keeper.NewMsgServerImpl(*k)
 		_, err = msgServer.AddToOutTxTracker(ctx, &types.MsgAddToOutTxTracker{
 			Creator:   admin,
@@ -47,7 +47,7 @@ func TestMsgServer_AddToOutTxTracker(t *testing.T) {
 		txIndex, block, header, headerRLP, proof, tx, err := sample.Proof()
 		require.NoError(t, err)
 		setupVerificationParams(zk, ctx, txIndex, chainID, header, headerRLP, block)
-		setupTss(k, ctx)
+		setupTssAndNonceToCctx(k, ctx, chainID, int64(tx.Nonce()))
 		msgServer := keeper.NewMsgServerImpl(*k)
 		_, err = msgServer.AddToOutTxTracker(ctx, &types.MsgAddToOutTxTracker{
 			Creator:   sample.AccAddress(),
@@ -69,7 +69,7 @@ func TestMsgServer_AddToOutTxTracker(t *testing.T) {
 		txIndex, block, header, headerRLP, proof, tx, err := sample.Proof()
 		require.NoError(t, err)
 		setupVerificationParams(zk, ctx, txIndex, chainID, header, headerRLP, block)
-		setupTss(k, ctx)
+		setupTssAndNonceToCctx(k, ctx, chainID, 1)
 		msgServer := keeper.NewMsgServerImpl(*k)
 		_, err = msgServer.AddToOutTxTracker(ctx, &types.MsgAddToOutTxTracker{
 			Creator:   sample.AccAddress(),
@@ -91,7 +91,7 @@ func TestMsgServer_AddToOutTxTracker(t *testing.T) {
 		txIndex, block, header, headerRLP, proof, tx, err := sample.Proof()
 		require.NoError(t, err)
 		setupVerificationParams(zk, ctx, txIndex, chainID, header, headerRLP, block)
-		setupTss(k, ctx)
+		setupTssAndNonceToCctx(k, ctx, chainID, int64(tx.Nonce()))
 		msgServer := keeper.NewMsgServerImpl(*k)
 		_, err = msgServer.AddToOutTxTracker(ctx, &types.MsgAddToOutTxTracker{
 			Creator:   sample.AccAddress(),
@@ -113,7 +113,7 @@ func TestMsgServer_AddToOutTxTracker(t *testing.T) {
 		txIndex, block, header, headerRLP, _, tx, err := sample.Proof()
 		require.NoError(t, err)
 		setupVerificationParams(zk, ctx, txIndex, chainID, header, headerRLP, block)
-		setupTss(k, ctx)
+		setupTssAndNonceToCctx(k, ctx, chainID, int64(tx.Nonce()))
 		msgServer := keeper.NewMsgServerImpl(*k)
 		_, err = msgServer.AddToOutTxTracker(ctx, &types.MsgAddToOutTxTracker{
 			Creator:   sample.AccAddress(),
@@ -134,7 +134,7 @@ func TestMsgServer_AddToOutTxTracker(t *testing.T) {
 		txIndex, block, header, headerRLP, proof, tx, err := sample.Proof()
 		require.NoError(t, err)
 		setupVerificationParams(zk, ctx, txIndex, chainID, header, headerRLP, block)
-		setupTss(k, ctx)
+		setupTssAndNonceToCctx(k, ctx, chainID, int64(tx.Nonce()))
 		msgServer := keeper.NewMsgServerImpl(*k)
 		_, err = msgServer.AddToOutTxTracker(ctx, &types.MsgAddToOutTxTracker{
 			Creator:   sample.AccAddress(),
@@ -151,8 +151,22 @@ func TestMsgServer_AddToOutTxTracker(t *testing.T) {
 	})
 }
 
-func setupTss(k *keeper.Keeper, ctx sdk.Context) {
+func setupTssAndNonceToCctx(k *keeper.Keeper, ctx sdk.Context, chainId, nonce int64) {
 	k.SetTSS(ctx, types.TSS{
 		TssPubkey: "zetapub1addwnpepq28c57cvcs0a2htsem5zxr6qnlvq9mzhmm76z3jncsnzz32rclangr2g35p",
 	})
+	cctx := types.CrossChainTx{
+		Creator: "any",
+		Index:   "0x123",
+		CctxStatus: &types.Status{
+			Status: types.CctxStatus_PendingOutbound,
+		},
+	}
+	k.SetCrossChainTx(ctx, cctx)
+	k.SetNonceToCctx(ctx, types.NonceToCctx{
+		ChainId:   chainId,
+		Nonce:     nonce,
+		CctxIndex: "0x123",
+		Tss:       "zetapub1addwnpepq28c57cvcs0a2htsem5zxr6qnlvq9mzhmm76z3jncsnzz32rclangr2g35p",
+	})
 }