@cityofzion/bs-ethereum 2.2.5 → 2.2.7

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/BSEthereumHelper.d.ts

@@ -2,6 +2,7 @@ import { Network, NetworkId } from '@cityofzion/blockchain-service';
 export type BSEthereumNetworkId = NetworkId<'1' | '10' | '25' | '56' | '137' | '250' | '1101' | '8453' | '80002' | '42161' | '42220' | '43114' | '59144' | '11155111' | '47763' | '12227332'>;
 export declare class BSEthereumHelper {
     #private;
+    static DEFAULT_DECIMALS: number;
     static DERIVATION_PATH: string;
     static DEFAULT_PATH: string;
     static NEOX_TESTNET_NETWORK_ID: BSEthereumNetworkId;

package/dist/BSEthereumHelper.js

@@ -29,6 +29,7 @@ class BSEthereumHelper {
 }
 exports.BSEthereumHelper = BSEthereumHelper;
 _a = BSEthereumHelper;
+BSEthereumHelper.DEFAULT_DECIMALS = 18;
 _BSEthereumHelper_NATIVE_ASSET = { value: {
         decimals: 18,
         hash: '-',

package/dist/BlockscoutNeoXBDSEthereum.d.ts

@@ -2,7 +2,6 @@ import { BalanceResponse, ContractResponse, Network, Token, TransactionResponse,
 import { RpcBDSEthereum } from './RpcBDSEthereum';
 import { BSEthereumNetworkId } from './BSEthereumHelper';
 export declare class BlockscoutNeoXBDSEthereum extends RpcBDSEthereum {
-    #private;
     static BASE_URL_BY_CHAIN_ID: Partial<Record<BSEthereumNetworkId, string>>;
     static isSupported(network: Network<BSEthereumNetworkId>): boolean;
     static getClient(network: Network<BSEthereumNetworkId>): import("axios").AxiosInstance;

package/dist/BlockscoutNeoXBDSEthereum.js

@@ -8,21 +8,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _BlockscoutNeoXBDSEthereum_instances, _BlockscoutNeoXBDSEthereum_parseTransfers;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BlockscoutNeoXBDSEthereum = void 0;
 const axios_1 = __importDefault(require("axios"));
 const RpcBDSEthereum_1 = require("./RpcBDSEthereum");
 const BSEthereumHelper_1 = require("./BSEthereumHelper");
 const ethers_1 = require("ethers");
+const ERC20_1 = require("./assets/abis/ERC20");
 class BlockscoutNeoXBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
     static isSupported(network) {
         return !!BlockscoutNeoXBDSEthereum.BASE_URL_BY_CHAIN_ID[network.id];
@@ -38,7 +33,6 @@ class BlockscoutNeoXBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
     }
     constructor(network) {
         super(network);
-        _BlockscoutNeoXBDSEthereum_instances.add(this);
         this.maxTimeToConfirmTransactionInMs = 1000 * 60 * 5;
     }
     getTransaction(txid) {
@@ -55,7 +49,48 @@ class BlockscoutNeoXBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
                 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);
+            const transfers = [];
+            const hasNativeTokenBeingTransferred = data.value !== '0';
+            if (hasNativeTokenBeingTransferred) {
+                transfers.push({
+                    amount: ethers_1.ethers.utils.formatUnits(data.value, nativeToken.decimals),
+                    from: data.from.hash,
+                    to: data.to.hash,
+                    type: 'token',
+                    contractHash: nativeToken.hash,
+                    token: nativeToken,
+                });
+            }
+            const hasTokenTransfers = data.token_transfers && data.token_transfers.length > 0;
+            if (hasTokenTransfers) {
+                for (const tokenTransfer of data.token_transfers) {
+                    if (tokenTransfer.token.type === 'ERC-20') {
+                        transfers.push({
+                            amount: ethers_1.ethers.utils.formatUnits(tokenTransfer.total.value, tokenTransfer.total.decimals),
+                            from: tokenTransfer.from.hash,
+                            to: tokenTransfer.to.hash,
+                            type: 'token',
+                            contractHash: tokenTransfer.token.address,
+                            token: {
+                                symbol: tokenTransfer.token.symbol,
+                                name: tokenTransfer.token.name,
+                                hash: tokenTransfer.token.address,
+                                decimals: Number(tokenTransfer.total.decimals),
+                            },
+                        });
+                        continue;
+                    }
+                    if (tokenTransfer.token.type === 'ERC-721') {
+                        transfers.push({
+                            tokenId: tokenTransfer.total.token_id,
+                            from: tokenTransfer.from.hash,
+                            to: tokenTransfer.to.hash,
+                            type: 'nft',
+                            contractHash: tokenTransfer.token.address,
+                        });
+                    }
+                }
+            }
             return {
                 block: data.block,
                 hash: data.hash,
@@ -85,8 +120,43 @@ class BlockscoutNeoXBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
             }
             const nativeToken = BSEthereumHelper_1.BSEthereumHelper.getNativeAsset(this._network);
             const transactions = [];
-            data.items.forEach(item => {
-                const transfers = __classPrivateFieldGet(this, _BlockscoutNeoXBDSEthereum_instances, "m", _BlockscoutNeoXBDSEthereum_parseTransfers).call(this, item, nativeToken);
+            const promises = data.items.map((item) => __awaiter(this, void 0, void 0, function* () {
+                const transfers = [];
+                const hasNativeTokenBeingTransferred = item.value !== '0';
+                if (hasNativeTokenBeingTransferred) {
+                    transfers.push({
+                        amount: ethers_1.ethers.utils.formatUnits(item.value, nativeToken.decimals),
+                        from: item.from.hash,
+                        to: item.to.hash,
+                        type: 'token',
+                        contractHash: nativeToken.hash,
+                        token: nativeToken,
+                    });
+                }
+                if (item.raw_input) {
+                    try {
+                        const ERC20Interface = new ethers_1.ethers.utils.Interface(ERC20_1.ERC20_ABI);
+                        const result = ERC20Interface.decodeFunctionData('transfer', item.raw_input);
+                        if (!result)
+                            throw new Error('Invalid ERC20 transfer');
+                        const contractHash = item.to.hash;
+                        const token = yield this.getTokenInfo(contractHash);
+                        const to = result[0];
+                        const value = result[1];
+                        transfers.push({
+                            amount: ethers_1.ethers.utils.formatUnits(value, token.decimals),
+                            from: item.from.hash,
+                            to,
+                            type: 'token',
+                            contractHash: item.to.hash,
+                            token,
+                        });
+                    }
+                    catch (error) {
+                        console.log(error);
+                        /* empty */
+                    }
+                }
                 transactions.push({
                     block: item.block,
                     hash: item.hash,
@@ -95,7 +165,8 @@ class BlockscoutNeoXBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
                     notifications: [],
                     transfers,
                 });
-            });
+            }));
+            yield Promise.allSettled(promises);
             return {
                 transactions,
                 nextPageParams: data.next_page_params,
@@ -161,8 +232,11 @@ class BlockscoutNeoXBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
             if (!data || 'message' in data) {
                 throw new Error('Token not found');
             }
+            if (data.type !== 'ERC-20') {
+                throw new Error('Token is not an ERC-20 token');
+            }
             return {
-                decimals: parseInt(data.decimals),
+                decimals: data.decimals ? parseInt(data.decimals) : BSEthereumHelper_1.BSEthereumHelper.DEFAULT_DECIMALS,
                 hash: tokenHash,
                 name: data.name,
                 symbol: data.symbol,
@@ -182,10 +256,11 @@ class BlockscoutNeoXBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
             if (!nativeBalance || 'message' in nativeBalance) {
                 throw new Error('Native balance not found');
             }
+            const nativeToken = BSEthereumHelper_1.BSEthereumHelper.getNativeAsset(this._network);
             const balances = [
                 {
-                    amount: ethers_1.ethers.utils.formatUnits(nativeBalance.coin_balance, 18),
-                    token: BSEthereumHelper_1.BSEthereumHelper.getNativeAsset(this._network),
+                    amount: ethers_1.ethers.utils.formatUnits(nativeBalance.coin_balance, nativeToken.decimals),
+                    token: nativeToken,
                 },
             ];
             const { data: erc20Balances } = yield client.get(`/addresses/${address}/token-balances`);
@@ -193,16 +268,24 @@ class BlockscoutNeoXBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
                 throw new Error('ERC20 balance not found');
             }
             erc20Balances.forEach(balance => {
-                const token = {
-                    decimals: parseInt(balance.token.decimals),
-                    hash: balance.token.address,
-                    name: balance.token.symbol,
-                    symbol: balance.token.symbol,
-                };
-                balances.push({
-                    amount: ethers_1.ethers.utils.formatUnits(balance.value, token.decimals),
-                    token,
-                });
+                try {
+                    if (balance.token.type !== 'ERC-20') {
+                        return;
+                    }
+                    const token = {
+                        decimals: balance.token.decimals ? parseInt(balance.token.decimals) : BSEthereumHelper_1.BSEthereumHelper.DEFAULT_DECIMALS,
+                        hash: balance.token.address,
+                        name: balance.token.symbol,
+                        symbol: balance.token.symbol,
+                    };
+                    balances.push({
+                        amount: ethers_1.ethers.utils.formatUnits(balance.value, token.decimals),
+                        token,
+                    });
+                }
+                catch (_a) {
+                    /* empty */
+                }
             });
             return balances;
         });
@@ -225,51 +308,6 @@ class BlockscoutNeoXBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
     }
 }
 exports.BlockscoutNeoXBDSEthereum = BlockscoutNeoXBDSEthereum;
-_BlockscoutNeoXBDSEthereum_instances = new WeakSet(), _BlockscoutNeoXBDSEthereum_parseTransfers = function _BlockscoutNeoXBDSEthereum_parseTransfers(item, nativeToken) {
-    const transfers = [];
-    const hasNativeTokenBeingTransferred = item.value !== '0';
-    if (hasNativeTokenBeingTransferred) {
-        transfers.push({
-            amount: ethers_1.ethers.utils.formatUnits(item.value, nativeToken.decimals),
-            from: item.from.hash,
-            to: item.to.hash,
-            type: 'token',
-            contractHash: nativeToken.hash,
-            token: nativeToken,
-        });
-    }
-    const hasTokenTransfers = item.token_transfers && item.token_transfers.length > 0;
-    if (hasTokenTransfers) {
-        for (const tokenTransfer of item.token_transfers) {
-            if (tokenTransfer.token.type === 'ERC-20') {
-                transfers.push({
-                    amount: ethers_1.ethers.utils.formatUnits(tokenTransfer.total.value, tokenTransfer.total.decimals),
-                    from: tokenTransfer.from.hash,
-                    to: tokenTransfer.to.hash,
-                    type: 'token',
-                    contractHash: tokenTransfer.token.address,
-                    token: {
-                        symbol: tokenTransfer.token.symbol,
-                        name: tokenTransfer.token.name,
-                        hash: tokenTransfer.token.address,
-                        decimals: Number(tokenTransfer.total.decimals),
-                    },
-                });
-                continue;
-            }
-            if (tokenTransfer.token.type === 'ERC-721') {
-                transfers.push({
-                    tokenId: tokenTransfer.total.token_id,
-                    from: tokenTransfer.from.hash,
-                    to: tokenTransfer.to.hash,
-                    type: 'nft',
-                    contractHash: tokenTransfer.token.address,
-                });
-            }
-        }
-    }
-    return transfers;
-};
 BlockscoutNeoXBDSEthereum.BASE_URL_BY_CHAIN_ID = {
     '12227332': 'https://dora-stage.coz.io/api/neox/testnet',
     '47763': 'https://dora.coz.io/api/neox/mainnet',

package/package.json

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