@ledgerhq/coin-solana 0.25.1 → 0.26.0-nightly.0

package/src/prepareTransaction.test.ts

@@ -15,6 +15,7 @@ import { prepareTransaction } from "./prepareTransaction";
 import { SolanaAccount, Transaction, TransferCommand } from "./types";
 import BigNumber from "bignumber.js";
 import { transaction } from "./__tests__/fixtures/helpers.fixture";
+import { NotEnoughGas } from "@ledgerhq/errors";
 
 jest.mock("./estimateMaxSpendable", () => {
   const originalModule = jest.requireActual("./estimateMaxSpendable");
@@ -30,6 +31,43 @@ jest.mock("./estimateMaxSpendable", () => {
 });
 
 describe("testing prepareTransaction", () => {
+  it("packs a 'NotEnoughGas' error if the sender can not afford the fees during a token transfer", async () => {
+    const preparedTransaction = await prepareTransaction(
+      {
+        currency: { units: [{ magnitude: 2 }] },
+        subAccounts: [
+          {
+            id: "subAccountId",
+            type: "TokenAccount",
+            token: { contractAddress: "mintAddress", units: [{ magnitude: 2 }] },
+          },
+        ],
+      } as unknown as SolanaAccount,
+      transaction({ kind: "token.transfer", subAccountId: "subAccountId" }),
+      {
+        getAccountInfo: () => ({
+          data: {
+            parsed: {
+              type: "mint",
+              info: {
+                mintAuthority: null,
+                supply: "",
+                decimals: 2,
+                isInitialized: true,
+                freezeAuthority: null,
+              },
+            },
+            program: "spl-token",
+          },
+        }),
+      } as unknown as ChainAPI,
+    );
+
+    expect(preparedTransaction.model.commandDescriptor?.errors.gasPrice).toBeInstanceOf(
+      NotEnoughGas,
+    );
+  });
+
   it("should return a new transaction from the raw transaction when user provide it", async () => {
     // Given
     const solanaTransaction = {
@@ -64,7 +102,7 @@ describe("testing prepareTransaction", () => {
     );
 
     const estimatedFees = 0.00005;
-    const rawTransaction = transaction("any random value");
+    const rawTransaction = transaction({ raw: "any random value" });
     const chainAPI = api(estimatedFees);
     const getFeeForMessageSpy = jest.spyOn(chainAPI, "getFeeForMessage");
 

package/src/prepareTransaction.ts

@@ -4,10 +4,11 @@ import {
   InvalidAddress,
   InvalidAddressBecauseDestinationIsAlsoSource,
   NotEnoughBalance,
+  NotEnoughGas,
   RecipientRequired,
 } from "@ledgerhq/errors";
 import type { Account } from "@ledgerhq/types-live";
-import { findSubAccountById } from "@ledgerhq/coin-framework/account/index";
+import { findSubAccountById, getFeesUnit } from "@ledgerhq/coin-framework/account/index";
 import { ChainAPI } from "./network";
 import {
   getMaybeMintAccount,
@@ -88,6 +89,7 @@ import {
   VersionedTransaction,
 } from "@solana/web3.js";
 import BigNumber from "bignumber.js";
+import { formatCurrencyUnit } from "@ledgerhq/coin-framework/currencies/formatCurrencyUnit";
 
 async function deriveCommandDescriptor(
   mainAccount: SolanaAccount,
@@ -319,7 +321,15 @@ const deriveTokenTransferCommandDescriptor = async (
   const { fee, spendable: spendableSol } = await estimateFeeAndSpendable(api, mainAccount, tx);
 
   if (spendableSol.lt(assocAccRentExempt) || spendableSol.isZero()) {
-    errors.fee = new NotEnoughBalance();
+    const query = new URLSearchParams({
+      ...(mainAccount?.id ? { account: mainAccount.id } : {}),
+    });
+    errors.gasPrice = new NotEnoughGas(undefined, {
+      fees: formatCurrencyUnit(getFeesUnit(mainAccount.currency), new BigNumber(fee)),
+      ticker: mainAccount.currency.ticker,
+      cryptoName: mainAccount.currency.name,
+      links: [`ledgerlive://buy?${query.toString()}`],
+    });
   }
 
   if (!tx.useAllAmount && tx.amount.lte(0)) {
@@ -347,6 +357,7 @@ const deriveTokenTransferCommandDescriptor = async (
       amount: txAmount,
       mintAddress,
       mintDecimals,
+      tokenId: tokenAccount.token.id,
       recipientDescriptor: recipientDescriptor,
       memo: model.uiState.memo,
       tokenProgram: tokenProgram,

package/src/signOperation.ts

@@ -64,6 +64,7 @@ function getResolution(
         return {
           deviceModelId,
           certificateSignatureKind,
+          tokenInternalId: command.tokenId,
           createATA: {
             address: command.recipientDescriptor.walletAddress,
             mintAddress: command.mintAddress,
@@ -73,6 +74,7 @@ function getResolution(
       return {
         deviceModelId,
         certificateSignatureKind,
+        tokenInternalId: command.tokenId,
         tokenAddress: command.recipientDescriptor.tokenAccAddress,
       };
     }

package/src/signer.ts

@@ -11,6 +11,7 @@ export type Resolution = {
   deviceModelId?: DeviceModelId | undefined;
   certificateSignatureKind?: "prod" | "test" | undefined;
   tokenAddress?: string;
+  tokenInternalId?: string;
   createATA?: {
     address: string;
     mintAddress: string;

package/src/tx-fees.ts

@@ -176,6 +176,7 @@ const createDummyTokenTransferTx = (address: string): Transaction => {
           amount: 0,
           mintAddress: randomAddresses[0],
           mintDecimals: 0,
+          tokenId: "",
           ownerAddress: address,
           ownerAssociatedTokenAccountAddress: randomAddresses[1],
           recipientDescriptor: {

package/src/types.ts

@@ -113,6 +113,7 @@ export type TokenTransferCommand = {
   amount: number;
   mintAddress: string;
   mintDecimals: number;
+  tokenId: string;
   memo?: string | undefined;
   tokenProgram: SolanaTokenProgram;
   extensions?: {