@ledgerhq/coin-solana 0.29.0-nightly.2 → 0.29.0

package/src/transaction.ts

@@ -88,8 +88,6 @@ function formatCommand(mainAccount: Account, tx: Transaction, command: Command)
       return formatStakeWithdraw(mainAccount, tx, command);
     case "stake.split":
       return formatStakeSplit(mainAccount, tx, command);
-    case "raw":
-      return formatRaw(tx);
     default:
       return assertUnreachable(command);
   }
@@ -107,7 +105,9 @@ function formatStakeCreateAccount(
     `  AMOUNT: ${amount}${tx.useAllAmount ? " (ALL)" : ""}`,
     `  SEED: ${command.seed}`,
     `  VALIDATOR: ${command.delegate.voteAccAddress}`,
-  ].join("\n");
+  ]
+    .filter(Boolean)
+    .join("\n");
 
   return "\n" + str;
 }
@@ -157,7 +157,7 @@ function formatCreateATA(mainAccount: Account, command: TokenCreateATACommand) {
   if (!token) {
     throw new Error(`token for mint "${command.mint}" not found`);
   }
-  const str = [`  OPT IN TOKEN: ${token.ticker}`].join("\n");
+  const str = [`  OPT IN TOKEN: ${token.ticker}`].filter(Boolean).join("\n");
   return "\n" + str;
 }
 
@@ -186,7 +186,9 @@ function formatCreateApprove(
     `  APPROVE: ${command.account}`,
     `  DELEGATE: ${command.recipientDescriptor.walletAddress}`,
     `  AMOUNT: ${amount}${tx.useAllAmount ? " (ALL)" : ""}`,
-  ].join("\n");
+  ]
+    .filter(Boolean)
+    .join("\n");
   return "\n" + str;
 }
 
@@ -203,17 +205,21 @@ function formatCreateRevoke(
     throw new Error("token subaccount expected");
   }
 
-  const str = [`  OWNER: ${command.owner}`, `  REVOKE: ${command.account}`].join("\n");
+  const str = [`  OWNER: ${command.owner}`, `  REVOKE: ${command.account}`]
+    .filter(Boolean)
+    .join("\n");
   return "\n" + str;
 }
 
 function formatStakeDelegate(command: StakeDelegateCommand) {
-  const str = [`  DELEGATE: ${command.stakeAccAddr}`, `  TO: ${command.voteAccAddr}`].join("\n");
+  const str = [`  DELEGATE: ${command.stakeAccAddr}`, `  TO: ${command.voteAccAddr}`]
+    .filter(Boolean)
+    .join("\n");
   return "\n" + str;
 }
 
 function formatStakeUndelegate(command: StakeUndelegateCommand) {
-  const str = [`  UNDELEGATE: ${command.stakeAccAddr}`].join("\n");
+  const str = [`  UNDELEGATE: ${command.stakeAccAddr}`].filter(Boolean).join("\n");
   return "\n" + str;
 }
 
@@ -223,7 +229,9 @@ function formatStakeWithdraw(mainAccount: Account, tx: Transaction, command: Sta
     `  WITHDRAW FROM: ${command.stakeAccAddr}`,
     `  AMOUNT: ${amount}${tx.useAllAmount ? " (ALL)" : ""}`,
     `  TO: ${command.toAccAddr}`,
-  ].join("\n");
+  ]
+    .filter(Boolean)
+    .join("\n");
   return "\n" + str;
 }
 
@@ -233,14 +241,9 @@ function formatStakeSplit(mainAccount: Account, tx: Transaction, command: StakeS
     `  SPLIT: ${command.stakeAccAddr}`,
     `  AMOUNT: ${amount}${tx.useAllAmount ? " (ALL)" : ""}`,
     `  TO: ${command.splitStakeAccAddr}`,
-  ].join("\n");
-  return "\n" + str;
-}
-
-function formatRaw(tx: Transaction) {
-  const str = [`  SEND RAW: ${tx.useAllAmount ? " (ALL)" : ""}`, `  TO: ${tx.recipient}`].join(
-    "\n",
-  );
+  ]
+    .filter(Boolean)
+    .join("\n");
   return "\n" + str;
 }
 

package/src/tx-fees.ts

