@ledgerhq/coin-tezos 6.3.0 → 6.3.1-nightly.0

package/src/api/index.integ.test.ts

@@ -57,7 +57,7 @@ describe("Tezos Api", () => {
   describe("listOperations", () => {
     it("returns a list regarding address parameter", async () => {
       // When
-      const [tx, _] = await module.listOperations(address, { minHeight: 0 });
+      const [tx, _] = await module.listOperations(address, { minHeight: 0, order: "asc" });
 
       // Then
       expect(tx.length).toBeGreaterThanOrEqual(1);
@@ -71,13 +71,24 @@ describe("Tezos Api", () => {
 
     it("returns all operations", async () => {
       // When
-      const [tx, _] = await module.listOperations(address, { minHeight: 0 });
+      const [tx, _] = await module.listOperations(address, { minHeight: 0, order: "asc" });
 
       // Then
       // Find a way to create a unique id. In Tezos, the same hash may represent different operations in case of delegation.
       const checkSet = new Set(tx.map(elt => `${elt.tx.hash}${elt.type}${elt.senders[0]}`));
       expect(checkSet.size).toEqual(tx.length);
     });
+
+    it("returns operations from latest, but in asc order", async () => {
+      // When
+      const [txDesc] = await module.listOperations(address, { minHeight: 0, order: "desc" });
+
+      // Then
+      // Check if the result is sorted in ascending order
+      expect(txDesc[0].tx.block.height).toBeGreaterThanOrEqual(
+        txDesc[txDesc.length - 1].tx.block.height,
+      );
+    });
   });
 
   describe("lastBlock", () => {

package/src/api/index.test.ts

@@ -57,7 +57,7 @@ describe("get operations", () => {
 
   it("could return no operation", async () => {
     logicGetTransactions.mockResolvedValue([[], ""]);
-    const [operations, token] = await api.listOperations("addr", { minHeight: 100 });
+    const [operations, token] = await api.listOperations("addr", { minHeight: 100, order: "asc" });
     expect(operations).toEqual([]);
     expect(token).toEqual("");
   });
@@ -81,11 +81,11 @@ describe("get operations", () => {
     recipients: ["tz1Recipient"],
   };
 
-  it("stops iterating after 10 iterations", async () => {
+  it("only does 1 iteration", async () => {
     logicGetTransactions.mockResolvedValue([[op], "888"]);
-    const [operations, token] = await api.listOperations("addr", { minHeight: 100 });
-    expect(logicGetTransactions).toHaveBeenCalledTimes(10);
-    expect(operations.length).toBe(10);
+    const [operations, token] = await api.listOperations("addr", { minHeight: 100, order: "asc" });
+    expect(logicGetTransactions).toHaveBeenCalledTimes(1);
+    expect(operations.length).toBe(1);
     expect(token).toEqual("888");
   });
 });

package/src/api/index.ts

@@ -10,7 +10,6 @@ import {
   Reward,
   Stake,
 } from "@ledgerhq/coin-framework/api/index";
-import { log } from "@ledgerhq/logs";
 import coinConfig, { type TezosConfig } from "../config";
 import {
   broadcast,
@@ -131,62 +130,15 @@ async function estimate(transactionIntent: TransactionIntent): Promise<TezosFeeE
   };
 }
 
-type PaginationState = {
-  readonly pageSize: number;
-  readonly maxIterations: number; // a security to avoid infinite loop
-  currentIteration: number;
-  readonly minHeight: number;
-  continueIterations: boolean;
-  nextCursor?: string;
-  accumulator: Operation[];
-};
-
-async function fetchNextPage(address: string, state: PaginationState): Promise<PaginationState> {
-  const [operations, newNextCursor] = await listOperations(address, {
-    limit: state.pageSize,
-    token: state.nextCursor,
-    sort: "Ascending",
-    minHeight: state.minHeight,
-  });
-  const newCurrentIteration = state.currentIteration + 1;
-  let continueIteration = newNextCursor !== "";
-  if (newCurrentIteration >= state.maxIterations) {
-    log("coin:tezos", "(api/operations): max iterations reached", state.maxIterations);
-    continueIteration = false;
-  }
-  const accumulated = operations.concat(state.accumulator);
-  return {
-    ...state,
-    continueIterations: continueIteration,
-    currentIteration: newCurrentIteration,
-    nextCursor: newNextCursor,
-    accumulator: accumulated,
-  };
-}
-
-async function operationsFromHeight(
-  address: string,
-  start: number,
-): Promise<[Operation[], string]> {
-  const firstState: PaginationState = {
-    pageSize: 200,
-    maxIterations: 10,
-    currentIteration: 0,
-    minHeight: start,
-    continueIterations: true,
-    accumulator: [],
-  };
-
-  let state = await fetchNextPage(address, firstState);
-  while (state.continueIterations) {
-    state = await fetchNextPage(address, state);
-  }
-  return [state.accumulator, state.nextCursor || ""];
-}
-
 async function operations(
   address: string,
-  pagination: Pagination = { minHeight: 0 },
+  pagination: Pagination = { minHeight: 0, order: "asc" },
 ): Promise<[Operation[], string]> {
-  return operationsFromHeight(address, pagination.minHeight);
+  const [operations, newNextCursor] = await listOperations(address, {
+    limit: 200,
+    token: pagination.lastPagingToken,
+    sort: pagination.order === "asc" ? "Ascending" : "Descending",
+    minHeight: pagination.minHeight,
+  });
+  return [operations, newNextCursor || ""];
 }

package/src/bridge/prepareTransaction.test.ts

@@ -4,7 +4,7 @@ import prepareTransaction from "./prepareTransaction";
 import { faker } from "@faker-js/faker";
 import coinConfig, { TezosCoinConfig } from "../config";
 import { mockConfig } from "../test/config";
-import { COST_PER_BYTE, DEFAULT_FEE } from "@taquito/taquito";
+import { COST_PER_BYTE, getRevealFee } from "@taquito/taquito";
 
 const mockTezosEstimate = jest.fn();
 jest.mock("../logic/tezosToolkit", () => ({
@@ -172,14 +172,18 @@ describe("prepareTransaction", () => {
 
     // Then
     const gasLimit = 500; // hardcoded in the function
-    const computedFees = new BigNumber(tezosEstimate.suggestedFeeMutez + DEFAULT_FEE.REVEAL);
+    const computedFees = new BigNumber(
+      tezosEstimate.suggestedFeeMutez + getRevealFee(account.freshAddress),
+    );
 
     const maxAmount = account.balance.minus(computedFees);
 
     expect(newTx).toEqual({
       ...tx,
       fees: new BigNumber(tezosEstimate.suggestedFeeMutez),
-      estimatedFees: new BigNumber(tezosEstimate.suggestedFeeMutez + DEFAULT_FEE.REVEAL),
+      estimatedFees: new BigNumber(
+        tezosEstimate.suggestedFeeMutez + getRevealFee(account.freshAddress),
+      ),
       gasLimit: new BigNumber(tezosEstimate.gasLimit),
       storageLimit: new BigNumber(tezosEstimate.storageLimit),
       amount: maxAmount.minus(gasLimit - (tezosEstimate.opSize + gasLimit * 0.1)),

package/src/bridge/signOperation.test.ts

@@ -1,5 +1,5 @@
 import BigNumber from "bignumber.js";
-import { DEFAULT_FEE, OpKind } from "@taquito/taquito";
+import { getRevealFee, OpKind } from "@taquito/taquito";
 import { SignOperationEvent } from "@ledgerhq/types-live";
 import buildSignOperation, { getOperationContents } from "./signOperation";
 import config, { type TezosCoinConfig } from "../config";
@@ -260,7 +260,7 @@ describe("getOperationContents - revealed account", () => {
       expect(contents).toStrictEqual([
         {
           kind: OpKind.REVEAL,
-          fee: DEFAULT_FEE.REVEAL.toString(),
+          fee: getRevealFee(account.freshAddress).toString(),
           gas_limit: "100",
           storage_limit: "200",
           source: "pkh",

package/src/logic/craftTransaction.test.ts

@@ -2,7 +2,7 @@ import { craftTransaction, rawEncode } from "./craftTransaction";
 import { getTezosToolkit } from "./tezosToolkit";
 import coinConfig from "../config";
 import { OpKind } from "@taquito/rpc";
-import { DEFAULT_FEE } from "@taquito/taquito";
+import { getRevealFee } from "@taquito/taquito";
 
 type TransactionType = "send" | "delegate" | "undelegate";
 
@@ -128,7 +128,7 @@ describe("craftTransaction", () => {
     expect(result.contents).toEqual([
       {
         kind: OpKind.REVEAL,
-        fee: DEFAULT_FEE.REVEAL.toString(),
+        fee: getRevealFee(account.address).toString(),
         gas_limit: "100",
         storage_limit: "0",
         source: publicKey.publicKeyHash,

package/src/logic/craftTransaction.ts

@@ -1,5 +1,5 @@
 import { type OperationContents, OpKind } from "@taquito/rpc";
-import { DEFAULT_FEE } from "@taquito/taquito";
+import { getRevealFee } from "@taquito/taquito";
 import coinConfig from "../config";
 import { UnsupportedTransactionMode } from "../types/errors";
 import { getTezosToolkit } from "./tezosToolkit";
@@ -48,7 +48,7 @@ export async function craftTransaction(
     const revealGasLimit = Math.max(revealFees?.gasLimit || 0, minRevealGasLimit);
     contents.push({
       kind: OpKind.REVEAL,
-      fee: DEFAULT_FEE.REVEAL.toString(),
+      fee: getRevealFee(address).toString(),
       //TODO: use instead of previous line when this PR will be validated, as the value change (don't forget to update the test too)
       // fee: getRevealFee(address).toString(),
       gas_limit: revealGasLimit.toString(),

package/src/logic/estimateFees.integ.test.ts

@@ -34,8 +34,8 @@ describe("estimateFees", () => {
     const result = await estimateFees({ account, transaction });
     // Then
     expect(result).toEqual({
-      estimatedFees: BigInt("866"),
-      fees: BigInt("492"),
+      estimatedFees: BigInt("825"),
+      fees: BigInt("491"),
       gasLimit: BigInt("2169"),
       storageLimit: BigInt("277"),
       amount: BigInt("1000000"),
@@ -56,11 +56,11 @@ describe("estimateFees", () => {
 
     // Then
     expect(result).toEqual({
-      estimatedFees: BigInt("864"),
-      fees: BigInt("490"),
+      estimatedFees: BigInt("823"),
+      fees: BigInt("489"),
       gasLimit: BigInt("2169"),
       storageLimit: BigInt("277"),
-      amount: BigInt("1934589"),
+      amount: BigInt("1934629"),
     });
   });
 });

package/src/logic/estimateFees.ts

@@ -1,7 +1,7 @@
 import { DerivationType } from "@taquito/ledger-signer";
 import { compressPublicKey } from "@taquito/ledger-signer/dist/lib/utils";
-import { COST_PER_BYTE, DEFAULT_FEE, DEFAULT_STORAGE_LIMIT, Estimate } from "@taquito/taquito";
-import { b58cencode, Prefix, prefix } from "@taquito/utils";
+import { COST_PER_BYTE, getRevealFee, ORIGINATION_SIZE, Estimate } from "@taquito/taquito";
+import { b58Encode, PrefixV2 } from "@taquito/utils";
 import { log } from "@ledgerhq/logs";
 import { getTezosToolkit } from "./tezosToolkit";
 import { TezosOperationMode } from "../types/model";
@@ -41,9 +41,9 @@ export async function estimateFees({
   account: CoreAccountInfo;
   transaction: CoreTransactionInfo;
 }): Promise<EstimatedFees> {
-  const encodedPubKey = b58cencode(
+  const encodedPubKey = b58Encode(
     compressPublicKey(Buffer.from(account.xpub || "", "hex"), DerivationType.ED25519),
-    prefix[Prefix.EDPK],
+    PrefixV2.Ed25519PublicKey,
   );
 
   const tezosToolkit = getTezosToolkit();
@@ -81,7 +81,7 @@ export async function estimateFees({
           mutez: true,
           to: transaction.recipient,
           amount: Number(amount),
-          storageLimit: DEFAULT_STORAGE_LIMIT.ORIGINATION, // https://github.com/TezTech/eztz/blob/master/PROTO_003_FEES.md for originating an account
+          storageLimit: ORIGINATION_SIZE, // https://github.com/TezTech/eztz/blob/master/PROTO_003_FEES.md for originating an account
         });
         break;
       case "delegate":
@@ -110,7 +110,7 @@ export async function estimateFees({
       }
       const maxAmount =
         parseInt(account.balance.toString()) -
-        (totalFees + (account.revealed ? 0 : DEFAULT_FEE.REVEAL));
+        (totalFees + (account.revealed ? 0 : getRevealFee(account.address)));
       // NOTE: from https://github.com/ecadlabs/taquito/blob/a70c64c4b105381bb9f1d04c9c70e8ef26e9241c/integration-tests/contract-empty-implicit-account-into-new-implicit-account.spec.ts#L33
       // Temporary fix, see https://gitlab.com/tezos/tezos/-/issues/1754
       // we need to increase the gasLimit and fee returned by the estimation
@@ -134,7 +134,7 @@ export async function estimateFees({
     estimation.storageLimit = BigInt(estimate.storageLimit);
     estimation.estimatedFees = estimation.fees;
     if (!account.revealed) {
-      estimation.estimatedFees = estimation.estimatedFees + BigInt(DEFAULT_FEE.REVEAL);
+      estimation.estimatedFees = estimation.estimatedFees + BigInt(getRevealFee(account.address));
     }
   } catch (e) {
     if (typeof e !== "object" || !e) throw e;

package/src/logic/listOperations.test.ts

@@ -201,8 +201,8 @@ describe("listOperations", () => {
   });
 
   it("should order the results in descending order even if the sort option is set to ascending", async () => {
-    const op1 = { ...undelegate, level: "1" };
-    const op2 = { ...undelegate, level: "2" };
+    const op1 = { ...undelegate, level: "1", timestamp: "2022-09-12T01:00:00Z" };
+    const op2 = { ...undelegate, level: "2", timestamp: "2022-09-12T01:01:00Z" };
     mockNetworkGetTransactions.mockResolvedValue([op1, op2]);
     const [results, _] = await listOperations("any address", options);
     expect(results.map(op => op.tx.block.height)).toEqual(["2", "1"]);

package/src/logic/listOperations.ts

@@ -45,11 +45,10 @@ export async function listOperations(
   const filteredOperations = operations
     .filter(op => isAPITransactionType(op) || isAPIDelegationType(op) || isAPIRevealType(op))
     .reduce((acc, op) => acc.concat(convertOperation(address, op)), [] as Operation[]);
-  if (sort === "Ascending") {
-    //results are always sorted in descending order
-    filteredOperations.reverse();
-  }
-  return [filteredOperations, nextToken];
+  const sortedOperations = filteredOperations.sort(
+    (a, b) => b.tx.date.getTime() - a.tx.date.getTime(),
+  );
+  return [sortedOperations, nextToken];
 }
 
 // note that "initiator" of APITransactionType is never used in the conversion