fixup! feat: discover shared wallet by metadata label

Author: greatertomi

packages/cardano-services-client/package.json

@@ -59,7 +59,6 @@
   "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,12 +1,11 @@
 import * as Crypto from '@cardano-sdk/crypto';
 import { BlockfrostClient, BlockfrostProvider, fetchSequentially } from '../blockfrost';
-import { Cardano } from '@cardano-sdk/core';
-import { KeyPurpose } from '@cardano-sdk/key-management';
+import { Cardano, Serialization } from '@cardano-sdk/core';
 import { Logger } from 'ts-log';
 import { MultiSigRegistration, MultiSigTransaction, SharedWalletProvider } from './types';
 import type { Responses } from '@blockfrost/blockfrost-js';
 
-const MULTI_SIG_LABEL = KeyPurpose.MULTI_SIG;
+const MULTI_SIG_LABEL = 1854;
 
 const isMultiSigRegistration = (metadata: unknown): metadata is MultiSigRegistration =>
   !!metadata && typeof metadata === 'object' && 'participants' in metadata;
@@ -16,10 +15,16 @@ export class BlockfrostSharedWalletProvider extends BlockfrostProvider implement
     super(client, logger);
   }
 
+  async getNativeScripts(txId: Cardano.TransactionId): Promise<Cardano.Script[]> {
+    const response = await this.request<Responses['tx_content_cbor']>(`txs/${txId}/cbor`);
+    const transaction = Serialization.Transaction.fromCbor(Serialization.TxCBOR(response.cbor)).toCore();
+    return transaction.auxiliaryData?.scripts ?? [];
+  }
+
   async discoverWallets(pubKey: Crypto.Ed25519KeyHashHex): Promise<MultiSigTransaction[]> {
     const batchSize = 100;
 
-    return fetchSequentially<Responses['tx_metadata_label_json'][0], MultiSigTransaction>(
+    const multiSigTransactions = await fetchSequentially<Responses['tx_metadata_label_json'][0], MultiSigTransaction>(
       {
         haveEnoughItems: (wallets, _) => wallets.length < batchSize,
         paginationOptions: { count: batchSize },
@@ -35,10 +40,18 @@ export class BlockfrostSharedWalletProvider extends BlockfrostProvider implement
             })
             .map((wallet) => ({
               metadata: wallet.json_metadata as unknown as MultiSigRegistration,
+              nativeScripts: [],
               txId: Cardano.TransactionId(wallet.tx_hash)
             }))
       },
       []
     );
+
+    return await Promise.all(
+      multiSigTransactions.map(async (wallet) => ({
+        ...wallet,
+        nativeScripts: await this.getNativeScripts(wallet.txId)
+      }))
+    );
   }
 }

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

@@ -1,8 +1,7 @@
 import { Cardano } from '@cardano-sdk/core';
 import { Ed25519KeyHashHex } from '@cardano-sdk/crypto';
-import { KeyRole } from '@cardano-sdk/key-management';
 
