@canton-network/wallet-gateway-remote 0.26.0 → 1.0.0

package/dist/dapp-api/controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../src/dapp-api/controller.ts"],"names":[],"mappings":"AAGA,OAAO,EAEH,WAAW,EAEd,MAAM,kCAAkC,CAAA;AAYzC,OAAO,EAAE,KAAK,EAAe,MAAM,mCAAmC,CAAA;AAQtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAA;AAC5E,OAAO,EAAE,UAAU,IAAI,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AACpE,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAI7B,eAAO,MAAM,cAAc,GACvB,YAAY,gBAAgB,EAC5B,SAAS,MAAM,EACf,SAAS,MAAM,EACf,OAAO,KAAK,EACZ,qBAAqB,mBAAmB,EACxC,SAAS,MAAM,EACf,QAAQ,MAAM,GAAG,IAAI,EACrB,UAAU,WAAW;;;;;;;;;;;;;;;CAiTxB,CAAA"}
+{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../src/dapp-api/controller.ts"],"names":[],"mappings":"AAGA,OAAO,EAEH,WAAW,EAEd,MAAM,kCAAkC,CAAA;AAYzC,OAAO,EAAE,KAAK,EAAe,MAAM,mCAAmC,CAAA;AAQtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAA;AAC5E,OAAO,EAAE,UAAU,IAAI,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AACpE,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAI7B,eAAO,MAAM,cAAc,GACvB,YAAY,gBAAgB,EAC5B,SAAS,MAAM,EACf,SAAS,MAAM,EACf,OAAO,KAAK,EACZ,qBAAqB,mBAAmB,EACxC,SAAS,MAAM,EACf,QAAQ,MAAM,GAAG,IAAI,EACrB,UAAU,WAAW;;;;;;;;;;;;;;;CAmTxB,CAAA"}

package/dist/dapp-api/controller.js

@@ -143,11 +143,13 @@ export const dappController = (kernelInfo, dappUrl, userUrl, store, notification
             const notifier = notificationService.getNotifier(userId);
             params.commandId = params.commandId || v4();
             const commandId = params.commandId;
+            const transactionId = v4();
             notifier.emit('txChanged', { status: 'pending', commandId });
             const synchronizerId = network.synchronizerId ??
                 (await ledgerClient.getSynchronizerId());
             const response = await prepareSubmission(context.userId, wallet.partyId, synchronizerId, params, ledgerClient);
             const transaction = {
+                id: transactionId,
                 commandId,
                 status: 'pending',
                 preparedTransaction: response.preparedTransaction,
@@ -168,7 +170,7 @@ export const dappController = (kernelInfo, dappUrl, userUrl, store, notification
             await store.setTransaction(transaction);
             return {
                 // closeafteraction query param flag makes approving or deleting tx close the popup
-                userUrl: `${userUrl}/approve/index.html?commandId=${commandId}&closeafteraction`,
+                userUrl: `${userUrl}/approve/index.html?transactionId=${transactionId}&commandId=${commandId}&closeafteraction`,
             };
         },
         status: async () => {

package/dist/ledger/transaction-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transaction-service.d.ts","sourceRoot":"","sources":["../../src/ledger/transaction-service.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAA;AACjE,OAAO,EACH,KAAK,EACL,WAAW,EACX,MAAM,EACN,OAAO,EACV,MAAM,mCAAmC,CAAA;AAC1C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAA;AAChE,OAAO,EAGH,sBAAsB,EACtB,eAAe,EAElB,MAAM,kCAAkC,CAAA;AACzC,OAAO,EACH,aAAa,EACb,aAAa,EACb,UAAU,EACV,gBAAgB,EACnB,MAAM,gCAAgC,CAAA;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,gCAAgC,CAAA;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAA;AAYjE,qBAAa,kBAAkB;IAEvB,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,cAAc;IAGtB,OAAO,CAAC,QAAQ;gBALR,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,OAAO,CAC3B,MAAM,CAAC,eAAe,EAAE,sBAAsB,CAAC,CAClD,YAAK,EACE,QAAQ,EAAE,QAAQ;YAGhB,iCAAiC;IAYxC,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB;IAS/C,oBAAoB,CAC7B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,GACvB,OAAO,CAAC,gBAAgB,CAAC;IAoDf,mBAAmB,CAC5B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,GACvB,OAAO,CAAC,UAAU,CAAC;IAsGT,kBAAkB,CAC3B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,GACvB,OAAO,CAAC,UAAU,CAAC;IA0GT,sBAAsB,CAC/B,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,WAAW,EACxB,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,OAAO,GACjB,OAAO,CAAC,aAAa,CAAC;IAuCZ,mBAAmB,CAC5B,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,WAAW,EACxB,YAAY,EAAE,YAAY,GAC3B,OAAO,CAAC,aAAa,CAAC;CAqD5B"}
+{"version":3,"file":"transaction-service.d.ts","sourceRoot":"","sources":["../../src/ledger/transaction-service.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAA;AACjE,OAAO,EACH,KAAK,EACL,WAAW,EACX,MAAM,EACN,OAAO,EACV,MAAM,mCAAmC,CAAA;AAC1C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAA;AAChE,OAAO,EAGH,sBAAsB,EACtB,eAAe,EAElB,MAAM,kCAAkC,CAAA;AACzC,OAAO,EACH,aAAa,EACb,aAAa,EACb,UAAU,EACV,gBAAgB,EACnB,MAAM,gCAAgC,CAAA;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,gCAAgC,CAAA;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAA;AAYjE,qBAAa,kBAAkB;IAEvB,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,cAAc;IAGtB,OAAO,CAAC,QAAQ;gBALR,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,OAAO,CAC3B,MAAM,CAAC,eAAe,EAAE,sBAAsB,CAAC,CAClD,YAAK,EACE,QAAQ,EAAE,QAAQ;YAGhB,iCAAiC;IAWxC,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB;IAS/C,oBAAoB,CAC7B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,GACvB,OAAO,CAAC,gBAAgB,CAAC;IAqDf,mBAAmB,CAC5B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,GACvB,OAAO,CAAC,UAAU,CAAC;IAwGT,kBAAkB,CAC3B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,GACvB,OAAO,CAAC,UAAU,CAAC;IA4GT,sBAAsB,CAC/B,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,WAAW,EACxB,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,OAAO,GACjB,OAAO,CAAC,aAAa,CAAC;IAyCZ,mBAAmB,CAC5B,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,WAAW,EACxB,YAAY,EAAE,YAAY,GAC3B,OAAO,CAAC,aAAa,CAAC;CAuD5B"}

package/dist/ledger/transaction-service.js

@@ -15,10 +15,10 @@ export class TransactionService {
         this.signingDrivers = signingDrivers;
         this.notifier = notifier;
     }
-    async loadPreparedTransactionForSigning(commandId) {
-        const existingTx = await this.store.getTransaction(commandId);
+    async loadPreparedTransactionForSigning(transactionId) {
+        const existingTx = await this.store.getTransaction(transactionId);
         if (!existingTx) {
-            throw new Error(`Transaction not found with commandId: ${commandId}`);
+            throw new Error(`Transaction not found with id: ${transactionId}`);
         }
         return existingTx;
     }
@@ -36,7 +36,7 @@ export class TransactionService {
             throw new Error('Wallet Kernel signing driver not available');
         }
         const driver = signingProvider.controller(userId);
-        const tx = await this.loadPreparedTransactionForSigning(signParams.commandId);
+        const tx = await this.loadPreparedTransactionForSigning(signParams.transactionId);
         const { signature } = await driver
             .signTransaction({
             tx: tx.preparedTransaction,
@@ -51,6 +51,7 @@ export class TransactionService {
         }
         const now = new Date();
         const signedTx = {
+            id: tx.id,
             commandId: tx.commandId,
             status: 'signed',
             preparedTransaction: tx.preparedTransaction,
@@ -61,7 +62,7 @@ export class TransactionService {
             }),
             signedAt: now,
         };
-        await this.store.setTransactionSigned(tx.commandId, now);
+        await this.store.setTransactionSigned(tx.id, now);
         this.notifier.emit('txChanged', signedTx);
         return {
             status: 'signed',
@@ -76,7 +77,7 @@ export class TransactionService {
             throw new Error('Blockdaemon signing driver not available');
         }
         const driver = signingProvider.controller(userId);
-        const tx = await this.loadPreparedTransactionForSigning(signParams.commandId);
+        const tx = await this.loadPreparedTransactionForSigning(signParams.transactionId);
         let signingResult;
         if (tx && tx.externalTxId) {
             signingResult = await driver
@@ -108,6 +109,7 @@ export class TransactionService {
                 throw new Error('No signature returned from signing driver');
             }
             const signedTx = {
+                id: tx.id,
                 commandId: tx.commandId,
                 status: signingResult.status,
                 preparedTransaction: tx.preparedTransaction,
@@ -119,7 +121,7 @@ export class TransactionService {
                 signedAt: now,
                 externalTxId: signingResult.txId,
             };
-            await this.store.setTransactionSigned(tx.commandId, now, signingResult.txId);
+            await this.store.setTransactionSigned(tx.id, now, signingResult.txId);
             this.notifier.emit('txChanged', signedTx);
             return {
                 status: signingResult.status,
@@ -132,6 +134,7 @@ export class TransactionService {
         else {
             const status = signingResult.status === 'pending' ? 'pending' : 'failed';
             const pendingTx = {
+                id: tx.id,
                 commandId: tx.commandId,
                 status,
                 preparedTransaction: tx.preparedTransaction,
@@ -142,7 +145,7 @@ export class TransactionService {
                     createdAt: tx.createdAt,
                 }),
             };
-            await this.store.setTransactionStatus(tx.commandId, status, {
+            await this.store.setTransactionStatus(tx.id, status, {
                 externalTxId: signingResult.txId,
             });
             this.notifier.emit('txChanged', pendingTx);
@@ -159,7 +162,7 @@ export class TransactionService {
             throw new Error('Fireblocks signing driver not available');
         }
         const driver = signingProvider.controller(userId);
-        const tx = await this.loadPreparedTransactionForSigning(signParams.commandId);
+        const tx = await this.loadPreparedTransactionForSigning(signParams.transactionId);
         let signingResult;
         if (tx && tx.externalTxId) {
             signingResult = await driver
@@ -187,6 +190,7 @@ export class TransactionService {
                 throw new Error('No signature returned from signing driver');
             }
             const signedTx = {
+                id: tx.id,
                 commandId: tx.commandId,
                 status: signingResult.status,
                 preparedTransaction: tx.preparedTransaction,
@@ -198,7 +202,7 @@ export class TransactionService {
                 signedAt: now,
                 externalTxId: signingResult.txId,
             };
-            await this.store.setTransactionSigned(tx.commandId, now, signingResult.txId);
+            await this.store.setTransactionSigned(tx.id, now, signingResult.txId);
             this.notifier.emit('txChanged', signedTx);
             // return signature in format that is already usable in execute
             const decodedSignature = Buffer.from(signingResult.signature, 'hex').toString('base64');
@@ -213,6 +217,7 @@ export class TransactionService {
         else {
             const status = signingResult.status === 'pending' ? 'pending' : 'failed';
             const pendingTx = {
+                id: tx.id,
                 commandId: tx.commandId,
                 status,
                 preparedTransaction: tx.preparedTransaction,
@@ -223,7 +228,7 @@ export class TransactionService {
                     createdAt: tx.createdAt,
                 }),
             };
-            await this.store.setTransactionStatus(tx.commandId, status, {
+            await this.store.setTransactionStatus(tx.id, status, {
                 externalTxId: signingResult.txId,
             });
             this.notifier.emit('txChanged', pendingTx);
@@ -235,11 +240,13 @@ export class TransactionService {
         }
     }
     async executeWithParticipant(userId, executeParams, transaction, ledgerClient, network) {
-        const { commandId, partyId } = executeParams;
+        const { partyId } = executeParams;
+        const { commandId } = transaction;
         const synchronizerId = network.synchronizerId ?? (await ledgerClient.getSynchronizerId());
         const prep = ledgerPrepareParams(userId, partyId, synchronizerId, transaction.payload);
         const res = await ledgerClient.postWithRetry('/v2/commands/submit-and-wait', prep);
         const executedTx = {
+            id: transaction.id,
             commandId,
             status: 'executed',
             preparedTransaction: transaction.preparedTransaction,
@@ -253,15 +260,16 @@ export class TransactionService {
                 signedAt: transaction.signedAt,
             }),
         };
-        await this.store.setTransactionStatus(commandId, 'executed', {
+        await this.store.setTransactionStatus(transaction.id, 'executed', {
             payload: res,
         });
         this.notifier.emit('txChanged', executedTx);
         return res;
     }
     async executeWithExternal(userId, executeParams, transaction, ledgerClient) {
-        const { commandId, partyId, signature, signedBy } = executeParams;
-        const result = await ledgerClient.postWithRetry('/v2/interactive-submission/execute', {
+        const { partyId, signature, signedBy } = executeParams;
+        const { commandId } = transaction;
+        const result = await ledgerClient.postWithRetry('/v2/interactive-submission/executeAndWait', {
             userId,
             preparedTransaction: transaction.preparedTransaction,
             hashingSchemeVersion: 'HASHING_SCHEME_VERSION_V2',
@@ -286,6 +294,7 @@ export class TransactionService {
             },
         });
         const executedTx = {
+            id: transaction.id,
             commandId,
             status: 'executed',
             preparedTransaction: transaction.preparedTransaction,
@@ -299,7 +308,7 @@ export class TransactionService {
                 signedAt: transaction.signedAt,
             }),
         };
-        await this.store.setTransactionStatus(commandId, 'executed', {
+        await this.store.setTransactionStatus(transaction.id, 'executed', {
             payload: result,
         });
         this.notifier.emit('txChanged', executedTx);

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);
@@ -346,22 +354,30 @@ export class WalletSyncService {
             const needsPrimaryReset = primaryWallet?.status === 'initialized' ||
                 (!primaryWallet && allocatedWallets.length > 0);
             if (needsPrimaryReset && allocatedWallets.length > 0) {
-                this.store.setPrimaryWallet(allocatedWallets[0].partyId);
+                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) {