hive-keychain-commons 1.4.1 → 1.4.3

package/lib/config/index.d.ts

@@ -0,0 +1,6 @@
+declare const _default: {
+    vsc: {
+        API_URL: string;
+    };
+};
+export default _default;

package/lib/config/index.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = {
+    vsc: { API_URL: 'https://api.vsc.eco/api/v1/graphql' },
+};

package/lib/index.d.ts

@@ -7,3 +7,4 @@ export * from './swaps/swap-api.interface';
 export * from './swaps/swap.interface';
 export * from './utils/keys.utils';
 export * from './utils/transfer.utils';
+export * from './utils/vsc.utils';

package/lib/index.js

@@ -24,3 +24,4 @@ __exportStar(require("./swaps/swap-api.interface"), exports);
 __exportStar(require("./swaps/swap.interface"), exports);
 __exportStar(require("./utils/keys.utils"), exports);
 __exportStar(require("./utils/transfer.utils"), exports);
+__exportStar(require("./utils/vsc.utils"), exports);

package/lib/interfaces/keychain.d.ts

@@ -271,14 +271,14 @@ export type RequestVscCallContract = CommonRequestParams & {
     payload: object;
     method: KeychainKeyTypes.posting | KeychainKeyTypes.active;
 };
-export type RequestVscCDeposit = CommonRequestParams & {
+export type RequestDeposit = CommonRequestParams & {
     type: KeychainRequestTypes.vscDeposit;
     username?: string;
     address: 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 | RequestVscCDeposit) & {
+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) & {
     redirect_uri?: string;
 };
 export type RequestId = {

package/lib/logger/formats.js

@@ -1,9 +1,32 @@
 "use strict";
 /* istanbul ignore file */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LoggerFormats = void 0;
 const moment = require("moment");
-const winston = require("winston");
+const winston = __importStar(require("winston"));
 const logFormat = winston.format.printf((info) => {
     const timestamp = moment(info.timestamp);
     return `[${timestamp.format('L') + ' ' + timestamp.format('HH:mm:ss')}][${info.level}] ${info.message}`;

package/lib/logger/logger.js

@@ -1,8 +1,31 @@
 "use strict";
 /* eslint-disable */
 /* istanbul ignore file */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const winston = require("winston");
+const winston = __importStar(require("winston"));
 const transports_1 = require("./transports");
 let winstonLogger;
 let environment;

package/lib/logger/transports.js

@@ -1,8 +1,31 @@
 "use strict";
 /* istanbul ignore file */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LoggerTransports = void 0;
-const winston = require("winston");
+const winston = __importStar(require("winston"));
 const formats_1 = require("./formats");
 const DailyRotateFile = require("winston-daily-rotate-file");
 const path = require("path");

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

@@ -0,0 +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>;
+    getOrganizedHistory: (username: string) => Promise<(import("../interfaces/vsc").VscTransfer | import("../interfaces/vsc").VscCall)[]>;
+    getAddressFromDid: (did: string) => string | undefined;
+};

package/lib/utils/vsc.utils.js

@@ -0,0 +1,141 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+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;
+    let iterations = 0;
+    let status = vsc_1.VscStatus.UNCONFIRMED;
+    while (iterations < MAX_ITERATIONS) {
+        status = yield checkStatus(id, type);
+        if (status === vsc_1.VscStatus.INCLUDED || status === vsc_1.VscStatus.CONFIRMED)
+            return status;
+        iterations++;
+        yield new Promise((resolve) => setTimeout(resolve, WAIT_TIME));
+    }
+    return status;
+});
+const checkStatus = (id, type) => {
+    let query;
+    if (type === vsc_1.VscHistoryType.CONTRACT_CALL) {
+        query = `{
+      findTransaction(
+        filterOptions: {byId:"${id}-0"}
+      ) {
+        txs {
+          status
+        }
+      }
+    }`;
+    }
+    else if (type === vsc_1.VscHistoryType.TRANSFER) {
+        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);
+    });
+};
+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
+      }
+    }
+    findTransaction(filterOptions: {byAccount: "${username}"}) {
+      txs {
+        status
+        id
+        anchored_height
+        data {
+          action
+          contract_id
+          op
+          payload
+        }
+        required_auths{value}
+      }
+  }}
+  `;
+    return (yield fetchQuery(query)).data;
+});
+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;
+        }),
+    ].sort((a, b) => {
+        return b.timestamp.getTime() - a.timestamp.getTime();
+    });
+    return organizedHistory;
+});
+const blockHeightToTimestamp = (height) => {
+    const START_BLOCK = 88079516;
+    const START_BLOCK_TIME = (0, moment_1.default)('2024-08-16T02:46:48Z');
+    return START_BLOCK_TIME.clone()
+        .add((height - START_BLOCK) * 3, 'seconds')
+        .toDate();
+};
+const getAddressFromDid = (did) => {
+    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 fetchQuery = (query) => {
+    return fetch(config_1.default.vsc.API_URL, {
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({
+            query,
+        }),
+    }).then((res) => res.json());
+};
+exports.VscUtils = {
+    checkStatus,
+    waitForStatus,
+    getOrganizedHistory,
+    getAddressFromDid,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hive-keychain-commons",
-  "version": "1.4.1",
+  "version": "1.4.3",
   "description": "Platform-agnostic functions used in Hive Keychain mobile and extensions",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -45,7 +45,7 @@
   },
   "dependencies": {
     "@hiveio/dhive": "^1.2.8",
-    "moment": "^2.29.4",
+    "moment": "^2.30.1",
     "winston": "^3.8.1",
     "winston-daily-rotate-file": "^4.7.1"
   }