@ledgerhq/coin-canton 0.12.0-nightly.20251211024123 → 0.12.0-nightly.20251213023821

package/lib-es/bridge/buildSubAccounts.d.ts

@@ -0,0 +1,23 @@
+import { Operation } from "@ledgerhq/types-live";
+import type { TokenAccount } from "@ledgerhq/types-live";
+import { TokenCurrency } from "@ledgerhq/types-cryptoassets";
+import { type TransferProposal } from "../network/gateway";
+export type CantonTokenAccount = TokenAccount & {
+    cantonResources: {
+        pendingTransferProposals: TransferProposal[];
+    };
+};
+export declare function buildSubAccounts({ accountId, tokenBalances, existingSubAccounts, allOperations, pendingTransferProposals, calTokens, }: {
+    accountId: string;
+    calTokens: Map<string, string>;
+    tokenBalances: Array<{
+        adminId: string;
+        totalBalance: bigint;
+        spendableBalance: bigint;
+        token: TokenCurrency;
+    }>;
+    existingSubAccounts: TokenAccount[];
+    allOperations: Operation[];
+    pendingTransferProposals: TransferProposal[];
+}): CantonTokenAccount[];
+//# sourceMappingURL=buildSubAccounts.d.ts.map

package/lib-es/bridge/buildSubAccounts.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"buildSubAccounts.d.ts","sourceRoot":"","sources":["../../src/bridge/buildSubAccounts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAI7D,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAE3D,MAAM,MAAM,kBAAkB,GAAG,YAAY,GAAG;IAC9C,eAAe,EAAE;QAAE,wBAAwB,EAAE,gBAAgB,EAAE,CAAA;KAAE,CAAC;CACnE,CAAC;AAEF,wBAAgB,gBAAgB,CAAC,EAC/B,SAAS,EACT,aAAa,EACb,mBAAmB,EACnB,aAAa,EACb,wBAAwB,EACxB,SAAS,GACV,EAAE;IACD,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,aAAa,EAAE,KAAK,CAAC;QACnB,OAAO,EAAE,MAAM,CAAC;QAChB,YAAY,EAAE,MAAM,CAAC;QACrB,gBAAgB,EAAE,MAAM,CAAC;QACzB,KAAK,EAAE,aAAa,CAAC;KACtB,CAAC,CAAC;IACH,mBAAmB,EAAE,YAAY,EAAE,CAAC;IACpC,aAAa,EAAE,SAAS,EAAE,CAAC;IAC3B,wBAAwB,EAAE,gBAAgB,EAAE,CAAC;CAC9C,GAAG,kBAAkB,EAAE,CA6CvB"}

package/lib-es/bridge/buildSubAccounts.js

@@ -0,0 +1,74 @@
+import BigNumber from "bignumber.js";
+import { encodeTokenAccountId, emptyHistoryCache } from "@ledgerhq/coin-framework/account/index";
+import { mergeOps } from "@ledgerhq/coin-framework/bridge/jsHelpers";
+import { encodeOperationId } from "@ledgerhq/coin-framework/operation";
+export function buildSubAccounts({ accountId, tokenBalances, existingSubAccounts, allOperations, pendingTransferProposals, calTokens, }) {
+    if (tokenBalances.length === 0)
+        return [];
+    const tokenAccounts = [];
+    const existingAccountByTicker = {};
+    const existingAccountTickers = [];
+    for (const existingSubAccount of existingSubAccounts) {
+        if (existingSubAccount.type === "TokenAccount") {
+            const { ticker } = existingSubAccount.token;
+            existingAccountTickers.push(ticker);
+            existingAccountByTicker[ticker] = existingSubAccount;
+        }
+    }
+    for (const { totalBalance, spendableBalance, token, adminId } of tokenBalances) {
+        const initialTokenAccount = existingAccountByTicker[token.ticker];
+        const instrumentId = calTokens.get(token.id) || token.name;
+        // Filter operations for this specific instrument (both id and admin must match)
+        const tokenOperations = allOperations.filter(op => {
+            const extra = op.extra;
+            return extra?.instrumentId === instrumentId && extra?.instrumentAdmin === adminId;
+        });
+        // Filter pending transfer proposals for this specific instrument
+        const tokenPendingTransferProposals = pendingTransferProposals.filter(proposal => proposal.instrument_id === instrumentId && proposal.instrument_admin === adminId);
+        const tokenAccount = buildSubAccount({
+            totalBalance: new BigNumber(totalBalance.toString()),
+            spendableBalance: new BigNumber(spendableBalance.toString()),
+            accountId,
+            initialTokenAccount,
+            parentAccountId: accountId,
+            token,
+            operations: tokenOperations,
+            pendingTransferProposals: tokenPendingTransferProposals,
+        });
+        if (tokenAccount)
+            tokenAccounts.push(tokenAccount);
+    }
+    return tokenAccounts;
+}
+function buildSubAccount({ totalBalance, spendableBalance, accountId, initialTokenAccount, parentAccountId, token, operations, pendingTransferProposals, }) {
+    const subAccountId = encodeTokenAccountId(accountId, token);
+    // Merge old operations with new ones and update accountId for sub-account
+    const oldOperations = initialTokenAccount?.operations || [];
+    const newOperations = operations.map(op => ({
+        ...op,
+        id: encodeOperationId(subAccountId, op.hash, op.type),
+        accountId: subAccountId,
+    }));
+    const mergedOperations = mergeOps(oldOperations, newOperations);
+    const creationDate = mergedOperations.length > 0
+        ? new Date(Math.min(...mergedOperations.map(op => op.date.getTime())))
+        : new Date();
+    return {
+        type: "TokenAccount",
+        id: subAccountId,
+        parentId: parentAccountId,
+        token,
+        balance: totalBalance,
+        spendableBalance,
+        operationsCount: mergedOperations.length,
+        operations: mergedOperations,
+        creationDate,
+        pendingOperations: initialTokenAccount?.pendingOperations || [],
+        balanceHistoryCache: initialTokenAccount?.balanceHistoryCache || emptyHistoryCache,
+        swapHistory: [],
+        cantonResources: {
+            pendingTransferProposals,
+        },
+    };
+}
+//# sourceMappingURL=buildSubAccounts.js.map

