@ledgerhq/coin-canton 0.9.0-nightly.2 → 0.9.0-nightly.20251031023756

package/src/common-logic/transaction/sign.test.ts

@@ -1,5 +1,10 @@
 import { OnboardingPrepareResponse, PrepareTransferResponse } from "../../network/gateway";
-import { CantonPreparedTransaction, CantonSigner } from "../../types/signer";
+import {
+  CantonPreparedTransaction,
+  CantonSigner,
+  CantonSignature,
+  CantonUntypedVersionedMessage,
+} from "../../types/signer";
 import { signTransaction } from "./sign";
 
 class MockCantonSigner implements CantonSigner {
@@ -13,12 +18,22 @@ class MockCantonSigner implements CantonSigner {
 
   async signTransaction(
     path: string,
-    data: CantonPreparedTransaction | { transactions: string[] },
-  ) {
-    if ("transactions" in data) {
-      return `untyped-signature-${data.transactions.length}`;
+    data: CantonPreparedTransaction | CantonUntypedVersionedMessage | string,
+  ): Promise<CantonSignature> {
+    if (typeof data === "string") {
+      return { signature: `txhash-signature-${data}` };
+    } else if ("transactions" in data) {
+      const result: CantonSignature = {
+        signature: `untyped-signature-${data.transactions.length}`,
+      };
+      if (data.challenge) {
+        result.applicationSignature = `challenge-signature-${data.challenge}`;
+      }
+      return result;
     } else {
-      return `prepared-transaction-signature-${data.damlTransaction.length}-${data.nodes.length}`;
+      return {
+        signature: `prepared-transaction-signature-${data.damlTransaction.length}-${data.nodes.length}`,
+      };
     }
   }
 }
@@ -85,7 +100,7 @@ describe("signTransaction", () => {
     );
 
     // THEN
-    expect(result).toBe("prepared-transaction-signature-10-1");
+    expect(result).toEqual({ signature: "prepared-transaction-signature-10-1" });
   });
 
   it("should sign untyped versioned message", async () => {
@@ -122,7 +137,7 @@ describe("signTransaction", () => {
     );
 
     // THEN
-    expect(result).toBe("untyped-signature-3");
+    expect(result).toEqual({ signature: "untyped-signature-3" });
   });
 
   it("should handle empty signature from signer", async () => {
@@ -201,7 +216,7 @@ describe("signTransaction", () => {
 
   it("should call signer with correct parameters for prepared transaction", async () => {
     // GIVEN
-    const mockSignerSpy = jest.fn().mockResolvedValue("test-signature");
+    const mockSignerSpy = jest.fn().mockResolvedValue({ signature: "test-signature" });
     const mockSignerWithSpy = {
       ...mockSigner,
       signTransaction: mockSignerSpy,
@@ -270,9 +285,9 @@ describe("signTransaction", () => {
     );
   });
 
-  it("should call signer with correct parameters for untyped versioned message", async () => {
+  it("should call signer with correct parameters for untyped versioned message without challenge", async () => {
     // GIVEN
-    const mockSignerSpy = jest.fn().mockResolvedValue("test-signature");
+    const mockSignerSpy = jest.fn().mockResolvedValue({ signature: "test-signature" });
     const mockSignerWithSpy = {
       ...mockSigner,
       signTransaction: mockSignerSpy,
@@ -314,4 +329,61 @@ describe("signTransaction", () => {
       ],
     });
   });
+
+  it("should call signer with correct parameters for untyped versioned message with challenge", async () => {
+    const mockSignerSpy = jest.fn().mockResolvedValue({
+      signature: "main-signature",
+      applicationSignature: "challenge-signature",
+    });
+    const mockSignerWithSpy = {
+      ...mockSigner,
+      signTransaction: mockSignerSpy,
+    } as unknown as CantonSigner;
+
+    const mockOnboardingPrepareResponse: OnboardingPrepareResponse = {
+      party_id: "test-party-id",
+      party_name: "test-party-name",
+      public_key_fingerprint: "test-fingerprint",
+      challenge_nonce: "1234567890abcdef",
+      challenge_deadline: 1735689599,
+      transactions: {
+        namespace_transaction: {
+          serialized: "namespace-transaction-data",
+          json: {},
+          hash: "namespace-hash",
+        },
+        party_to_key_transaction: {
+          serialized: "party-to-key-transaction-data",
+          json: {},
+          hash: "party-to-key-hash",
+        },
+        party_to_participant_transaction: {
+          serialized: "party-to-participant-transaction-data",
+          json: {},
+          hash: "party-to-participant-hash",
+        },
+        combined_hash: "combined-hash",
+      },
+    };
+
+    const result = await signTransaction(
+      mockSignerWithSpy,
+      mockDerivationPath,
+      mockOnboardingPrepareResponse,
+    );
+
+    expect(result).toEqual({
+      signature: "main-signature",
+      applicationSignature: "challenge-signature",
+    });
+
+    expect(mockSignerSpy).toHaveBeenCalledWith(mockDerivationPath, {
+      transactions: [
+        "namespace-transaction-data",
+        "party-to-key-transaction-data",
+        "party-to-participant-transaction-data",
+      ],
+      challenge: "181234567890abcdef000000006774857f",
+    });
+  });
 });

package/src/common-logic/transaction/sign.ts

@@ -1,33 +1,59 @@
 import { OnboardingPrepareResponse, PrepareTransferResponse } from "../../network/gateway";
 import { PrepareTransactionResponse } from "../../types/onboard";
-import { CantonSigner } from "../../types/signer";
+import { CantonSigner, CantonSignature } from "../../types/signer";
 import { splitTransaction } from "./split";
 
 /**
  * Sign a Canton transaction - handles both prepared transactions and untyped versioned messages
  */
+
 export async function signTransaction(
   signer: CantonSigner,
   derivationPath: string,
-  transactionData: PrepareTransferResponse | OnboardingPrepareResponse | PrepareTransactionResponse,
-): Promise<string> {
-  let signature: string;
+  transactionData: PrepareTransferResponse | PrepareTransactionResponse | OnboardingPrepareResponse,
+): Promise<CantonSignature> {
+  let signature: CantonSignature;
 
   if ("json" in transactionData) {
     const components = splitTransaction(transactionData.json);
     signature = await signer.signTransaction(derivationPath, components);
   } else {
+    const challenge = getTransactionChallenge(transactionData);
+
     const transactions = [
       transactionData.transactions.namespace_transaction.serialized,
       transactionData.transactions.party_to_key_transaction.serialized,
       transactionData.transactions.party_to_participant_transaction.serialized,
     ];
-    signature = await signer.signTransaction(derivationPath, { transactions });
+
+    signature = await signer.signTransaction(derivationPath, {
+      transactions,
+      ...(challenge && { challenge }),
+    });
   }
 
-  if (!signature || signature.length === 0) {
+  if (!signature?.signature) {
     throw new Error("Device returned empty signature");
   }
 
   return signature;
 }
+
+const getTransactionChallenge = ({
+  challenge_nonce,
+  challenge_deadline,
+}: OnboardingPrepareResponse) => {
+  if (!challenge_nonce || !challenge_deadline) {
+    return undefined;
+  }
+
+  try {
+    const deadlineHex = Buffer.alloc(8);
+    deadlineHex.writeBigInt64BE(BigInt(challenge_deadline), 0);
+
+    // Format: [length (1B) = 0x18][challenge (16 bytes)][deadline (8 bytes)]
+    return "18" + challenge_nonce.toLowerCase() + deadlineHex.toString("hex");
+  } catch (error) {
+    return undefined;
+  }
+};

package/src/network/gateway.integ.test.ts

@@ -83,12 +83,9 @@ describe("gateway (devnet)", () => {
       const signature = keyPair.sign(prepareResponse.transactions.combined_hash);
 
       // WHEN
-      const response = await submitOnboarding(
-        mockCurrency,
-        keyPair.publicKeyHex,
-        prepareResponse,
+      const response = await submitOnboarding(mockCurrency, keyPair.publicKeyHex, prepareResponse, {
         signature,
-      );
+      });
 
       // Save onboarded account for next tests that need a valid party ID
       onboardedAccount = {
@@ -118,7 +115,7 @@ describe("gateway (devnet)", () => {
           mockCurrency,
           keyPair.publicKeyHex,
           prepareResponse!,
-          signature,
+          { signature },
         );
 
         // THEN

package/src/network/gateway.ts

@@ -10,6 +10,7 @@ import {
   PreApprovalResult,
 } from "../types/onboard";
 import type { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
+import type { CantonSignature } from "../types/signer";
 
 export type OnboardingPrepareResponse = {
   party_id: string;
@@ -33,6 +34,8 @@ export type OnboardingPrepareResponse = {
     };
     combined_hash: string;
   };
+  challenge_nonce?: string;
+  challenge_deadline?: number;
 };
 
 type OnboardingPrepareRequest = {
@@ -59,6 +62,7 @@ type OnboardingSubmitRequest = {
   prepare_request: OnboardingPrepareRequest;
   prepare_response: OnboardingPrepareResponse;
   signature: string;
+  application_signature?: string;
 };
 
 type OnboardingSubmitResponse = {
@@ -87,6 +91,7 @@ export type InstrumentBalance = {
   instrument_id: string;
   amount: string;
   locked: boolean;
+  utxo_count: number;
 };
 
 type PartyInfo = {
@@ -325,7 +330,7 @@ export async function submitOnboarding(
   currency: CryptoCurrency,
   publicKey: string,
   prepareResponse: OnboardingPrepareResponse,
-  signature: string,
+  { signature, applicationSignature }: CantonSignature,
 ) {
   try {
     const { data } = await gatewayNetwork<OnboardingSubmitResponse, OnboardingSubmitRequest>({
@@ -338,6 +343,7 @@ export async function submitOnboarding(
         },
         prepare_response: prepareResponse,
         signature,
+        ...(applicationSignature ? { application_signature: applicationSignature } : {}),
       },
     });
     return data;
@@ -449,11 +455,13 @@ export async function prepareTapRequest(
   currency: CryptoCurrency,
   { partyId, amount = 1000000 }: PrepareTapRequest,
 ) {
+  const fixedPointAmount = BigInt(amount) * BigInt(10) ** BigInt(38);
+
   const { data } = await gatewayNetwork<PrepareTapResponse, { amount: string; type: string }>({
     method: "POST",
     url: `${getGatewayUrl(currency)}/v1/node/${getNodeId(currency)}/party/${partyId}/transaction/prepare`,
     data: {
-      amount: amount.toString(),
+      amount: fixedPointAmount.toString(),
       type: TransactionType.TAP_REQUEST,
     },
   });

package/src/test/fixtures.ts

@@ -0,0 +1,53 @@
+import BigNumber from "bignumber.js";
+import { Account } from "@ledgerhq/types-live";
+import { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
+import { getDerivationScheme, runDerivationScheme } from "@ledgerhq/coin-framework/derivation";
+import { createEmptyHistoryCache } from "@ledgerhq/coin-framework/account";
+
+export const createMockCantonCurrency = (): CryptoCurrency => {
+  const mockCurrency = {
+    id: "canton_network",
+    name: "Canton",
+    type: "CryptoCurrency",
+    family: "canton",
+    units: [{ name: "Canton", code: "CANTON", magnitude: 38 }],
+    ticker: "CANTON",
+    scheme: "canton",
+    color: "#000000",
+    managerAppName: "Canton",
+    coinType: 6767,
+    explorerViews: [],
+  } satisfies CryptoCurrency;
+  return mockCurrency;
+};
+
+export const createMockAccount = (overrides: Partial<Account> = {}): Account => {
+  const currency = createMockCantonCurrency();
+  const derivationMode = "canton" as const;
+  const scheme = getDerivationScheme({ derivationMode, currency });
+  const freshAddressPath = runDerivationScheme(scheme, currency, { account: 0 });
+
+  return {
+    id: "js:2:canton_network:test-address:canton",
+    type: "Account",
+    used: true,
+    currency,
+    derivationMode,
+    index: 0,
+    freshAddress: "test_address",
+    freshAddressPath,
+    creationDate: new Date(),
+    lastSyncDate: new Date(),
+    balance: new BigNumber(0),
+    spendableBalance: new BigNumber(0),
+    seedIdentifier: "test_seed",
+    blockHeight: 0,
+    operationsCount: 0,
+    operations: [],
+    pendingOperations: [],
+    balanceHistoryCache: createEmptyHistoryCache(),
+    swapHistory: [],
+    subAccounts: [],
+    ...overrides,
+  };
+};

package/src/types/bridge.ts

@@ -48,6 +48,7 @@ export type Transaction = TransactionCommon & {
   fee: BigNumber | null | undefined;
   memo?: string;
   tokenId: string;
+  expireInSeconds?: number;
 };
 
 export type TransactionRaw = TransactionCommonRaw & {
@@ -55,10 +56,22 @@ export type TransactionRaw = TransactionCommonRaw & {
   fee: string | null | undefined;
   memo?: string;
   tokenId: string;
+  expireInSeconds?: number;
 };
 
 export type TransactionStatus = TransactionStatusCommon;
 export type TransactionStatusRaw = TransactionStatusCommonRaw;
 
-export type CantonAccount = Account;
-export type CantonAccountRaw = AccountRaw;
+export type CantonResources = {
+  instrumentUtxoCounts: Record<string, number>;
+};
+export type CantonResourcesRaw = {
+  instrumentUtxoCounts: Record<string, number>;
+};
+
+export type CantonAccount = Account & {
+  cantonResources: CantonResources;
+};
+export type CantonAccountRaw = AccountRaw & {
+  cantonResources: CantonResourcesRaw;
+};

package/src/types/errors.ts

@@ -1,3 +1,6 @@
 import { createCustomErrorClass } from "@ledgerhq/errors";
 
 export const SimulationError = createCustomErrorClass("SimulationError");
+
+export const TooManyUtxosCritical = createCustomErrorClass("TooManyUtxosCritical");
+export const TooManyUtxosWarning = createCustomErrorClass("TooManyUtxosWarning");

package/src/types/index.ts

@@ -1,3 +1,4 @@
 export * from "./bridge";
+export * from "./errors";
 export * from "./onboard";
 export * from "./signer";

package/src/types/signer.ts

@@ -4,7 +4,10 @@ export type CantonAddress = {
   path: string;
 };
 
-export type CantonSignature = string;
+export type CantonSignature = {
+  signature: string;
+  applicationSignature?: string;
+};
 
 export interface CantonPreparedTransaction {
   damlTransaction: Uint8Array;
@@ -15,6 +18,7 @@ export interface CantonPreparedTransaction {
 
 export interface CantonUntypedVersionedMessage {
   transactions: string[];
+  challenge?: string;
 }
 
 export interface CantonSigner {