@transak/hedera-transak 1.0.5 → 1.0.7

package/lib/config.js

@@ -5,12 +5,14 @@ exports.networks = {
     main: {
         transactionLink: hash => `https://hederaexplorer.io/search-details/transaction/${hash}`,
         walletLink: address => `https://hederaexplorer.io/search-details/account/${address}`,
+        mirrorNodeUrl: 'https://mainnet-public.mirrornode.hedera.com/api/v1/transactions/',
         networkName: 'mainnet',
     },
     testnet: {
         transactionLink: hash => `https://testnet.hederaexplorer.io/search-details/transaction/${hash}`,
         walletLink: address => `https://testnet.hederaexplorer.io/search-details/account/${address}`,
         networkName: 'testnet',
+        mirrorNodeUrl: 'https://testnet.mirrornode.hedera.com/api/v1/transactions/',
     },
 };
 module.exports = { networks: exports.networks };

package/lib/index.d.ts

@@ -4,7 +4,8 @@ import { GetTransactionResult, SendTransactionResult, SendTransactionParams } fr
  * @param network
  * @param privateKey
  * @param accountId
- * @param tokenId // tokenId
+ * @param userAccountId  // user account id
+ * @param tokenId
  * @returns
  */
 declare function isTokenAssociated(network: string, privateKey: string, accountId: string, userAccountId: string, tokenId: string): Promise<boolean>;
