Merge pull request #869 from input-output-hk/fix/resubmission-broken-by-861

fix(wallet): do not prevent re-submission

Author: rhyslbw

packages/wallet/src/PersonalWallet/PersonalWallet.ts

@@ -598,10 +598,12 @@ export class PersonalWallet implements ObservableWallet {
       return this.#submittingPromises[outgoingTx.id]!;
     }
     return (this.#submittingPromises[outgoingTx.id] = (async () => {
-      const inFlightTxs = await firstValueFrom(this.transactions.outgoing.inFlight$);
-      const inFlightTx = inFlightTxs.find((inFlight) => inFlight.id === outgoingTx.id);
       try {
-        if (!inFlightTx) {
+        // Submit to provider only if it's either:
+        // - an internal re-submission. External re-submissions are ignored,
+        //   because PersonalWallet takes care of it internally.
+        // - is a new submission
+        if (options.mightBeAlreadySubmitted || !(await this.#isTxInFlight(outgoingTx.id))) {
           await this.#submitTx(outgoingTx, options);
         }
       } finally {
@@ -684,6 +686,11 @@ export class PersonalWallet implements ObservableWallet {
     };
   }
 
+  async #isTxInFlight(txId: Cardano.TransactionId) {
+    const inFlightTxs = await firstValueFrom(this.transactions.outgoing.inFlight$);
+    return inFlightTxs.some((inFlight) => inFlight.id === txId);
+  }
+
   #firstValueFromSettled<T>(o$: Observable<T>): Promise<T> {
     return firstValueFrom(
       this.syncStatus.isSettled$.pipe(

packages/wallet/test/PersonalWallet/methods.test.ts

@@ -367,6 +367,13 @@ describe('PersonalWallet methods', () => {
     });
 
     describe('submitTx', () => {
+      const valueNotConservedError = new ProviderError(
+        ProviderFailure.BadRequest,
+        new CardanoNodeErrors.TxSubmissionErrors.ValueNotConservedError({
+          valueNotConserved: { consumed: 2, produced: 1 }
+        })
+      );
+
       it('resolves on success', async () => {
         const tx = await wallet.finalizeTx({ tx: await wallet.initializeTx(props) });
         const outgoingTx = toOutgoingTx(tx);
@@ -442,14 +449,9 @@ describe('PersonalWallet methods', () => {
       });
 
       it('mightBeAlreadySubmitted option interprets ValueNotConservedError as success', async () => {
-        txSubmitProvider.submitTx.mockRejectedValueOnce(
-          new ProviderError(
-            ProviderFailure.BadRequest,
-            new CardanoNodeErrors.TxSubmissionErrors.ValueNotConservedError({
-              valueNotConserved: { consumed: 2, produced: 1 }
-            })
-          )
-        );
+        txSubmitProvider.submitTx
+          .mockRejectedValueOnce(valueNotConservedError)
+          .mockRejectedValueOnce(valueNotConservedError);
         const tx = await wallet.finalizeTx({ tx: await wallet.initializeTx(props) });
         const outgoingTx = toOutgoingTx(tx);
 
@@ -462,6 +464,20 @@ describe('PersonalWallet methods', () => {
         expect(await txPending).toEqual(outgoingTx);
       });
 
+      it('attempts to resubmit the tx that is already in flight', async () => {
+        const tx = await wallet.finalizeTx({ tx: await wallet.initializeTx(props) });
+
+        await wallet.submitTx(tx);
+        expect(await firstValueFrom(wallet.transactions.outgoing.inFlight$)).toHaveLength(1);
+
+        // resubmit the same tx while it's 'in flight'
+        txSubmitProvider.submitTx.mockRejectedValueOnce(valueNotConservedError);
+        await wallet.submitTx(tx, { mightBeAlreadySubmitted: true });
+
+        expect(await firstValueFrom(wallet.transactions.outgoing.inFlight$)).toHaveLength(1);
+        expect(txSubmitProvider.submitTx).toBeCalledTimes(2);
+      });
+
       it('resolves on success when submitting a tx when sending coins to a handle', async () => {
         const txBuilder = wallet.createTxBuilder();
         const txOutput = await txBuilder.buildOutput().handle('alice').coin(1_000_000n).build();