fix: add to BaseWallet re-submit exceptions CredentialAlreadyRegistered and DrepAlreadyRegistered errors

Author: AngelCastilloB

packages/core/src/CardanoNode/types/CardanoNodeErrors.ts

@@ -1,5 +1,6 @@
 import { CustomError } from 'ts-custom-error';
 import type * as Cardano from '../../Cardano';
+import type * as Crypto from '@cardano-sdk/crypto';
 
 export enum GeneralCardanoNodeErrorCode {
   ServerNotReady = 503,
@@ -129,3 +130,11 @@ export type IncompleteWithdrawalsData = {
 export type UnknownOutputReferencesData = {
   unknownOutputReferences: Cardano.TxIn[];
 };
+
+export type CredentialAlreadyRegisteredData = {
+  hash: Crypto.Hash28ByteBase16;
+};
+
+export type DRepAlreadyRegisteredData = {
+  hash: Crypto.Hash28ByteBase16;
+};

packages/core/src/CardanoNode/util/cardanoNodeErrors.ts

@@ -2,6 +2,8 @@
 import {
   ChainSyncError,
   ChainSyncErrorCode,
+  CredentialAlreadyRegisteredData,
+  DRepAlreadyRegisteredData,
   GeneralCardanoNodeError,
   GeneralCardanoNodeErrorCode,
   IncompleteWithdrawalsData,
@@ -124,3 +126,11 @@ export const isUnknownOutputReferences = (
   error: unknown
 ): error is TxSubmissionError<UnknownOutputReferencesData | null> =>
   error instanceof TxSubmissionError && error.code === TxSubmissionErrorCode.UnknownOutputReferences;
+
+export const isCredentialAlreadyRegistered = (
+  error: unknown
+): error is TxSubmissionError<CredentialAlreadyRegisteredData | null> =>
+  error instanceof TxSubmissionError && error.code === TxSubmissionErrorCode.CredentialAlreadyRegistered;
+
+export const isDrepAlreadyRegistered = (error: unknown): error is TxSubmissionError<DRepAlreadyRegisteredData | null> =>
+  error instanceof TxSubmissionError && error.code === TxSubmissionErrorCode.DRepAlreadyRegistered;

packages/core/test/CardanoNode/util/cardanoNodeErrors.test.ts

@@ -78,6 +78,16 @@ describe('util/cardanoNodeErrors', () => {
           new TxSubmissionError(TxSubmissionErrorCode.OutsideOfValidityInterval, null, '')
         )
       ).toBe(true);
+      expect(
+        CardanoNodeUtil.isCredentialAlreadyRegistered(
+          new TxSubmissionError(TxSubmissionErrorCode.CredentialAlreadyRegistered, null, '')
+        )
+      ).toBe(true);
+      expect(
+        CardanoNodeUtil.isDrepAlreadyRegistered(
+          new TxSubmissionError(TxSubmissionErrorCode.DRepAlreadyRegistered, null, '')
+        )
+      ).toBe(true);
     });
     it('returns false if error type or code does not match', () => {
       expect(CardanoNodeUtil.isValueNotConservedError(generalError)).toBe(false);
@@ -98,6 +108,16 @@ describe('util/cardanoNodeErrors', () => {
           new TxSubmissionError(TxSubmissionErrorCode.IncompleteWithdrawals, null, '')
         )
       ).toBe(false);
+      expect(
+        CardanoNodeUtil.isCredentialAlreadyRegistered(
+          new TxSubmissionError(TxSubmissionErrorCode.IncompleteWithdrawals, null, '')
+        )
+      ).toBe(false);
+      expect(
+        CardanoNodeUtil.isDrepAlreadyRegistered(
+          new TxSubmissionError(TxSubmissionErrorCode.IncompleteWithdrawals, null, '')
+        )
+      ).toBe(false);
     });
   });
 });

packages/e2e/test/wallet_epoch_3/PersonalWallet/conwayTransactions.test.ts

@@ -135,7 +135,7 @@ export const paramsUpdate: Cardano.ProtocolParametersUpdateConway = {
   treasuryExpansion: '0.25'
 };
 
-describe.skip('PersonalWallet/conwayTransactions', () => {
+describe('PersonalWallet/conwayTransactions', () => {
   let dRepWallet: BaseWallet;
   let wallet: BaseWallet;
 

packages/ogmios/src/CardanoNode/queries.ts

@@ -2,6 +2,8 @@ import {
   Cardano,
   CardanoNodeUtil,
   ChainSyncError,
+  CredentialAlreadyRegisteredData,
+  DRepAlreadyRegisteredData,
   GeneralCardanoNodeError,
   GeneralCardanoNodeErrorCode,
   IncompleteWithdrawalsData,
@@ -17,6 +19,8 @@ import {
 import { LedgerStateQuery } from '@cardano-ogmios/client';
 import { Logger } from 'ts-log';
 import {
+  SubmitTransactionFailureCredentialAlreadyRegistered,
+  SubmitTransactionFailureDRepAlreadyRegistered,
   SubmitTransactionFailureIncompleteWithdrawals,
   SubmitTransactionFailureOutsideOfValidityInterval,
   SubmitTransactionFailureUnknownOutputReferences,
@@ -25,6 +29,7 @@ import {
 import { eraSummary, genesis } from '../ogmiosToCore';
 import { isConnectionError } from '@cardano-sdk/util';
 import { mapTxIn, mapValue, mapWithdrawals } from '../ogmiosToCore/tx';
+import type * as Crypto from '@cardano-sdk/crypto';
 
 const errorDataToCore = (data: unknown, code: number) => {
   switch (code) {
@@ -57,6 +62,23 @@ const errorDataToCore = (data: unknown, code: number) => {
         unknownOutputReferences: typedData.unknownOutputReferences.map(mapTxIn)
       } as UnknownOutputReferencesData;
     }
+    case TxSubmissionErrorCode.CredentialAlreadyRegistered: {
+      const typedData = data as SubmitTransactionFailureCredentialAlreadyRegistered['data'];
+
+      return {
+        hash: typedData.knownCredential as Crypto.Hash28ByteBase16
+      } as CredentialAlreadyRegisteredData;
+    }
+    case TxSubmissionErrorCode.DRepAlreadyRegistered: {
+      const typedData = data as SubmitTransactionFailureDRepAlreadyRegistered['data'];
+
+      if (typedData.knownDelegateRepresentative.type === 'registered') {
+        return {
+          hash: typedData.knownDelegateRepresentative.id as Crypto.Hash28ByteBase16
+        } as DRepAlreadyRegisteredData;
+      }
+      return null;
+    }
     default:
       // Mapper not implemented
       return data;

packages/wallet/src/Wallets/BaseWallet.ts

@@ -685,7 +685,9 @@ export class BaseWallet implements ObservableWallet {
           // TODO: check if IncompleteWithdrawals available withdrawal amount === wallet's reward acc balance?
           // Not sure what the 'Withdrawals' in error data is exactly: value being withdrawed, or reward acc balance
           CardanoNodeUtil.isIncompleteWithdrawalsError(error.innerError) ||
-          CardanoNodeUtil.isUnknownOutputReferences(error.innerError))
+          CardanoNodeUtil.isUnknownOutputReferences(error.innerError) ||
+          CardanoNodeUtil.isCredentialAlreadyRegistered(error.innerError) ||
+          CardanoNodeUtil.isDrepAlreadyRegistered(error.innerError))
       ) {
         this.#logger.debug(
           `Transaction ${outgoingTx.id} failed with ${error.innerError}, but it appears to be already submitted...`