hive-keychain-commons 1.7.1 → 1.7.3

package/lib/index.d.ts

@@ -1,4 +1,7 @@
+export * from './interfaces/global-properties';
 export * from './interfaces/keychain';
+export * from './interfaces/price';
+export * from './interfaces/tokens';
 export * from './interfaces/vsc';
 export { LeaseKeys } from './lease-market/lease-keys';
 export { AcceptRequestJSON, CancelDelegationJSON, CancelRequestJSON, PaymentJSON, ReimbursmentJSON, RequestCancelRequestJSON, RequestJSON, } from './lease-market/lease-market.interface';
@@ -8,6 +11,7 @@ export * from './swaps/swap.interface';
 export * from './utils/assets.utils';
 export * from './utils/crypto.utils';
 export * from './utils/export-transactions.utils';
+export * from './utils/format.utils';
 export * from './utils/history-filters.utils';
 export * from './utils/keys.utils';
 export * from './utils/transaction.utils';

package/lib/index.js

@@ -15,7 +15,10 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LeaseKeys = void 0;
+__exportStar(require("./interfaces/global-properties"), exports);
 __exportStar(require("./interfaces/keychain"), exports);
+__exportStar(require("./interfaces/price"), exports);
+__exportStar(require("./interfaces/tokens"), exports);
 __exportStar(require("./interfaces/vsc"), exports);
 var lease_keys_1 = require("./lease-market/lease-keys");
 Object.defineProperty(exports, "LeaseKeys", { enumerable: true, get: function () { return lease_keys_1.LeaseKeys; } });
@@ -25,6 +28,7 @@ __exportStar(require("./swaps/swap.interface"), exports);
 __exportStar(require("./utils/assets.utils"), exports);
 __exportStar(require("./utils/crypto.utils"), exports);
 __exportStar(require("./utils/export-transactions.utils"), exports);
+__exportStar(require("./utils/format.utils"), exports);
 __exportStar(require("./utils/history-filters.utils"), exports);
 __exportStar(require("./utils/keys.utils"), exports);
 __exportStar(require("./utils/transaction.utils"), exports);

package/lib/interfaces/global-properties.d.ts

@@ -0,0 +1,18 @@
+import type { DynamicGlobalProperties, Price } from '@hiveio/dhive';
+export interface RewardFund {
+    author_reward_curve: string;
+    content_constant: string;
+    curation_reward_curve: string;
+    id: number;
+    last_update: string;
+    name: string;
+    percent_content_rewards: number;
+    percent_curation_rewards: number;
+    recent_claims: string;
+    reward_balance: string;
+}
+export interface GlobalProperties {
+    globals?: DynamicGlobalProperties;
+    price?: Price;
+    rewardFund?: RewardFund;
+}

package/lib/interfaces/global-properties.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/interfaces/keychain.d.ts

@@ -341,4 +341,9 @@ export type KeychainRequestWrapper = {
     request: KeychainRequest;
     request_id: number;
 };
+export declare enum LoadingState {
+    LOADING = 0,
+    LOADED = 1,
+    FAILED = 2
+}
 export {};

package/lib/interfaces/keychain.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.KeychainKeyTypesLC = exports.KeychainKeyTypes = exports.KeychainRequestTypes = void 0;
+exports.LoadingState = exports.KeychainKeyTypesLC = exports.KeychainKeyTypes = exports.KeychainRequestTypes = void 0;
 var KeychainRequestTypes;
 (function (KeychainRequestTypes) {
     KeychainRequestTypes["decode"] = "decode";
@@ -50,3 +50,9 @@ var KeychainKeyTypesLC;
     KeychainKeyTypesLC["active"] = "active";
     KeychainKeyTypesLC["memo"] = "memo";
 })(KeychainKeyTypesLC = exports.KeychainKeyTypesLC || (exports.KeychainKeyTypesLC = {}));
+var LoadingState;
+(function (LoadingState) {
+    LoadingState[LoadingState["LOADING"] = 0] = "LOADING";
+    LoadingState[LoadingState["LOADED"] = 1] = "LOADED";
+    LoadingState[LoadingState["FAILED"] = 2] = "FAILED";
+})(LoadingState = exports.LoadingState || (exports.LoadingState = {}));

