chore: remove from aptos blockchain from families

.changeset/brave-sheep-accept.md

@@ -0,0 +1,9 @@
+---
+"@ledgerhq/hw-app-aptos": minor
+"@ledgerhq/coin-aptos": minor
+"ledger-live-desktop": minor
+"live-mobile": minor
+"@ledgerhq/live-common": minor
+---
+
+support: move aptos to its own coin module

apps/ledger-live-desktop/package.json

@@ -54,6 +54,7 @@
   "dependencies": {
     "@braze/web-sdk": "4.10.2",
     "@ledgerhq/coin-bitcoin": "workspace:^",
+    "@ledgerhq/coin-aptos": "workspace:^",
     "@ledgerhq/coin-cosmos": "workspace:^",
     "@ledgerhq/coin-evm": "workspace:^",
     "@ledgerhq/coin-filecoin": "workspace:^",

apps/ledger-live-desktop/src/renderer/families/aptos/types.ts

@@ -1,10 +1,6 @@
-import {
-  AptosAccount,
-  Transaction,
-  TransactionStatus,
-} from "@ledgerhq/live-common/families/aptos/types";
 import { Operation } from "@ledgerhq/types-live";
 import { FieldComponentProps, LLDCoinFamily } from "../types";
+import { AptosAccount, TransactionStatus } from "@ledgerhq/coin-aptos/lib/types/index";
 
 export type AptosFamily = LLDCoinFamily<AptosAccount, Transaction, TransactionStatus, Operation>;
 export type AptosFieldComponentProps = FieldComponentProps<

libs/coin-modules/coin-aptos/.unimportedrc.json

@@ -0,0 +1,16 @@
+{
+  "ignoreUnresolved": ["follow-redirects", "form-data", "proxy-from-env"],
+  "ignoreUnused": ["@ledgerhq/devices", "invariant", "expect"],
+  "ignoreUnimported": [
+    "src/bridge/deviceTransactionConfig.ts",
+    "src/bridge/transaction.ts",
+    "src/bridge/bridge.fixture.ts",
+    "src/errors.ts",
+    "src/hw-signMessage.ts",
+    "src/test/bot-specs.ts",
+    "src/test/bridgeDatasetTest.ts",
+    "src/test/cli.ts",
+    "src/test/index.ts",
+    "src/test/speculos-deviceActions.ts"
+  ]
+}

libs/coin-modules/coin-aptos/jest.config.js

@@ -0,0 +1,8 @@
+/** @type {import('ts-jest/dist/types').JestConfigWithTsJest} */
+module.exports = {
+  collectCoverageFrom: ["src/**/*.ts"],
+  coverageDirectory: "coverage",
+  preset: "ts-jest",
+  testEnvironment: "node",
+  testPathIgnorePatterns: ["lib/", "lib-es/", ".integration.test.ts"],
+};

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

@@ -0,0 +1,124 @@
+{
+  "name": "@ledgerhq/coin-aptos",
+  "version": "1.3.2",
+  "description": "Ledger Aptos Coin integration",
+  "keywords": [
+    "Ledger",
+    "LedgerWallet",
+    "apt",
+    "Aptos",
+    "Hardware Wallet"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/LedgerHQ/ledger-live.git"
+  },
+  "bugs": {
+    "url": "https://github.com/LedgerHQ/ledger-live/issues"
+  },
+  "homepage": "https://github.com/LedgerHQ/ledger-live/tree/develop/libs/coin-modules/coin-aptos",
+  "publishConfig": {
+    "access": "public"
+  },
+  "typesVersions": {
+    "*": {
+      "lib/*": [
+        "lib/*"
+      ],
+      "lib-es/*": [
+        "lib-es/*"
+      ],
+      "specs": [
+        "lib/test/bot-specs"
+      ],
+      "*": [
+        "lib/*",
+        "lib/api/*",
+        "lib/bridge/*",
+        "lib/common-logic/*",
+        "lib/signer/*",
+        "lib/test/*",
+        "lib/types/*"
+      ]
+    }
+  },
+  "exports": {
+    "./lib/*": "./lib/*.js",
+    "./lib-es/*": "./lib-es/*.js",
+    "./api": {
+      "require": "./lib/api/index.js",
+      "default": "./lib-es/api/index.js"
+    },
+    "./deviceTransactionConfig": {
+      "require": "./lib/bridge/deviceTransactionConfig.js",
+      "default": "./lib-es/bridge/deviceTransactionConfig.js"
+    },
+    "./signer": {
+      "require": "./lib/signer/index.js",
+      "default": "./lib-es/signer/index.js"
+    },
+    "./specs": {
+      "require": "./lib/test/bot-specs.js",
+      "default": "./lib-es/test/bot-specs.js"
+    },
+    "./transaction": {
+      "require": "./lib/bridge/transaction.js",
+      "default": "./lib-es/bridge/transaction.js"
+    },
+    "./types": {
+      "require": "./lib/types/index.js",
+      "default": "./lib-es/types/index.js"
+    },
+    "./*": {
+      "require": "./lib/*.js",
+      "default": "./lib-es/*.js"
+    },
+    ".": {
+      "require": "./lib/index.js",
+      "default": "./lib-es/index.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "license": "Apache-2.0",
+  "dependencies": {
+    "@ledgerhq/coin-framework": "workspace:^",
+    "@ledgerhq/cryptoassets": "workspace:^",
+    "@ledgerhq/devices": "workspace:*",
+    "@ledgerhq/errors": "workspace:^",
+    "@ledgerhq/live-env": "workspace:^",
+    "@ledgerhq/live-network": "workspace:^",
+    "@ledgerhq/logs": "workspace:^",
+    "@ledgerhq/types-live": "workspace:^",
+    "@aptos-labs/ts-sdk": "^1.33.1",
+    "@apollo/client": "^3.12.6",
+    "@noble/hashes": "1.7.0",
+    "bignumber.js": "^9.1.2",
+    "graphql": "^16.10.0",
+    "invariant": "^2.2.4",
+    "lodash": "^4.17.21",
+    "rxjs": "^7.8.1"
+  },
+  "devDependencies": {
+    "@faker-js/faker": "^9.4.0",
+    "@types/invariant": "^2.2.37",
+    "@types/jest": "^29.5.14",
+    "@types/lodash": "^4.17.14",
+    "@types/semver": "^7.5.8",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.2.5",
+    "axios": "^1.7.9",
+    "react": "^18.3.1"
+  },
+  "scripts": {
+    "clean": "rimraf lib lib-es",
+    "build": "tsc && tsc -m ES6 --outDir lib-es",
+    "coverage": "jest --coverage --testPathIgnorePatterns='/bridge.integration.test.ts|node_modules|lib-es|lib/' --coveragePathIgnorePatterns='src/test|src/types|src/index.ts|src/bridge/bridge.fixture.ts' --passWithNoTests && mv coverage/coverage-final.json coverage/coverage-aptos.json",
+    "prewatch": "pnpm build",
+    "watch": "tsc --watch",
+    "doc": "documentation readme src/** --section=API --pe ts --re ts --re d.ts",
+    "lint": "eslint ./src --no-error-on-unmatched-pattern --ext .ts,.tsx --cache",
+    "lint:fix": "pnpm lint --fix",
+    "test": "jest",
+    "unimported": "unimported"
+  }
+}

libs/ledger-live-common/src/families/aptos/api/index.test.ts → libs/coin-modules/coin-aptos/src/__tests__/api/index.test.ts

@@ -9,16 +9,15 @@ import {
   Serializable,
   post,
 } from "@aptos-labs/ts-sdk";
-import network from "@ledgerhq/live-network/network";
+import network from "@ledgerhq/live-network";
 import BigNumber from "bignumber.js";
-import { AptosAPI } from ".";
-import { Account } from "../../../e2e/enum/Account";
+import { AptosAPI } from "../../api";
 
 jest.mock("@aptos-labs/ts-sdk");
 jest.mock("@apollo/client");
-let mockedAptos;
-let mockedApolloClient;
-let mockedPost;
+let mockedAptos: jest.Mocked<any>;
+let mockedApolloClient: jest.Mocked<any>;
+let mockedPost = jest.fn();
 
 jest.mock("@ledgerhq/live-network/network");
 const mockedNetwork = jest.mocked(network);
@@ -69,19 +68,17 @@ describe("Aptos API", () => {
   describe("getAccount", () => {
     it("calls getAccountInfo", async () => {
       const mockGetAccountInfo = jest.fn();
-      mockedAptos.mockImplementation(() => {
-        return {
-          getAccountInfo: mockGetAccountInfo,
-        };
-      });
+      mockedAptos.mockImplementation(() => ({
+        getAccountInfo: mockGetAccountInfo,
+      }));
 
       const mockGetAccountSpy = jest.spyOn({ getAccount: mockGetAccountInfo }, "getAccount");
 
       const api = new AptosAPI("aptos");
-      await api.getAccount(Account.APTOS_1.address);
+      await api.getAccount("address");
 
       expect(mockGetAccountSpy).toHaveBeenCalledWith({
-        accountAddress: Account.APTOS_1.address,
+        accountAddress: "address",
       });
     });
   });
@@ -135,7 +132,7 @@ describe("Aptos API", () => {
       }));
 
       const api = new AptosAPI("aptos");
-      const accountInfo = await api.getAccountInfo(Account.APTOS_1.address, "1");
+      const accountInfo = await api.getAccountInfo("APTOS_1_ADDRESS", "1");
 
       expect(accountInfo.balance).toEqual(new BigNumber(123));
       expect(accountInfo.transactions).toEqual([
@@ -201,7 +198,7 @@ describe("Aptos API", () => {
       }));
 
       const api = new AptosAPI("aptos");
-      const accountInfo = await api.getAccountInfo(Account.APTOS_1.address, "1");
+      const accountInfo = await api.getAccountInfo("APTOS_1_ADDRESS", "1");
 
       expect(accountInfo.balance).toEqual(new BigNumber(0));
       expect(accountInfo.transactions).toEqual([
@@ -319,7 +316,7 @@ describe("Aptos API", () => {
       }));
 
       const api = new AptosAPI("aptos");
-      const accountInfo = await api.getAccountInfo(Account.APTOS_1.address, "1");
+      const accountInfo = await api.getAccountInfo("APTOS_1_ADDRESS", "1");
 
       expect(accountInfo.balance).toEqual(new BigNumber(123));
       expect(accountInfo.transactions).toEqual([null]);
@@ -367,15 +364,15 @@ describe("Aptos API", () => {
       const mockSimpleSpy = jest.spyOn({ simple: mockSimple }, "simple");
 
       const api = new AptosAPI("aptos");
-      await api.generateTransaction(Account.APTOS_1.address, payload, options);
+      await api.generateTransaction("APTOS_1_ADDRESS", payload, options);
 
       expect(mockSimpleSpy).toHaveBeenCalledWith({
         data: payload,
         options: {
           maxGasAmount: Number(options.maxGasAmount),
           gasUnitPrice: Number(options.gasUnitPrice),
         },
-        sender: Account.APTOS_1.address,
+        sender: "APTOS_1_ADDRESS",
       });
     });
 
@@ -403,7 +400,7 @@ describe("Aptos API", () => {
       const mockSimpleSpy = jest.spyOn({ simple: mockSimple }, "simple");
 
       const api = new AptosAPI("aptos");
-      await api.generateTransaction(Account.APTOS_1.address, payload, options);
+      await api.generateTransaction("APTOS_1_ADDRESS", payload, options);
 
       expect(mockSimpleSpy).toHaveBeenCalledWith({
         data: payload,
@@ -412,7 +409,7 @@ describe("Aptos API", () => {
           gasUnitPrice: Number(options.gasUnitPrice),
           expireTimestamp: 120,
         },
-        sender: Account.APTOS_1.address,
+        sender: "APTOS_1_ADDRESS",
       });
     });
 
@@ -433,7 +430,7 @@ describe("Aptos API", () => {
 
       const api = new AptosAPI("aptos");
       expect(
-        async () => await api.generateTransaction(Account.APTOS_1.address, payload, options),
+        async () => await api.generateTransaction("APTOS_1_ADDRESS", payload, options),
       ).rejects.toThrow();
     });
   });
@@ -454,9 +451,9 @@ describe("Aptos API", () => {
       const mockSimpleSpy = jest.spyOn({ simple: mockSimple }, "simple");
 
       const api = new AptosAPI("aptos");
-      const address = new Ed25519PublicKey(Account.APTOS_1.address);
+      const address = new Ed25519PublicKey("APTOS_1_ADDRESS");
       const tx = new RawTransaction(
-        new AccountAddress(Uint8Array.from(Buffer.from(Account.APTOS_2.address))),
+        new AccountAddress(Uint8Array.from(Buffer.from("APTOS_2_ADDRESS"))),
         BigInt(1),
         "" as unknown as Serializable,
         BigInt(100),

libs/ledger-live-common/src/families/aptos/broadcast.test.ts → libs/coin-modules/coin-aptos/src/__tests__/bridge/broadcast.test.ts

@@ -1,12 +1,11 @@
-import broadcast from "./broadcast";
-import { AptosAPI } from "./api";
-import { patchOperationWithHash } from "./../../operation";
+import broadcast from "../../bridge/broadcast";
+import { AptosAPI } from "../../api";
+import { patchOperationWithHash } from "@ledgerhq/coin-framework/operation";
 import type { Account, Operation, SignedOperation } from "@ledgerhq/types-live";
 import BigNumber from "bignumber.js";
 
-jest.mock("./api");
-jest.mock("./../../operation");
-jest.mock("@ledgerhq/logs");
+jest.mock("../../api");
+jest.mock("@ledgerhq/coin-framework/operation");
 
 describe("broadcast", () => {
   const mockAccount: Account = {

libs/ledger-live-common/src/families/aptos/buildTransaction.test.ts → libs/coin-modules/coin-aptos/src/__tests__/bridge/buildTransaction.test.ts

@@ -1,14 +1,13 @@
-import { createFixtureAccount } from "../../mock/fixtures/cryptoCurrencies";
-import createTransaction from "./createTransaction";
-import buildTransaction from "./buildTransaction";
-import { AptosAPI } from "./api";
-import { normalizeTransactionOptions } from "./logic";
+import { createFixtureAccount, createFixtureTransaction } from "../../bridge/bridge.fixture";
+import buildTransaction from "../../bridge/buildTransaction";
+import { AptosAPI } from "../../api";
+import { normalizeTransactionOptions } from "../../bridge/logic";
 import { InputEntryFunctionData } from "@aptos-labs/ts-sdk";
-import { TransactionOptions } from "./types";
+import { TransactionOptions } from "../../types";
 
 const generateTransaction = jest.fn(() => "tx");
 
-jest.mock("./logic", () => ({
+jest.mock("../../bridge/logic", () => ({
   normalizeTransactionOptions: jest.fn(() => ({
     maxGasAmount: "100",
     gasUnitPrice: "200",
@@ -17,7 +16,7 @@ jest.mock("./logic", () => ({
   DEFAULT_GAS_PRICE: 200,
 }));
 
-jest.mock("./api", () => {
+jest.mock("../../api", () => {
   return {
     AptosAPI: function () {
       return {
@@ -30,7 +29,7 @@ jest.mock("./api", () => {
 describe("buildTransaction Test", () => {
   it("should return tx", async () => {
     const account = createFixtureAccount();
-    const transaction = createTransaction();
+    const transaction = createFixtureTransaction();
     const aptosClient = new AptosAPI(account.currency.id);
     const result = await buildTransaction(account, transaction, aptosClient);
 
@@ -47,11 +46,11 @@ describe("buildTransaction Test", () => {
       generateTransaction.mock.calls[0];
 
     expect(mockedNormalizeTransactionOptions.mock.calls[0][0]).toEqual({
-      maxGasAmount: "100",
-      gasUnitPrice: "200",
+      maxGasAmount: "0",
+      gasUnitPrice: "0",
     });
 
-    expect(generateTransactionArgs[0]).toBe("0x01");
+    expect(generateTransactionArgs[0]).toBe("address");
     expect(generateTransactionArgs[1]).toEqual({
       function: "0x1::aptos_account::transfer_coins",
       typeArguments: ["0x1::aptos_coin::AptosCoin"],

libs/ledger-live-common/src/families/aptos/createTransaction.test.ts → libs/coin-modules/coin-aptos/src/__tests__/bridge/createTransaction.test.ts

@@ -1,7 +1,7 @@
 import BigNumber from "bignumber.js";
-import createTransaction from "./createTransaction";
+import createTransaction from "../../bridge/createTransaction";
 
-jest.mock("./logic", () => ({
+jest.mock("../../bridge/logic", () => ({
   DEFAULT_GAS: 100,
   DEFAULT_GAS_PRICE: 200,
 }));