@canton-network/wallet-gateway-remote 0.27.0 → 1.1.0

package/dist/example-config.d.ts

@@ -34,7 +34,7 @@ declare const _default: {
             id: string;
             type: "self_signed";
             issuer: string;
-            configUrl?: never;
+            configUrl?: undefined;
         } | {
             id: string;
             type: "oauth";
@@ -61,7 +61,7 @@ declare const _default: {
                 audience: string;
                 clientId: string;
                 clientSecret: string;
-                clientSecretEnv?: never;
+                clientSecretEnv?: undefined;
             };
             ledgerApi: {
                 baseUrl: string;
@@ -76,8 +76,8 @@ declare const _default: {
                 clientId: string;
                 scope: string;
                 audience: string;
-                issuer?: never;
-                clientSecret?: never;
+                issuer?: undefined;
+                clientSecret?: undefined;
             };
             adminAuth: {
                 method: "client_credentials";
@@ -85,8 +85,8 @@ declare const _default: {
                 audience: string;
                 clientId: string;
                 clientSecretEnv: string;
-                issuer?: never;
-                clientSecret?: never;
+                issuer?: undefined;
+                clientSecret?: undefined;
             };
             ledgerApi: {
                 baseUrl: string;

package/dist/index.d.ts

@@ -3,9 +3,9 @@ declare const options: {
     config: string;
     configSchema: boolean;
     configExample: boolean;
-    port?: string | true;
-    logFormat?: "json" | "pretty";
-    logLevel?: "error" | "trace" | "debug" | "info" | "warn" | "fatal";
+    port?: string | true | undefined;
+    logFormat?: "json" | "pretty" | undefined;
+    logLevel?: "error" | "trace" | "debug" | "info" | "warn" | "fatal" | undefined;
 };
 export type CliOptions = typeof options;
 export {};

package/dist/ledger/wallet-sync-service.d.ts

@@ -16,7 +16,8 @@ export declare class WalletSyncService {
     private static readonly EMPTY_RIGHTS;
     private sameRights;
     run(timeoutMs: number): Promise<void>;
-    protected resolveSigningProvider(namespace: string): Promise<{
+    private getParticipantNamespace;
+    protected resolveSigningProvider(partyNamespace: string, participantNamespace: string): Promise<{
         signingProviderId: SigningProvider.PARTICIPANT;
         matched: boolean;
     } | {

package/dist/ledger/wallet-sync-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wallet-sync-service.d.ts","sourceRoot":"","sources":["../../src/ledger/wallet-sync-service.ts"],"names":[],"mappings":"AAGA,OAAO,EACH,YAAY,EAEf,MAAM,oCAAoC,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAA;AAC9D,OAAO,EACH,KAAK,EAIR,MAAM,mCAAmC,CAAA;AAC1C,OAAO,EACH,sBAAsB,EACtB,eAAe,EAClB,MAAM,kCAAkC,CAAA;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAC7B,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAA;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAGlE,qBAAa,iBAAiB;IAEtB,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,cAAc;IAGtB,OAAO,CAAC,cAAc;gBAPd,KAAK,EAAE,KAAK,EACZ,YAAY,EAAE,YAAY,EAC1B,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,OAAO,CAC3B,MAAM,CAAC,eAAe,EAAE,sBAAsB,CAAC,CAClD,YAAK,EACE,cAAc,EAAE,sBAAsB;IAGlD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAwB;IAE5D,OAAO,CAAC,UAAU;IAUZ,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAU3B,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAC5D;QACI,iBAAiB,EAAE,eAAe,CAAC,WAAW,CAAA;QAC9C,OAAO,EAAE,OAAO,CAAA;KACnB,GACD;QACI,iBAAiB,EAAE,OAAO,CACtB,eAAe,EACf,eAAe,CAAC,WAAW,CAC9B,CAAA;QACD,SAAS,EAAE,MAAM,CAAA;QACjB,OAAO,EAAE,OAAO,CAAA;KACnB,CACN;YA4Ha,iBAAiB;IA8DzB,kBAAkB,IAAI,OAAO,CAAC,OAAO,CAAC;YA8D9B,yBAAyB;YAkEzB,0BAA0B;YAgD1B,mBAAmB;IAsB3B,WAAW,IAAI,OAAO,CAAC,iBAAiB,CAAC;CAuGlD"}
+{"version":3,"file":"wallet-sync-service.d.ts","sourceRoot":"","sources":["../../src/ledger/wallet-sync-service.ts"],"names":[],"mappings":"AAGA,OAAO,EACH,YAAY,EAEf,MAAM,oCAAoC,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAA;AAC9D,OAAO,EACH,KAAK,EAIR,MAAM,mCAAmC,CAAA;AAC1C,OAAO,EACH,sBAAsB,EACtB,eAAe,EAClB,MAAM,kCAAkC,CAAA;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAC7B,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAA;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAGlE,qBAAa,iBAAiB;IAEtB,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,cAAc;IAGtB,OAAO,CAAC,cAAc;gBAPd,KAAK,EAAE,KAAK,EACZ,YAAY,EAAE,YAAY,EAC1B,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,OAAO,CAC3B,MAAM,CAAC,eAAe,EAAE,sBAAsB,CAAC,CAClD,YAAK,EACE,cAAc,EAAE,sBAAsB;IAGlD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAwB;IAE5D,OAAO,CAAC,UAAU;IAUZ,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAU7B,uBAAuB;cAkBrB,sBAAsB,CAClC,cAAc,EAAE,MAAM,EACtB,oBAAoB,EAAE,MAAM,GAC7B,OAAO,CACJ;QACI,iBAAiB,EAAE,eAAe,CAAC,WAAW,CAAA;QAC9C,OAAO,EAAE,OAAO,CAAA;KACnB,GACD;QACI,iBAAiB,EAAE,OAAO,CACtB,eAAe,EACf,eAAe,CAAC,WAAW,CAC9B,CAAA;QACD,SAAS,EAAE,MAAM,CAAA;QACjB,OAAO,EAAE,OAAO,CAAA;KACnB,CACN;YAwGa,iBAAiB;IA8DzB,kBAAkB,IAAI,OAAO,CAAC,OAAO,CAAC;YA8D9B,yBAAyB;YA2EzB,0BAA0B;YAoD1B,mBAAmB;IAsB3B,WAAW,IAAI,OAAO,CAAC,iBAAiB,CAAC;CAgHlD"}

package/dist/ledger/wallet-sync-service.js

@@ -28,27 +28,23 @@ export class WalletSyncService {
             await new Promise((res) => setTimeout(res, timeoutMs));
         }
     }
-    async resolveSigningProvider(namespace) {
+    async getParticipantNamespace() {
+        const { participantId } = await this.ledgerClient.getWithRetry('/v2/parties/participant-id', defaultRetryableOptions);
+        // Extract the namespace part from participantId
+        // Format is hint::namespace
+        const [, extractedNamespace] = participantId.split('::');
+        if (extractedNamespace) {
+            return extractedNamespace;
+        }
+        else {
+            throw new Error(`Invalid participantId format: expected "hint::namespace", got "${participantId}"`);
+        }
+    }
+    // Protected for tests
+    async resolveSigningProvider(partyNamespace, participantNamespace) {
         try {
-            // Check if namespace matches participant namespace first
-            // (participant parties have namespace === participantId's namespace)
-            let participantNamespace;
-            try {
-                const { participantId } = await this.ledgerClient.getWithRetry('/v2/parties/participant-id', defaultRetryableOptions);
-                // Extract the namespace part from participantId
-                // Format is hint::namespace
-                const [, extractedNamespace] = participantId.split('::');
-                if (extractedNamespace) {
-                    participantNamespace = extractedNamespace;
-                }
-                else {
-                    this.logger.warn({ participantId }, `Invalid participantId format: expected "hint::namespace", got "${participantId}"`);
-                }
-            }
-            catch (err) {
-                this.logger.warn({ err }, 'Failed to get participant namespace');
-            }
-            if (participantNamespace && namespace === participantNamespace) {
+            if (participantNamespace &&
+                partyNamespace === participantNamespace) {
                 return {
                     signingProviderId: SigningProvider.PARTICIPANT,
                     matched: true,
@@ -82,9 +78,9 @@ export class WalletSyncService {
                             if (!normalizedKey)
                                 continue;
                             const keyNamespace = this.partyAllocator.createFingerprintFromKey(normalizedKey);
-                            if (keyNamespace === namespace) {
+                            if (keyNamespace === partyNamespace) {
                                 this.logger.info({
-                                    namespace,
+                                    namespace: partyNamespace,
                                     providerId,
                                     keyId: key.id,
                                     publicKey: key.publicKey,
@@ -104,14 +100,14 @@ export class WalletSyncService {
                 }
             }
             // No match found - use participant as default provider
-            this.logger.warn({ namespace }, 'No signing provider match found for namespace, using participant as default and marking wallet as unmatched (disabled)');
+            this.logger.warn({ namespace: partyNamespace }, 'No signing provider match found for namespace, using participant as default and marking wallet as unmatched (disabled)');
             return {
                 signingProviderId: SigningProvider.PARTICIPANT,
                 matched: false,
             };
         }
         catch (err) {
-            this.logger.error({ err, namespace }, 'Error resolving signing provider, using participant as default and marking wallet as unmatched (disabled)');
+            this.logger.error({ err, namespace: partyNamespace }, 'Error resolving signing provider, using participant as default and marking wallet as unmatched (disabled)');
             // On error, use participant as default but mark as unmatched
             return {
                 signingProviderId: SigningProvider.PARTICIPANT,
@@ -217,12 +213,12 @@ export class WalletSyncService {
     }
     // Participant wallets: disable when party not on ledger (participant node reset, namespace changed).
     // Other wallets: mark as initialized so user can re-allocate (e.g. after external signing).
-    async handleWalletsWithoutParty(enabledWallets, partiesWithRights) {
-        const walletsWithoutParty = enabledWallets.filter((wallet) => !partiesWithRights.has(wallet.partyId));
-        const markedForAllocateWallets = [];
-        const disabledExistingWallets = [];
+    async handleWalletsWithoutParty(allocatedWallets, partiesWithRights) {
+        const walletsWithoutParty = allocatedWallets.filter((wallet) => !partiesWithRights.has(wallet.partyId));
+        const updatedToInitialized = [];
+        const updatedToDisabled = [];
         for (const wallet of walletsWithoutParty) {
-            if (wallet.status !== 'allocated')
+            if (wallet.status !== 'allocated' || wallet.disabled)
                 continue;
             try {
                 if (wallet.signingProviderId === SigningProvider.PARTICIPANT) {
@@ -230,6 +226,12 @@ export class WalletSyncService {
                         partyId: wallet.partyId,
                         signingProviderId: wallet.signingProviderId,
                     }, 'Participant wallet party not on ledger, disabling (participant namespace changed)');
+                    const disabledWallet = {
+                        ...wallet,
+                        disabled: true,
+                        reason: WALLET_DISABLED_REASON.PARTICIPANT_NAMESPACE_CHANGED,
+                        ...(wallet.primary && { primary: false }),
+                    };
                     await this.store.updateWallet({
                         partyId: wallet.partyId,
                         networkId: wallet.networkId,
@@ -237,7 +239,7 @@ export class WalletSyncService {
                         reason: WALLET_DISABLED_REASON.PARTICIPANT_NAMESPACE_CHANGED,
                         ...(wallet.primary && { primary: false }),
                     });
-                    disabledExistingWallets.push(wallet);
+                    updatedToDisabled.push(disabledWallet);
                 }
                 else {
                     this.logger.info({
@@ -250,7 +252,12 @@ export class WalletSyncService {
                         status: 'initialized',
                         ...(wallet.primary && { primary: false }),
                     });
-                    markedForAllocateWallets.push(wallet);
+                    const reinitialized = {
+                        ...wallet,
+                        status: 'initialized',
+                        ...(wallet.primary && { primary: false }),
+                    };
+                    updatedToInitialized.push(reinitialized);
                 }
             }
             catch (err) {
@@ -258,16 +265,15 @@ export class WalletSyncService {
             }
         }
         return {
-            markedForAllocateWallets,
-            walletsWithoutParty,
-            disabledExistingWallets,
+            updatedToInitialized,
+            updatedToDisabled,
         };
     }
     // Creates wallets for parties user has rights to
-    async handlePartiesWithoutWallet(newParties, networkId, rightsByParty) {
+    async handlePartiesWithoutWallet(newParties, networkId, rightsByParty, participantNamespace) {
         return await Promise.all(newParties.map(async (partyId) => {
             const [hint, namespace] = partyId.split('::');
-            const resolvedSigningProvider = await this.resolveSigningProvider(namespace);
+            const resolvedSigningProvider = await this.resolveSigningProvider(namespace, participantNamespace);
             const isMatched = resolvedSigningProvider.matched;
             const walletPublicKey = resolvedSigningProvider.signingProviderId ===
                 SigningProvider.PARTICIPANT
@@ -316,6 +322,7 @@ export class WalletSyncService {
     async syncWallets() {
         this.logger.info('Starting wallet sync...');
         try {
+            const participantNamespace = await this.getParticipantNamespace();
             const network = await this.store.getCurrentNetwork();
             this.logger.info(network, 'Current network');
             const { rightsByParty, rightsByUser } = await this.getRightsSnapshot();
@@ -332,13 +339,14 @@ export class WalletSyncService {
             const newParties = partiesWithRights.filter((party) => !existingPartiesOnNetwork.has(`${party}:${network.id}`)
             // todo: filter on idp id
             );
-            const { markedForAllocateWallets, walletsWithoutParty, disabledExistingWallets, } = await this.handleWalletsWithoutParty(existingAllocatedWallets, new Set(partiesWithRights));
+            const { updatedToInitialized, updatedToDisabled } = await this.handleWalletsWithoutParty(existingAllocatedWallets, new Set(partiesWithRights));
             const rightsUpdatedWallets = await this.handleRightsUpdates(existingAllocatedWallets, rightsByParty);
             this.logger.info({
                 newParties,
-                markedForAllocate: markedForAllocateWallets.map((w) => w.partyId),
+                updatedToInitialized: updatedToInitialized.map((w) => w.partyId),
+                updatedToDisabled: updatedToDisabled.map((w) => w.partyId),
             }, 'Wallets without parties');
-            const newParticipantWallets = await this.handlePartiesWithoutWallet(newParties, network.id, rightsByParty);
+            const newParticipantWallets = await this.handlePartiesWithoutWallet(newParties, network.id, rightsByParty, participantNamespace);
             // Set primary wallet if none exists, or if primary is on an initialized wallet
             const networkWallets = await this.store.getWallets();
             const primaryWallet = networkWallets.find((w) => w.primary);
@@ -349,19 +357,27 @@ export class WalletSyncService {
                 await this.store.setPrimaryWallet(allocatedWallets[0].partyId);
                 this.logger.info(`Set ${allocatedWallets[0].partyId} as primary wallet in network ${network.id}`);
             }
+            const newWallets = newParticipantWallets;
+            const updatedRaw = [
+                ...updatedToInitialized,
+                ...rightsUpdatedWallets,
+            ];
+            const added = newWallets.filter((wallet) => !wallet.disabled);
+            const updated = updatedRaw.filter((wallet) => !wallet.disabled);
             const disabled = [
-                ...newParticipantWallets.filter((wallet) => wallet.disabled),
-                ...disabledExistingWallets,
+                ...newWallets.filter((wallet) => wallet.disabled),
+                ...updatedRaw.filter((wallet) => wallet.disabled),
+                ...updatedToDisabled,
             ];
             this.logger.info({
-                added: newParticipantWallets,
-                updated: [...walletsWithoutParty, ...rightsUpdatedWallets],
-                disabled: disabled,
+                added,
+                updated,
+                disabled,
             }, 'Wallet sync completed.');
             return {
-                added: newParticipantWallets,
-                updated: [...walletsWithoutParty, ...rightsUpdatedWallets],
-                disabled: disabled,
+                added,
+                updated,
+                disabled,
             };
         }
         catch (err) {