package/lib-es/bridge/buildSubAccounts.js.map

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

package/lib-es/bridge/getTransactionStatus.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getTransactionStatus.d.ts","sourceRoot":"","sources":["../../src/bridge/getTransactionStatus.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,OAAO,EACL,WAAW,EACX,iBAAiB,EACjB,aAAa,EAGd,MAAM,UAAU,CAAC;AAOlB,eAAO,MAAM,4BAA4B,KAAK,CAAC;AAC/C,eAAO,MAAM,2BAA2B,KAAK,CAAC;AAE9C,eAAO,MAAM,oBAAoB,EAAE,aAAa,CAC9C,WAAW,EACX,aAAa,EACb,iBAAiB,CAClB,CAAC,sBAAsB,CAqEvB,CAAC;AAkCF,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,CAqBpF"}
+{"version":3,"file":"getTransactionStatus.d.ts","sourceRoot":"","sources":["../../src/bridge/getTransactionStatus.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,OAAO,EACL,WAAW,EACX,iBAAiB,EACjB,aAAa,EAGd,MAAM,UAAU,CAAC;AAOlB,eAAO,MAAM,4BAA4B,KAAK,CAAC;AAC/C,eAAO,MAAM,2BAA2B,KAAK,CAAC;AAE9C,eAAO,MAAM,oBAAoB,EAAE,aAAa,CAC9C,WAAW,EACX,aAAa,EACb,iBAAiB,CAClB,CAAC,sBAAsB,CA+FvB,CAAC;AAqCF,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,CAqBpF"}

package/lib-es/bridge/getTransactionStatus.js

@@ -1,4 +1,4 @@
-import { AmountRequired, FeeNotLoaded, FeeTooHigh, InvalidAddress, NotEnoughBalanceBecauseDestinationNotCreated, NotEnoughSpendableBalance, RecipientRequired, } from "@ledgerhq/errors";
+import { AmountRequired, FeeNotLoaded, FeeTooHigh, InvalidAddress, NotEnoughBalance, NotEnoughBalanceBecauseDestinationNotCreated, NotEnoughBalanceInParentAccount, NotEnoughSpendableBalance, RecipientRequired, } from "@ledgerhq/errors";
 import BigNumber from "bignumber.js";
 import { formatCurrencyUnit } from "@ledgerhq/coin-framework/currencies/index";
 import { TooManyUtxosCritical, TooManyUtxosWarning, } from "../types";
@@ -15,9 +15,17 @@ export const getTransactionStatus = async (account, transaction) => {
     // reserveAmount is the minimum amount of currency that an account must hold in order to stay activated
     const reserveAmount = new BigNumber(coinConfig.getCoinConfig(account.currency).minReserve || 0);
     const estimatedFees = new BigNumber(transaction.fee || 0);
-    const totalSpent = new BigNumber(transaction.amount).plus(estimatedFees);
     const amount = new BigNumber(transaction.amount);
-    if (amount.gt(0) && estimatedFees.times(10).gt(amount)) {
+    const isTokenTransaction = !!transaction.subAccountId;
+    // For token transactions, fees are paid from parent account, so totalSpent is just amount
+    const totalSpent = isTokenTransaction ? amount : amount.plus(estimatedFees);
+    // Get the account balance to check against (subAccount for tokens, main account for native)
+    let accountBalance = account.spendableBalance;
+    if (isTokenTransaction && account.subAccounts) {
+        const subAccount = account.subAccounts.find(sub => sub.type === "TokenAccount" && sub.id === transaction.subAccountId);
+        accountBalance = subAccount?.spendableBalance ?? new BigNumber(0);
+    }
+    if (amount.gt(0) && estimatedFees.times(10).gt(amount) && !isTokenTransaction) {
         // if the fee is more than 10 times the amount, we warn the user that fee is high compared to what he is sending
         warnings.feeTooHigh = new FeeTooHigh();
     }
@@ -25,26 +33,6 @@ export const getTransactionStatus = async (account, transaction) => {
         // if the fee is not loaded, we can't do much
         errors.fee = new FeeNotLoaded();
     }
-    else if (totalSpent.gt(account.balance.minus(reserveAmount))) {
-        // if the total spent is greater than the balance minus the reserve amount, tx is invalid
-        errors.amount = new NotEnoughSpendableBalance("", {
-            minimumAmount: formatCurrencyUnit(account.currency.units[0], reserveAmount, {
-                disableRounding: true,
-                useGrouping: false,
-                showCode: true,
-            }),
-        });
-    }
-    else if (transaction.recipient && transaction.amount.lt(reserveAmount)) {
-        // if we send an amount lower than reserve amount AND target account is new, we need to warn the user that the target account will not be activated
-        errors.amount = new NotEnoughBalanceBecauseDestinationNotCreated("", {
-            minimalAmount: formatCurrencyUnit(account.currency.units[0], reserveAmount, {
-                disableRounding: true,
-                useGrouping: false,
-                showCode: true,
-            }),
-        });
-    }
     if (!transaction.recipient) {
         errors.recipient = new RecipientRequired("");
     }
@@ -54,10 +42,40 @@ export const getTransactionStatus = async (account, transaction) => {
             currencyName: account.currency.name,
         });
     }
-    if (!errors.amount && amount.eq(0)) {
+    if (amount.eq(0)) {
         // if the amount is 0, we prevent the user from sending the tx (even if it's technically feasible)
         errors.amount = new AmountRequired();
     }
+    // For token transactions, check that parent account has enough native balance to pay fees
+    if (isTokenTransaction && estimatedFees.gt(account.balance)) {
+        errors.amount = new NotEnoughBalanceInParentAccount();
+    }
+    // Check if total spent exceeds available balance
+    if (!errors.amount && totalSpent.gt(accountBalance)) {
+        errors.amount = new NotEnoughBalance();
+    }
+    // For native coin transactions, check reserve amount constraints
+    if (!isTokenTransaction && !errors.amount) {
+        if (totalSpent.gt(account.balance.minus(reserveAmount))) {
+            errors.amount = new NotEnoughSpendableBalance("", {
+                minimumAmount: formatCurrencyUnit(account.currency.units[0], reserveAmount, {
+                    disableRounding: true,
+                    useGrouping: false,
+                    showCode: true,
+                }),
+            });
+        }
+        else if (transaction.recipient && amount.lt(reserveAmount)) {
+            // if we send an amount lower than reserve amount AND target account is new, we need to warn the user that the target account will not be activated
+            errors.amount = new NotEnoughBalanceBecauseDestinationNotCreated("", {
+                minimalAmount: formatCurrencyUnit(account.currency.units[0], reserveAmount, {
+                    disableRounding: true,
+                    useGrouping: false,
+                    showCode: true,
+                }),
+            });
+        }
+    }
     const utxoWarning = validateUtxoCount(account, transaction);
     if (utxoWarning) {
         warnings.tooManyUtxos = utxoWarning;
@@ -89,7 +107,10 @@ function validateUtxoCount(account, transaction) {
         return null;
     }
     const { instrumentUtxoCounts } = account.cantonResources;
-    const instrumentUtxoCount = instrumentUtxoCounts[transaction.tokenId] || 0;
+    const instrumentKey = transaction.instrumentAdmin
+        ? `${transaction.tokenId}-${transaction.instrumentAdmin}`
+        : transaction.tokenId;
+    const instrumentUtxoCount = instrumentUtxoCounts[instrumentKey] || 0;
     if (instrumentUtxoCount > TO_MANY_UTXOS_CRITICAL_COUNT) {
         return new TooManyUtxosCritical();
     }

package/lib-es/bridge/getTransactionStatus.js.map

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

package/lib-es/bridge/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/bridge/index.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAyB,EAAE,KAAK,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAEpE,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAC7E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAa5C,wBAAgB,aAAa,CAC3B,aAAa,EAAE,aAAa,CAAC,YAAY,CAAC,EAC1C,UAAU,EAAE,UAAU,CAAC,gBAAgB,CAAC;;;EAkDzC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/bridge/index.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAyB,EAAE,KAAK,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAEpE,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAC7E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAc5C,wBAAgB,aAAa,CAC3B,aAAa,EAAE,aAAa,CAAC,YAAY,CAAC,EAC1C,UAAU,EAAE,UAAU,CAAC,gBAAgB,CAAC;;;EAmDzC"}

package/lib-es/bridge/index.js

@@ -13,6 +13,7 @@ import { updateTransaction } from "./updateTransaction";
 import { buildOnboardAccount, buildAuthorizePreapproval } from "./onboard";
 import { buildTransferInstruction } from "./acceptOffer";
 import { assignToAccountRaw, assignFromAccountRaw } from "./serialization";
+import { validateAddress } from "./validateAddress";
 export function createBridges(signerContext, coinConfig) {
     cantonCoinConfig.setCoinConfig(coinConfig);
     const getAddress = resolver(signerContext);
@@ -50,6 +51,7 @@ export function createBridges(signerContext, coinConfig) {
         assignToAccountRaw,
         assignFromAccountRaw,
         getSerializedAddressParameters,
+        validateAddress,
     };
     return {
         currencyBridge,

package/lib-es/bridge/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/bridge/index.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,MAAM,mDAAmD,CAAC;AAClF,OAAO,EACL,8BAA8B,EAC9B,wBAAwB,EACxB,gBAAgB,EAChB,QAAQ,GACT,MAAM,2CAA2C,CAAC;AAInD,OAAO,gBAA2C,MAAM,WAAW,CAAC;AACpE,OAAO,QAAQ,MAAM,WAAW,CAAC;AAGjC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,MAAM,WAAW,CAAC;AAC3E,OAAO,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAE3E,MAAM,UAAU,aAAa,CAC3B,aAA0C,EAC1C,UAAwC;IAExC,gBAAgB,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IAE3C,MAAM,UAAU,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAC;IAC3C,MAAM,OAAO,GAAG,wBAAwB,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC,CAAC;IAExE,MAAM,YAAY,GAAG,gBAAgB,CAAC;QACpC,eAAe,EAAE,mBAAmB,CAAC,aAAa,CAAC;QACnD,YAAY,EAAE,UAAU;KACzB,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,mBAAmB,CAAC,aAAa,CAAC,CAAC;IAC1D,MAAM,oBAAoB,GAAG,yBAAyB,CAAC,aAAa,CAAC,CAAC;IACtE,MAAM,mBAAmB,GAAG,wBAAwB,CAAC,aAAa,CAAC,CAAC;IAEpE,MAAM,cAAc,GAAyB;QAC3C,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QAClC,OAAO,EAAE,GAAG,EAAE,GAAE,CAAC;QACjB,YAAY;QACZ,cAAc;QACd,oBAAoB;QACpB,mBAAmB;KACpB,CAAC;IAEF,MAAM,aAAa,GAAG,kBAAkB,CAAC,aAAa,CAAC,CAAC;IACxD,MAAM,IAAI,GAAG,QAAQ,CAAC,EAAE,eAAe,EAAE,mBAAmB,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;IAE/E,MAAM,aAAa,GAA8C;QAC/D,SAAS;QACT,iBAAiB;QACjB,iBAAiB;QACjB,kBAAkB;QAClB,oBAAoB;QACpB,oBAAoB;QACpB,IAAI;QACJ,OAAO;QACP,aAAa;QACb,gBAAgB,EAAE,GAAG,EAAE;YACrB,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;QACvD,CAAC;QACD,kBAAkB;QAClB,oBAAoB;QACpB,8BAA8B;KAC/B,CAAC;IAEF,OAAO;QACL,cAAc;QACd,aAAa;KACd,CAAC;AACJ,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/bridge/index.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,MAAM,mDAAmD,CAAC;AAClF,OAAO,EACL,8BAA8B,EAC9B,wBAAwB,EACxB,gBAAgB,EAChB,QAAQ,GACT,MAAM,2CAA2C,CAAC;AAInD,OAAO,gBAA2C,MAAM,WAAW,CAAC;AACpE,OAAO,QAAQ,MAAM,WAAW,CAAC;AAGjC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,MAAM,WAAW,CAAC;AAC3E,OAAO,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,UAAU,aAAa,CAC3B,aAA0C,EAC1C,UAAwC;IAExC,gBAAgB,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IAE3C,MAAM,UAAU,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAC;IAC3C,MAAM,OAAO,GAAG,wBAAwB,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC,CAAC;IAExE,MAAM,YAAY,GAAG,gBAAgB,CAAC;QACpC,eAAe,EAAE,mBAAmB,CAAC,aAAa,CAAC;QACnD,YAAY,EAAE,UAAU;KACzB,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,mBAAmB,CAAC,aAAa,CAAC,CAAC;IAC1D,MAAM,oBAAoB,GAAG,yBAAyB,CAAC,aAAa,CAAC,CAAC;IACtE,MAAM,mBAAmB,GAAG,wBAAwB,CAAC,aAAa,CAAC,CAAC;IAEpE,MAAM,cAAc,GAAyB;QAC3C,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QAClC,OAAO,EAAE,GAAG,EAAE,GAAE,CAAC;QACjB,YAAY;QACZ,cAAc;QACd,oBAAoB;QACpB,mBAAmB;KACpB,CAAC;IAEF,MAAM,aAAa,GAAG,kBAAkB,CAAC,aAAa,CAAC,CAAC;IACxD,MAAM,IAAI,GAAG,QAAQ,CAAC,EAAE,eAAe,EAAE,mBAAmB,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;IAE/E,MAAM,aAAa,GAA8C;QAC/D,SAAS;QACT,iBAAiB;QACjB,iBAAiB;QACjB,kBAAkB;QAClB,oBAAoB;QACpB,oBAAoB;QACpB,IAAI;QACJ,OAAO;QACP,aAAa;QACb,gBAAgB,EAAE,GAAG,EAAE;YACrB,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;QACvD,CAAC;QACD,kBAAkB;QAClB,oBAAoB;QACpB,8BAA8B;QAC9B,eAAe;KAChB,CAAC;IAEF,OAAO;QACL,cAAc;QACd,aAAa;KACd,CAAC;AACJ,CAAC"}

package/lib-es/bridge/prepareTransaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prepareTransaction.d.ts","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAMvC,eAAO,MAAM,kBAAkB,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC,oBAAoB,CAa/E,CAAC"}
+{"version":3,"file":"prepareTransaction.d.ts","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAgB,MAAM,sBAAsB,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAWvC,eAAO,MAAM,kBAAkB,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC,oBAAoB,CAiC/E,CAAC"}

package/lib-es/bridge/prepareTransaction.js

@@ -2,12 +2,28 @@ import { estimateFees } from "../common-logic";
 import BigNumber from "bignumber.js";
 import { updateTransaction } from "./updateTransaction";
 import coinConfig from "../config";
+import { getCalTokensCached } from "../network/gateway";
 export const prepareTransaction = async (account, transaction) => {
     const amount = transaction.amount || BigNumber(0);
     const fee = BigNumber((await estimateFees(account.currency, BigInt(amount.toFixed()))).toString());
-    if (!transaction.tokenId) {
-        transaction.tokenId = coinConfig.getCoinConfig(account.currency).nativeInstrumentId;
+    let tokenId = transaction.tokenId;
+    let instrumentAdmin;
+    if (transaction.subAccountId && account.subAccounts) {
+        const subAccount = account.subAccounts.find((sub) => sub.type === "TokenAccount" && sub.id === transaction.subAccountId);
+        if (subAccount) {
+            const calTokens = await getCalTokensCached(account.currency);
+            tokenId = calTokens.get(subAccount.token.id) || subAccount.token.name;
+            instrumentAdmin = subAccount.token.contractAddress;
+        }
     }
-    return updateTransaction(transaction, { fee });
+    // Default to native instrument if no tokenId set
+    if (!tokenId) {
+        tokenId = coinConfig.getCoinConfig(account.currency).nativeInstrumentId;
+    }
+    return updateTransaction(transaction, {
+        fee,
+        tokenId,
+        ...(instrumentAdmin !== undefined && { instrumentAdmin }),
+    });
 };
 //# sourceMappingURL=prepareTransaction.js.map

package/lib-es/bridge/prepareTransaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"prepareTransaction.js","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,UAAU,MAAM,WAAW,CAAC;AAEnC,MAAM,CAAC,MAAM,kBAAkB,GAAqD,KAAK,EACvF,OAAO,EACP,WAAW,EACX,EAAE;IACF,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC;IAClD,MAAM,GAAG,GAAG,SAAS,CACnB,CAAC,MAAM,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAC5E,CAAC;IAEF,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;QACzB,WAAW,CAAC,OAAO,GAAG,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,kBAAkB,CAAC;IACtF,CAAC;IACD,OAAO,iBAAiB,CAAC,WAAW,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;AACjD,CAAC,CAAC"}
+{"version":3,"file":"prepareTransaction.js","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,UAAU,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAMxD,MAAM,CAAC,MAAM,kBAAkB,GAAqD,KAAK,EACvF,OAAO,EACP,WAAW,EACX,EAAE;IACF,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC;IAClD,MAAM,GAAG,GAAG,SAAS,CACnB,CAAC,MAAM,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAC5E,CAAC;IAEF,IAAI,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC;IAClC,IAAI,eAAmC,CAAC;IACxC,IAAI,WAAW,CAAC,YAAY,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;QACpD,MAAM,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,IAAI,CACzC,CAAC,GAAG,EAA6B,EAAE,CACjC,GAAG,CAAC,IAAI,KAAK,cAAc,IAAI,GAAG,CAAC,EAAE,KAAK,WAAW,CAAC,YAAY,CACrE,CAAC;QACF,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,SAAS,GAAG,MAAM,kBAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAC7D,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC;YACtE,eAAe,GAAG,UAAU,CAAC,KAAK,CAAC,eAAe,CAAC;QACrD,CAAC;IACH,CAAC;IAED,iDAAiD;IACjD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,GAAG,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,kBAAkB,CAAC;IAC1E,CAAC;IAED,OAAO,iBAAiB,CAAC,WAAW,EAAE;QACpC,GAAG;QACH,OAAO;QACP,GAAG,CAAC,eAAe,KAAK,SAAS,IAAI,EAAE,eAAe,EAAE,CAAC;KAC1D,CAAC,CAAC;AACL,CAAC,CAAC"}

package/lib-es/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;AAKhE,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,CA6FpF,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;AAKhE,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,CAiGpF,CAAC"}

package/lib-es/bridge/signOperation.js

@@ -23,6 +23,9 @@ export const buildSignOperation = (signerContext) => ({ account, deviceId, trans
                     expireInSeconds: 60 * 60,
                     tokenId: transaction.tokenId,
                 };
+                if (transaction.instrumentAdmin) {
+                    params.instrumentAdmin = transaction.instrumentAdmin;
+                }
                 if (transaction.memo) {
                     params.memo = transaction.memo;
                 }

package/lib-es/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-es/bridge/sync.d.ts

@@ -1,5 +1,8 @@
+import { TokenAccount } from "@ledgerhq/types-live";
+import type { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
 import { GetAccountShape } from "@ledgerhq/coin-framework/bridge/jsHelpers";
 import { SignerContext } from "@ledgerhq/coin-framework/signer";
 import { CantonAccount, CantonSigner } from "../types";
+export declare function filterDisabledTokenAccounts(currency: CryptoCurrency, subAccounts: TokenAccount[] | undefined): Promise<TokenAccount[]>;
 export declare function makeGetAccountShape(signerContext: SignerContext<CantonSigner>): GetAccountShape<CantonAccount>;
 //# sourceMappingURL=sync.d.ts.map

package/lib-es/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;AAEtF,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAUhE,OAAO,EAAE,aAAa,EAAmB,YAAY,EAAE,MAAM,UAAU,CAAC;AA0ExE,wBAAgB,mBAAmB,CACjC,aAAa,EAAE,aAAa,CAAC,YAAY,CAAC,GACzC,eAAe,CAAC,aAAa,CAAC,CAsHhC"}
+{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/bridge/sync.ts"],"names":[],"mappings":"AACA,OAAO,EAA4B,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAC9E,OAAO,KAAK,EAAE,cAAc,EAAiB,MAAM,8BAA8B,CAAC;AAElF,OAAO,EAAE,eAAe,EAAY,MAAM,2CAA2C,CAAC;AAEtF,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAYhE,OAAO,EAAE,aAAa,EAAmB,YAAY,EAAE,MAAM,UAAU,CAAC;AAmFxE,wBAAsB,2BAA2B,CAC/C,QAAQ,EAAE,cAAc,EACxB,WAAW,EAAE,YAAY,EAAE,GAAG,SAAS,GACtC,OAAO,CAAC,YAAY,EAAE,CAAC,CAwBzB;AAED,wBAAgB,mBAAmB,CACjC,aAAa,EAAE,aAAa,CAAC,YAAY,CAAC,GACzC,eAAe,CAAC,aAAa,CAAC,CA+MhC"}

package/lib-es/bridge/sync.js

@@ -2,14 +2,18 @@ import BigNumber from "bignumber.js";
 import { encodeAccountId } from "@ledgerhq/coin-framework/account/index";
 import { mergeOps } from "@ledgerhq/coin-framework/bridge/jsHelpers";
 import { encodeOperationId } from "@ledgerhq/coin-framework/operation";
-import { getLedgerEnd, getOperations, getPendingTransferProposals, } from "../network/gateway";
+import { getLedgerEnd, getOperations, getPendingTransferProposals, getEnabledInstrumentsCached, getCalTokensCached, } from "../network/gateway";
 import { getBalance } from "../common-logic/account/getBalance";
 import coinConfig from "../config";
 import resolver from "../signer";
 import { isAccountOnboarded } from "./onboard";
 import { isCantonAccountEmpty } from "../helpers";
+import { getCryptoAssetsStore } from "@ledgerhq/cryptoassets/state";
+import { buildSubAccounts } from "./buildSubAccounts";
+const SEPARATOR = "____";
+const getKey = (id, adminId) => `${id}${SEPARATOR}${adminId}`;
 const txInfoToOperationAdapter = (accountId, partyId) => (txInfo) => {
-    const { transaction_hash, uid, block: { height, hash }, senders, recipients, transaction_timestamp, fee: { value: fee }, transfers: [{ value: transferValue, details }], } = txInfo;
+    const { asset: { instrumentId, instrumentAdmin }, transaction_hash, uid, block: { height, hash }, senders, recipients, transaction_timestamp, fee: { value: fee }, transfers: [{ value: transferValue, details }], } = txInfo;
     let type = "UNKNOWN";
     if (details.operationType === "transfer-proposal") {
         type = "TRANSFER_PROPOSAL";
@@ -55,6 +59,8 @@ const txInfoToOperationAdapter = (accountId, partyId) => (txInfo) => {
         extra: {
             uid,
             memo,
+            instrumentId,
+            instrumentAdmin,
         },
     };
     return op;
@@ -62,6 +68,27 @@ const txInfoToOperationAdapter = (accountId, partyId) => (txInfo) => {
 const filterOperations = (transactions, accountId, partyId) => {
     return transactions.map(txInfoToOperationAdapter(accountId, partyId));
 };
+export async function filterDisabledTokenAccounts(currency, subAccounts) {
+    if (!subAccounts || subAccounts.length === 0) {
+        return [];
+    }
+    let enabledInstruments;
+    try {
+        const enabledList = await getEnabledInstrumentsCached(currency);
+        enabledInstruments = new Set(enabledList);
+    }
+    catch (error) {
+        // If API fails, hide all token accounts
+        return [];
+    }
+    return subAccounts.filter(subAccount => {
+        const instrumentId = subAccount.token.contractAddress;
+        if (!instrumentId) {
+            return false;
+        }
+        return enabledInstruments.has(instrumentId);
+    });
+}
 export function makeGetAccountShape(signerContext) {
     return async (info) => {
         const { address, currency, derivationMode, derivationPath, initialAccount } = info;
@@ -95,24 +122,75 @@ export function makeGetAccountShape(signerContext) {
         const pendingTransferProposals = xpubOrAddress
             ? await getPendingTransferProposals(currency, xpubOrAddress)
             : [];
-        const balancesData = (balances || []).reduce((acc, balance) => {
-            if (balance.locked) {
-                acc[`Locked${balance.instrumentId}`] = balance;
+        // Aggregate all balances by instrument (unlocked + locked)
+        const aggregatedBalances = new Map();
+        const proposalInstrumentKeys = new Set(pendingTransferProposals.map(proposal => getKey(proposal.instrument_id, proposal.instrument_admin)));
+        for (const key of proposalInstrumentKeys) {
+            if (aggregatedBalances.has(key))
+                continue;
+            const [instrumentId, adminId] = key.split(SEPARATOR);
+            balances.push({
+                value: 0n,
+                locked: 0n,
+                utxoCount: 0,
+                instrumentId,
+                adminId,
+                asset: { type: "token", assetReference: instrumentId },
+            });
+        }
+        const tokensByKey = new Map();
+        for await (const balance of balances) {
+            const token = await getCryptoAssetsStore().findTokenByAddressInCurrency(balance.adminId, currency.id);
+            if (!token)
+                continue;
+            tokensByKey.set(getKey(balance.instrumentId, balance.adminId), token);
+        }
+        for await (const balance of balances) {
+            const isNative = balance.instrumentId === nativeInstrumentId;
+            // Use just instrumentId for native (no admin), composite key for tokens
+            const balanceKey = isNative
+                ? nativeInstrumentId
+                : getKey(balance.instrumentId, balance.adminId);
+            const token = isNative ? null : tokensByKey.get(balanceKey) ?? null;
+            const existing = aggregatedBalances.get(balanceKey);
+            if (existing) {
+                if (balance.locked) {
+                    existing.lockedBalance += balance.value;
+                }
+                else {
+                    existing.unlockedBalance += balance.value;
+                }
+                existing.utxoCount += balance.utxoCount;
             }
             else {
-                acc[balance.instrumentId] = balance;
+                aggregatedBalances.set(balanceKey, {
+                    unlockedBalance: balance.locked ? 0n : balance.value,
+                    lockedBalance: balance.locked ? balance.value : 0n,
+                    utxoCount: balance.utxoCount,
+                    token,
+                    adminId: balance.adminId,
+                });
             }
-            return acc;
-        }, {});
-        const unlockedAmount = new BigNumber(balancesData[nativeInstrumentId]?.value.toString() || "0");
-        const lockedAmount = new BigNumber(balancesData[`Locked${nativeInstrumentId}`]?.value.toString() || "0");
+        }
+        // Find native balance (token is null for native)
+        const nativeBalance = Array.from(aggregatedBalances.values()).find(data => data.token === null);
+        const unlockedAmount = new BigNumber((nativeBalance?.unlockedBalance ?? 0n).toString());
+        const lockedAmount = new BigNumber((nativeBalance?.lockedBalance ?? 0n).toString());
         const totalBalance = unlockedAmount.plus(lockedAmount);
         const reserveMin = new BigNumber(coinConfig.getCoinConfig(currency).minReserve || 0);
-        const spendableBalance = BigNumber.max(0, totalBalance.minus(reserveMin));
+        const spendableBalance = BigNumber.max(0, unlockedAmount.minus(reserveMin));
         const instrumentUtxoCounts = {};
-        for (const [instrumentId, balance] of Object.entries(balancesData)) {
-            instrumentUtxoCounts[instrumentId] = balance.utxoCount;
+        for (const [key, data] of aggregatedBalances) {
+            instrumentUtxoCounts[key] = data.utxoCount;
         }
+        const tokenBalances = Array.from(aggregatedBalances.entries())
+            .filter(([, data]) => data.token !== null)
+            .map(([, { unlockedBalance, lockedBalance, token, adminId }]) => ({
+            totalBalance: unlockedBalance + lockedBalance,
+            spendableBalance: unlockedBalance,
+            token: token,
+            adminId,
+        }));
         let operations = [];
         if (xpubOrAddress) {
             const oldOperations = initialAccount?.operations || [];
@@ -124,22 +202,38 @@ export function makeGetAccountShape(signerContext) {
             const newOperations = filterOperations(transactionData.operations, accountId, xpubOrAddress);
             operations = mergeOps(oldOperations, newOperations);
         }
+        // Filter main account operations (native instrument only)
+        const mainAccountOperations = operations.filter(op => {
+            const extra = op.extra;
+            return extra?.instrumentId === nativeInstrumentId;
+        });
+        // Build sub-accounts for tokens with their filtered operations
+        const calTokens = await getCalTokensCached(currency);
+        const subAccounts = buildSubAccounts({
+            accountId,
+            tokenBalances,
+            existingSubAccounts: initialAccount?.subAccounts ?? [],
+            allOperations: operations,
+            pendingTransferProposals,
+            calTokens,
+        });
         const cantonResources = {
             isOnboarded,
             instrumentUtxoCounts,
-            pendingTransferProposals,
+            pendingTransferProposals: pendingTransferProposals.filter(proposal => proposal.instrument_id === nativeInstrumentId),
             ...(publicKey && { publicKey }),
             xpub: xpubOrAddress,
         };
+        const filteredSubAccounts = await filterDisabledTokenAccounts(currency, subAccounts);
         const used = !isCantonAccountEmpty({
-            operationsCount: operations.length,
+            operationsCount: mainAccountOperations.length,
             balance: totalBalance,
-            subAccounts: initialAccount?.subAccounts ?? [],
+            subAccounts: filteredSubAccounts,
             cantonResources,
         });
         const blockHeight = await getLedgerEnd(currency);
-        const creationDate = operations.length > 0
-            ? new Date(Math.min(...operations.map(op => op.date.getTime())))
+        const creationDate = mainAccountOperations.length > 0
+            ? new Date(Math.min(...mainAccountOperations.map(op => op.date.getTime())))
             : new Date();
         const shape = {
             id: accountId,
@@ -150,9 +244,10 @@ export function makeGetAccountShape(signerContext) {
             lastSyncDate: new Date(),
             freshAddress: address,
             seedIdentifier: address,
-            operations,
-            operationsCount: operations.length,
+            operations: mainAccountOperations,
+            operationsCount: mainAccountOperations.length,
             spendableBalance,
+            subAccounts: filteredSubAccounts,
             xpub: xpubOrAddress,
             used,
             cantonResources,