fixup! feat: discover shared wallet by metadata label

Author: greatertomi

packages/cardano-services-client/package.json

@@ -59,6 +59,7 @@
   "dependencies": {
     "@cardano-sdk/core": "workspace:~",
     "@cardano-sdk/crypto": "workspace:~",
+    "@cardano-sdk/key-management": "workspace:~",
     "@cardano-sdk/util": "workspace:~",
     "axios": "^1.7.4",
     "class-validator": "^0.14.0",

packages/cardano-services-client/src/SharedWalletProvider/BlockfrostSharedWalletProvider.ts

@@ -1,26 +1,44 @@
 import * as Crypto from '@cardano-sdk/crypto';
-import { BlockfrostClient, BlockfrostProvider } from '../blockfrost';
+import { BlockfrostClient, BlockfrostProvider, fetchSequentially } from '../blockfrost';
+import { Cardano } from '@cardano-sdk/core';
+import { KeyPurpose } from '@cardano-sdk/key-management';
 import { Logger } from 'ts-log';
-import { MULTI_SIG_LABEL, MultiSigTransaction, SharedWalletProvider } from '@cardano-sdk/core';
+import { MultiSigRegistration, MultiSigTransaction, SharedWalletProvider } from './types';
+import type { Responses } from '@blockfrost/blockfrost-js';
+
+const MULTI_SIG_LABEL = KeyPurpose.MULTI_SIG;
+
+const isMultiSigRegistration = (metadata: unknown): metadata is MultiSigRegistration =>
+  !!metadata && typeof metadata === 'object' && 'participants' in metadata;
 
 export class BlockfrostSharedWalletProvider extends BlockfrostProvider implements SharedWalletProvider {
   constructor(client: BlockfrostClient, logger: Logger) {
     super(client, logger);
   }
 
   async discoverWallets(pubKey: Crypto.Ed25519KeyHashHex): Promise<MultiSigTransaction[]> {
-    let page = 1;
-    const pageSize = 100;
-    let allTransactions: MultiSigTransaction[] = [];
-
-    // eslint-disable-next-line no-constant-condition
-    while (true) {
-      const response = await this.request<MultiSigTransaction[]>(`metadata/txs/labels/${MULTI_SIG_LABEL}?page=${page}`);
-      allTransactions = [...allTransactions, ...response];
-      if (response.length < pageSize) break;
-      page++;
-    }
+    const batchSize = 100;
 
-    return allTransactions.filter((wallet) => wallet.json_metadata.participants?.[pubKey]);
+    return fetchSequentially<Responses['tx_metadata_label_json'][0], MultiSigTransaction>(
+      {
+        haveEnoughItems: (wallets, _) => wallets.length < batchSize,
+        paginationOptions: { count: batchSize },
+        request: (paginationQueryString) =>
+          this.request<Responses['tx_metadata_label_json']>(
+            `metadata/txs/labels/${MULTI_SIG_LABEL}?${paginationQueryString}`
+          ),
+        responseTranslator: (wallets) =>
+          wallets
+            .filter((wallet) => {
+              const metadata = wallet.json_metadata;
+              return isMultiSigRegistration(metadata) && metadata?.participants?.[pubKey];
+            })
+            .map((wallet) => ({
+              metadata: wallet.json_metadata as unknown as MultiSigRegistration,
+              txId: Cardano.TransactionId(wallet.tx_hash)
+            }))
+      },
+      []
+    );
   }
 }

packages/core/src/Provider/SharedWalletProvider/types.ts packages/cardano-services-client/src/SharedWalletProvider/types.ts

@@ -1,8 +1,8 @@
+import { Cardano } from '@cardano-sdk/core';
 import { Ed25519KeyHashHex } from '@cardano-sdk/crypto';
+import { KeyRole } from '@cardano-sdk/key-management';
 
-type ScriptType = number;
-
-export const MULTI_SIG_LABEL = 1854;
+type ScriptType = KeyRole;
 
 interface MultiSigParticipant {
   name: string;
@@ -11,10 +11,10 @@ interface MultiSigParticipant {
 }
 
 interface MultiSigParticipants {
-  [key: string]: MultiSigParticipant;
+  [key: Ed25519KeyHashHex]: MultiSigParticipant;
 }
 
-interface MultiSigRegistration {
+export interface MultiSigRegistration {
   types: ScriptType[];
   name?: string;
   description?: string;
@@ -23,8 +23,9 @@ interface MultiSigRegistration {
 }
 
 export interface MultiSigTransaction {
-  tx_hash: string;
-  json_metadata: MultiSigRegistration;
+  txId: Cardano.TransactionId;
+  metadata: MultiSigRegistration;
+  nativeScripts?: Cardano.NativeScript[];
 }
 
 export interface SharedWalletProvider {

packages/cardano-services-client/test/SharedWalletProvider/BlockfrostSharedWallet.test.ts

@@ -156,7 +156,7 @@ describe('BlockfrostSharedWallet', () => {
       const wallets = await provider.discoverWallets(Crypto.Ed25519KeyHashHex(pubKey));
       expect(wallets.length).toEqual(3);
       for (const wallet of wallets) {
-        expect(wallet.json_metadata.participants).toHaveProperty(pubKey);
+        expect(wallet.metadata.participants).toHaveProperty(pubKey);
       }
     });
   });

packages/core/src/Provider/SharedWalletProvider/index.ts

@@ -12,4 +12,3 @@ export * from './providerFactory';
 export * from './types';
 export * from './HandleProvider';
 export * from './DRepProvider';
-export * from './SharedWalletProvider';

packages/core/src/Provider/index.ts

@@ -3389,6 +3389,7 @@ __metadata:
     "@blockfrost/blockfrost-js": ^5.7.0
     "@cardano-sdk/core": "workspace:~"
     "@cardano-sdk/crypto": "workspace:~"
+    "@cardano-sdk/key-management": "workspace:~"
     "@cardano-sdk/util": "workspace:~"
     "@cardano-sdk/util-dev": "workspace:~"
     "@types/lodash": ^4.14.182