@ledgerhq/coin-canton 0.7.0 → 0.8.0-nightly.1

package/lib/bridge/onboard.integ.test.js

@@ -3,17 +3,39 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const rxjs_1 = require("rxjs");
+const index_1 = require("@ledgerhq/coin-framework/account/index");
 const cantonTestUtils_1 = require("../test/cantonTestUtils");
-const onboard_1 = require("./onboard");
-const onboard_2 = require("../types/onboard");
+const onboard_1 = require("../types/onboard");
 const config_1 = __importDefault(require("../config"));
+const onboard_2 = require("./onboard");
 describe("onboard (devnet)", () => {
     const mockDeviceId = "test-device-id";
-    const mockDerivationPath = "44'/6767'/0'/0'/0'";
     const mockCurrency = {
         id: "canton_network",
     };
+    const mockAccount = {
+        type: "Account",
+        id: "js:2:canton_network:canton_3f5c9d9a:canton",
+        seedIdentifier: "canton_3f5c9d9a",
+        derivationMode: "canton",
+        index: 0,
+        freshAddress: "canton_3f5c9d9a",
+        freshAddressPath: "44'/6767'/0'/0'/0'",
+        used: false,
+        balance: (0, bignumber_js_1.default)(10000),
+        spendableBalance: (0, bignumber_js_1.default)(10000),
+        creationDate: new Date(),
+        blockHeight: 1,
+        currency: mockCurrency,
+        operationsCount: 0,
+        operations: [],
+        pendingOperations: [],
+        lastSyncDate: new Date(),
+        balanceHistoryCache: index_1.emptyHistoryCache,
+        swapHistory: [],
+    };
     let onboardedAccount = null;
     beforeAll(() => {
         config_1.default.setCoinConfig(() => ({
@@ -40,8 +62,8 @@ describe("onboard (devnet)", () => {
             const mockSignerContext = jest.fn().mockImplementation((deviceId, callback) => {
                 return callback(mockSigner);
             });
-            const onboardObservable = (0, onboard_1.buildOnboardAccount)(mockSignerContext);
-            const onboardValues = await (0, rxjs_1.firstValueFrom)(onboardObservable(mockCurrency, mockDeviceId, mockDerivationPath).pipe((0, rxjs_1.toArray)()));
+            const onboardObservable = (0, onboard_2.buildOnboardAccount)(mockSignerContext);
+            const onboardValues = await (0, rxjs_1.firstValueFrom)(onboardObservable(mockCurrency, mockDeviceId, mockAccount).pipe((0, rxjs_1.toArray)()));
             const onboardResult = onboardValues.find((value) => "partyId" in value);
             if (!onboardResult) {
                 throw new Error("Failed to onboard account for shared test data");
@@ -54,19 +76,19 @@ describe("onboard (devnet)", () => {
                 onboardResult,
             };
             // WHEN
-            const result = await (0, onboard_1.isAccountOnboarded)(mockCurrency, keyPair.publicKeyHex);
+            const result = await (0, onboard_2.isAccountOnboarded)(mockCurrency, keyPair.publicKeyHex);
             // THEN
             expect(result).not.toBe(false);
             if (typeof result === "object") {
-                expect(result.party_id).toBeDefined();
-                expect(result.party_id).toBe(onboardResult.partyId);
+                expect(result.partyId).toBeDefined();
+                expect(result.partyId).toBe(onboardResult.partyId);
             }
-        }, 30000);
+        }, 40000);
         it("should return false for non-onboarded account with fresh keypair", async () => {
             // GIVEN
             const keyPair = (0, cantonTestUtils_1.generateMockKeyPair)();
             // WHEN
-            const result = await (0, onboard_1.isAccountOnboarded)(mockCurrency, keyPair.publicKeyHex);
+            const result = await (0, onboard_2.isAccountOnboarded)(mockCurrency, keyPair.publicKeyHex);
             // THEN
             expect(result).toEqual({ isOnboarded: false });
         }, 15000);
@@ -74,7 +96,7 @@ describe("onboard (devnet)", () => {
             // GIVEN
             const keyPair = (0, cantonTestUtils_1.generateMockKeyPair)();
             // WHEN
-            const result = await (0, onboard_1.isAccountOnboarded)(mockCurrency, keyPair.publicKeyHex);
+            const result = await (0, onboard_2.isAccountOnboarded)(mockCurrency, keyPair.publicKeyHex);
             // THEN
             expect(result).toEqual({ isOnboarded: false });
         }, 15000);
@@ -87,17 +109,17 @@ describe("onboard (devnet)", () => {
             const mockSignerContext = jest.fn().mockImplementation((deviceId, callback) => {
                 return callback(mockSigner);
             });
-            const onboardObservable = (0, onboard_1.buildOnboardAccount)(mockSignerContext);
+            const onboardObservable = (0, onboard_2.buildOnboardAccount)(mockSignerContext);
             // WHEN
-            const allValues = await (0, rxjs_1.firstValueFrom)(onboardObservable(mockCurrency, mockDeviceId, mockDerivationPath).pipe((0, rxjs_1.toArray)()));
+            const allValues = await (0, rxjs_1.firstValueFrom)(onboardObservable(mockCurrency, mockDeviceId, mockAccount).pipe((0, rxjs_1.toArray)()));
             const progressValues = allValues.filter((value) => "status" in value && !("partyId" in value));
             const resultValues = allValues.filter((value) => "partyId" in value);
             // THEN
             // Check expected status progression
-            expect(progressValues.some(p => p.status === onboard_2.OnboardStatus.INIT)).toBe(true);
-            expect(progressValues.some(p => p.status === onboard_2.OnboardStatus.PREPARE)).toBe(true);
-            expect(progressValues.some(p => p.status === onboard_2.OnboardStatus.SIGN)).toBe(true);
-            expect(progressValues.some(p => p.status === onboard_2.OnboardStatus.SUBMIT)).toBe(true);
+            expect(progressValues.some(p => p.status === onboard_1.OnboardStatus.INIT)).toBe(true);
+            expect(progressValues.some(p => p.status === onboard_1.OnboardStatus.PREPARE)).toBe(true);
+            expect(progressValues.some(p => p.status === onboard_1.OnboardStatus.SIGN)).toBe(true);
+            expect(progressValues.some(p => p.status === onboard_1.OnboardStatus.SUBMIT)).toBe(true);
             // Check final result
             expect(resultValues.length).toBeGreaterThan(0);
             const finalResult = resultValues[resultValues.length - 1];
@@ -107,10 +129,10 @@ describe("onboard (devnet)", () => {
         }, 30000);
         it("should complete full onboarding flow with already onboarded account", async () => {
             // GIVEN
-            const { keyPair, mockSignerContext, onboardResult: firstResult } = getOnboardedAccount();
-            const secondOnboardObservable = (0, onboard_1.buildOnboardAccount)(mockSignerContext);
+            const { mockSignerContext, onboardResult: firstResult } = getOnboardedAccount();
+            const secondOnboardObservable = (0, onboard_2.buildOnboardAccount)(mockSignerContext);
             // WHEN
-            const secondOnboardValues = await (0, rxjs_1.firstValueFrom)(secondOnboardObservable(mockCurrency, mockDeviceId, mockDerivationPath).pipe((0, rxjs_1.toArray)()));
+            const secondOnboardValues = await (0, rxjs_1.firstValueFrom)(secondOnboardObservable(mockCurrency, mockDeviceId, mockAccount).pipe((0, rxjs_1.toArray)()));
             const secondResult = secondOnboardValues.find((value) => "partyId" in value);
             // THEN
             expect(secondResult).toBeDefined();
@@ -122,16 +144,16 @@ describe("onboard (devnet)", () => {
         it("should complete preapproval flow for onboarded account", async () => {
             // GIVEN
             const { mockSignerContext, onboardResult } = getOnboardedAccount();
-            const preapprovalObservable = (0, onboard_1.buildAuthorizePreapproval)(mockSignerContext);
+            const preapprovalObservable = (0, onboard_2.buildAuthorizePreapproval)(mockSignerContext);
             // WHEN
-            const preapprovalValues = await (0, rxjs_1.firstValueFrom)(preapprovalObservable(mockCurrency, mockDeviceId, mockDerivationPath, onboardResult.partyId).pipe((0, rxjs_1.toArray)()));
+            const preapprovalValues = await (0, rxjs_1.firstValueFrom)(preapprovalObservable(mockCurrency, mockDeviceId, mockAccount, onboardResult.partyId).pipe((0, rxjs_1.toArray)()));
             const progressValues = preapprovalValues.filter((value) => "status" in value && !("isApproved" in value));
             const resultValues = preapprovalValues.filter((value) => "isApproved" in value);
             // THEN
             // Check expected status progression
-            expect(progressValues.some(p => p.status === onboard_2.PreApprovalStatus.PREPARE)).toBe(true);
-            expect(progressValues.some(p => p.status === onboard_2.PreApprovalStatus.SIGN)).toBe(true);
-            expect(progressValues.some(p => p.status === onboard_2.PreApprovalStatus.SUBMIT)).toBe(true);
+            expect(progressValues.some(p => p.status === onboard_1.AuthorizeStatus.PREPARE)).toBe(true);
+            expect(progressValues.some(p => p.status === onboard_1.AuthorizeStatus.SIGN)).toBe(true);
+            expect(progressValues.some(p => p.status === onboard_1.AuthorizeStatus.SUBMIT)).toBe(true);
             // Check final result (should be approved)
             expect(resultValues.length).toBeGreaterThan(0);
             const finalResult = resultValues[resultValues.length - 1];
@@ -145,10 +167,10 @@ describe("onboard (devnet)", () => {
             const mockSignerContext = jest.fn().mockImplementation((deviceId, callback) => {
                 return callback(mockSigner);
             });
-            const preapprovalObservable = (0, onboard_1.buildAuthorizePreapproval)(mockSignerContext);
+            const preapprovalObservable = (0, onboard_2.buildAuthorizePreapproval)(mockSignerContext);
             // WHEN & THEN
             try {
-                await (0, rxjs_1.firstValueFrom)(preapprovalObservable(mockCurrency, mockDeviceId, mockDerivationPath, "invalid-party-id-123"));
+                await (0, rxjs_1.firstValueFrom)(preapprovalObservable(mockCurrency, mockDeviceId, mockAccount, "invalid-party-id-123"));
                 expect(true).toBe(true);
             }
             catch (error) {

package/lib/bridge/onboard.integ.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"onboard.integ.test.js","sourceRoot":"","sources":["../../src/bridge/onboard.integ.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"onboard.integ.test.js","sourceRoot":"","sources":["../../src/bridge/onboard.integ.test.ts"],"names":[],"mappings":"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"}

package/lib/bridge/onboard.js

@@ -3,157 +3,86 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildAuthorizePreapproval = exports.buildOnboardAccount = exports.isAccountOnboarded = void 0;
+exports.buildAuthorizePreapproval = exports.buildOnboardAccount = exports.isAccountAuthorized = exports.isAccountOnboarded = void 0;
 const rxjs_1 = require("rxjs");
-const index_1 = require("@ledgerhq/coin-framework/account/index");
-const derivation_1 = require("@ledgerhq/coin-framework/derivation");
-const sync_1 = require("./sync");
+const logs_1 = require("@ledgerhq/logs");
 const gateway_1 = require("../network/gateway");
 const onboard_1 = require("../types/onboard");
 const signer_1 = __importDefault(require("../signer"));
-async function _getKeypair(signerContext, deviceId, derivationPath) {
-    return signerContext(deviceId, async (signer) => {
-        const { publicKey, address } = await signer.getAddress(derivationPath);
-        return { signer, publicKey: publicKey.replace("0x", ""), address };
-    });
-}
 const isAccountOnboarded = async (currency, publicKey) => {
     try {
         const { party_id } = await (0, gateway_1.getPartyByPubKey)(currency, publicKey);
         if (party_id) {
-            return { isOnboarded: true, party_id };
+            return { isOnboarded: true, partyId: party_id };
         }
         else {
             return { isOnboarded: false };
         }
     }
     catch (err) {
-        log("[isAccountOnboarded] Error checking party status (likely not onboarded):", err);
         return { isOnboarded: false };
     }
 };
 exports.isAccountOnboarded = isAccountOnboarded;
-const buildOnboardAccount = (signerContext) => (currency, deviceId, derivationPath) => new rxjs_1.Observable(observer => {
+const isAccountAuthorized = async (operations, partyId) => {
+    // temporary solution to check if the account is authorized
+    return operations.some(operation => operation.senders.includes(partyId));
+};
+exports.isAccountAuthorized = isAccountAuthorized;
+const buildOnboardAccount = (signerContext) => (currency, deviceId, account) => new rxjs_1.Observable(o => {
     async function main() {
-        observer.next({
-            status: onboard_1.OnboardStatus.INIT,
-        });
-        const derivationMode = (0, derivation_1.getDerivationModesForCurrency)(currency)[0];
+        o.next({ status: onboard_1.OnboardStatus.INIT });
         const getAddress = (0, signer_1.default)(signerContext);
-        const { address, publicKey } = await getAddress(deviceId, {
-            path: derivationPath,
+        const { publicKey } = await getAddress(deviceId, {
+            path: account.freshAddressPath,
             currency,
-            derivationMode: derivationMode || "",
+            derivationMode: account.derivationMode,
         });
-        observer.next({
-            status: onboard_1.OnboardStatus.PREPARE,
-        });
-        const { party_id: partyId } = await (0, exports.isAccountOnboarded)(currency, publicKey);
+        o.next({ status: onboard_1.OnboardStatus.PREPARE });
+        let { partyId } = await (0, exports.isAccountOnboarded)(currency, publicKey);
         if (partyId) {
-            const account = await createAccount({
-                address,
-                derivationPath,
-                partyId,
-                currency,
-                derivationMode,
-            });
-            observer.next({
-                partyId,
-                account,
-            });
-            observer.complete();
+            o.next({ partyId, account }); // success
             return;
         }
-        const preparedTransaction = await (0, gateway_1.prepareOnboarding)(currency, publicKey, "ed25519");
-        observer.next({
-            status: onboard_1.OnboardStatus.SIGN,
-        });
-        const signature = await signerContext(deviceId, signer => signer.signTransaction(derivationPath, preparedTransaction.transactions.combined_hash));
-        observer.next({
-            status: onboard_1.OnboardStatus.SUBMIT,
-        });
-        const result = await (0, gateway_1.submitOnboarding)(currency, { public_key: publicKey, public_key_type: "ed25519" }, preparedTransaction, signature).catch(async (err) => {
-            if (err.type === "PARTY_ALREADY_EXISTS") {
-                const account = await createAccount({
-                    address,
-                    derivationPath,
-                    partyId: preparedTransaction.party_id,
-                    currency,
-                    derivationMode,
-                });
-                observer.next({
-                    partyId: preparedTransaction.party_id,
-                    account,
-                });
-                return observer.complete();
-            }
-            throw err;
-        });
-        if (result) {
-            observer.next({
-                status: onboard_1.OnboardStatus.SUCCESS,
-            });
-            const account = await createAccount({
-                address,
-                derivationPath,
-                partyId: result.party.party_id,
-                currency,
-                derivationMode,
-            });
-            observer.next({
-                partyId: result.party.party_id,
-                account,
-            });
-        }
-        observer.complete();
+        const preparedTransaction = await (0, gateway_1.prepareOnboarding)(currency, publicKey);
+        partyId = preparedTransaction.party_id;
+        o.next({ status: onboard_1.OnboardStatus.SIGN });
+        const signature = await signerContext(deviceId, signer => signer.signTransaction(account.freshAddressPath, preparedTransaction.transactions.combined_hash));
+        o.next({ status: onboard_1.OnboardStatus.SUBMIT });
+        await (0, gateway_1.submitOnboarding)(currency, publicKey, preparedTransaction, signature);
+        o.next({ partyId, account }); // success
     }
-    main().then(() => observer.complete(), error => {
-        log("[onboardAccount] Error:", error);
-        observer.error(error);
+    main().then(() => o.complete(), error => {
+        (0, logs_1.log)("[canton:onboard] onboardAccount failed:", error);
+        o.error(error);
     });
 });
 exports.buildOnboardAccount = buildOnboardAccount;
-const buildAuthorizePreapproval = (signerContext) => (currency, deviceId, derivationPath, partyId) => new rxjs_1.Observable(observer => {
+const buildAuthorizePreapproval = (signerContext) => (currency, deviceId, account, partyId) => new rxjs_1.Observable(o => {
     async function main() {
-        observer.next({
-            status: onboard_1.PreApprovalStatus.PREPARE,
-        });
-        const preparedTransaction = await (0, gateway_1.preparePreApprovalTransaction)(currency, partyId);
-        observer.next({
-            status: onboard_1.PreApprovalStatus.SIGN,
-        });
-        const signature = await signerContext(deviceId, signer => signer.signTransaction(derivationPath, preparedTransaction.hash));
-        observer.next({
-            status: onboard_1.PreApprovalStatus.SUBMIT,
-        });
-        const { isApproved } = await (0, gateway_1.submitPreApprovalTransaction)(currency, partyId, preparedTransaction, signature);
-        observer.next({
-            status: onboard_1.PreApprovalStatus.SUCCESS,
-        });
-        observer.next({
-            isApproved,
-        });
+        o.next({ status: onboard_1.AuthorizeStatus.INIT });
+        const isAuthorized = await (0, exports.isAccountAuthorized)(account.operations, partyId);
+        if (!isAuthorized) {
+            o.next({ status: onboard_1.AuthorizeStatus.PREPARE });
+            const preparedTransaction = await (0, gateway_1.preparePreApprovalTransaction)(currency, partyId);
+            o.next({ status: onboard_1.AuthorizeStatus.SIGN });
+            const signature = await signerContext(deviceId, signer => signer.signTransaction(account.freshAddressPath, preparedTransaction.hash));
+            o.next({ status: onboard_1.AuthorizeStatus.SUBMIT });
+            await (0, gateway_1.submitPreApprovalTransaction)(currency, partyId, preparedTransaction, signature);
+        }
+        o.next({ isApproved: true }); // success
         const handleTapRequest = async () => {
             try {
-                const { serialized, hash } = await (0, gateway_1.prepareTapRequest)(currency, {
-                    partyId,
-                });
+                const { serialized, hash } = await (0, gateway_1.prepareTapRequest)(currency, { partyId });
                 if (serialized && hash) {
-                    observer.next({
-                        status: onboard_1.PreApprovalStatus.SIGN,
-                    });
-                    const signature = await signerContext(deviceId, signer => signer.signTransaction(derivationPath, hash));
-                    observer.next({
-                        status: onboard_1.PreApprovalStatus.SUBMIT,
-                    });
+                    o.next({ status: onboard_1.AuthorizeStatus.SIGN });
+                    const signature = await signerContext(deviceId, signer => signer.signTransaction(account.freshAddressPath, hash));
+                    o.next({ status: onboard_1.AuthorizeStatus.SUBMIT });
                     await (0, gateway_1.submitTapRequest)(currency, {
                         partyId,
                         serialized,
                         signature,
                     });
-                    observer.next({
-                        status: onboard_1.PreApprovalStatus.SUCCESS,
-                    });
                 }
             }
             catch (err) {
@@ -161,47 +90,11 @@ const buildAuthorizePreapproval = (signerContext) => (currency, deviceId, deriva
             }
         };
         await handleTapRequest();
-        observer.complete();
     }
-    main().then(() => observer.complete(), error => {
-        log("[buildAuthorizePreapproval] Error:", error);
-        observer.error(error);
+    main().then(() => o.complete(), error => {
+        (0, logs_1.log)("[canton:onboard] authorizePreapproval failed:", error);
+        o.error(error);
     });
 });
 exports.buildAuthorizePreapproval = buildAuthorizePreapproval;
-const createAccount = async ({ address, partyId, derivationPath, currency, derivationMode, index = 0, }) => {
-    const accountShape = await (0, sync_1.getAccountShape)({
-        address,
-        currency,
-        derivationMode,
-        derivationPath,
-        index,
-        rest: {
-            cantonResources: {
-                partyId,
-            },
-        },
-    }, { paginationConfig: {} });
-    const account = {
-        ...accountShape,
-        type: "Account",
-        xpub: partyId.replace(/:/g, "_"),
-        index,
-        // operations: [],
-        currency,
-        derivationMode,
-        lastSyncDate: new Date(),
-        pendingOperations: [],
-        seedIdentifier: address,
-        balanceHistoryCache: index_1.emptyHistoryCache,
-        cantonResources: {
-            partyId,
-        },
-    };
-    return account;
-};
-const log = (message, ...rest) => {
-    // eslint-disable-next-line no-console
-    console.log(message, ...rest);
-};
 //# sourceMappingURL=onboard.js.map

package/lib/bridge/onboard.js.map

@@ -1 +1 @@
-{"version":3,"file":"onboard.js","sourceRoot":"","sources":["../../src/bridge/onboard.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"onboard.js","sourceRoot":"","sources":["../../src/bridge/onboard.ts"],"names":[],"mappings":"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"}

package/lib/bridge/signOperation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signOperation.d.ts","sourceRoot":"","sources":["../../src/bridge/signOperation.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAa,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAGhE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAErD,eAAO,MAAM,kBAAkB,GAC5B,eAAe,aAAa,CAAC,YAAY,CAAC,KAAG,aAAa,CAAC,WAAW,CAAC,CAAC,eAAe,CAyFpF,CAAC"}
+{"version":3,"file":"signOperation.d.ts","sourceRoot":"","sources":["../../src/bridge/signOperation.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAa,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAIhE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAErD,eAAO,MAAM,kBAAkB,GAC5B,eAAe,aAAa,CAAC,YAAY,CAAC,KAAG,aAAa,CAAC,WAAW,CAAC,CAAC,eAAe,CAuFpF,CAAC"}

package/lib/bridge/signOperation.js

@@ -4,6 +4,7 @@ exports.buildSignOperation = void 0;
 const rxjs_1 = require("rxjs");
 const errors_1 = require("@ledgerhq/errors");
 const operation_1 = require("@ledgerhq/coin-framework/operation");
+const account_1 = require("@ledgerhq/coin-framework/account");
 const common_logic_1 = require("../common-logic");
 const buildSignOperation = (signerContext) => ({ account, deviceId, transaction }) => new rxjs_1.Observable(o => {
     async function main() {
@@ -16,9 +17,8 @@ const buildSignOperation = (signerContext) => ({ account, deviceId, transaction
                 type: "device-signature-requested",
             });
             const signature = await signerContext(deviceId, async (signer) => {
-                const { freshAddressPath: derivationPath } = account;
-                const partyId = account
-                    .cantonResources.partyId;
+                const { id, freshAddressPath: derivationPath, xpub } = account;
+                const address = xpub ?? (0, account_1.decodeAccountId)(id).xpubOrAddress;
                 const params = {
                     recipient: transaction.recipient,
                     amount: transaction.amount,
@@ -29,10 +29,10 @@ const buildSignOperation = (signerContext) => ({ account, deviceId, transaction
                     params.memo = transaction.memo;
                 }
                 const { hash, serializedTransaction } = await (0, common_logic_1.craftTransaction)(account.currency, {
-                    address: partyId,
+                    address,
                 }, params);
                 const transactionSignature = await signer.signTransaction(derivationPath, hash);
-                return (0, common_logic_1.combine)(serializedTransaction, `${transactionSignature}__PARTY__${partyId}`);
+                return (0, common_logic_1.combine)(serializedTransaction, `${transactionSignature}__PARTY__${address}`);
             });
             o.next({
                 type: "device-signature-granted",

package/lib/bridge/signOperation.js.map

@@ -1 +1 @@
-{"version":3,"file":"signOperation.js","sourceRoot":"","sources":["../../src/bridge/signOperation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"signOperation.js","sourceRoot":"","sources":["../../src/bridge/signOperation.ts"],"names":[],"mappings":"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"}

package/lib/bridge/sync.d.ts

@@ -1,4 +1,5 @@
 import { GetAccountShape } from "@ledgerhq/coin-framework/bridge/jsHelpers";
-import { CantonAccount } from "../types";
-export declare const getAccountShape: GetAccountShape<CantonAccount>;
+import { SignerContext } from "@ledgerhq/coin-framework/signer";
+import { CantonAccount, CantonSigner } from "../types";
+export declare function makeGetAccountShape(signerContext: SignerContext<CantonSigner>): GetAccountShape<CantonAccount>;
 //# sourceMappingURL=sync.d.ts.map

package/lib/bridge/sync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/bridge/sync.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAY,MAAM,2CAA2C,CAAC;AAGtF,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AA6DzC,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,aAAa,CAwE1D,CAAC"}
+{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/bridge/sync.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAY,MAAM,2CAA2C,CAAC;AAEtF,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAIhE,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AA4DvD,wBAAgB,mBAAmB,CACjC,aAAa,EAAE,aAAa,CAAC,YAAY,CAAC,GACzC,eAAe,CAAC,aAAa,CAAC,CAsFhC"}