add: closing artifact on failure

Author: Aman035

universalClient/tss/coordinator/coordinator_test.go

@@ -75,6 +75,11 @@ func (m *coordMockTxBuilder) BroadcastFundMigrationTx(ctx context.Context, req *
 	return args.String(0), args.Error(1)
 }
 
+func (m *coordMockTxBuilder) CleanupOutboundArtifacts(ctx context.Context, data *uexecutortypes.OutboundCreatedEvent) error {
+	args := m.Called(ctx, data)
+	return args.Error(0)
+}
+
 type coordMockChainClient struct {
 	builder    *coordMockTxBuilder
 	builderErr error

universalClient/tss/txbroadcaster/broadcaster_test.go

@@ -75,6 +75,11 @@ func (m *mockTxBuilder) BroadcastFundMigrationTx(ctx context.Context, req *commo
 	return args.String(0), args.Error(1)
 }
 
+func (m *mockTxBuilder) CleanupOutboundArtifacts(ctx context.Context, data *uexecutortypes.OutboundCreatedEvent) error {
+	args := m.Called(ctx, data)
+	return args.Error(0)
+}
+
 type mockChainClient struct{ builder *mockTxBuilder }
 
 func (m *mockChainClient) Start(context.Context) error                     { return nil }

universalClient/tss/txresolver/resolver_test.go

@@ -74,6 +74,11 @@ func (m *mockTxBuilder) BroadcastFundMigrationTx(ctx context.Context, req *commo
 	return args.String(0), args.Error(1)
 }
 
+func (m *mockTxBuilder) CleanupOutboundArtifacts(ctx context.Context, data *uexecutortypes.OutboundCreatedEvent) error {
+	args := m.Called(ctx, data)
+	return args.Error(0)
+}
+
 type mockChainClient struct{ builder *mockTxBuilder }
 
 func (m *mockChainClient) Start(context.Context) error                     { return nil }
@@ -270,7 +275,8 @@ func TestSVM_PDAExists_MarksCompleted(t *testing.T) {
 }
 
 func TestSVM_PDANotFound_VotesFailureAndReverts(t *testing.T) {
-	// PDA not found → vote failure → REVERTED.
+	// PDA not found → vote failure → REVERTED, plus cleanup of any orphaned
+	// StoredIxData PDA from the ref-finalize route.
 	evtStore, db := setupTestDB(t)
 	builder := &mockTxBuilder{}
 	client := &mockChainClient{builder: builder}
@@ -280,6 +286,7 @@ func TestSVM_PDANotFound_VotesFailureAndReverts(t *testing.T) {
 	insertBroadcastedEvent(t, db, "ev-1", "solana:mainnet", "solana:mainnet:", eventData)
 
 	builder.On("IsAlreadyExecuted", mock.Anything, "tx-123").Return(false, nil)
+	builder.On("CleanupOutboundArtifacts", mock.Anything, mock.Anything).Return(nil).Once()
 
 	// No PushSigner — voteFailure will log warning and return nil, but won't mark REVERTED
 	// (because pushSigner is nil, it returns early). This validates the code path.
@@ -291,6 +298,38 @@ func TestSVM_PDANotFound_VotesFailureAndReverts(t *testing.T) {
 	// The event stays BROADCASTED because the vote+revert is skipped.
 	updated := getEvent(t, db, "ev-1")
 	require.Equal(t, store.StatusBroadcasted, updated.Status)
+	// Explicit assertion: cleanup must have been invoked once for the failure path.
+	builder.AssertExpectations(t)
+}
+
+func TestSVM_PDANotFound_CleanupErrorIsBestEffort(t *testing.T) {
+	// A failure from CleanupOutboundArtifacts must NOT crash the resolver or
+	// roll back the failure-vote transition. Cleanup is opex-only.
+	evtStore, db := setupTestDB(t)
+	builder := &mockTxBuilder{}
+	client := &mockChainClient{builder: builder}
+	ch := newTestChains(t, "solana:mainnet", uregistrytypes.VmType_SVM, client)
+
+	eventData := makeOutboundEventData("tx-123", "utx-456", "solana:mainnet")
+	insertBroadcastedEvent(t, db, "ev-1", "solana:mainnet", "solana:mainnet:", eventData)
+
+	builder.On("IsAlreadyExecuted", mock.Anything, "tx-123").Return(false, nil)
+	builder.On("CleanupOutboundArtifacts", mock.Anything, mock.Anything).
+		Return(assert.AnError).Once()
+
+	resolver := newResolver(evtStore, ch)
+	ev := getEvent(t, db, "ev-1")
+
+	// Should not panic even though cleanup returned an error.
+	require.NotPanics(t, func() {
+		resolver.resolveSVM(context.Background(), &ev, "solana:mainnet")
+	})
+
+	// State transition behaves identically to the success-cleanup case
+	// (BROADCASTED here because no push signer is configured).
+	updated := getEvent(t, db, "ev-1")
+	require.Equal(t, store.StatusBroadcasted, updated.Status)
+	builder.AssertExpectations(t)
 }
 
 func TestSVM_PDACheckFails_StaysBroadcasted(t *testing.T) {

universalClient/tss/txresolver/svm.go

@@ -2,8 +2,10 @@ package txresolver
 
 import (
 	"context"
+	"encoding/json"
 
 	"github.com/pushchain/push-chain-node/universalClient/store"
+	uexecutortypes "github.com/pushchain/push-chain-node/x/uexecutor/types"
 )
 
 // resolveSVM checks the on-chain ExecutedTx PDA and moves the event to COMPLETED or REVERTED.
@@ -55,4 +57,17 @@ func (r *Resolver) resolveSVM(ctx context.Context, event *store.Event, chainID s
 
 	// PDA not found — tx was not executed on destination chain, no gas consumed
 	_ = r.voteOutboundFailureAndMarkReverted(ctx, event, txID, utxID, "", 0, "0", "tx not executed on destination chain")
+
+	// Best-effort: close any orphaned StoredIxData PDA from the ref-finalize
+	// route so the relayer recovers the ~0.002 SOL of rent. No-op for direct-
+	// route outbounds and for ref-route outbounds whose PDA was already auto-
+	// closed by a successful finalize.
+	var data uexecutortypes.OutboundCreatedEvent
+	if err := json.Unmarshal(event.EventData, &data); err != nil {
+		return
+	}
+	if err := builder.CleanupOutboundArtifacts(ctx, &data); err != nil {
+		r.logger.Warn().Err(err).Str("event_id", event.EventID).Str("tx_id", txID).
+			Msg("SVM cleanup of stored_ix_data PDA failed; rent recovery deferred")
+	}
 }