Merge branch 'cctx-validate-outbound' into cctx-validate-inbound

zeta-chain · Jun 13, 2024 · 0a7234e · 0a7234e
2 parents 4e468f7 + dd56896
commit 0a7234e
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
@@ -73,6 +73,5 @@ func (c CCTXGatewayObservers) InitiateOutbound(
 		return types.CctxStatus_Aborted, err
 	}
 	commit()
-	config.CCTX.SetPendingOutbound("")
 	return types.CctxStatus_PendingOutbound, nil
 }
diff --git a/x/crosschain/keeper/cctx_gateway_zevm.go b/x/crosschain/keeper/cctx_gateway_zevm.go
@@ -32,7 +32,6 @@ func (c CCTXGatewayZEVM) InitiateOutbound(
 		return types.CctxStatus_Aborted, err
 	}
 
-	config.CCTX.SetPendingOutbound("")
 	newCCTXStatus = c.crosschainKeeper.ValidateOutboundZEVM(ctx, config.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
@@ -44,5 +44,6 @@ func (k Keeper) InitiateOutbound(ctx sdk.Context, config InitiateOutboundConfig)
 		)
 	}
 
+	config.CCTX.SetPendingOutbound("")
 	return cctxGateway.InitiateOutbound(ctx, config)
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     		)
     	}
+    	config.CCTX.SetPendingOutbound("")
     	return cctxGateway.InitiateOutbound(ctx, config)
     }