@cityofzion/bs-ethereum 2.2.4 → 2.2.6

package/dist/BSEthereum.js

@@ -157,21 +157,21 @@ class BSEthereum {
             }
             const decimals = (_a = param.intent.tokenDecimals) !== null && _a !== void 0 ? _a : 18;
             const amount = ethersBigNumber.parseFixed(param.intent.amount, decimals);
-            let transactionParams;
+            const gasPrice = yield provider.getGasPrice();
+            let transactionParams = {
+                gasPrice,
+            };
             const isNative = BSEthereumHelper_1.BSEthereumHelper.normalizeHash(this.feeToken.hash) === BSEthereumHelper_1.BSEthereumHelper.normalizeHash(param.intent.tokenHash);
             if (isNative) {
-                const gasPrice = yield provider.getGasPrice();
-                transactionParams = {
-                    to: param.intent.receiverAddress,
-                    value: amount,
-                    gasPrice,
-                };
+                transactionParams.to = param.intent.receiverAddress;
+                transactionParams.value = amount;
             }
             else {
                 const contract = new ethers_1.ethers.Contract(param.intent.tokenHash, [
                     'function transfer(address to, uint amount) returns (bool)',
                 ]);
-                transactionParams = yield contract.populateTransaction.transfer(param.intent.receiverAddress, amount);
+                const populatedTransaction = yield contract.populateTransaction.transfer(param.intent.receiverAddress, amount);
+                transactionParams = Object.assign(Object.assign({}, populatedTransaction), transactionParams);
             }
             const transaction = yield signer.sendTransaction(transactionParams);
             return transaction.hash;

package/dist/BlockscoutNeoXBDSEthereum.js

@@ -51,6 +51,9 @@ class BlockscoutNeoXBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
             }
             const client = BlockscoutNeoXBDSEthereum.getClient(this._network);
             const { data } = yield client.get(`/transactions/${txid}`);
+            if (!data || 'message' in data) {
+                throw new Error('Transaction not found');
+            }
             const nativeToken = BSEthereumHelper_1.BSEthereumHelper.getNativeAsset(this._network);
             const transfers = __classPrivateFieldGet(this, _BlockscoutNeoXBDSEthereum_instances, "m", _BlockscoutNeoXBDSEthereum_parseTransfers).call(this, data, nativeToken);
             return {
@@ -77,6 +80,9 @@ class BlockscoutNeoXBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
                     next_page_params: params.nextPageParams,
                 },
             });
+            if (!data || 'message' in data) {
+                throw new Error('Transactions not found');
+            }
             const nativeToken = BSEthereumHelper_1.BSEthereumHelper.getNativeAsset(this._network);
             const transactions = [];
             data.items.forEach(item => {
@@ -107,6 +113,9 @@ class BlockscoutNeoXBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
             try {
                 const client = BlockscoutNeoXBDSEthereum.getClient(this._network);
                 const { data } = yield client.get(`/smart-contracts/${contractHash}`);
+                if (!data || 'message' in data) {
+                    throw new Error('Contract not found');
+                }
                 const methods = [];
                 data.abi.forEach(abi => {
                     var _a, _b;
@@ -149,6 +158,9 @@ class BlockscoutNeoXBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
             }
             const client = BlockscoutNeoXBDSEthereum.getClient(this._network);
             const { data } = yield client.get(`/tokens/${tokenHash}`);
+            if (!data || 'message' in data) {
+                throw new Error('Token not found');
+            }
             return {
                 decimals: parseInt(data.decimals),
                 hash: tokenHash,
@@ -167,6 +179,9 @@ class BlockscoutNeoXBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
             }
             const client = BlockscoutNeoXBDSEthereum.getClient(this._network);
             const { data: nativeBalance } = yield client.get(`/addresses/${address}`);
+            if (!nativeBalance || 'message' in nativeBalance) {
+                throw new Error('Native balance not found');
+            }
             const balances = [
                 {
                     amount: ethers_1.ethers.utils.formatUnits(nativeBalance.coin_balance, 18),
@@ -174,6 +189,9 @@ class BlockscoutNeoXBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
                 },
             ];
             const { data: erc20Balances } = yield client.get(`/addresses/${address}/token-balances`);
+            if (!erc20Balances || 'message' in erc20Balances) {
+                throw new Error('ERC20 balance not found');
+            }
             erc20Balances.forEach(balance => {
                 const token = {
                     decimals: parseInt(balance.token.decimals),
@@ -199,6 +217,9 @@ class BlockscoutNeoXBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
             }
             const client = BlockscoutNeoXBDSEthereum.getClient(this._network);
             const { data } = yield client.get('/blocks');
+            if (!data || 'message' in data) {
+                throw new Error('Block not found');
+            }
             return data.items[0].height;
         });
     }
@@ -231,7 +252,7 @@ _BlockscoutNeoXBDSEthereum_instances = new WeakSet(), _BlockscoutNeoXBDSEthereum
                         symbol: tokenTransfer.token.symbol,
                         name: tokenTransfer.token.name,
                         hash: tokenTransfer.token.address,
-                        decimals: tokenTransfer.total.decimals,
+                        decimals: Number(tokenTransfer.total.decimals),
                     },
                 });
                 continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-ethereum",
-  "version": "2.2.4",
+  "version": "2.2.6",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "https://github.com/CityOfZion/blockchain-services",