@ledgerhq/live-common 21.21.0 → 21.21.1

package/src/families/solana/js-signOperation.ts

@@ -7,6 +7,7 @@ import type {
 } from "../../types";
 import { open, close } from "../../hw";
 import type {
+  Command,
   TokenCreateATACommand,
   TokenTransferCommand,
   Transaction,
@@ -147,9 +148,7 @@ function optimisticOpForTransfer(
     senders: [account.freshAddress],
     recipients: [transaction.recipient],
     value: new BigNumber(command.amount).plus(commons.fee),
-    extra: {
-      memo: command.memo,
-    },
+    extra: getOpExtras(command),
   };
 }
 
@@ -170,9 +169,7 @@ function optimisticOpForTokenTransfer(
     senders: [account.freshAddress],
     recipients: [transaction.recipient],
     value: new BigNumber(command.amount),
-    extra: {
-      memo: command.memo,
-    },
+    extra: getOpExtras(command),
     subOperations: [
       {
         ...optimisticOpcommons(transaction, commandDescriptor),
@@ -182,9 +179,7 @@ function optimisticOpForTokenTransfer(
         senders: [account.freshAddress],
         recipients: [transaction.recipient],
         value: new BigNumber(command.amount),
-        extra: {
-          memo: command.memo,
-        },
+        extra: getOpExtras(command),
       },
     ],
   };
@@ -228,3 +223,20 @@ function optimisticOpcommons(
     extra: {},
   };
 }
+
+function getOpExtras(command: Command): Record<string, any> {
+  const extra: Record<string, any> = {};
+  switch (command.kind) {
+    case "transfer":
+    case "token.transfer":
+      if (command.memo !== undefined) {
+        extra.memo = command.memo;
+      }
+      break;
+    case "token.createATA":
+      break;
+    default:
+      return assertUnreachable(command);
+  }
+  return extra;
+}

package/src/families/solana/js-synchronization.ts

@@ -299,9 +299,7 @@ function txToMainAccOperation(
     hasFailed: !!tx.info.err,
     blockHeight: tx.info.slot,
     blockHash: message.recentBlockhash,
-    extra: {
-      memo: tx.info.memo ? dropMemoLengthPrefixIfAny(tx.info.memo) : undefined,
-    },
+    extra: getOpExtra(tx),
     type: opType,
     senders,
     recipients,
@@ -311,6 +309,15 @@ function txToMainAccOperation(
   };
 }
 
+function getOpExtra(tx: TransactionDescriptor): Record<string, any> {
+  const extra: Record<string, any> = {};
+  if (tx.info.memo !== null) {
+    extra.memo = dropMemoLengthPrefixIfAny(tx.info.memo);
+  }
+
+  return extra;
+}
+
 function txToTokenAccOperation(
   tx: TransactionDescriptor,
   assocTokenAcc: OnChainTokenAccount,
@@ -364,9 +371,7 @@ function txToTokenAccOperation(
     senders,
     value: delta.abs(),
     hasFailed: !!tx.info.err,
-    extra: {
-      memo: tx.info.memo ? dropMemoLengthPrefixIfAny(tx.info.memo) : undefined,
-    },
+    extra: getOpExtra(tx),
     blockHash: tx.parsed.transaction.message.recentBlockhash,
   };
 }

package/src/families/solana/test-dataset.ts

@@ -110,7 +110,7 @@ const dataset: DatasetTest<Transaction> = {
                 warnings: {},
                 estimatedFees: fees(1),
                 amount: zero,
-                totalSpent: zero,
+                totalSpent: fees(1),
               },
             },
             {
@@ -175,7 +175,7 @@ const dataset: DatasetTest<Transaction> = {
                 warnings: {},
                 estimatedFees: fees(1),
                 amount: testOnChainData.fundedSenderBalance,
-                totalSpent: zero,
+                totalSpent: testOnChainData.fundedSenderBalance.plus(fees(1)),
               },
             },
             {
@@ -204,7 +204,7 @@ const dataset: DatasetTest<Transaction> = {
                 warnings: {},
                 estimatedFees: testOnChainData.fundedSenderBalance.plus(1),
                 amount: zero,
-                totalSpent: zero,
+                totalSpent: testOnChainData.fundedSenderBalance.plus(1),
               },
             },
             {
@@ -226,7 +226,7 @@ const dataset: DatasetTest<Transaction> = {
                 warnings: {},
                 estimatedFees: fees(1),
                 amount: zero,
-                totalSpent: zero,
+                totalSpent: fees(1),
               },
             },
             {
@@ -248,7 +248,7 @@ const dataset: DatasetTest<Transaction> = {
                 warnings: {},
                 estimatedFees: fees(1),
                 amount: new BigNumber(-1),
-                totalSpent: zero,
+                totalSpent: new BigNumber(-1).plus(fees(1)),
               },
             },
             {
@@ -497,7 +497,7 @@ function recipientRequired(): TransactionTestSpec[] {
         warnings: {},
         estimatedFees: fees(1),
         amount: zero,
-        totalSpent: zero,
+        totalSpent: model.kind === "transfer" ? fees(1) : zero,
       },
     };
   });