Merge pull request #8004 from LedgerHQ/bugfix/LIVE-14015-tezos-unreve…

…aled

Bugfix/live 14015 tezos unrevealed

.changeset/curly-bats-work.md

@@ -0,0 +1,5 @@
+---
+"@ledgerhq/coin-tezos": patch
+---
+
+Tezos send full balance

.changeset/fifty-rats-perform.md

@@ -0,0 +1,6 @@
+---
+"@ledgerhq/coin-algorand": patch
+"@ledgerhq/coin-tezos": patch
+---
+
+Tezos send full balance and fix algorand format issue

libs/coin-framework/.unimportedrc.json

@@ -21,13 +21,16 @@
     "src/transaction/common.ts"
   ],
   "ignoreUnimported": [
-    "src/test-helpers/staticTime.ts",
+    "src/config.ts",
     "src/test-helpers/bridge-integration-suite.ts",
-    "src/config.ts"
+    "src/test-helpers/staticTime.ts"
   ],
   "ignoreUnresolved": [
     "follow-redirects",
     "form-data",
     "proxy-from-env"
+  ],
+  "ignoreUnused": [
+    "lru-cache"
   ]
 }

libs/coin-modules/coin-tezos/package.json

@@ -75,10 +75,10 @@
     "@ledgerhq/logs": "workspace:^",
     "@ledgerhq/types-cryptoassets": "workspace:^",
     "@ledgerhq/types-live": "workspace:^",
-    "@taquito/ledger-signer": "^20.0.0",
-    "@taquito/rpc": "^20.0.0",
-    "@taquito/taquito": "^20.0.0",
-    "@taquito/utils": "^20.0.0",
+    "@taquito/ledger-signer": "^20.0.1",
+    "@taquito/rpc": "^20.0.1",
+    "@taquito/taquito": "^20.0.1",
+    "@taquito/utils": "^20.0.1",
     "bignumber.js": "^9.1.2",
     "blake2b": "^2.1.4",
     "bs58check": "^3.0.1",

libs/coin-modules/coin-tezos/src/bridge/prepareTransaction.test.ts

