hive-keychain-commons 1.6.0 → 1.7.0

package/lib/interfaces/keychain.d.ts

@@ -1,5 +1,6 @@
 import type { Operation, Transaction } from '@hiveio/dhive';
 import { IStep } from '../swaps/swap.interface';
+import { VscRequestParams, VscStakingOperation } from './vsc';
 export declare enum KeychainRequestTypes {
     decode = "decode",
     encode = "encode",
@@ -31,7 +32,10 @@ export declare enum KeychainRequestTypes {
     recurrentTransfer = "recurrentTransfer",
     swap = "swap",
     vscCallContract = "vscCallContract",
-    vscDeposit = "vscDeposit"
+    vscDeposit = "vscDeposit",
+    vscWithdrawal = "vscWithdrawal",
+    vscTransfer = "vscTransfer",
+    vscStaking = "vscStaking"
 }
 export declare enum KeychainKeyTypes {
     posting = "Posting",
@@ -271,14 +275,38 @@ export type RequestVscCallContract = CommonRequestParams & {
     payload: object;
     method: KeychainKeyTypes.posting | KeychainKeyTypes.active;
 };
-export type RequestDeposit = CommonRequestParams & {
+export type RequestVscDeposit = CommonRequestParams & {
     type: KeychainRequestTypes.vscDeposit;
     username?: string;
-    address: string;
+    to?: string;
     amount: string;
     currency: string;
 };
-export type KeychainRequestData = (RequestDecode | RequestEncodeWithKeys | RequestEncode | RequestSignBuffer | RequestBroadcast | RequestAddAccountAuthority | RequestRemoveAccountAuthority | RequestAddKeyAuthority | RequestRemoveKeyAuthority | RequestSignTx | RequestPost | RequestVote | RequestCustomJSON | RequestSignedCall | RequestTransfer | RequestSendToken | RequestDelegation | RequestWitnessVote | RequestProxy | RequestPowerUp | RequestPowerDown | RequestCreateClaimedAccount | RequestUpdateProposalVote | RequestCreateProposal | RequestRemoveProposal | RequestAddAccount | RequestConvert | RequestRecurrentTransfer | RequestSwap | RequestVscCallContract | RequestDeposit) & {
+export type RequestVscWithdrawal = CommonRequestParams & VscRequestParams & {
+    type: KeychainRequestTypes.vscWithdrawal;
+    username?: string;
+    to: string;
+    amount: string;
+    currency: string;
+    memo: string;
+};
+export type RequestVscTransfer = CommonRequestParams & VscRequestParams & {
+    type: KeychainRequestTypes.vscTransfer;
+    username?: string;
+    to: string;
+    amount: string;
+    currency: string;
+    memo: string;
+};
+export type RequestVscStaking = CommonRequestParams & VscRequestParams & {
+    type: KeychainRequestTypes.vscStaking;
+    username?: string;
+    to: string;
+    amount: string;
+    currency: string;
+    operation: VscStakingOperation;
+};
+export type KeychainRequestData = (RequestDecode | RequestEncodeWithKeys | RequestEncode | RequestSignBuffer | RequestBroadcast | RequestAddAccountAuthority | RequestRemoveAccountAuthority | RequestAddKeyAuthority | RequestRemoveKeyAuthority | RequestSignTx | RequestPost | RequestVote | RequestCustomJSON | RequestSignedCall | RequestTransfer | RequestSendToken | RequestDelegation | RequestWitnessVote | RequestProxy | RequestPowerUp | RequestPowerDown | RequestCreateClaimedAccount | RequestUpdateProposalVote | RequestCreateProposal | RequestRemoveProposal | RequestAddAccount | RequestConvert | RequestRecurrentTransfer | RequestSwap | RequestVscCallContract | RequestVscDeposit | RequestVscWithdrawal | RequestVscTransfer | RequestVscStaking) & {
     redirect_uri?: string;
 };
 export type RequestId = {

package/lib/interfaces/keychain.js

@@ -34,6 +34,9 @@ var KeychainRequestTypes;
     KeychainRequestTypes["swap"] = "swap";
     KeychainRequestTypes["vscCallContract"] = "vscCallContract";
     KeychainRequestTypes["vscDeposit"] = "vscDeposit";
+    KeychainRequestTypes["vscWithdrawal"] = "vscWithdrawal";
+    KeychainRequestTypes["vscTransfer"] = "vscTransfer";
+    KeychainRequestTypes["vscStaking"] = "vscStaking";
 })(KeychainRequestTypes = exports.KeychainRequestTypes || (exports.KeychainRequestTypes = {}));
 var KeychainKeyTypes;
 (function (KeychainKeyTypes) {

package/lib/interfaces/vsc.d.ts

@@ -1,11 +1,16 @@
 export declare enum VscStatus {
     UNCONFIRMED = "UNCONFIRMED",
     CONFIRMED = "CONFIRMED",
-    INCLUDED = "INCLUDED"
+    INCLUDED = "INCLUDED",
+    FAILED = "FAILED"
 }
 export declare enum VscHistoryType {
     CONTRACT_CALL = "CONTRACT_CALL",
-    TRANSFER = "TRANSFER"
+    TRANSFER = "TRANSFER",
+    DEPOSIT = "DEPOSIT",
+    WITHDRAW = "WITHDRAW",
+    STAKING = "STAKING",
+    UNSTAKING = "UNSTAKING"
 }
 export declare enum VscLedgerType {
     WITHDRAW = "withdraw",
@@ -15,6 +20,13 @@ export declare enum VscToken {
     HIVE = "HIVE",
     HBD = "HBD"
 }
+export declare enum VscStakingOperation {
+    STAKING = "STAKING",
+    UNSTAKING = "UNSTAKING"
+}
+export type VscRequestParams = {
+    netId?: string;
+};
 export type VscHistoryResponse = {
     findLedgerTXs: {
         txs: VscTransfer[];

package/lib/interfaces/vsc.js

@@ -1,16 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VscToken = exports.VscLedgerType = exports.VscHistoryType = exports.VscStatus = void 0;
+exports.VscStakingOperation = exports.VscToken = exports.VscLedgerType = exports.VscHistoryType = exports.VscStatus = void 0;
 var VscStatus;
 (function (VscStatus) {
     VscStatus["UNCONFIRMED"] = "UNCONFIRMED";
     VscStatus["CONFIRMED"] = "CONFIRMED";
     VscStatus["INCLUDED"] = "INCLUDED";
+    VscStatus["FAILED"] = "FAILED";
 })(VscStatus = exports.VscStatus || (exports.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 = exports.VscHistoryType || (exports.VscHistoryType = {}));
 var VscLedgerType;
 (function (VscLedgerType) {
@@ -22,3 +27,8 @@ var VscToken;
     VscToken["HIVE"] = "HIVE";
     VscToken["HBD"] = "HBD";
 })(VscToken = exports.VscToken || (exports.VscToken = {}));
+var VscStakingOperation;
+(function (VscStakingOperation) {
+    VscStakingOperation["STAKING"] = "STAKING";
+    VscStakingOperation["UNSTAKING"] = "UNSTAKING";
+})(VscStakingOperation = exports.VscStakingOperation || (exports.VscStakingOperation = {}));

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

@@ -1,7 +1,7 @@
 import { VscHistoryType, VscStatus } from '../interfaces/vsc';
 export declare const VscUtils: {
     checkStatus: (id: string, type: VscHistoryType) => Promise<VscStatus>;
-    waitForStatus: (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)[]>;
     getAddressFromDid: (did: string) => string | undefined;
 };

package/lib/utils/vsc.utils.js

@@ -16,46 +16,47 @@ 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) => __awaiter(void 0, void 0, void 0, function* () {
-    const MAX_ITERATIONS = 20;
-    const WAIT_TIME = 500;
+const waitForStatus = (id, type, maxIterations = 20, wait = 500) => __awaiter(void 0, void 0, void 0, function* () {
     let iterations = 0;
     let status = vsc_1.VscStatus.UNCONFIRMED;
-    while (iterations < MAX_ITERATIONS) {
+    while (iterations < maxIterations) {
         status = yield checkStatus(id, type);
-        if (status === vsc_1.VscStatus.INCLUDED || status === vsc_1.VscStatus.CONFIRMED)
+        if (status === vsc_1.VscStatus.CONFIRMED || status === vsc_1.VscStatus.FAILED)
             return status;
         iterations++;
-        yield new Promise((resolve) => setTimeout(resolve, WAIT_TIME));
+        yield new Promise((resolve) => setTimeout(resolve, wait));
     }
     return status;
 });
 const checkStatus = (id, type) => {
     let query;
-    if (type === vsc_1.VscHistoryType.CONTRACT_CALL) {
+    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 = `{
       findTransaction(
-        filterOptions: {byId:"${id}-0"}
+        filterOptions: {byId:"${id}"}
       ) {
-        txs {
           status
-        }
       }
     }`;
     }
-    else if (type === vsc_1.VscHistoryType.TRANSFER) {
+    else if (type === vsc_1.VscHistoryType.DEPOSIT) {
         query = `{
       findLedgerTXs(filterOptions: {byTxId: "${id}-0"}) {
-      txs {
+      
         status
-      }
+      
     }
     }`;
     }
     return fetchQuery(query).then((res) => {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
-        return ((_d = (_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.txs) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.status) ||
-            ((_h = (_g = (_f = (_e = res === null || res === void 0 ? void 0 : res.data) === null || _e === void 0 ? void 0 : _e.findLedgerTXs) === null || _f === void 0 ? void 0 : _f.txs) === null || _g === void 0 ? void 0 : _g[0]) === null || _h === void 0 ? void 0 : _h.status);
+        var _a, _b, _c, _d, _e, _f;
+        console.log(res.data);
+        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));
     });
 };
 const fetchHistory = (username) => __awaiter(void 0, void 0, void 0, function* () {

package/package.json

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