rename TransactionEstimate to TransactionOptions

LedgerHQ · Jan 9, 2025 · a535836 · a535836
1 parent 434b24b
commit a535836
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/libs/ledger-live-common/src/families/aptos/api/index.ts b/libs/ledger-live-common/src/families/aptos/api/index.ts
@@ -22,7 +22,7 @@ import BigNumber from "bignumber.js";
 import isUndefined from "lodash/isUndefined";
 import { APTOS_ASSET_ID } from "../constants";
 import { isTestnet } from "../logic";
-import type { AptosTransaction, TransactionEstimate } from "../types";
+import type { AptosTransaction, TransactionOptions } from "../types";
 import { GetAccountTransactionsData, GetAccountTransactionsDataGt } from "./graphql/queries";
 import {
   GetAccountTransactionsDataQuery,
@@ -85,7 +85,7 @@ export class AptosAPI {
   async generateTransaction(
     address: string,
     payload: InputEntryFunctionData,
-    options: TransactionEstimate,
+    options: TransactionOptions,
   ): Promise<RawTransaction> {
     const opts: Partial<InputGenerateTransactionOptions> = {};
     if (!isUndefined(options.maxGasAmount)) {
@@ -97,8 +97,8 @@ export class AptosAPI {
     }
 
     try {
-      const ts = (await this.aptosClient.getLedgerInfo()).ledger_timestamp;
-      opts.expireTimestamp = Number(Math.ceil(+ts / 1_000_000 + 2 * 60)); // in milliseconds
+      const { ledger_timestamp } = await this.aptosClient.getLedgerInfo();
+      opts.expireTimestamp = Number(Math.ceil(+ledger_timestamp / 1_000_000 + 2 * 60)); // in milliseconds
     } catch (_) {
       // skip
     }

diff --git a/libs/ledger-live-common/src/families/aptos/buildTransaction.test.ts b/libs/ledger-live-common/src/families/aptos/buildTransaction.test.ts
@@ -4,7 +4,7 @@ import buildTransaction from "./buildTransaction";
 import { AptosAPI } from "./api";
 import { normalizeTransactionOptions } from "./logic";
 import { InputEntryFunctionData } from "@aptos-labs/ts-sdk";
-import { TransactionEstimate } from "./types";
+import { TransactionOptions } from "./types";
 
 const generateTransaction = jest.fn(() => "tx");
 
@@ -43,7 +43,7 @@ describe("buildTransaction Test", () => {
     expect(mockedNormalizeTransactionOptions).toHaveBeenCalledTimes(1);
     expect(generateTransaction).toHaveBeenCalledTimes(1);
 
-    const generateTransactionArgs: [string, InputEntryFunctionData, TransactionEstimate][] =
+    const generateTransactionArgs: [string, InputEntryFunctionData, TransactionOptions][] =
       generateTransaction.mock.calls[0];
 
     expect(mockedNormalizeTransactionOptions.mock.calls[0][0]).toEqual({

diff --git a/libs/ledger-live-common/src/families/aptos/logic.ts b/libs/ledger-live-common/src/families/aptos/logic.ts
@@ -16,7 +16,7 @@ import {
   DIRECTION,
   TRANSFER_TYPES,
 } from "./constants";
-import type { AptosTransaction, TransactionEstimate } from "./types";
+import type { AptosTransaction, TransactionOptions } from "./types";
 
 export const DEFAULT_GAS = 200;
 export const DEFAULT_GAS_PRICE = 100;
@@ -38,7 +38,7 @@ export const getMaxSendBalance = (
   return amount.gt(totalGas) ? amount.minus(totalGas) : new BigNumber(0);
 };
 
-export function normalizeTransactionOptions(options: TransactionEstimate): TransactionEstimate {
+export function normalizeTransactionOptions(options: TransactionOptions): TransactionOptions {
   const check = (v: any) => ((v ?? "").toString().trim() ? v : undefined);
   return {
     maxGasAmount: check(options.maxGasAmount),

diff --git a/libs/ledger-live-common/src/families/aptos/types.ts b/libs/ledger-live-common/src/families/aptos/types.ts
@@ -38,7 +38,7 @@ export type AptosAddress = {
   path: string;
 };
 
-export interface TransactionEstimate {
+export interface TransactionOptions {
   maxGasAmount: string;
   gasUnitPrice: string;
 }
@@ -52,7 +52,7 @@ export type Transaction = TransactionCommon & {
   mode: string;
   family: "aptos";
   fees?: BigNumber | null;
-  estimate: TransactionEstimate;
+  estimate: TransactionOptions;
   errors?: TransactionErrors;
   tag?: string;
 };