@@ -58,7 +58,6 @@ const createDummyTx = (address: string, kind: TransactionModel["kind"]) => {
       return createDummyTokenRevokeTx(address);
     case "stake.split":
     case "token.createATA":
-    case "raw":
       throw new Error(`not implemented for <${kind}>`);
     default:
       return assertUnreachable(kind);

package/src/types.ts

@@ -121,11 +121,6 @@ export type TokenTransferCommand = {
   };
 };
 
-export type RawCommand = {
-  kind: "raw";
-  raw: string;
-};
-
 export type Command =
   | TransferCommand
   | TokenTransferCommand
@@ -136,8 +131,7 @@ export type Command =
   | StakeDelegateCommand
   | StakeUndelegateCommand
   | StakeWithdrawCommand
-  | StakeSplitCommand
-  | RawCommand;
+  | StakeSplitCommand;
 
 export type CommandDescriptor = {
   command: Command;
@@ -220,11 +214,6 @@ export type StakeSplitTransaction = {
   };
 };
 
-export type RawTransaction = {
-  kind: "raw";
-  uiState: object;
-};
-
 export type TransactionModel = { commandDescriptor?: CommandDescriptor } & (
   | TransferTransaction
   | TokenTransferTransaction
@@ -236,7 +225,6 @@ export type TransactionModel = { commandDescriptor?: CommandDescriptor } & (
   | StakeUndelegateTransaction
   | StakeWithdrawTransaction
   | StakeSplitTransaction
-  | RawTransaction
 );
 
 export type Transaction = TransactionCommon & {

package/lib/rawTransaction.d.ts

@@ -1,5 +0,0 @@
-import { ChainAPI } from "./network";
-import { Transaction } from "./types";
-export declare function toLiveTransaction(api: ChainAPI, serializedTransaction: string): Promise<Transaction>;
-export declare function deriveRawCommandDescriptor(tx: Transaction, api: ChainAPI): Promise<import("./types").CommandDescriptor>;
-//# sourceMappingURL=rawTransaction.d.ts.map

package/lib/rawTransaction.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"rawTransaction.d.ts","sourceRoot":"","sources":["../src/rawTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AA0BtC,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,QAAQ,EACb,qBAAqB,EAAE,MAAM,GAC5B,OAAO,CAAC,WAAW,CAAC,CAQtB;AAED,wBAAsB,0BAA0B,CAAC,EAAE,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,gDAkB9E"}

package/lib/rawTransaction.js

@@ -1,52 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.deriveRawCommandDescriptor = exports.toLiveTransaction = void 0;
-const web3_js_1 = require("@solana/web3.js");
-const bignumber_js_1 = __importDefault(require("bignumber.js"));
-function buildRawTransaction(raw, estimatedFees) {
-    return {
-        raw,
-        family: "solana",
-        amount: (0, bignumber_js_1.default)(0),
-        recipient: "",
-        model: {
-            kind: "raw",
-            uiState: {},
-            commandDescriptor: {
-                command: {
-                    kind: "raw",
-                    raw,
-                },
-                fee: estimatedFees ?? 0,
-                warnings: {},
-                errors: {},
-            },
-        },
-    };
-}
-async function toLiveTransaction(api, serializedTransaction) {
-    const solanaTransaction = web3_js_1.VersionedTransaction.deserialize(Buffer.from(serializedTransaction, "base64"));
-    const estimatedFees = await api.getFeeForMessage(solanaTransaction.message);
-    return buildRawTransaction(serializedTransaction, estimatedFees);
-}
-exports.toLiveTransaction = toLiveTransaction;
-async function deriveRawCommandDescriptor(tx, api) {
-    if (!tx.raw) {
-        throw new Error("Raw transaction is required to derive command descriptor");
-    }
-    const liveTx = await toLiveTransaction(api, tx.raw);
-    return (liveTx.model.commandDescriptor || {
-        command: {
-            kind: "raw",
-            raw: tx.raw,
-        },
-        fee: tx.model.commandDescriptor?.fee ?? 0,
-        warnings: {},
-        errors: {},
-    });
-}
-exports.deriveRawCommandDescriptor = deriveRawCommandDescriptor;
-//# sourceMappingURL=rawTransaction.js.map

package/lib/rawTransaction.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"rawTransaction.js","sourceRoot":"","sources":["../src/rawTransaction.ts"],"names":[],"mappings":";;;;;;AAEA,6CAAuD;AACvD,gEAAqC;AAErC,SAAS,mBAAmB,CAAC,GAAW,EAAE,aAA4B;IACpE,OAAO;QACL,GAAG;QACH,MAAM,EAAE,QAAQ;QAChB,MAAM,EAAE,IAAA,sBAAS,EAAC,CAAC,CAAC;QACpB,SAAS,EAAE,EAAE;QACb,KAAK,EAAE;YACL,IAAI,EAAE,KAAK;YACX,OAAO,EAAE,EAAE;YACX,iBAAiB,EAAE;gBACjB,OAAO,EAAE;oBACP,IAAI,EAAE,KAAK;oBACX,GAAG;iBACJ;gBACD,GAAG,EAAE,aAAa,IAAI,CAAC;gBACvB,QAAQ,EAAE,EAAE;gBACZ,MAAM,EAAE,EAAE;aACX;SACF;KACF,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,iBAAiB,CACrC,GAAa,EACb,qBAA6B;IAE7B,MAAM,iBAAiB,GAAG,8BAAoB,CAAC,WAAW,CACxD,MAAM,CAAC,IAAI,CAAC,qBAAqB,EAAE,QAAQ,CAAC,CAC7C,CAAC;IAEF,MAAM,aAAa,GAAG,MAAM,GAAG,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAE5E,OAAO,mBAAmB,CAAC,qBAAqB,EAAE,aAAa,CAAC,CAAC;AACnE,CAAC;AAXD,8CAWC;AAEM,KAAK,UAAU,0BAA0B,CAAC,EAAe,EAAE,GAAa;IAC7E,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;IAC9E,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;IAEpD,OAAO,CACL,MAAM,CAAC,KAAK,CAAC,iBAAiB,IAAI;QAChC,OAAO,EAAE;YACP,IAAI,EAAE,KAAK;YACX,GAAG,EAAE,EAAE,CAAC,GAAG;SACZ;QACD,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,iBAAiB,EAAE,GAAG,IAAI,CAAC;QACzC,QAAQ,EAAE,EAAE;QACZ,MAAM,EAAE,EAAE;KACX,CACF,CAAC;AACJ,CAAC;AAlBD,gEAkBC"}

package/lib-es/rawTransaction.d.ts

@@ -1,5 +0,0 @@
-import { ChainAPI } from "./network";
-import { Transaction } from "./types";
-export declare function toLiveTransaction(api: ChainAPI, serializedTransaction: string): Promise<Transaction>;
-export declare function deriveRawCommandDescriptor(tx: Transaction, api: ChainAPI): Promise<import("./types").CommandDescriptor>;
-//# sourceMappingURL=rawTransaction.d.ts.map

package/lib-es/rawTransaction.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"rawTransaction.d.ts","sourceRoot":"","sources":["../src/rawTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AA0BtC,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,QAAQ,EACb,qBAAqB,EAAE,MAAM,GAC5B,OAAO,CAAC,WAAW,CAAC,CAQtB;AAED,wBAAsB,0BAA0B,CAAC,EAAE,EAAE,WAAW,EAAE,GAAG,EAAE,QAAQ,gDAkB9E"}

package/lib-es/rawTransaction.js

@@ -1,44 +0,0 @@
-import { VersionedTransaction } from "@solana/web3.js";
-import BigNumber from "bignumber.js";
-function buildRawTransaction(raw, estimatedFees) {
-    return {
-        raw,
-        family: "solana",
-        amount: BigNumber(0),
-        recipient: "",
-        model: {
-            kind: "raw",
-            uiState: {},
-            commandDescriptor: {
-                command: {
-                    kind: "raw",
-                    raw,
-                },
-                fee: estimatedFees ?? 0,
-                warnings: {},
-                errors: {},
-            },
-        },
-    };
-}
-export async function toLiveTransaction(api, serializedTransaction) {
-    const solanaTransaction = VersionedTransaction.deserialize(Buffer.from(serializedTransaction, "base64"));
-    const estimatedFees = await api.getFeeForMessage(solanaTransaction.message);
-    return buildRawTransaction(serializedTransaction, estimatedFees);
-}
-export async function deriveRawCommandDescriptor(tx, api) {
-    if (!tx.raw) {
-        throw new Error("Raw transaction is required to derive command descriptor");
-    }
-    const liveTx = await toLiveTransaction(api, tx.raw);
-    return (liveTx.model.commandDescriptor || {
-        command: {
-            kind: "raw",
-            raw: tx.raw,
-        },
-        fee: tx.model.commandDescriptor?.fee ?? 0,
-        warnings: {},
-        errors: {},
-    });
-}
-//# sourceMappingURL=rawTransaction.js.map

package/lib-es/rawTransaction.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"rawTransaction.js","sourceRoot":"","sources":["../src/rawTransaction.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,SAAS,mBAAmB,CAAC,GAAW,EAAE,aAA4B;IACpE,OAAO;QACL,GAAG;QACH,MAAM,EAAE,QAAQ;QAChB,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;QACpB,SAAS,EAAE,EAAE;QACb,KAAK,EAAE;YACL,IAAI,EAAE,KAAK;YACX,OAAO,EAAE,EAAE;YACX,iBAAiB,EAAE;gBACjB,OAAO,EAAE;oBACP,IAAI,EAAE,KAAK;oBACX,GAAG;iBACJ;gBACD,GAAG,EAAE,aAAa,IAAI,CAAC;gBACvB,QAAQ,EAAE,EAAE;gBACZ,MAAM,EAAE,EAAE;aACX;SACF;KACF,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,GAAa,EACb,qBAA6B;IAE7B,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,WAAW,CACxD,MAAM,CAAC,IAAI,CAAC,qBAAqB,EAAE,QAAQ,CAAC,CAC7C,CAAC;IAEF,MAAM,aAAa,GAAG,MAAM,GAAG,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAE5E,OAAO,mBAAmB,CAAC,qBAAqB,EAAE,aAAa,CAAC,CAAC;AACnE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAAC,EAAe,EAAE,GAAa;IAC7E,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;IAC9E,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;IAEpD,OAAO,CACL,MAAM,CAAC,KAAK,CAAC,iBAAiB,IAAI;QAChC,OAAO,EAAE;YACP,IAAI,EAAE,KAAK;YACX,GAAG,EAAE,EAAE,CAAC,GAAG;SACZ;QACD,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,iBAAiB,EAAE,GAAG,IAAI,CAAC;QACzC,QAAQ,EAAE,EAAE;QACZ,MAAM,EAAE,EAAE;KACX,CACF,CAAC;AACJ,CAAC"}

package/src/rawTransaction.ts

@@ -1,59 +0,0 @@
-import { ChainAPI } from "./network";
-import { Transaction } from "./types";
-import { VersionedTransaction } from "@solana/web3.js";
-import BigNumber from "bignumber.js";
-
-function buildRawTransaction(raw: string, estimatedFees: number | null): Transaction {
-  return {
-    raw,
-    family: "solana",
-    amount: BigNumber(0),
-    recipient: "",
-    model: {
-      kind: "raw",
-      uiState: {},
-      commandDescriptor: {
-        command: {
-          kind: "raw",
-          raw,
-        },
-        fee: estimatedFees ?? 0,
-        warnings: {},
-        errors: {},
-      },
-    },
-  };
-}
-
-export async function toLiveTransaction(
-  api: ChainAPI,
-  serializedTransaction: string,
-): Promise<Transaction> {
-  const solanaTransaction = VersionedTransaction.deserialize(
-    Buffer.from(serializedTransaction, "base64"),
-  );
-
-  const estimatedFees = await api.getFeeForMessage(solanaTransaction.message);
-
-  return buildRawTransaction(serializedTransaction, estimatedFees);
-}
-
-export async function deriveRawCommandDescriptor(tx: Transaction, api: ChainAPI) {
-  if (!tx.raw) {
-    throw new Error("Raw transaction is required to derive command descriptor");
-  }
-
-  const liveTx = await toLiveTransaction(api, tx.raw);
-
-  return (
-    liveTx.model.commandDescriptor || {
-      command: {
-        kind: "raw",
-        raw: tx.raw,
-      },
-      fee: tx.model.commandDescriptor?.fee ?? 0,
-      warnings: {},
-      errors: {},
-    }
-  );
-}