@ledgerhq/coin-xrp 2.1.0 → 2.2.0-nightly.0

package/src/logic/listOperations.test.ts

@@ -2,6 +2,7 @@ import { assert } from "console";
 import { listOperations } from "./listOperations";
 import { RIPPLE_EPOCH } from "./utils";
 import { Marker } from "../network/types";
+import { Operation } from "@ledgerhq/coin-framework/api/types";
 
 const maxHeight = 2;
 const minHeight = 1;
@@ -215,20 +216,24 @@ describe("listOperations", () => {
         expectedType === "IN" ? BigInt(deliveredAmount) : BigInt(deliveredAmount + fee);
       expect(results).toEqual([
         {
-          hash: "HASH_VALUE",
-          address,
-          type: "Payment",
-          simpleType: expectedType,
+          operationIndex: 0,
+          tx: {
+            fees: BigInt(10),
+            hash: "HASH_VALUE",
+            block: {
+              hash: "HASH_VALUE_BLOCK",
+              height: 1,
+              time: new Date("2000-01-01T00:00:01Z"),
+            },
+            date: new Date(1000000 + RIPPLE_EPOCH * 1000),
+          },
+          type: expectedType,
           value: expectedValue,
-          fee: BigInt(10),
-          blockHeight: 1,
-          blockHash: "HASH_VALUE_BLOCK",
-          blockTime: new Date("2000-01-01T00:00:01Z"),
           senders: [opSender],
           recipients: [opDestination],
-          date: new Date(1000000 + RIPPLE_EPOCH * 1000),
-          transactionSequenceNumber: 1,
           details: {
+            sequence: 1,
+            xrpTxType: "Payment",
             memos: [
               {
                 type: "687474703a2f2f6578616d706c652e636f6d2f6d656d6f2f67656e65726963",
@@ -238,39 +243,49 @@ describe("listOperations", () => {
           },
         },
         {
-          hash: "HASH_VALUE",
-          address,
-          type: "Payment",
-          simpleType: expectedType,
+          operationIndex: 0,
+          tx: {
+            hash: "HASH_VALUE",
+            fees: BigInt(10),
+            date: new Date(1000000 + RIPPLE_EPOCH * 1000),
+            block: {
+              hash: "HASH_VALUE_BLOCK",
+              height: 1,
+              time: new Date("2000-01-01T00:00:01Z"),
+            },
+          },
+          type: expectedType,
           value: expectedValue,
-          fee: BigInt(10),
-          blockHeight: 1,
-          blockHash: "HASH_VALUE_BLOCK",
-          blockTime: new Date("2000-01-01T00:00:01Z"),
           senders: [opSender],
           recipients: [opDestination],
-          date: new Date(1000000 + RIPPLE_EPOCH * 1000),
-          transactionSequenceNumber: 1,
           details: {
+            sequence: 1,
             destinationTag: 509555,
+            xrpTxType: "Payment",
           },
         },
         {
-          hash: "HASH_VALUE",
-          address,
-          type: "Payment",
-          simpleType: expectedType,
+          tx: {
+            hash: "HASH_VALUE",
+            fees: BigInt(10),
+            block: {
+              hash: "HASH_VALUE_BLOCK",
+              height: 1,
+              time: new Date("2000-01-01T00:00:01Z"),
+            },
+            date: new Date(1000000 + RIPPLE_EPOCH * 1000),
+          },
+          details: {
+            sequence: 1,
+            xrpTxType: "Payment",
+          },
+          type: expectedType,
           value: expectedValue,
-          fee: BigInt(10),
-          blockHeight: 1,
-          blockHash: "HASH_VALUE_BLOCK",
-          blockTime: new Date("2000-01-01T00:00:01Z"),
           senders: [opSender],
           recipients: [opDestination],
-          date: new Date(1000000 + RIPPLE_EPOCH * 1000),
-          transactionSequenceNumber: 1,
+          operationIndex: 0,
         },
-      ]);
+      ] satisfies Operation<void>[]);
     },
   );
 });

package/src/logic/listOperations.ts

@@ -1,6 +1,7 @@
+import { Operation } from "@ledgerhq/coin-framework/api/types";
 import { getServerInfos, getTransactions, GetTransactionsOptions } from "../network";
 import type { XrplOperation } from "../network/types";
-import { ListOperationsOptions, XrpMemo, XrpOperation } from "../types";
+import { ListOperationsOptions, XrpMemo } from "../types";
 import { RIPPLE_EPOCH } from "./utils";
 
 /**
@@ -19,7 +20,7 @@ import { RIPPLE_EPOCH } from "./utils";
 export async function listOperations(
   address: string,
   { limit, minHeight, token, order }: ListOperationsOptions,
-): Promise<[XrpOperation[], string]> {
+): Promise<[Operation<void>[], string]> {
   const serverInfo = await getServerInfos();
   const ledgers = serverInfo.info.complete_ledgers.split("-");
   const minLedgerVersion = Number(ledgers[0]);
@@ -98,7 +99,7 @@ export async function listOperations(
 
 const convertToCoreOperation =
   (address: string) =>
-  (operation: XrplOperation): XrpOperation => {
+  (operation: XrplOperation): Operation<void> => {
     const {
       ledger_hash,
       hash,
@@ -111,9 +112,9 @@ const convertToCoreOperation =
         Account,
         Destination,
         DestinationTag,
-        Sequence,
         Memos,
         ledger_index,
+        Sequence,
       },
     } = operation;
 
@@ -156,20 +157,28 @@ const convertToCoreOperation =
       };
     }
 
-    let op: XrpOperation = {
-      blockTime: new Date(close_time_iso),
-      blockHash: ledger_hash,
-      hash,
-      address,
-      type: TransactionType,
-      simpleType: type,
+    details = {
+      ...details,
+      xrpTxType: TransactionType,
+      sequence: Sequence,
+    };
+
+    let op: Operation<void> = {
+      operationIndex: 0,
+      tx: {
+        hash: hash,
+        fees: fee,
+        date: new Date(toEpochDate),
+        block: {
+          time: new Date(close_time_iso),
+          hash: ledger_hash,
+          height: ledger_index,
+        },
+      },
+      type: type,
       value,
-      fee,
-      blockHeight: ledger_index,
       senders: [Account],
       recipients: [Destination],
-      date: new Date(toEpochDate),
-      transactionSequenceNumber: Sequence,
     };
 
     if (Object.keys(details).length != 0) {

package/src/types/model.ts

@@ -10,25 +10,6 @@ export type XrpMemo = {
   format?: string;
   type?: string;
 };
-export type XrpOperation = {
-  blockTime: Date;
-  blockHash: string;
-  hash: string;
-  address: string;
-  type: string;
-  simpleType: "IN" | "OUT";
-  value: bigint;
-  fee: bigint;
-  blockHeight: number;
-  senders: string[];
-  recipients: string[];
-  date: Date;
-  transactionSequenceNumber: number;
-  details?: {
-    destinationTag?: number;
-    memos?: XrpMemo[];
-  };
-};
 
 type Order = "asc" | "desc";
 export type ListOperationsOptions = {