@cityofzion/bs-ethereum 2.2.7 → 2.2.9

package/dist/BSEthereum.js

@@ -36,7 +36,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _BSEthereum_instances, _BSEthereum_setTokens;
+var _BSEthereum_instances, _BSEthereum_buildTransferParams, _BSEthereum_setTokens;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BSEthereum = void 0;
 const ethers_1 = require("ethers");
@@ -139,76 +139,23 @@ class BSEthereum {
         });
     }
     transfer(param) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const provider = new ethers_1.ethers.providers.JsonRpcProvider(this.network.url);
-            let ledgerTransport;
-            if (param.isLedger) {
-                if (!this.ledgerService.getLedgerTransport)
-                    throw new Error('You must provide getLedgerTransport function to use Ledger');
-                ledgerTransport = yield this.ledgerService.getLedgerTransport(param.senderAccount);
-            }
-            let signer;
-            if (ledgerTransport) {
-                signer = this.ledgerService.getSigner(ledgerTransport, provider);
-            }
-            else {
-                signer = new ethers_1.ethers.Wallet(param.senderAccount.key, provider);
+            const { signer, transactionParams, gasPrice } = yield __classPrivateFieldGet(this, _BSEthereum_instances, "m", _BSEthereum_buildTransferParams).call(this, param);
+            let gasLimit;
+            try {
+                gasLimit = yield signer.estimateGas(transactionParams);
             }
-            const decimals = (_a = param.intent.tokenDecimals) !== null && _a !== void 0 ? _a : 18;
-            const amount = ethersBigNumber.parseFixed(param.intent.amount, decimals);
-            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) {
-                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)',
-                ]);
-                const populatedTransaction = yield contract.populateTransaction.transfer(param.intent.receiverAddress, amount);
-                transactionParams = Object.assign(Object.assign({}, populatedTransaction), transactionParams);
+            catch (_a) {
+                gasLimit = BSEthereumHelper_1.BSEthereumHelper.DEFAULT_GAS_LIMIT;
             }
-            const transaction = yield signer.sendTransaction(transactionParams);
+            const transaction = yield signer.sendTransaction(Object.assign(Object.assign({}, transactionParams), { gasLimit, maxPriorityFeePerGas: gasPrice, maxFeePerGas: gasPrice }));
             return transaction.hash;
         });
     }
     calculateTransferFee(param) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const provider = new ethers_1.ethers.providers.JsonRpcProvider(this.network.url);
-            let ledgerTransport;
-            if (param.isLedger) {
-                if (!this.ledgerService.getLedgerTransport)
-                    throw new Error('You must provide getLedgerTransport function to use Ledger');
-                ledgerTransport = yield this.ledgerService.getLedgerTransport(param.senderAccount);
-            }
-            let signer;
-            if (ledgerTransport) {
-                signer = this.ledgerService.getSigner(ledgerTransport, provider);
-            }
-            else {
-                signer = new ethers_1.ethers.Wallet(param.senderAccount.key, provider);
-            }
-            const gasPrice = yield provider.getGasPrice();
-            let estimated;
-            const isNative = BSEthereumHelper_1.BSEthereumHelper.normalizeHash(this.feeToken.hash) === BSEthereumHelper_1.BSEthereumHelper.normalizeHash(param.intent.tokenHash);
-            const decimals = (_a = param.intent.tokenDecimals) !== null && _a !== void 0 ? _a : 18;
-            const amount = ethersBigNumber.parseFixed(param.intent.amount, decimals);
-            if (!isNative) {
-                const contract = new ethers_1.ethers.Contract(param.intent.tokenHash, ['function transfer(address to, uint amount) returns (bool)'], signer);
-                estimated = yield contract.estimateGas.transfer(param.intent.receiverAddress, amount);
-            }
-            else {
-                estimated = yield signer.estimateGas({
-                    to: param.intent.receiverAddress,
-                    value: amount,
-                });
-            }
+            const { signer, transactionParams, gasPrice } = yield __classPrivateFieldGet(this, _BSEthereum_instances, "m", _BSEthereum_buildTransferParams).call(this, param);
+            const estimated = yield signer.estimateGas(transactionParams);
             return ethers_1.ethers.utils.formatEther(gasPrice.mul(estimated));
         });
     }