-type ScriptType = KeyRole;
+type ScriptType = number;
 
 interface MultiSigParticipant {
   name: string;
@@ -25,7 +24,7 @@ export interface MultiSigRegistration {
 export interface MultiSigTransaction {
   txId: Cardano.TransactionId;
   metadata: MultiSigRegistration;
-  nativeScripts?: Cardano.NativeScript[];
+  nativeScripts?: Cardano.Script[];
 }
 
 export interface SharedWalletProvider {

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

@@ -132,6 +132,10 @@ const mockedResponses = [
   }
 ];
 
+const nativeScriptResponse = {
+  cbor: '84a70081825820765bf5499431711696c37ce98cf5b40b94e592ae497c7e1acadf44e97db540de0001818258390029fb060929ae397acd22105b8d512cafbe14beb372b7940734c8e0a049ffdf3c964ec375208a6b46cc6075ad36beb80bcce21663021d78da1a004caf43021a0002d611031a04850a6905a1581de049ffdf3c964ec375208a6b46cc6075ad36beb80bcce21663021d78da1a0005ee750758200e0397a8285695c5f5a581b4cfca2896ecdcab79e1723b36ba0b3904cc8ad04f0800a100828258202ebc0ea3cd6546b9e1c82c8f14a9d59e1f21a8483453e2bce5e1aa9fb5cd37bb5840cefb6d1f99e7ef1d72f2a67779764832949d10b1f62e08602b8bba50da703fe36c91f192e2fd60d709fc027b964979ac6197da708091b591c75e5e21b770b500825820520b5cd3b967df70972451885c54de299738ead98113080130848b39cea2854e5840f092b42091f16082a34789c45471ab1f60ee175fe752ce29f7c42edea6c04151c8c47bf684f53bdefd765de0f2dba9fc1f8e914f29b97c8fae6cc7727465c006f582a119073ea46b6465736372697074696f6e7064206d622d732b6c6e782b746d743032646e616d656e6d622d732b6c6e782b746d7430326c7061727469636970616e7473a065747970657382677061796d656e74657374616b65828202838200581ce3ad78d912029930ec11394610bdd4dd12bc64effb61e2258ab059338200581c8a7c43db68954f99e8afa35130ac65576776eb6500d2c616cb6d1d408200581c83dec074a40f7d6b7cfd902243ec4b902d17960a69a66acd8bd35ce08202838200581c96f941682e4b1873dc45ef6930378915ae637c5be5d6c1fd1f9491e68200581c734a5efd35afe4de6a9bf2ca4c4bfe2a22b370a0acbddd9c3dfbfa6b8200581cd8747c9c7d51385172474bfea67ecdb27eaf9bb5be216118b407775b'
+};
+
 describe('BlockfrostSharedWallet', () => {
   let request: jest.Mock;
   let provider: BlockfrostSharedWalletProvider;
@@ -152,11 +156,19 @@ describe('BlockfrostSharedWallet', () => {
 
     it('should return all wallets for a given public key', async () => {
       request.mockResolvedValueOnce(mockedResponses);
+
+      request
+        .mockResolvedValueOnce(nativeScriptResponse)
+        .mockResolvedValueOnce(nativeScriptResponse)
+        .mockResolvedValueOnce(nativeScriptResponse);
+
       const pubKey = '962746268ee907e18c895c9943c6684b01fa7a4956b0fe0fa76cfa6f';
       const wallets = await provider.discoverWallets(Crypto.Ed25519KeyHashHex(pubKey));
+
       expect(wallets.length).toEqual(3);
       for (const wallet of wallets) {
         expect(wallet.metadata.participants).toHaveProperty(pubKey);
+        expect(wallet.nativeScripts).toHaveLength(2);
       }
     });
   });

packages/core/test/Serialization/Transaction.test.ts

@@ -86,6 +86,13 @@ describe('Transaction', () => {
     expect(tx3.body().toCbor()).toEqual(tx2.body().toCbor());
   });
 
+  it('serializationTest', () => {
+    const cbor =
+      '84a70081825820765bf5499431711696c37ce98cf5b40b94e592ae497c7e1acadf44e97db540de0001818258390029fb060929ae397acd22105b8d512cafbe14beb372b7940734c8e0a049ffdf3c964ec375208a6b46cc6075ad36beb80bcce21663021d78da1a004caf43021a0002d611031a04850a6905a1581de049ffdf3c964ec375208a6b46cc6075ad36beb80bcce21663021d78da1a0005ee750758200e0397a8285695c5f5a581b4cfca2896ecdcab79e1723b36ba0b3904cc8ad04f0800a100828258202ebc0ea3cd6546b9e1c82c8f14a9d59e1f21a8483453e2bce5e1aa9fb5cd37bb5840cefb6d1f99e7ef1d72f2a67779764832949d10b1f62e08602b8bba50da703fe36c91f192e2fd60d709fc027b964979ac6197da708091b591c75e5e21b770b500825820520b5cd3b967df70972451885c54de299738ead98113080130848b39cea2854e5840f092b42091f16082a34789c45471ab1f60ee175fe752ce29f7c42edea6c04151c8c47bf684f53bdefd765de0f2dba9fc1f8e914f29b97c8fae6cc7727465c006f582a119073ea46b6465736372697074696f6e7064206d622d732b6c6e782b746d743032646e616d656e6d622d732b6c6e782b746d7430326c7061727469636970616e7473a065747970657382677061796d656e74657374616b65828202838200581ce3ad78d912029930ec11394610bdd4dd12bc64effb61e2258ab059338200581c8a7c43db68954f99e8afa35130ac65576776eb6500d2c616cb6d1d408200581c83dec074a40f7d6b7cfd902243ec4b902d17960a69a66acd8bd35ce08202838200581c96f941682e4b1873dc45ef6930378915ae637c5be5d6c1fd1f9491e68200581c734a5efd35afe4de6a9bf2ca4c4bfe2a22b370a0acbddd9c3dfbfa6b8200581cd8747c9c7d51385172474bfea67ecdb27eaf9bb5be216118b407775b';
+    const tx = Transaction.fromCbor(TxCBOR(cbor)).toCore();
+    expect(tx).toBeDefined();
+  });
+
   it('can set the witness set on the transaction', () => {
     const tx = Transaction.fromCbor(TxCBOR(TX));
     const tx2 = Transaction.fromCbor(TxCBOR(TX2));

yarn.lock

@@ -3389,7 +3389,6 @@ __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