@ledgerhq/live-common 34.47.0-nightly.3 → 34.47.0-nightly.5

package/src/bridge/generic-alpaca/utils.test.ts

@@ -0,0 +1,93 @@
+import { adaptCoreOperationToLiveOperation, extractBalance } from "./utils";
+import BigNumber from "bignumber.js";
+import { Operation as CoreOperation } from "@ledgerhq/coin-framework/api/types";
+
+describe("Alpaca utils", () => {
+  describe("extractBalance", () => {
+    it("extracts an existing balance", () => {
+      expect(extractBalance([{ value: 4n, asset: { type: "type1" } }], "type1")).toEqual({
+        value: 4n,
+        asset: { type: "type1" },
+      });
+    });
+
+    it("generates an empty balance for a missing type", () => {
+      expect(extractBalance([{ value: 4n, asset: { type: "type1" } }], "type2")).toEqual({
+        value: 0n,
+        asset: { type: "type2" },
+      });
+    });
+  });
+
+  jest.mock("@ledgerhq/coin-framework/operation", () => ({
+    encodeOperationId: jest.fn((accountId, txHash, opType) => `${accountId}-${txHash}-${opType}`),
+  }));
+
+  describe("adaptCoreOperationToLiveOperation", () => {
+    const accountId = "acc_123";
+    const baseOp: CoreOperation = {
+      id: "op_123",
+      asset: { type: "native" },
+      type: "OUT",
+      value: BigInt(100),
+      tx: {
+        hash: "txhash123",
+        fees: BigInt(10),
+        block: {
+          hash: "blockhash123",
+          height: 123456,
+        },
+        date: new Date("2025-08-29T12:00:00Z"),
+      },
+      senders: ["sender1"],
+      recipients: ["recipient1"],
+    };
+
+    it("adapts a basic OUT operation", () => {
+      const result = adaptCoreOperationToLiveOperation(accountId, baseOp);
+
+      expect(result).toEqual({
+        id: "acc_123-txhash123-OUT",
+        hash: "txhash123",
+        accountId,
+        type: "OUT",
+        value: new BigNumber(110), // value + fee
+        fee: new BigNumber(10),
+        blockHash: "blockhash123",
+        blockHeight: 123456,
+        senders: ["sender1"],
+        recipients: ["recipient1"],
+        date: new Date("2025-08-29T12:00:00Z"),
+        transactionSequenceNumber: undefined,
+        hasFailed: false,
+        extra: {},
+      });
+    });
+
+    it("handles FEES operation where value = value + fees", () => {
+      const op = {
+        ...baseOp,
+        type: "FEES",
+        value: BigInt(5),
+        tx: { ...baseOp.tx, fees: BigInt(2) },
+      };
+
+      const result = adaptCoreOperationToLiveOperation(accountId, op);
+
+      expect(result.value.toString()).toEqual("7");
+    });
+
+    it("handles non-FEES/OUT operation where value = value only", () => {
+      const op = {
+        ...baseOp,
+        type: "IN",
+        value: BigInt(50),
+        tx: { ...baseOp.tx, fees: BigInt(2) },
+      };
+
+      const result = adaptCoreOperationToLiveOperation(accountId, op);
+
+      expect(result.value.toString()).toEqual("50");
+    });
+  });
+});

package/src/bridge/generic-alpaca/utils.ts