@@ -20,9 +21,10 @@ declare function isTokenAssociated(network: string, privateKey: string, accountI
 declare function getBalance(network: string, decimals: number, privateKey: string, accountId: string, tokenId?: string): Promise<number>;
 /**
  * Get the transaction details by transaction id
- * @param txId
+ * @param txnId
  * @param network
- * @param decimals
+ * @param privateKey
+ * @param accountId
  * @returns
  */
 declare function getTransaction(txnId: string, network: string, privateKey: string, accountId: string): Promise<GetTransactionResult | null>;

package/lib/index.js

@@ -8,6 +8,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+const axios_1 = __importDefault(require("axios"));
 const config_1 = require("./config");
 const utils_1 = require("./utils");
 const sdk_1 = require("@hashgraph/sdk");
@@ -61,7 +65,8 @@ function getClient(network, privateKey, accountId) {
  * @param network
  * @param privateKey
  * @param accountId
- * @param tokenId // tokenId
+ * @param userAccountId  // user account id
+ * @param tokenId
  * @returns
  */
 function isTokenAssociated(network, privateKey, accountId, userAccountId, tokenId) {
@@ -101,42 +106,49 @@ function getBalance(network, decimals, privateKey, accountId, tokenId) {
 }
 /**
  * Get the transaction details by transaction id
- * @param txId
+ * @param txnId
  * @param network
- * @param decimals
+ * @param privateKey
+ * @param accountId
  * @returns
  */
 function getTransaction(txnId, network, privateKey, accountId) {
-    var _a, _b, _c;
     return __awaiter(this, void 0, void 0, function* () {
-        const client = yield getClient(network, privateKey, accountId);
-        const TransactionRecord = yield new sdk_1.TransactionRecordQuery()
-            .setTransactionId(txnId)
-            .setIncludeDuplicates(true)
-            .execute(client);
-        const from = (_a = TransactionRecord.transactionId.accountId) === null || _a === void 0 ? void 0 : _a.toString();
-        return {
-            transactionData: TransactionRecord,
-            receipt: {
-                amount: Math.abs(((_b = TransactionRecord.transfers
-                    .find(d => d.accountId.toString() === from)) === null || _b === void 0 ? void 0 : _b.amount.toTinybars().toNumber()) || 0),
-                date: TransactionRecord.consensusTimestamp.toDate(),
-                from: from || '',
-                gasCostCryptoCurrency: 'HBAR',
-                gasCostInCrypto: TransactionRecord.transactionFee.toBigNumber().toNumber(),
-                gasLimit: 1,
-                isPending: false,
-                isExecuted: true,
-                isSuccessful: TransactionRecord.receipt.status.toString() === 'SUCCESS',
-                isFailed: TransactionRecord.receipt.status.toString() !== 'SUCCESS',
-                isInvalid: TransactionRecord.receipt.status.toString() !== 'SUCCESS',
-                network,
-                nonce: ((_c = TransactionRecord.transactionId.nonce) === null || _c === void 0 ? void 0 : _c.toNumber()) || 0,
-                transactionHash: TransactionRecord.transactionHash.toString(),
-                transactionId: TransactionRecord.transactionId.toString(),
-                transactionLink: getTransactionLink(TransactionRecord.transactionId.toString(), network),
-            },
-        };
+        try {
+            const { mirrorNodeUrl } = getNetwork(network);
+            if (txnId.includes('@')) {
+                txnId = (0, utils_1._getTransactionNumber)(txnId);
+            }
+            const response = yield (0, axios_1.default)({
+                method: 'get',
+                url: mirrorNodeUrl + txnId,
+                headers: {
+                    accept: 'application/json',
+                },
+            });
+            const transactionData = response.data.transactions[0];
+            return {
+                transactionData,
+                receipt: {
+                    date: transactionData.consensus_timestamp,
+                    gasCostCryptoCurrency: 'HBAR',
+                    gasCostInCrypto: +(0, utils_1._toDecimal)(transactionData.charged_tx_fee.toString(), 8),
+                    gasLimit: +(0, utils_1._toDecimal)(transactionData.max_fee.toString(), 8),
+                    isPending: false,
+                    isExecuted: true,
+                    isSuccessful: transactionData.result === 'SUCCESS',
+                    isFailed: transactionData.result !== 'SUCCESS',
+                    isInvalid: transactionData.result !== 'SUCCESS',
+                    network,
+                    nonce: transactionData.nonce || 0,
+                    transactionHash: transactionData.transaction_id,
+                    transactionLink: getTransactionLink(txnId, network),
+                },
+            };
+        }
+        catch (error) {
+            return null;
+        }
     });
 }
 /**
@@ -179,9 +191,8 @@ function sendTransaction({ to, amount, network, accountId, privateKey, decimals,
                 network,
                 nonce: ((_b = sendTransactionResponse.transactionId.nonce) === null || _b === void 0 ? void 0 : _b.toNumber()) || 0,
                 to,
-                transactionHash: sendTransactionResponse.transactionHash,
-                transactionId: sendTransactionResponse.transactionId.toString(),
-                transactionLink: getTransactionLink(sendTransactionResponse.transactionId.toString(), network),
+                transactionHash: (0, utils_1._getTransactionNumber)(sendTransactionResponse.transactionId.toString()),
+                transactionLink: getTransactionLink((0, utils_1._getTransactionNumber)(sendTransactionResponse.transactionId.toString()), network),
             },
         };
     });

package/lib/types.d.ts

@@ -3,13 +3,12 @@ export declare type Network = {
     networkName: string;
     transactionLink: (arg0: string) => string;
     walletLink: (arg0: string) => string;
+    mirrorNodeUrl: string;
 };
 export declare type GetTransactionResult = {
     transactionData: TransactionRecord;
     receipt: {
-        amount: number;
         date: Date | null;
-        from: string;
         gasCostCryptoCurrency: string;
         gasCostInCrypto: number;
         gasLimit: number;
@@ -21,7 +20,6 @@ export declare type GetTransactionResult = {
         network: string;
         nonce: number;
         transactionHash: string;
-        transactionId: string;
         transactionLink: string;
     };
 };
@@ -44,9 +42,8 @@ export declare type SendTransactionResult = {
         network: string;
         nonce: number;
         to: string;
-        transactionHash: Uint8Array;
+        transactionHash: string;
         transactionLink: string;
-        transactionId: string;
         transactionReceipt: TransactionReceipt;
     };
 };

package/lib/utils.d.ts

@@ -1,4 +1,4 @@
 import { BigNumber } from '@hashgraph/hethers';
 export declare const _toDecimal: (amount: string, decimals: number) => string;
 export declare const _toCrypto: (amount: string, decimals: number) => BigNumber;
-export declare const _getAccountNumber: (txnId: string) => string;
+export declare const _getTransactionNumber: (txnId: string) => string;

package/lib/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._getAccountNumber = exports._toCrypto = exports._toDecimal = void 0;
+exports._getTransactionNumber = exports._toCrypto = exports._toDecimal = void 0;
 const hethers_1 = require("@hashgraph/hethers");
 // converts any units to Hbars
 const _toDecimal = (amount, decimals) => {
@@ -11,8 +11,9 @@ exports._toDecimal = _toDecimal;
 // converts Hbar to tinybar
 const _toCrypto = (amount, decimals) => hethers_1.hethers.utils.parseUnits(amount, decimals);
 exports._toCrypto = _toCrypto;
-const _getAccountNumber = (txnId) => {
+const _getTransactionNumber = (txnId) => {
     const [accountId, rest] = txnId.split('@');
-    return accountId;
+    const [realm, timestamp] = rest.split('.');
+    return [accountId, realm, timestamp].join('-');
 };
-exports._getAccountNumber = _getAccountNumber;
+exports._getTransactionNumber = _getTransactionNumber;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@transak/hedera-transak",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -32,6 +32,7 @@
     "@ethersproject/wordlists": "^5.7.0",
     "@hashgraph/hethers": "^1.2.1",
     "@hashgraph/sdk": "^2.18.1",
+    "axios": "^0.27.2",
     "dotenv": "10.0.0"
   },
   "devDependencies": {