PR comments

zeta-chain · Jun 13, 2024 · dd56896 · dd56896
1 parent e7cedab
commit dd56896
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 3 deletions.
diff --git a/x/crosschain/keeper/cctx_gateway_observers.go b/x/crosschain/keeper/cctx_gateway_observers.go
@@ -55,6 +55,5 @@ func (c CCTXGatewayObservers) InitiateOutbound(
 		return types.CctxStatus_Aborted
 	}
 	commit()
-	cctx.SetPendingOutbound("")
 	return types.CctxStatus_PendingOutbound
 }
diff --git a/x/crosschain/keeper/cctx_gateway_zevm.go b/x/crosschain/keeper/cctx_gateway_zevm.go
@@ -29,7 +29,6 @@ func (c CCTXGatewayZEVM) InitiateOutbound(ctx sdk.Context, cctx *types.CrossChai
 		return types.CctxStatus_Aborted
 	}
 
-	cctx.SetPendingOutbound("")
 	newCCTXStatus = c.crosschainKeeper.ValidateOutboundZEVM(ctx, cctx, err, isContractReverted)
 	if newCCTXStatus == types.CctxStatus_OutboundMined {
 		commit()

diff --git a/x/crosschain/keeper/cctx_orchestrator_validate_outbound.go b/x/crosschain/keeper/cctx_orchestrator_validate_outbound.go
@@ -155,7 +155,7 @@ func (k Keeper) validateFailedOutbound(
 	cctx *types.CrossChainTx,
 	oldStatus types.CctxStatus,
 	revertMsg string,
-	inputAmount math.Uint, // TODO: find different way for this
+	inputAmount math.Uint,
 ) error {
 	switch oldStatus {
 	case types.CctxStatus_PendingOutbound:

diff --git a/x/crosschain/keeper/initiate_outbound.go b/x/crosschain/keeper/initiate_outbound.go
@@ -35,5 +35,6 @@ func (k Keeper) InitiateOutbound(ctx sdk.Context, cctx *types.CrossChainTx) (typ
 		)
 	}
 
+	cctx.SetPendingOutbound("")
 	return cctxGateway.InitiateOutbound(ctx, cctx), nil
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     		)
     	}
+    	cctx.SetPendingOutbound("")
     	return cctxGateway.InitiateOutbound(ctx, cctx), nil
     }