hive-keychain-commons 1.9.0 → 1.9.2

package/lib/interfaces/vsc.d.ts

@@ -24,8 +24,8 @@ export type VscRequestParams = {
     netId?: string;
 };
 export type VscHistoryResponse = {
-    findLedgerTXs: VscLedgerTxResponse[];
     findTransaction: VscTxResponse[];
+    findLedgerTXs: VscLedgerTxResponse[];
 };
 declare enum VscAsset {
     HIVE = "hive",
@@ -46,19 +46,26 @@ export type VscTxResponse = {
     status: VscStatus;
     id: string;
     anchr_height: number;
-    timestamp: Date;
-    data: VscTxData;
-    required_auths: {
-        value: string;
-    }[];
     anchr_index: number;
-    anchr_opidx: number;
-    anchr_ts: Date;
-    first_seen: Date;
-    ledger: any[];
+    anchr_ts: string;
+    type: string;
+    op_types: string[];
+    first_seen: string;
     nonce: number;
     rc_limit: number;
-    type: string;
+    required_auths: string[];
+    ops: {
+        required_auths: string[];
+        type: string;
+        index: number;
+        data: {
+            amount: string;
+            asset: VscAsset;
+            from: string;
+            memo: string;
+            to: string;
+        };
+    }[];
 };
 export type VscTxData = {
     amount: number;
@@ -83,5 +90,6 @@ export type VscAccountBalance = {
     hbd_savings: number;
     hive: number;
     hive_consensus: number;
+    pending_hbd_unstaking: number;
 };
 export {};

package/lib/utils/vsc.utils.js

@@ -50,74 +50,48 @@ const checkStatus = (id) => {
 };
 const fetchHistory = (username) => __awaiter(void 0, void 0, void 0, function* () {
     const query = `{
-  #  findLedgerTXs(filterOptions: {byToFrom: "hive:${username}",byTypes: "deposit"}) {
-  #           amount
-  #           asset
-  #           block_height
-  #           from
-  #           id
-  #           owner
-  #           timestamp
-  #           tx_id
-  #           type
-  #     }
-  findTransaction(filterOptions: {byLedgerToFrom: "hive:${username}"}) {
-    anchr_height
-    anchr_index
-    anchr_opidx
-    anchr_ts
-    data
-    first_seen
-    id
-    ledger {
-      amount
-      asset
-      from
-      memo
-      params
-      to
+    findTransaction(filterOptions: {byLedgerToFrom: "hive:${username}"}) {
+      id
+      anchr_height
+      anchr_index
+      anchr_ts
       type
+      op_types
+      first_seen
+      nonce
+      rc_limit
+      required_auths
+      status
+      ops {
+        required_auths
+        type
+        index
+        data
+      }
+    }
+  }`;
+    const response = yield fetchQuery(query);
+    if (!(response === null || response === void 0 ? void 0 : response.data)) {
+        console.error('Invalid response from VSC API:', response);
+        return { findTransaction: [], findLedgerTXs: [] };
     }
-    nonce
-    rc_limit
-    required_auths
-    status
-    type
-  }}
-  `;
-    return (yield fetchQuery(query)).data;
+    return response.data;
 });
 const getOrganizedHistory = (username) => __awaiter(void 0, void 0, void 0, function* () {
     const history = yield fetchHistory(username);
     const organizedHistory = [
-        // ...(history.findLedgerTXs || [])
-        //   .map((e) => {
-        //     return {
-        //       from: e.from,
-        //       to: e.owner,
-        //       amount: e.amount,
-        //       timestamp: new Date(e.timestamp + 'Z'),
-        //       txId: e.id,
-        //       asset: e.asset,
-        //       status: VscStatus.CONFIRMED,
-        //       type: VscHistoryType.DEPOSIT,
-        //     };
-        //   })
-        //   .filter((e) => e.to === `hive:${username}`),
         ...(history.findTransaction || [])
-            .map((e) => {
-            return {
-                from: e.data.from,
-                to: e.data.to,
-                amount: e.data.amount,
-                timestamp: e.first_seen,
-                txId: e.id,
-                memo: e.data.memo,
-                asset: e.data.asset,
-                status: e.status,
-                type: e.data.type,
-            };
-        })
+            .flatMap((e) => e.ops.map((op) => ({
+            from: op.data.from,
+            to: op.data.to,
+            amount: parseFloat(op.data.amount),
+            timestamp: new Date(e.first_seen),
+            txId: e.id,
+            memo: op.data.memo,
+            asset: op.data.asset,
+            status: e.status,
+            type: op.type,
+        })))
             .filter((e) => !(e.type === 'withdraw' && e.from !== `hive:${username}`)),
     ].sort((a, b) => {
         return new Date(b.timestamp).getTime() - new Date(a.timestamp).getTime();
@@ -157,14 +131,16 @@ const getAccountBalance = (username) => __awaiter(void 0, void 0, void 0, functi
     const query = `{
     getAccountBalance(account: "hive:${username}") {
     account
+    block_height
     hbd
-    hive
-    hbd_savings
-    hbd_claim
-    hbd_modify
     hbd_avg
-    block_height
+    hbd_modify
+    hbd_claim
+    hbd_savings
+    hive
     hive_consensus
+    consensus_unstaking
+    pending_hbd_unstaking
   }
   }`;
     return ((yield fetchQuery(query)).data.getAccountBalance || {
@@ -175,6 +151,7 @@ const getAccountBalance = (username) => __awaiter(void 0, void 0, void 0, functi
         hbd_claim: 0,
         hbd_modify: 0,
         hbd_savings: 0,
+        pending_hbd_unstaking: 0,
     });
 });
 const getWithdrawJson = (data, netId) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hive-keychain-commons",
-  "version": "1.9.0",
+  "version": "1.9.2",
   "description": "Platform-agnostic functions used in Hive Keychain mobile and extensions",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",