package/lib/interfaces/price.d.ts

@@ -0,0 +1,9 @@
+export interface Currency {
+    usd_24h_change?: number;
+    usd?: number;
+}
+export interface CurrencyPrices {
+    bitcoin: Currency;
+    hive: Currency;
+    hive_dollar: Currency;
+}

package/lib/interfaces/price.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/interfaces/tokens.d.ts

@@ -0,0 +1,5 @@
+export declare enum TokenType {
+    HIVE = "HIVE",
+    HIVE_ENGINE = "HIVE_ENGINE",
+    VSC = "VSC"
+}

package/lib/interfaces/tokens.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TokenType = void 0;
+var TokenType;
+(function (TokenType) {
+    TokenType["HIVE"] = "HIVE";
+    TokenType["HIVE_ENGINE"] = "HIVE_ENGINE";
+    TokenType["VSC"] = "VSC";
+})(TokenType = exports.TokenType || (exports.TokenType = {}));

package/lib/interfaces/vsc.d.ts

@@ -6,15 +6,11 @@ export declare enum VscStatus {
 }
 export declare enum VscHistoryType {
     CONTRACT_CALL = "CONTRACT_CALL",
-    TRANSFER = "TRANSFER",
-    DEPOSIT = "DEPOSIT",
-    WITHDRAW = "WITHDRAW",
-    STAKING = "STAKING",
-    UNSTAKING = "UNSTAKING"
-}
-export declare enum VscLedgerType {
+    TRANSFER = "transfer",
+    DEPOSIT = "deposit",
     WITHDRAW = "withdraw",
-    DEPOSIT = "deposit"
+    STAKING = "stake_hbd",
+    UNSTAKING = "unstake_hbd"
 }
 export declare enum VscToken {
     HIVE = "HIVE",
@@ -28,39 +24,64 @@ export type VscRequestParams = {
     netId?: string;
 };
 export type VscHistoryResponse = {
-    findLedgerTXs: {
-        txs: VscTransfer[];
-    };
-    findTransaction: {
-        txs: VscCall[];
-    };
+    findLedgerTXs: VscLedgerTxResponse[];
+    findTransaction: VscTxResponse[];
 };
-export type VscTransfer = {
-    type?: VscHistoryType.TRANSFER;
+declare enum VscAsset {
+    HIVE = "hive",
+    HBD = "hbd"
+}
+export type VscLedgerTxResponse = {
     amount: number;
     block_height: number;
     from: string;
     id: string;
-    memo: string | null;
     owner: string;
-    t: VscLedgerType;
-    tk: VscToken;
     timestamp: Date;
-    status: VscStatus;
+    asset: VscAsset;
+    tx_id: string;
+    type: string;
 };
-export type VscCall = {
-    type?: VscHistoryType.CONTRACT_CALL;
+export type VscTxResponse = {
     status: VscStatus;
     id: string;
-    anchored_height: number;
+    anchr_height: number;
     timestamp: Date;
-    data: {
-        action: string;
-        contract_id: string;
-        op: string;
-        payload: object;
-    };
+    data: VscTxData;
     required_auths: {
         value: string;
     }[];
+    anchr_index: number;
+    anchr_opidx: number;
+    anchr_ts: Date;
+    first_seen: Date;
+    ledger: any[];
+    nonce: number;
+    rc_limit: number;
+    type: string;
+};
+export type VscTxData = {
+    amount: number;
+    asset: VscAsset;
+    from: string;
+    memo?: string;
+    to: string;
+    type: VscHistoryType;
+};
+export type VscHistoryItem = VscTxData & {
+    timestamp: Date;
+    status: VscStatus;
+    txId: string;
+};
+export type VscAccountBalance = {
+    account: string;
+    block_height: number;
+    hbd: number;
+    hbd_avg: number;
+    hbd_claim: number;
+    hbd_modify: number;
+    hbd_savings: number;
+    hive: number;
+    hive_consensus: number;
 };
+export {};

package/lib/interfaces/vsc.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VscStakingOperation = exports.VscToken = exports.VscLedgerType = exports.VscHistoryType = exports.VscStatus = void 0;
+exports.VscStakingOperation = exports.VscToken = exports.VscHistoryType = exports.VscStatus = void 0;
 var VscStatus;
 (function (VscStatus) {
     VscStatus["UNCONFIRMED"] = "UNCONFIRMED";
@@ -11,17 +11,12 @@ var VscStatus;
 var VscHistoryType;
 (function (VscHistoryType) {
     VscHistoryType["CONTRACT_CALL"] = "CONTRACT_CALL";
-    VscHistoryType["TRANSFER"] = "TRANSFER";
-    VscHistoryType["DEPOSIT"] = "DEPOSIT";
-    VscHistoryType["WITHDRAW"] = "WITHDRAW";
-    VscHistoryType["STAKING"] = "STAKING";
-    VscHistoryType["UNSTAKING"] = "UNSTAKING";
+    VscHistoryType["TRANSFER"] = "transfer";
+    VscHistoryType["DEPOSIT"] = "deposit";
+    VscHistoryType["WITHDRAW"] = "withdraw";
+    VscHistoryType["STAKING"] = "stake_hbd";
+    VscHistoryType["UNSTAKING"] = "unstake_hbd";
 })(VscHistoryType = exports.VscHistoryType || (exports.VscHistoryType = {}));
-var VscLedgerType;
-(function (VscLedgerType) {
-    VscLedgerType["WITHDRAW"] = "withdraw";
-    VscLedgerType["DEPOSIT"] = "deposit";
-})(VscLedgerType = exports.VscLedgerType || (exports.VscLedgerType = {}));
 var VscToken;
 (function (VscToken) {
     VscToken["HIVE"] = "HIVE";
@@ -32,3 +27,8 @@ var VscStakingOperation;
     VscStakingOperation["STAKING"] = "STAKING";
     VscStakingOperation["UNSTAKING"] = "UNSTAKING";
 })(VscStakingOperation = exports.VscStakingOperation || (exports.VscStakingOperation = {}));
+var VscAsset;
+(function (VscAsset) {
+    VscAsset["HIVE"] = "hive";
+    VscAsset["HBD"] = "hbd";
+})(VscAsset || (VscAsset = {}));

package/lib/utils/format.utils.d.ts

@@ -0,0 +1,24 @@
+import type { DynamicGlobalProperties } from '@hiveio/dhive';
+import { Asset } from '..';
+import { GlobalProperties } from '../interfaces/global-properties';
+import { CurrencyPrices } from '../interfaces/price';
+export declare const FormatUtils: {
+    withCommas: (nb: string, decimals?: number, removeTrailingZeros?: boolean) => string;
+    toHP: (vests: string, props?: DynamicGlobalProperties) => number;
+    toFormattedHP: (vests: number, props?: DynamicGlobalProperties) => string;
+    fromHP: (hp: string, props: DynamicGlobalProperties) => number;
+    formatCurrencyValue: (value: string | Asset | number, digits?: number, removeTrailingZeros?: boolean) => string;
+    nFormatter: (num: number, digits: number) => string;
+    hasMoreThanXDecimal: (nb: number, decimal: number) => boolean;
+    toNumber: (value: string | Asset) => number;
+    getSymbol: (nai: string) => "HIVE" | "HBD" | "HP" | undefined;
+    getAmountFromNai: (obj: any) => number;
+    fromNaiAndSymbol: (obj: any) => string;
+    removeHtmlTags: (str: string) => string;
+    getValFromString: (str: string) => number;
+    trimUselessZero: (nb: number, precision: number) => string;
+    getUSDFromVests: (vestAmount: number, globalProperties: GlobalProperties, currencyPrices: CurrencyPrices) => string;
+    getOrdinalLabelTranslation: (activeRank: string) => "html_popup_witness_ranking_ordinal_st_label" | "html_popup_witness_ranking_ordinal_nd_label" | "html_popup_witness_ranking_ordinal_rd_label" | "html_popup_witness_ranking_ordinal_th_label";
+    dateToFormattedString: (date: Date) => string;
+    shortenString: (str: string, length?: number) => string;
+};

package/lib/utils/format.utils.js

@@ -0,0 +1,160 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FormatUtils = void 0;
+const moment_1 = __importDefault(require("moment"));
+const __1 = require("..");
+const withCommas = (nb, decimals = 3, removeTrailingZeros = false) => {
+    const currency = nb.split(' ')[1];
+    const value = parseFloat(nb).toFixed(decimals);
+    const parts = value.split('.');
+    parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+    let finalNumber = parts.join('.');
+    if (removeTrailingZeros) {
+        finalNumber = finalNumber.replace(/^([\d,]+)$|^([\d,]+)\.0*$|^([\d,]+\.[0-9]*?)0*$/, '$1$2$3');
+    }
+    if (currency) {
+        finalNumber = finalNumber + ' ' + currency;
+    }
+    return finalNumber;
+};
+const toHP = (vests, props) => props
+    ? (parseFloat(vests) * parseFloat(props.total_vesting_fund_hive + '')) /
+        parseFloat(props.total_vesting_shares + '')
+    : 0;
+const toFormattedHP = (vests, props) => {
+    return `${toHP(vests.toString(), props).toFixed(3)} HP`;
+};
+const fromHP = (hp, props) => (parseFloat(hp) / parseFloat(props.total_vesting_fund_hive + '')) *
+    parseFloat(props.total_vesting_shares + '');
+const formatCurrencyValue = (value, digits = 3, removeTrailingZeros = false) => {
+    if (value === undefined || value === null) {
+        return '...';
+    }
+    return withCommas(value.toString().replace('HBD', '').replace('HIVE', '').trim(), digits, removeTrailingZeros);
+};
+const nFormatter = (num, digits) => {
+    const si = [
+        {
+            value: 1,
+            symbol: '',
+        },
+        {
+            value: 1e3,
+            symbol: 'k',
+        },
+        {
+            value: 1e6,
+            symbol: 'M',
+        },
+        {
+            value: 1e9,
+            symbol: 'G',
+        },
+        {
+            value: 1e12,
+            symbol: 'T',
+        },
+        {
+            value: 1e15,
+            symbol: 'P',
+        },
+        {
+            value: 1e18,
+            symbol: 'E',
+        },
+    ];
+    const rx = /\.0+$|(\.[0-9]*[1-9])0+$/;
+    let i;
+    for (i = si.length - 1; i > 0; i--) {
+        if (num >= si[i].value) {
+            break;
+        }
+    }
+    return (num / si[i].value).toFixed(digits).replace(rx, '$1') + si[i].symbol;
+};
+const hasMoreThanXDecimal = (nb, decimal) => {
+    const splitedNumber = nb.toString().split('.');
+    return splitedNumber.length > 1 ? splitedNumber[1].length > decimal : false;
+};
+const toNumber = (value) => {
+    return parseFloat(value.toString().split(' ')[0].trim());
+};
+const getSymbol = (nai) => {
+    if (nai === '@@000000013')
+        return 'HBD';
+    if (nai === '@@000000021')
+        return 'HIVE';
+    if (nai === '@@000000037')
+        return 'HP';
+};
+const fromNaiAndSymbol = (obj) => {
+    return `${(obj.amount / 1000).toFixed(obj.precision)} ${exports.FormatUtils.getSymbol(obj.nai)}`;
+};
+const getAmountFromNai = (obj) => {
+    const res = fromNaiAndSymbol(obj);
+    return __1.Asset.fromString(res).amount;
+};
+const removeHtmlTags = (str) => {
+    return str.replace(/<(?:.|\n)*?>/gm, '');
+};
+const getValFromString = (str) => {
+    return parseFloat(str.split(' ')[0]);
+};
+const trimUselessZero = (nb, precision) => {
+    var _a;
+    const numberWithPrecision = nb.toFixed(precision);
+    const n = parseFloat(numberWithPrecision).toString();
+    if (n.split('.').length > 0 && ((_a = n.split('.')[1]) === null || _a === void 0 ? void 0 : _a.length) > 3)
+        return exports.FormatUtils.withCommas(n);
+    else
+        return exports.FormatUtils.withCommas(parseFloat(n).toFixed(3));
+};
+const getUSDFromVests = (vestAmount, globalProperties, currencyPrices) => {
+    return (exports.FormatUtils.toHP(vestAmount.toString(), globalProperties.globals) *
+        currencyPrices.hive.usd).toFixed(2);
+};
+const getOrdinalLabelTranslation = (activeRank) => {
+    const result = parseFloat(activeRank) % 10;
+    switch (result) {
+        case 1:
+            return 'html_popup_witness_ranking_ordinal_st_label';
+        case 2:
+            return 'html_popup_witness_ranking_ordinal_nd_label';
+        case 3:
+            return 'html_popup_witness_ranking_ordinal_rd_label';
+        default:
+            return 'html_popup_witness_ranking_ordinal_th_label';
+    }
+};
+const dateToFormattedString = (date) => {
+    return (0, moment_1.default)(date).format('MM/DD/YY');
+};
+const shortenString = (str, length = 3) => {
+    // TODO : remove during merge EVM (duplicate)
+    return (str === null || str === void 0 ? void 0 : str.length) > length * 2
+        ? `${str.substring(length, 0)}...${str === null || str === void 0 ? void 0 : str.toString().slice(-length)}`
+        : str;
+};
+exports.FormatUtils = {
+    withCommas,
+    toHP,
+    toFormattedHP,
+    fromHP,
+    formatCurrencyValue,
+    nFormatter,
+    hasMoreThanXDecimal,
+    toNumber,
+    getSymbol,
+    getAmountFromNai,
+    fromNaiAndSymbol,
+    removeHtmlTags,
+    getValFromString,
+    trimUselessZero,
+    getUSDFromVests,
+    getOrdinalLabelTranslation,
+    dateToFormattedString,
+    shortenString,
+};

package/lib/utils/vsc.utils.d.ts

@@ -1,7 +1,43 @@
-import { VscHistoryType, VscStatus } from '../interfaces/vsc';
+import { RequestVscStaking, RequestVscTransfer, RequestVscWithdrawal } from '../interfaces/keychain';
+import { VscHistoryItem, VscHistoryType, VscStatus } from '../interfaces/vsc';
 export declare const VscUtils: {
     checkStatus: (id: string, type: VscHistoryType) => Promise<VscStatus>;
-    waitForStatus: (id: string, type: VscHistoryType, maxIterations?: number, wait?: number) => Promise<VscStatus>;
-    getOrganizedHistory: (username: string) => Promise<(import("../interfaces/vsc").VscTransfer | import("../interfaces/vsc").VscCall)[]>;
+    waitForStatus: (id: string, type: VscHistoryType, timeoutSeconds?: number, endAtStatus?: VscStatus) => Promise<VscStatus>;
+    getOrganizedHistory: (username: string) => Promise<VscHistoryItem[]>;
     getAddressFromDid: (did: string) => string | undefined;
+    getAccountBalance: (username: string) => Promise<any>;
+    blockHeightToTimestamp: (height: number) => Date;
+    getFormattedAddress: (address: string) => string;
+    getWithdrawJson: (data: Omit<RequestVscWithdrawal, 'domain' | 'type'>, netId?: string) => {
+        id: string;
+        json: {
+            net_id: string | undefined;
+            from: string | undefined;
+            to: string;
+            amount: string;
+            asset: string;
+            memo: string;
+        };
+    };
+    getTransferJson: (data: Omit<RequestVscTransfer, 'domain' | 'type'>, netId?: string) => {
+        id: string;
+        json: {
+            net_id: string | undefined;
+            from: string | undefined;
+            to: string;
+            amount: string;
+            asset: string;
+            memo: string;
+        };
+    };
+    getStakingJson: (data: Omit<RequestVscStaking, 'domain' | 'type'>, netId?: string) => {
+        id: string;
+        json: {
+            net_id: string | undefined;
+            from: string | undefined;
+            to: string;
+            amount: string;
+            asset: string;
+        };
+    };
 };

package/lib/utils/vsc.utils.js

@@ -16,12 +16,15 @@ exports.VscUtils = void 0;
 const moment_1 = __importDefault(require("moment"));
 const config_1 = __importDefault(require("../config"));
 const vsc_1 = require("../interfaces/vsc");
-const waitForStatus = (id, type, maxIterations = 20, wait = 500) => __awaiter(void 0, void 0, void 0, function* () {
+const format_utils_1 = require("./format.utils");
+const waitForStatus = (id, type, timeoutSeconds = 10, endAtStatus = vsc_1.VscStatus.CONFIRMED) => __awaiter(void 0, void 0, void 0, function* () {
     let iterations = 0;
     let status = vsc_1.VscStatus.UNCONFIRMED;
+    const wait = 500;
+    const maxIterations = (timeoutSeconds / wait) * 1000;
     while (iterations < maxIterations) {
         status = yield checkStatus(id, type);
-        if (status === vsc_1.VscStatus.CONFIRMED || status === vsc_1.VscStatus.FAILED)
+        if (status === endAtStatus || status === vsc_1.VscStatus.FAILED)
             return status;
         iterations++;
         yield new Promise((resolve) => setTimeout(resolve, wait));
@@ -29,65 +32,57 @@ const waitForStatus = (id, type, maxIterations = 20, wait = 500) => __awaiter(vo
     return status;
 });
 const checkStatus = (id, type) => {
-    let query;
-    if (type === vsc_1.VscHistoryType.CONTRACT_CALL ||
-        type === vsc_1.VscHistoryType.WITHDRAW ||
-        type === vsc_1.VscHistoryType.STAKING ||
-        type === vsc_1.VscHistoryType.UNSTAKING ||
-        type === vsc_1.VscHistoryType.TRANSFER) {
-        query = `{
+    const query = `{
       findTransaction(
         filterOptions: {byId:"${id}"}
       ) {
           status
       }
     }`;
-    }
-    else if (type === vsc_1.VscHistoryType.DEPOSIT) {
-        query = `{
-      findLedgerTXs(filterOptions: {byTxId: "${id}-0"}) {
-      
-        status
-      
-    }
-    }`;
-    }
     return fetchQuery(query).then((res) => {
         var _a, _b, _c, _d, _e, _f;
-        return (((_c = (_b = (_a = res === null || res === void 0 ? void 0 : res.data) === null || _a === void 0 ? void 0 : _a.findTransaction) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.status) ||
-            ((_f = (_e = (_d = res === null || res === void 0 ? void 0 : res.data) === null || _d === void 0 ? void 0 : _d.findLedgerTXs) === null || _e === void 0 ? void 0 : _e[0]) === null || _f === void 0 ? void 0 : _f.status));
+        if ((_b = (_a = res === null || res === void 0 ? void 0 : res.data) === null || _a === void 0 ? void 0 : _a.findTransaction) === null || _b === void 0 ? void 0 : _b[0])
+            return (_c = res.data.findTransaction) === null || _c === void 0 ? void 0 : _c[0].status;
+        return ((_f = (_e = (_d = res === null || res === void 0 ? void 0 : res.data) === null || _d === void 0 ? void 0 : _d.findLedgerTXs) === null || _e === void 0 ? void 0 : _e[0]) === null || _f === void 0 ? void 0 : _f.id) === id
+            ? vsc_1.VscStatus.CONFIRMED
+            : vsc_1.VscStatus.UNCONFIRMED;
     });
 };
 const fetchHistory = (username) => __awaiter(void 0, void 0, void 0, function* () {
     const query = `{
-    findLedgerTXs(
-      filterOptions: {byToFrom: "hive:${username}"}
-    ) {
-      txs {
-        amount
-        block_height
-        from
-        id
-        memo
-        owner
-        t
-        tk
-        status
-      }
+  #  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
+      type
     }
-    findTransaction(filterOptions: {byAccount: "${username}"}) {
-      txs {
-        status
-        id
-        anchored_height
-        data {
-          action
-          contract_id
-          op
-          payload
-        }
-        required_auths{value}
-      }
+    nonce
+    rc_limit
+    required_auths
+    status
+    type
   }}
   `;
     return (yield fetchQuery(query)).data;
@@ -95,18 +90,37 @@ const fetchHistory = (username) => __awaiter(void 0, void 0, void 0, function* (
 const getOrganizedHistory = (username) => __awaiter(void 0, void 0, void 0, function* () {
     const history = yield fetchHistory(username);
     const organizedHistory = [
-        ...history.findLedgerTXs.txs.map((e) => {
-            e.type = vsc_1.VscHistoryType.TRANSFER;
-            e.timestamp = blockHeightToTimestamp(e.block_height);
-            return e;
-        }),
-        ...history.findTransaction.txs.map((e) => {
-            e.type = vsc_1.VscHistoryType.CONTRACT_CALL;
-            e.timestamp = blockHeightToTimestamp(e.anchored_height);
-            return e;
-        }),
+        // ...(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,
+            };
+        })
+            .filter((e) => !(e.type === 'withdraw' && e.from !== `hive:${username}`)),
     ].sort((a, b) => {
-        return b.timestamp.getTime() - a.timestamp.getTime();
+        return new Date(b.timestamp).getTime() - new Date(a.timestamp).getTime();
     });
     return organizedHistory;
 });
@@ -118,10 +132,16 @@ const blockHeightToTimestamp = (height) => {
         .toDate();
 };
 const getAddressFromDid = (did) => {
-    const regex = new RegExp(':([a-zA-Z0-9]*)$');
+    const regex = new RegExp(':([a-zA-Z0-9.-]*)$');
     const matches = did.match(regex);
     return matches === null || matches === void 0 ? void 0 : matches[matches.length - 1];
 };
+const getFormattedAddress = (address) => {
+    if (address.startsWith('hive:'))
+        return `@${getAddressFromDid(address)}`;
+    else
+        return format_utils_1.FormatUtils.shortenString(getAddressFromDid(address), 4);
+};
 const fetchQuery = (query) => {
     return fetch(config_1.default.vsc.API_URL, {
         method: 'POST',
@@ -133,9 +153,83 @@ const fetchQuery = (query) => {
         }),
     }).then((res) => res.json());
 };
+const getAccountBalance = (username) => __awaiter(void 0, void 0, void 0, function* () {
+    const query = `{
+    getAccountBalance(account: "hive:${username}") {
+    account
+    hbd
+    hive
+    hbd_savings
+    hbd_claim
+    hbd_modify
+    hbd_avg
+    block_height
+    hive_consensus
+  }
+  }`;
+    return (yield fetchQuery(query)).data.getAccountBalance;
+});
+const getWithdrawJson = (data, netId) => {
+    const JSON_ID = 'vsc.withdraw';
+    const json = {
+        net_id: data.netId || netId,
+        from: data.username.startsWith('hive:')
+            ? data.username
+            : `hive:${data.username}`,
+        to: data.to.startsWith('hive:') ? data.to : `hive:${data.to}`,
+        amount: data.amount,
+        asset: data.currency.toLowerCase(),
+        memo: data.memo,
+    };
+    return {
+        id: JSON_ID,
+        json,
+    };
+};
+const getTransferJson = (data, netId) => {
+    const JSON_ID = 'vsc.transfer';
+    const json = {
+        net_id: data.netId || netId,
+        from: data.username.startsWith('hive:')
+            ? data.username
+            : `hive:${data.username}`,
+        to: data.to.startsWith('hive:') ? data.to : `hive:${data.to}`,
+        amount: data.amount,
+        asset: data.currency.toLowerCase(),
+        memo: data.memo,
+    };
+    return {
+        id: JSON_ID,
+        json,
+    };
+};
+const getStakingJson = (data, netId) => {
+    const JSON_ID = data.operation === vsc_1.VscStakingOperation.STAKING
+        ? 'vsc.stake_hbd'
+        : 'vsc.unstake_hbd';
+    const json = {
+        net_id: data.netId || netId,
+        from: data.username.startsWith('hive:')
+            ? data.username
+            : `hive:${data.username}`,
+        to: data.to.startsWith('hive:') ? data.to : `hive:${data.to}`,
+        amount: data.amount,
+        asset: data.currency.toLowerCase(),
+    };
+    return {
+        id: JSON_ID,
+        json,
+    };
+};
 exports.VscUtils = {
     checkStatus,
     waitForStatus,
     getOrganizedHistory,
     getAddressFromDid,
+    getAccountBalance,
+    blockHeightToTimestamp,
+    getFormattedAddress,
+    getWithdrawJson,
+    getTransferJson,
+    getStakingJson,
 };

package/package.json

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