@ledgerhq/coin-aptos 2.0.0-nightly.4 → 2.0.0-nightly.5

package/src/api/graphql/queries.ts

@@ -18,8 +18,8 @@ export const GetDelegatedStakingActivities = gql`
 `;
 export const GetAccountTransactionsData = gql`
   query GetAccountTransactionsData($address: String, $limit: Int) {
-    account_transactions(
-      where: { account_address: { _eq: $address } }
+    address_version_from_move_resources(
+      where: { address: { _eq: $address } }
       order_by: { transaction_version: desc }
       limit: $limit
     ) {
@@ -30,8 +30,8 @@ export const GetAccountTransactionsData = gql`
 `;
 export const GetAccountTransactionsDataGt = gql`
   query GetAccountTransactionsDataGt($address: String, $limit: Int, $gt: bigint) {
-    account_transactions(
-      where: { account_address: { _eq: $address }, transaction_version: { _gt: $gt } }
+    address_version_from_move_resources(
+      where: { address: { _eq: $address }, transaction_version: { _gt: $gt } }
       order_by: { transaction_version: desc }
       limit: $limit
     ) {
@@ -42,8 +42,8 @@ export const GetAccountTransactionsDataGt = gql`
 `;
 export const GetAccountTransactionsDataLt = gql`
   query GetAccountTransactionsDataLt($address: String, $limit: Int, $lt: bigint) {
-    account_transactions(
-      where: { account_address: { _eq: $address }, transaction_version: { _lt: $lt } }
+    address_version_from_move_resources(
+      where: { address: { _eq: $address }, transaction_version: { _lt: $lt } }
       order_by: { transaction_version: desc }
       limit: $limit
     ) {

package/src/api/graphql/types.ts

@@ -22,9 +22,9 @@ export type GetAccountTransactionsDataQueryVariables = Exact<{
 
 export type GetAccountTransactionsDataQuery = {
   __typename?: "query_root";
-  account_transactions: Array<{
-    __typename?: "account_transactions";
-    transaction_version: number;
+  address_version_from_move_resources: Array<{
+    __typename: "address_version_from_move_resources";
+    transaction_version?: any | null;
   }>;
 };
 
@@ -36,9 +36,9 @@ export type GetAccountTransactionsDataGtQueryVariables = Exact<{
 
 export type GetAccountTransactionsDataGtQuery = {
   __typename?: "query_root";
-  account_transactions: Array<{
-    __typename?: "account_transactions";
-    transaction_version: number;
+  address_version_from_move_resources: Array<{
+    __typename: "address_version_from_move_resources";
+    transaction_version?: any | null;
   }>;
 };
 
@@ -50,9 +50,9 @@ export type GetAccountTransactionsDataLtQueryVariables = Exact<{
 
 export type GetAccountTransactionsDataLtQuery = {
   __typename?: "query_root";
-  account_transactions: Array<{
-    __typename?: "account_transactions";
-    transaction_version: number;
+  address_version_from_move_resources: Array<{
+    __typename: "address_version_from_move_resources";
+    transaction_version?: any | null;
   }>;
 };
 

package/src/api/index.ts

@@ -30,7 +30,6 @@ import {
   GetAccountTransactionsDataQuery,
   GetAccountTransactionsDataGtQueryVariables,
 } from "./graphql/types";
-import { TokenCurrency } from "@ledgerhq/types-cryptoassets";
 
 const getApiEndpoint = (currencyId: string) =>
   isTestnet(currencyId) ? getEnv("APTOS_TESTNET_API_ENDPOINT") : getEnv("APTOS_API_ENDPOINT");
@@ -67,9 +66,9 @@ export class AptosAPI {
     return this.aptosClient.getAccountInfo({ accountAddress: address });
   }
 
-  async getAccountInfo(address: string, startAt?: string) {
+  async getAccountInfo(address: string, startAt: string) {
     const [balance, transactions, blockHeight] = await Promise.all([
-      this.getCoinBalance(address, APTOS_ASSET_ID),
+      this.getBalance(address),
       this.fetchTransactions(address, startAt),
       this.getHeight(),
     ]);
@@ -147,22 +146,12 @@ export class AptosAPI {
     return pendingTx.data.hash;
   }
 
-  async getBalance(address: string, token: TokenCurrency): Promise<BigNumber> {
-    let balance = new BigNumber(0);
-    if (token.tokenType === "coin") {
-      balance = await this.getCoinBalance(address, token.contractAddress);
-    } else {
-      balance = await this.getFABalance(address, token.contractAddress);
-    }
-    return balance;
-  }
-
-  async getCoinBalance(address: string, contract_address: string): Promise<BigNumber> {
+  private async getBalance(address: string): Promise<BigNumber> {
     try {
       const [balanceStr] = await this.aptosClient.view<[string]>({
         payload: {
           function: "0x1::coin::balance",
-          typeArguments: [contract_address],
+          typeArguments: [APTOS_ASSET_ID],
           functionArguments: [address],
         },
       });
@@ -173,22 +162,6 @@ export class AptosAPI {
     }
   }
 
-  async getFABalance(address: string, contract_address: string): Promise<BigNumber> {
-    try {
-      const [balanceStr] = await this.aptosClient.view<[string]>({
-        payload: {
-          function: "0x1::primary_fungible_store::balance",
-          typeArguments: ["0x1::object::ObjectCore"],
-          functionArguments: [address, contract_address],
-        },
-      });
-      const balance = parseInt(balanceStr, 10);
-      return new BigNumber(balance);
-    } catch (_) {
-      return new BigNumber(0);
-    }
-  }
-
   private async fetchTransactions(address: string, gt?: string) {
     if (!address) {
       return [];
@@ -213,7 +186,7 @@ export class AptosAPI {
     });
 
     return Promise.all(
-      queryResponse.data.account_transactions.map(({ transaction_version }) => {
+      queryResponse.data.address_version_from_move_resources.map(({ transaction_version }) => {
         return this.richItemByVersion(transaction_version);
       }),
     );

package/src/bridge/bridge.fixture.ts

@@ -3,7 +3,6 @@ import { faker } from "@faker-js/faker";
 import type { AptosAccount, Transaction } from "../types/index";
 import { getCryptoCurrencyById } from "@ledgerhq/cryptoassets/currencies";
 import { emptyHistoryCache } from "@ledgerhq/coin-framework/account/index";
-import { TokenCurrency } from "@ledgerhq/types-cryptoassets";
 
 const currency = getCryptoCurrencyById("aptos");
 
@@ -19,113 +18,35 @@ export function createFixtureAccount(account?: Partial<AptosAccount>): AptosAcco
     seedIdentifier: faker.string.uuid(),
     derivationMode: "",
     index: faker.number.int(),
-    freshAddress: freshAddress.address,
-    freshAddressPath: freshAddress.derivationPath,
+    freshAddress: account?.freshAddress || freshAddress.address,
+    freshAddressPath: account?.freshAddressPath || freshAddress.derivationPath,
     used: true,
-    balance: new BigNumber(0),
-    spendableBalance: new BigNumber(0),
+    balance: account?.balance || new BigNumber(0),
+    spendableBalance: account?.spendableBalance || new BigNumber(0),
     creationDate: faker.date.past(),
     blockHeight: faker.number.int({ min: 100_000, max: 200_000 }),
     currency,
-    operationsCount: 0,
-    operations: [],
-    pendingOperations: [],
+    operationsCount: account?.operationsCount || 0,
+    operations: account?.operations || [],
+    pendingOperations: account?.pendingOperations || [],
     lastSyncDate: new Date(),
     balanceHistoryCache: emptyHistoryCache,
     swapHistory: [],
-    ...account,
-  };
-}
-
-export function createFixtureAccountWithSubAccount(
-  tokenType: string,
-  account?: Partial<AptosAccount>,
-): AptosAccount {
-  const freshAddress = {
-    address: "address",
-    derivationPath: "derivation_path",
-  };
-
-  const id = faker.string.uuid();
-
-  return {
-    type: "Account",
-    id,
-    seedIdentifier: faker.string.uuid(),
-    derivationMode: "",
-    index: faker.number.int(),
-    freshAddress: freshAddress.address,
-    freshAddressPath: freshAddress.derivationPath,
-    used: true,
-    balance: new BigNumber(0),
-    spendableBalance: new BigNumber(0),
-    creationDate: faker.date.past(),
-    blockHeight: faker.number.int({ min: 100_000, max: 200_000 }),
-    currency,
-    operationsCount: 0,
-    operations: [],
-    pendingOperations: [],
-    lastSyncDate: new Date(),
-    balanceHistoryCache: emptyHistoryCache,
-    swapHistory: [],
-    subAccounts: [
-      {
-        id: "1",
-        parentId: id,
-        type: "TokenAccount",
-        token: {
-          type: "TokenCurrency",
-          id: "aptToken",
-          contractAddress: "contract_address",
-          parentCurrency: currency,
-          tokenType,
-        } as TokenCurrency,
-        balance: BigNumber(1000),
-        spendableBalance: BigNumber(1000),
-        creationDate: new Date(),
-        operationsCount: 0,
-        operations: [],
-        pendingOperations: [],
-        balanceHistoryCache: emptyHistoryCache,
-        swapHistory: [],
-      },
-    ],
-    ...account,
   };
 }
 
 export function createFixtureTransaction(tx?: Partial<Transaction>): Transaction {
   const transaction: Transaction = {
-    amount: new BigNumber(0),
-    recipient: "recipient",
-    useAllAmount: false,
-    family: "aptos",
-    mode: "send",
-    fees: null,
-    options: {
-      maxGasAmount: BigNumber(0).toString(),
-      gasUnitPrice: BigNumber(0).toString(),
-    },
-    ...tx,
-  };
-
-  return transaction;
-}
-
-export function createFixtureTransactionWithSubAccount(tx?: Partial<Transaction>): Transaction {
-  const transaction: Transaction = {
-    amount: new BigNumber(0),
-    recipient: "recipient",
-    useAllAmount: false,
+    amount: tx?.amount || new BigNumber(0),
+    recipient: tx?.recipient || "",
+    useAllAmount: tx?.useAllAmount || false,
     family: "aptos",
-    mode: "send",
-    fees: null,
+    mode: tx?.mode || "send",
+    fees: tx?.fees || null,
     options: {
       maxGasAmount: BigNumber(0).toString(),
       gasUnitPrice: BigNumber(0).toString(),
     },
-    subAccountId: "1",
-    ...tx,
   };
 
   return transaction;

package/src/bridge/buildTransaction.ts

@@ -1,8 +1,8 @@
 import { InputEntryFunctionData, RawTransaction } from "@aptos-labs/ts-sdk";
-import type { Account, TokenAccount } from "@ledgerhq/types-live";
-import { findSubAccountById, isTokenAccount } from "@ledgerhq/coin-framework/account/index";
+import type { Account } from "@ledgerhq/types-live";
+import BigNumber from "bignumber.js";
 import { AptosAPI } from "../api";
-import { APTOS_ASSET_ID, SUPPORTED_TOKEN_TYPES } from "../constants";
+import { APTOS_ASSET_ID } from "../constants";
 import { normalizeTransactionOptions } from "./logic";
 import type { Transaction } from "../types";
 
@@ -11,51 +11,18 @@ const buildTransaction = async (
   transaction: Transaction,
   aptosClient: AptosAPI,
 ): Promise<RawTransaction> => {
-  const subAccount = findSubAccountById(account, transaction.subAccountId ?? "");
-
-  const txPayload = getPayload(subAccount, transaction);
+  const txPayload = getPayload(transaction.recipient, transaction.amount);
   const txOptions = normalizeTransactionOptions(transaction.options);
   const tx = await aptosClient.generateTransaction(account.freshAddress, txPayload, txOptions);
 
   return tx;
 };
 
-const getPayload = (
-  tokenAccount: TokenAccount | undefined,
-  transaction: Transaction,
-): InputEntryFunctionData => {
-  if (tokenAccount && isTokenAccount(tokenAccount)) {
-    const { tokenType } = tokenAccount.token;
-
-    if (!SUPPORTED_TOKEN_TYPES.includes(tokenType)) {
-      throw new Error(`Token type ${tokenType} not supported`);
-    }
-
-    if (tokenType === "fungible_asset") {
-      return {
-        function: `0x1::primary_fungible_store::transfer`,
-        typeArguments: ["0x1::fungible_asset::Metadata"],
-        functionArguments: [
-          tokenAccount.token.contractAddress,
-          transaction.recipient,
-          transaction.amount.toString(),
-        ],
-      };
-    }
-
-    if (tokenType === "coin") {
-      return {
-        function: `0x1::aptos_account::transfer_coins`,
-        typeArguments: [tokenAccount.token.contractAddress],
-        functionArguments: [transaction.recipient, transaction.amount.toString()],
-      };
-    }
-  }
-
+const getPayload = (sendTo: string, amount: BigNumber): InputEntryFunctionData => {
   return {
     function: "0x1::aptos_account::transfer_coins",
     typeArguments: [APTOS_ASSET_ID],
-    functionArguments: [transaction.recipient, transaction.amount.toString()],
+    functionArguments: [sendTo, amount.toString()],
   };
 };
 

package/src/bridge/estimateMaxSpendable.ts

@@ -29,7 +29,7 @@ const estimateMaxSpendable = async ({
     gasUnitPrice = BigNumber(estimate.gasUnitPrice);
   }
 
-  return getMaxSendBalance(maxGasAmount, gasUnitPrice, mainAccount, transaction);
+  return getMaxSendBalance(mainAccount.spendableBalance, maxGasAmount, gasUnitPrice);
 };
 
 export default estimateMaxSpendable;

package/src/bridge/getFeesForTransaction.ts

@@ -5,7 +5,7 @@ import BigNumber from "bignumber.js";
 import { makeLRUCache, seconds } from "@ledgerhq/live-network/cache";
 import { AptosAPI } from "../api";
 import buildTransaction from "./buildTransaction";
-import { DEFAULT_GAS, DEFAULT_GAS_PRICE, ESTIMATE_GAS_MUL, getTokenAccount } from "./logic";
+import { DEFAULT_GAS, DEFAULT_GAS_PRICE, ESTIMATE_GAS_MUL } from "./logic";
 import type { Transaction, TransactionErrors } from "../types";
 
 type IGetEstimatedGasReturnType = {
@@ -49,18 +49,16 @@ export const getFee = async (
 
       const expectedGas = gasPrice.multipliedBy(gasLimit);
 
-      if (!completedTx.success) {
-        if (completedTx.vm_status.includes("MAX_GAS_UNITS_BELOW_MIN_TRANSACTION_GAS_UNITS")) {
-          res.errors.maxGasAmount = "GasInsufficientBalance";
-        } else if (
-          !completedTx.vm_status.includes("INSUFFICIENT_BALANCE") &&
-          !completedTx.vm_status.includes("0x203ed") // 0x203ed -> PROLOGUE_ECANT_PAY_GAS_DEPOSIT equivalent to INSUFFICIENT_BALANCE_FOR_TRANSACTION_FEE
-        ) {
-          // INSUFFICIENT_BALANCE will be processed by getTransactionStatus
+      const isUnderMaxSpendable = transaction.amount
+        .plus(expectedGas)
+        .isLessThan(account.spendableBalance);
+
+      if (isUnderMaxSpendable && !completedTx.success) {
+        // we want to skip INSUFFICIENT_BALANCE error because it will be processed by getTransactionStatus
+        if (!completedTx.vm_status.includes("INSUFFICIENT_BALANCE")) {
           throw Error(`Simulation failed with following error: ${completedTx.vm_status}`);
         }
       }
-
       res.fees = expectedGas;
       res.estimate.maxGasAmount = gasLimit.toString();
       res.estimate.gasUnitPrice = completedTx.gas_unit_price;
@@ -74,10 +72,7 @@ export const getFee = async (
 
 const CACHE = makeLRUCache(
   getFee,
-  (account: Account, transaction: Transaction) => {
-    const tokenAccount = getTokenAccount(account, transaction);
-    return `${tokenAccount ? tokenAccount.id : account.id}-${transaction.amount.toString()}}`;
-  },
+  (account: Account, transaction: Transaction) => `${account.id}-${transaction.amount.toString()}}`,
   seconds(30),
 );
 

package/src/bridge/getTransactionStatus.ts

@@ -1,3 +1,4 @@
+import { BigNumber } from "bignumber.js";
 import {
   NotEnoughBalance,
   RecipientRequired,
@@ -5,65 +6,42 @@ import {
   FeeNotLoaded,
   InvalidAddressBecauseDestinationIsAlsoSource,
   AmountRequired,
-  NotEnoughBalanceFees,
 } from "@ledgerhq/errors";
 import type { Account } from "@ledgerhq/types-live";
-import { BigNumber } from "bignumber.js";
 import type { Transaction, TransactionStatus } from "../types";
 
 import { AccountAddress } from "@aptos-labs/ts-sdk";
-import { getTokenAccount } from "./logic";
 
 const getTransactionStatus = async (a: Account, t: Transaction): Promise<TransactionStatus> => {
   const errors: Record<string, Error> = {};
   const warnings = {};
 
-  if (!t.recipient) {
-    errors.recipient = new RecipientRequired();
-  }
-
-  if (!AccountAddress.isValid({ input: t.recipient }).valid && !errors.recipient) {
-    errors.recipient = new InvalidAddress("", { currencyName: a.currency.name });
-  }
-
-  if (t.recipient === a.freshAddress && !errors.recipient) {
-    errors.recipient = new InvalidAddressBecauseDestinationIsAlsoSource();
-  }
-
   if (!t.fees) {
     errors.fees = new FeeNotLoaded();
   }
 
   const estimatedFees = t.fees || BigNumber(0);
 
-  if (t.amount.lte(0)) {
+  if (t.amount.eq(0)) {
     errors.amount = new AmountRequired();
   }
 
-  const tokenAccount = getTokenAccount(a, t);
-
-  const amount = t.useAllAmount
-    ? tokenAccount
-      ? tokenAccount.spendableBalance
-      : a.spendableBalance.minus(estimatedFees).isLessThan(0)
-        ? BigNumber(0)
-        : a.spendableBalance.minus(estimatedFees)
-    : t.amount;
+  const amount = t.amount;
 
-  const totalSpent = tokenAccount ? amount : amount.plus(estimatedFees);
+  const totalSpent = BigNumber(t.amount).plus(estimatedFees);
 
-  if (tokenAccount && t.errors?.maxGasAmount == "GasInsufficientBalance" && !errors.amount) {
-    errors.amount = new NotEnoughBalanceFees();
-  }
-  if (
-    tokenAccount
-      ? tokenAccount.spendableBalance.isLessThan(totalSpent) ||
-        a.spendableBalance.isLessThan(estimatedFees)
-      : a.spendableBalance.isLessThan(totalSpent) && !errors.amount
-  ) {
+  if (totalSpent.gt(a.balance) && !errors.amount) {
     errors.amount = new NotEnoughBalance();
   }
 
+  if (!t.recipient) {
+    errors.recipient = new RecipientRequired();
+  } else if (AccountAddress.isValid({ input: t.recipient }).valid === false && !errors.recipient) {
+    errors.recipient = new InvalidAddress("", { currencyName: a.currency.name });
+  } else if (t.recipient === a.freshAddress && !errors.recipient) {
+    errors.recipient = new InvalidAddressBecauseDestinationIsAlsoSource();
+  }
+
   return Promise.resolve({
     errors,
     warnings,