@ledgerhq/coin-canton 0.9.0-nightly.3 → 0.9.0-nightly.5

package/src/bridge/sync.ts

@@ -4,7 +4,8 @@ import { encodeAccountId } from "@ledgerhq/coin-framework/account/index";
 import { GetAccountShape, mergeOps } from "@ledgerhq/coin-framework/bridge/jsHelpers";
 import { encodeOperationId } from "@ledgerhq/coin-framework/operation";
 import { SignerContext } from "@ledgerhq/coin-framework/signer";
-import { getBalance, getLedgerEnd, getOperations, type OperationInfo } from "../network/gateway";
+import { getLedgerEnd, getOperations, type OperationInfo } from "../network/gateway";
+import { getBalance, type CantonBalance } from "../common-logic/account/getBalance";
 import coinConfig from "../config";
 import resolver from "../signer";
 import { CantonAccount, CantonSigner } from "../types";
@@ -108,19 +109,26 @@ export function makeGetAccountShape(
     const balances = xpubOrAddress ? await getBalance(currency, xpubOrAddress) : [];
 
     const balancesData = (balances || []).reduce(
-      (acc, { amount, instrument_id, locked }) => {
-        acc[instrument_id] = { amount, locked };
+      (acc, balance) => {
+        acc[balance.instrumentId] = balance;
         return acc;
       },
-      {} as Record<string, { amount: string; locked: boolean }>,
+      {} as Record<string, CantonBalance>,
     );
 
-    const unlockedAmount = new BigNumber(balancesData[nativeInstrumentId]?.amount || "0");
-    const lockedAmount = new BigNumber(balancesData[`Locked${nativeInstrumentId}`]?.amount || "0");
+    const unlockedAmount = new BigNumber(balancesData[nativeInstrumentId]?.value.toString() || "0");
+    const lockedAmount = new BigNumber(
+      balancesData[`Locked${nativeInstrumentId}`]?.value.toString() || "0",
+    );
     const totalBalance = unlockedAmount.plus(lockedAmount);
     const reserveMin = new BigNumber(coinConfig.getCoinConfig(currency).minReserve || 0);
     const spendableBalance = BigNumber.max(0, unlockedAmount.minus(reserveMin));
 
+    const instrumentUtxoCounts: Record<string, number> = {};
+    for (const [instrumentId, balance] of Object.entries(balancesData)) {
+      instrumentUtxoCounts[instrumentId] = balance.utxoCount;
+    }
+
     let operations: Operation[] = [];
     if (xpubOrAddress) {
       const oldOperations = initialAccount?.operations || [];
@@ -159,6 +167,9 @@ export function makeGetAccountShape(
       spendableBalance,
       xpub: xpubOrAddress,
       used,
+      cantonResources: {
+        instrumentUtxoCounts,
+      },
     };
 
     return shape;

package/src/bridge/transaction.ts

@@ -48,7 +48,7 @@ export const toTransactionRaw = (t: Transaction): TransactionRaw => {
   return {
     ...common,
     family: t.family,
-    fee: t.fee ? t.fee.toString() : null,
+    fee: t.fee ? t.fee.toFixed() : null,
     tokenId: t.tokenId,
   };
 };

package/src/common-logic/account/getBalance.ts

@@ -3,12 +3,17 @@ import { getBalance as gatewayGetBalance, type InstrumentBalance } from "../../n
 import coinConfig from "../../config";
 import { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
 
+export type CantonBalance = Balance & {
+  utxoCount: number;
+  instrumentId: string;
+};
+
 const useGateway = (currency: CryptoCurrency) =>
   coinConfig.getCoinConfig(currency).useGateway === true;
 const getNativeId = (currency: CryptoCurrency) =>
   coinConfig.getCoinConfig(currency).nativeInstrumentId;
 
-function adaptInstrument(currency: CryptoCurrency, instrument: InstrumentBalance): Balance {
+function adaptInstrument(currency: CryptoCurrency, instrument: InstrumentBalance): CantonBalance {
   return {
     value: BigInt(instrument.amount),
     locked: instrument.locked === true ? BigInt(instrument.amount) : BigInt(0),
@@ -16,10 +21,15 @@ function adaptInstrument(currency: CryptoCurrency, instrument: InstrumentBalance
       getNativeId(currency) === instrument.instrument_id
         ? { type: "native" }
         : { type: "token", assetReference: instrument.instrument_id },
+    utxoCount: instrument.utxo_count,
+    instrumentId: instrument.instrument_id,
   };
 }
 
-export async function getBalance(currency: CryptoCurrency, partyId: string): Promise<Balance[]> {
+export async function getBalance(
+  currency: CryptoCurrency,
+  partyId: string,
+): Promise<CantonBalance[]> {
   if (useGateway(currency))
     return (await gatewayGetBalance(currency, partyId)).map(instrument =>
       adaptInstrument(currency, instrument),

package/src/common-logic/account/getBalance.unit.test.ts

@@ -29,11 +29,13 @@ describe("getBalance", () => {
       {
         instrument_id: "native-id",
         amount: "1000",
+        utxo_count: 1,
         locked: false,
       },
       {
         instrument_id: "token-123",
         amount: "5000",
+        utxo_count: 1,
         locked: true,
       },
     ];
@@ -43,16 +45,20 @@ describe("getBalance", () => {
     const result = await getBalance(mockCurrency, "party-id");
 
     expect(getBalanceFromNetwork).toHaveBeenCalledWith(mockCurrency, "party-id");
-    expect(result).toEqual<Balance[]>([
+    expect(result).toEqual([
       {
         value: BigInt(1000),
         locked: BigInt(0),
         asset: { type: "native" },
+        utxoCount: 1,
+        instrumentId: "native-id",
       },
       {
         value: BigInt(5000),
         locked: BigInt(5000),
         asset: { type: "token", assetReference: "token-123" },
+        utxoCount: 1,
+        instrumentId: "token-123",
       },
     ]);
   });

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

@@ -27,7 +27,7 @@ export async function craftTransaction(
 }> {
   const params: PrepareTransferRequest = {
     recipient: transaction.recipient || "",
-    amount: transaction.amount.toString(),
+    amount: transaction.amount.toFixed(),
     type: "token-transfer-request" as const,
     execute_before_secs: transaction.expireInSeconds,
     instrument_id: transaction.tokenId,

package/src/network/gateway.ts

@@ -91,6 +91,7 @@ export type InstrumentBalance = {
   instrument_id: string;
   amount: string;
   locked: boolean;
+  utxo_count: number;
 };
 
 type PartyInfo = {

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";