@@ -223,7 +170,48 @@ class BSEthereum {
     }
 }
 exports.BSEthereum = BSEthereum;
-_BSEthereum_instances = new WeakSet(), _BSEthereum_setTokens = function _BSEthereum_setTokens(network) {
+_BSEthereum_instances = new WeakSet(), _BSEthereum_buildTransferParams = function _BSEthereum_buildTransferParams(param) {
+    var _a;
+    return __awaiter(this, void 0, void 0, function* () {
+        const provider = new ethers_1.ethers.providers.JsonRpcProvider(this.network.url);
+        let ledgerTransport;
+        if (param.isLedger) {
+            if (!this.ledgerService.getLedgerTransport)
+                throw new Error('You must provide getLedgerTransport function to use Ledger');
+            ledgerTransport = yield this.ledgerService.getLedgerTransport(param.senderAccount);
+        }
+        let signer;
+        if (ledgerTransport) {
+            signer = this.ledgerService.getSigner(ledgerTransport, provider);
+        }
+        else {
+            signer = new ethers_1.ethers.Wallet(param.senderAccount.key, provider);
+        }
+        const decimals = (_a = param.intent.tokenDecimals) !== null && _a !== void 0 ? _a : 18;
+        const amount = ethersBigNumber.parseFixed(param.intent.amount, decimals);
+        const gasPrice = yield provider.getGasPrice();
+        let transactionParams = {
+            type: 2,
+        };
+        const isNative = BSEthereumHelper_1.BSEthereumHelper.normalizeHash(this.feeToken.hash) === BSEthereumHelper_1.BSEthereumHelper.normalizeHash(param.intent.tokenHash);
+        if (isNative) {
+            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)',
+            ]);
+            const populatedTransaction = yield contract.populateTransaction.transfer(param.intent.receiverAddress, amount);
+            transactionParams = Object.assign(Object.assign({}, populatedTransaction), transactionParams);
+        }
+        return {
+            transactionParams,
+            signer,
+            gasPrice,
+        };
+    });
+}, _BSEthereum_setTokens = function _BSEthereum_setTokens(network) {
     const nativeAsset = BSEthereumHelper_1.BSEthereumHelper.getNativeAsset(network);
     this.tokens = [nativeAsset];
     this.feeToken = nativeAsset;

package/dist/BSEthereumHelper.d.ts

@@ -3,6 +3,7 @@ export type BSEthereumNetworkId = NetworkId<'1' | '10' | '25' | '56' | '137' | '
 export declare class BSEthereumHelper {
     #private;
     static DEFAULT_DECIMALS: number;
+    static DEFAULT_GAS_LIMIT: number;
     static DERIVATION_PATH: string;
     static DEFAULT_PATH: string;
     static NEOX_TESTNET_NETWORK_ID: BSEthereumNetworkId;

package/dist/BSEthereumHelper.js

@@ -30,6 +30,7 @@ class BSEthereumHelper {
 exports.BSEthereumHelper = BSEthereumHelper;
 _a = BSEthereumHelper;
 BSEthereumHelper.DEFAULT_DECIMALS = 18;
+BSEthereumHelper.DEFAULT_GAS_LIMIT = 0x5208;
 _BSEthereumHelper_NATIVE_ASSET = { value: {
         decimals: 18,
         hash: '-',

package/dist/BlockscoutNeoXBDSEthereum.js

@@ -153,7 +153,6 @@ class BlockscoutNeoXBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
                         });
                     }
                     catch (error) {
-                        console.log(error);
                         /* empty */
                     }
                 }

package/package.json

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