@ledgerhq/coin-aptos 2.2.0-nightly.3 → 2.2.1-nightly.0

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

@@ -1,6 +1,6 @@
 import { Aptos } from "@aptos-labs/ts-sdk";
-import type { AlpacaApi } from "@ledgerhq/coin-framework/api/types";
-import type { AptosAsset } from "../../types/assets";
+import type { Api } from "@ledgerhq/coin-framework/api/types";
+import type { AptosAsset, AptosExtra, AptosFeeParameters, AptosSender } from "../../types/assets";
 import type { AptosConfig } from "../../config";
 import { createApi } from "../../api";
 import coinConfig from "../../config";
@@ -33,7 +33,8 @@ describe("createApi", () => {
   });
 
   it("should return an API object with alpaca api methods", () => {
-    const api: AlpacaApi<AptosAsset> = createApi(mockAptosConfig);
+    const api: Api<AptosAsset, AptosExtra, AptosSender, AptosFeeParameters> =
+      createApi(mockAptosConfig);
 
     // Check that methods are set with what we expect
     expect(api.broadcast).toBeDefined();
@@ -69,7 +70,8 @@ describe("lastBlock", () => {
       }),
     }));
 
-    const api: AlpacaApi<AptosAsset> = createApi(mockAptosConfig);
+    const api: Api<AptosAsset, AptosExtra, AptosSender, AptosFeeParameters> =
+      createApi(mockAptosConfig);
 
     expect(await api.lastBlock()).toStrictEqual({
       height: 123,

package/src/__tests__/network/client.test.ts

@@ -14,7 +14,7 @@ import {
 import network from "@ledgerhq/live-network";
 import BigNumber from "bignumber.js";
 import { AptosAPI } from "../../network";
-import { AptosAsset } from "../../types/assets";
+import { AptosAsset, AptosExtra, AptosSender } from "../../types/assets";
 import { Pagination, TransactionIntent } from "@ledgerhq/coin-framework/api/types";
 import { APTOS_ASSET_ID } from "../../constants";
 import { AptosBalance, AptosTransaction } from "../../types";
@@ -559,20 +559,19 @@ describe("Aptos API", () => {
       }));
 
       const amount = BigInt(100);
-      const sender = {
+      const sender: AptosSender = {
         xpub: "xpub",
         freshAddress: "address1",
       };
       const recipient = "address2";
 
       const api = new AptosAPI("aptos");
-      const transactionIntent: TransactionIntent<AptosAsset> = {
+      const transactionIntent: TransactionIntent<AptosAsset, AptosExtra, AptosSender> = {
         asset: {
           type: "native",
         },
         type: "send",
-        sender: sender.freshAddress,
-        senderPublicKey: sender.xpub,
+        sender,
         amount,
         recipient,
       };
@@ -624,22 +623,21 @@ describe("Aptos API", () => {
       }));
 
       const amount = BigInt(100);
-      const sender = {
+      const sender: AptosSender = {
         xpub: "xpub",
         freshAddress: "address1",
       };
       const recipient = "address2";
 
       const api = new AptosAPI("aptos");
-      const transactionIntent: TransactionIntent<AptosAsset> = {
+      const transactionIntent: TransactionIntent<AptosAsset, AptosExtra, AptosSender> = {
         asset: {
           type: "token",
           standard: "coin",
           contractAddress: "0x111",
         },
         type: "send",
-        sender: sender.freshAddress,
-        senderPublicKey: sender.xpub,
+        sender,
         amount,
         recipient,
       };
@@ -690,22 +688,21 @@ describe("Aptos API", () => {
       }));
 
       const amount = BigInt(100);
-      const sender = {
+      const sender: AptosSender = {
         xpub: "xpub",
         freshAddress: "address1",
       };
       const recipient = "address2";
 
       const api = new AptosAPI("aptos");
-      const transactionIntent: TransactionIntent<AptosAsset> = {
+      const transactionIntent: TransactionIntent<AptosAsset, AptosExtra, AptosSender> = {
         asset: {
           type: "token",
           standard: "fungible_asset",
           contractAddress: "0x111",
         },
         type: "send",
-        sender: sender.freshAddress,
-        senderPublicKey: sender.xpub,
+        sender,
         amount,
         recipient,
       };

package/src/api/index.ts

@@ -1,14 +1,16 @@
-import type { AlpacaApi } from "@ledgerhq/coin-framework/api/index";
+import type { Api } from "@ledgerhq/coin-framework/api/index";
 import type { AptosConfig as AptosConfigApi } from "../config";
 import type { Balance, Pagination, TransactionIntent } from "@ledgerhq/coin-framework/api/types";
 import coinConfig from "../config";
-import type { AptosAsset } from "../types/assets";
+import type { AptosAsset, AptosExtra, AptosFeeParameters, AptosSender } from "../types/assets";
 import { AptosAPI } from "../network";
 import { combine } from "../logic/combine";
 import { craftTransaction } from "../logic/craftTransaction";
 import { getBalances } from "../logic/getBalances";
 
-export function createApi(config: AptosConfigApi): AlpacaApi<AptosAsset> {
+export function createApi(
+  config: AptosConfigApi,
+): Api<AptosAsset, AptosExtra, AptosSender, AptosFeeParameters> {
   coinConfig.setCoinConfig(() => ({ ...config, status: { type: "active" } }));
 
   const client = new AptosAPI(config.aptosSettings);
@@ -18,7 +20,7 @@ export function createApi(config: AptosConfigApi): AlpacaApi<AptosAsset> {
     combine: (tx, signature, pubkey): string => combine(tx, signature, pubkey),
     craftTransaction: (transactionIntent, _customFees): Promise<string> =>
       craftTransaction(client, transactionIntent),
-    estimateFees: (transactionIntent: TransactionIntent<AptosAsset>) =>
+    estimateFees: (transactionIntent: TransactionIntent<AptosAsset, AptosExtra, AptosSender>) =>
       client.estimateFees(transactionIntent),
     getBalance: (address): Promise<Balance<AptosAsset>[]> => getBalances(client, address),
     lastBlock: () => client.getLastBlock(),

package/src/logic/craftTransaction.ts

@@ -1,5 +1,5 @@
 import type { TransactionIntent } from "@ledgerhq/coin-framework/lib/api/types";
-import type { AptosAsset } from "../types/assets";
+import type { AptosAsset, AptosExtra, AptosSender } from "../types/assets";
 import type { Account, TokenAccount } from "@ledgerhq/types-live";
 import type { AptosAPI } from "../network";
 import buildTransaction, { isTokenType } from "./buildTransaction";
@@ -10,7 +10,7 @@ import type { AptosBalance } from "../types";
 
 export async function craftTransaction(
   aptosClient: AptosAPI,
-  transactionIntent: TransactionIntent<AptosAsset>,
+  transactionIntent: TransactionIntent<AptosAsset, AptosExtra, AptosSender>,
 ): Promise<string> {
   const newTx = createTransaction();
   newTx.amount = BigNumber(transactionIntent.amount.toString());
@@ -19,8 +19,8 @@ export async function craftTransaction(
   newTx.useAllAmount = transactionIntent.amount === BigInt(0);
 
   const account = {
-    freshAddress: transactionIntent.sender,
-    xpub: transactionIntent.senderPublicKey,
+    freshAddress: transactionIntent.sender.freshAddress,
+    xpub: transactionIntent.sender.xpub,
     subAccounts: new Array<TokenAccount>(),
   } as Account;
 
@@ -29,7 +29,7 @@ export async function craftTransaction(
   let balance: AptosBalance | undefined;
 
   if (newTx.useAllAmount === true) {
-    const balances = await aptosClient.getBalances(transactionIntent.sender);
+    const balances = await aptosClient.getBalances(transactionIntent.sender.freshAddress);
     balance = balances?.find(
       b => b.contractAddress.toLowerCase() === contractAddress?.toLowerCase(),
     );
@@ -54,7 +54,9 @@ export async function craftTransaction(
   return aptosTx.bcsToHex().toString();
 }
 
-function getContractAddress(txIntent: TransactionIntent<AptosAsset>): string {
+function getContractAddress(
+  txIntent: TransactionIntent<AptosAsset, AptosExtra, AptosSender>,
+): string {
   if (txIntent.asset.type === "token" && isTokenType(txIntent.asset.standard)) {
     return txIntent.asset.contractAddress;
   }

package/src/network/client.ts

@@ -43,7 +43,7 @@ import {
   Pagination,
   TransactionIntent,
 } from "@ledgerhq/coin-framework/api/types";
-import { AptosAsset } from "../types/assets";
+import { AptosAsset, AptosExtra, AptosFeeParameters, AptosSender } from "../types/assets";
 import { log } from "@ledgerhq/logs";
 import { transactionsToOperations } from "../logic/transactionsToOperations";
 import { isTestnet } from "../logic/isTestnet";
@@ -175,8 +175,10 @@ export class AptosAPI {
     };
   }
 
-  async estimateFees(transactionIntent: TransactionIntent<AptosAsset>): Promise<FeeEstimation> {
-    const publicKeyEd = new Ed25519PublicKey(transactionIntent?.senderPublicKey ?? "");
+  async estimateFees(
+    transactionIntent: TransactionIntent<AptosAsset, AptosExtra, AptosSender>,
+  ): Promise<FeeEstimation<AptosFeeParameters>> {
+    const publicKeyEd = new Ed25519PublicKey(transactionIntent.sender.xpub);
 
     const txPayload: InputEntryFunctionData = {
       function: "0x1::aptos_account::transfer_coins",
@@ -206,7 +208,11 @@ export class AptosAPI {
       gasUnitPrice: DEFAULT_GAS_PRICE.toString(),
     };
 
-    const tx = await this.generateTransaction(transactionIntent.sender, txPayload, txOptions);
+    const tx = await this.generateTransaction(
+      transactionIntent.sender.freshAddress,
+      txPayload,
+      txOptions,
+    );
 
     const simulation = await this.simulateTransaction(publicKeyEd, tx);
     const completedTx = simulation[0];
@@ -219,7 +225,6 @@ export class AptosAPI {
     return {
       value: BigInt(expectedGas.toString()),
       parameters: {
-        storageLimit: BigInt(0),
         gasLimit: BigInt(gasLimit.toString()),
         gasPrice: BigInt(gasPrice.toString()),
       },

package/src/types/assets.ts

@@ -9,6 +9,11 @@ export type AptosTokenInformation = {
 
 export type AptosExtra = Record<string, unknown>;
 
+export type AptosSender = {
+  xpub: string;
+  freshAddress: string;
+};
+
 export type AptosFeeParameters = {
   gasLimit: bigint;
   gasPrice: bigint;