@@ -4,6 +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";
 
 const mockTezosEstimate = jest.fn();
 jest.mock("../logic/tezosToolkit", () => ({
@@ -78,7 +79,7 @@ describe("prepareTransaction", () => {
     });
   });
 
-  it("returns new transaction with estimated fees by TezosToolkit when useAllAmount", async () => {
+  it("returns new transaction with estimated fees by TezosToolkit when useAllAmount from revealed account to revealed account", async () => {
     // Given
     const tx = createFixtureTransaction({
       amount: BigNumber(200),
@@ -90,31 +91,98 @@ describe("prepareTransaction", () => {
       gasLimit: faker.number.int(20),
       storageLimit: faker.number.int(20),
       opSize: faker.number.int(20),
-      burnFeeMutez: faker.number.int(20),
+      burnFeeMutez: faker.number.int(0),
     };
     mockTezosEstimate.mockResolvedValue(tezosEstimate);
     const account = createFixtureAccount({ balance: BigNumber(1_000) });
 
     // When
     const newTx = await prepareTransaction(account, tx);
 
+    // Then
+    const gasLimit = 500; // hardcoded in the function
+    const maxAmount = account.balance.minus(tezosEstimate.suggestedFeeMutez);
+
+    expect(newTx).toEqual({
+      ...tx,
+      fees: new BigNumber(tezosEstimate.suggestedFeeMutez),
+      estimatedFees: new BigNumber(tezosEstimate.suggestedFeeMutez),
+      gasLimit: new BigNumber(tezosEstimate.gasLimit),
+      storageLimit: new BigNumber(tezosEstimate.storageLimit),
+      amount: maxAmount.minus(gasLimit - (tezosEstimate.opSize + gasLimit * 0.1)),
+    });
+  });
+
+  it("returns new transaction with estimated fees by TezosToolkit when useAllAmount from revealed account to account with zero balance", async () => {
+    // Given
+    const tx = createFixtureTransaction({
+      amount: BigNumber(0),
+      recipient: "tz1VSUr8wwNhLAzempoch5d6hLRiTh8Cjcjb",
+      useAllAmount: true,
+    });
+    const tezosEstimate = {
+      suggestedFeeMutez: faker.number.int(20),
+      gasLimit: faker.number.int(20),
+      storageLimit: faker.number.int(20),
+      opSize: faker.number.int(20),
+      burnFeeMutez: faker.number.int(20),
+    };
+    mockTezosEstimate.mockResolvedValue(tezosEstimate);
+    const account = createFixtureAccount({ balance: BigNumber(1_000) });
+    // When
+    const newTx = await prepareTransaction(account, tx);
+
     // Then
     const gasLimit = 500; // hardcoded in the function
     const computedFees = new BigNumber(
-      tezosEstimate.suggestedFeeMutez + tezosEstimate.opSize + gasLimit * 0.1,
+      tezosEstimate.suggestedFeeMutez + tezosEstimate.burnFeeMutez - 20 * COST_PER_BYTE,
     );
+
+    const maxAmount = account.balance.minus(computedFees);
+
     expect(newTx).toEqual({
       ...tx,
-      fees: computedFees,
-      estimatedFees: computedFees,
-      gasLimit: new BigNumber(tezosEstimate.gasLimit + gasLimit),
+      fees: new BigNumber(tezosEstimate.suggestedFeeMutez),
+      estimatedFees: new BigNumber(tezosEstimate.suggestedFeeMutez),
+      gasLimit: new BigNumber(tezosEstimate.gasLimit),
+      storageLimit: new BigNumber(tezosEstimate.storageLimit),
+      amount: maxAmount.minus(gasLimit - (tezosEstimate.opSize + gasLimit * 0.1)),
+    });
+  });
+
+  it("returns new transaction with estimated fees by TezosToolkit when useAllAmount from unrevealed account to revealed account", async () => {
+    // Given
+    const tx = createFixtureTransaction({
+      amount: BigNumber(200),
+      recipient: "tz1VSUr8wwNhLAzempoch5d6hLRiTh8Cjcjb",
+      useAllAmount: true,
+    });
+    const tezosEstimate = {
+      suggestedFeeMutez: faker.number.int(20),
+      gasLimit: faker.number.int(20),
+      storageLimit: faker.number.int(20),
+      opSize: faker.number.int(20),
+      burnFeeMutez: faker.number.int(0),
+    };
+    mockTezosEstimate.mockResolvedValue(tezosEstimate);
+    const account = createFixtureAccount({ balance: BigNumber(1_000) });
+    account.tezosResources.revealed = false;
+    // When
+    const newTx = await prepareTransaction(account, tx);
+
+    // Then
+    const gasLimit = 500; // hardcoded in the function
+    const computedFees = new BigNumber(tezosEstimate.suggestedFeeMutez + DEFAULT_FEE.REVEAL);
+
+    const maxAmount = account.balance.minus(computedFees);
+
+    expect(newTx).toEqual({
+      ...tx,
+      fees: new BigNumber(tezosEstimate.suggestedFeeMutez),
+      estimatedFees: new BigNumber(tezosEstimate.suggestedFeeMutez + DEFAULT_FEE.REVEAL),
+      gasLimit: new BigNumber(tezosEstimate.gasLimit),
       storageLimit: new BigNumber(tezosEstimate.storageLimit),
-      amount: account.balance.minus(
-        tezosEstimate.opSize +
-          gasLimit * 0.1 +
-          tezosEstimate.suggestedFeeMutez +
-          tezosEstimate.burnFeeMutez,
-      ),
+      amount: maxAmount.minus(gasLimit - (tezosEstimate.opSize + gasLimit * 0.1)),
     });
   });
 

libs/coin-modules/coin-tezos/src/logic/estimateFees.ts

@@ -1,6 +1,6 @@
 import { DerivationType } from "@taquito/ledger-signer";
 import { compressPublicKey } from "@taquito/ledger-signer/dist/lib/utils";
-import { DEFAULT_FEE, DEFAULT_STORAGE_LIMIT, Estimate } from "@taquito/taquito";
+import { COST_PER_BYTE, DEFAULT_FEE, DEFAULT_STORAGE_LIMIT, Estimate } from "@taquito/taquito";
 import { b58cencode, Prefix, prefix } from "@taquito/utils";
 import { log } from "@ledgerhq/logs";
 import { getTezosToolkit } from "./tezosToolkit";
@@ -99,12 +99,19 @@ export async function estimateFees({
         throw new UnsupportedTransactionMode("unsupported mode", { mode: transaction.mode });
     }
 
+    // NOTE: if useAllAmount is true, is it for sure in the send mode (ie. transfer)?
     if (transaction.useAllAmount) {
-      const totalFees = estimate.suggestedFeeMutez + estimate.burnFeeMutez;
+      let totalFees: number;
+      if (estimate.burnFeeMutez > 0) {
+        // NOTE: from https://github.com/ecadlabs/taquito/blob/master/integration-tests/__tests__/contract/empty-implicit-account-into-new-implicit-account.spec.ts#L37
+        totalFees = estimate.suggestedFeeMutez + estimate.burnFeeMutez - 20 * COST_PER_BYTE; // 20 is storage buffer
+      } else {
+        totalFees = estimate.suggestedFeeMutez;
+      }
       const maxAmount =
         parseInt(account.balance.toString()) -
         (totalFees + (account.revealed ? 0 : DEFAULT_FEE.REVEAL));
-      // from https://github.com/ecadlabs/taquito/blob/a70c64c4b105381bb9f1d04c9c70e8ef26e9241c/integration-tests/contract-empty-implicit-account-into-new-implicit-account.spec.ts#L33
+      // 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
       const gasBuffer = 500;
@@ -114,15 +121,16 @@ export async function estimateFees({
       };
       const incr = increasedFee(gasBuffer, Number(estimate.opSize));
 
-      estimation.fees = BigInt(estimate.suggestedFeeMutez + incr);
-      estimation.gasLimit = BigInt(estimate.gasLimit + gasBuffer);
-      estimation.amount = maxAmount - incr > 0 ? BigInt(maxAmount - incr) : BigInt(0);
+      const maxMinusBuff = maxAmount - (gasBuffer - incr);
+      estimation.amount = maxMinusBuff > 0 ? BigInt(maxMinusBuff) : BigInt(0);
+
+      estimation.fees = BigInt(estimate.suggestedFeeMutez);
+      estimation.gasLimit = BigInt(estimate.gasLimit);
     } else {
       estimation.fees = BigInt(estimate.suggestedFeeMutez);
       estimation.gasLimit = BigInt(estimate.gasLimit);
       estimation.amount = transaction.amount;
     }
-
     estimation.storageLimit = BigInt(estimate.storageLimit);
     estimation.estimatedFees = estimation.fees;
     if (!account.revealed) {
@@ -143,6 +151,5 @@ export async function estimateFees({
       throw e;
     }
   }
-
   return estimation;
 }