@@ -44,6 +44,7 @@ export function adaptCoreOperationToLiveOperation(accountId: string, op: CoreOpe
   if (op.details?.memo) {
     extra.memo = op.details.memo as string;
   }
+  const bnFees = new BigNumber(op.tx.fees.toString());
   const res = {
     id: extra.ledgerOpType
       ? encodeOperationId(accountId, op.tx.hash, extra.ledgerOpType)
@@ -51,8 +52,10 @@ export function adaptCoreOperationToLiveOperation(accountId: string, op: CoreOpe
     hash: op.tx.hash,
     accountId,
     type: opType,
-    value: new BigNumber(op.value.toString()),
-    fee: new BigNumber(op.tx.fees.toString()),
+    value: ["OUT", "FEES"].includes(opType)
+      ? new BigNumber(op.value.toString()).plus(bnFees)
+      : new BigNumber(op.value.toString()),
+    fee: bnFees,
     blockHash: op.tx.block.hash,
     blockHeight: op.tx.block.height,
     senders: op.senders,

package/src/e2e/speculos.ts

@@ -731,14 +731,14 @@ export async function signDelegationTransaction(delegatingAccount: Delegate) {
 }
 
 export async function verifyAmountsAndAcceptSwap(swap: Swap, amount: string) {
-  await waitFor(DeviceLabels.REVIEW_OPERATION);
-  const events = await pressUntilTextFound(DeviceLabels.ACCEPT);
+  await waitFor(DeviceLabels.REVIEW_TRANSACTION);
+  const events = await pressUntilTextFound(DeviceLabels.SIGN_TRANSACTION);
   await verifySwapData(swap, events, amount);
   await pressBoth();
 }
 
 export async function verifyAmountsAndRejectSwap(swap: Swap, amount: string) {
-  await waitFor(DeviceLabels.REVIEW_OPERATION);
+  await waitFor(DeviceLabels.REVIEW_TRANSACTION);
   const events = await pressUntilTextFound(DeviceLabels.REJECT);
   await verifySwapData(swap, events, amount);
   await pressBoth();

package/lib/bridge/generic-alpaca/tests/utils.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.test.d.ts","sourceRoot":"","sources":["../../../../src/bridge/generic-alpaca/tests/utils.test.ts"],"names":[],"mappings":""}

package/lib/bridge/generic-alpaca/tests/utils.test.js

@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../utils");
-describe("Alpaca utils", () => {
-    describe("extractBalance", () => {
-        it("extracts an existing balance", () => {
-            expect((0, utils_1.extractBalance)([{ value: 4n, asset: { type: "type1" } }], "type1")).toEqual({
-                value: 4n,
-                asset: { type: "type1" },
-            });
-        });
-        it("generates an empty balance for a missing type", () => {
-            expect((0, utils_1.extractBalance)([{ value: 4n, asset: { type: "type1" } }], "type2")).toEqual({
-                value: 0n,
-                asset: { type: "type2" },
-            });
-        });
-    });
-});
-//# sourceMappingURL=utils.test.js.map

package/lib/bridge/generic-alpaca/tests/utils.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.test.js","sourceRoot":"","sources":["../../../../src/bridge/generic-alpaca/tests/utils.test.ts"],"names":[],"mappings":";;AAAA,oCAA0C;AAE1C,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;QAC9B,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;YACtC,MAAM,CAAC,IAAA,sBAAc,EAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;gBACjF,KAAK,EAAE,EAAE;gBACT,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE;aACzB,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;YACvD,MAAM,CAAC,IAAA,sBAAc,EAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;gBACjF,KAAK,EAAE,EAAE;gBACT,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE;aACzB,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/lib-es/bridge/generic-alpaca/tests/utils.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.test.d.ts","sourceRoot":"","sources":["../../../../src/bridge/generic-alpaca/tests/utils.test.ts"],"names":[],"mappings":""}

package/lib-es/bridge/generic-alpaca/tests/utils.test.js

@@ -1,18 +0,0 @@
-import { extractBalance } from "../utils";
-describe("Alpaca utils", () => {
-    describe("extractBalance", () => {
-        it("extracts an existing balance", () => {
-            expect(extractBalance([{ value: 4n, asset: { type: "type1" } }], "type1")).toEqual({
-                value: 4n,
-                asset: { type: "type1" },
-            });
-        });
-        it("generates an empty balance for a missing type", () => {
-            expect(extractBalance([{ value: 4n, asset: { type: "type1" } }], "type2")).toEqual({
-                value: 0n,
-                asset: { type: "type2" },
-            });
-        });
-    });
-});
-//# sourceMappingURL=utils.test.js.map

package/lib-es/bridge/generic-alpaca/tests/utils.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.test.js","sourceRoot":"","sources":["../../../../src/bridge/generic-alpaca/tests/utils.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAE1C,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;QAC9B,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;YACtC,MAAM,CAAC,cAAc,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;gBACjF,KAAK,EAAE,EAAE;gBACT,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE;aACzB,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;YACvD,MAAM,CAAC,cAAc,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;gBACjF,KAAK,EAAE,EAAE;gBACT,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE;aACzB,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/src/bridge/generic-alpaca/tests/utils.test.ts

@@ -1,19 +0,0 @@
-import { extractBalance } from "../utils";
-
-describe("Alpaca utils", () => {
-  describe("extractBalance", () => {
-    it("extracts an existing balance", () => {
-      expect(extractBalance([{ value: 4n, asset: { type: "type1" } }], "type1")).toEqual({
-        value: 4n,
-        asset: { type: "type1" },
-      });
-    });
-
-    it("generates an empty balance for a missing type", () => {
-      expect(extractBalance([{ value: 4n, asset: { type: "type1" } }], "type2")).toEqual({
-        value: 0n,
-        asset: { type: "type2" },
-      });
-    });
-  });
-});