@pioneer-platform/mayachain-client 0.0.30 → 0.0.32

package/lib/index.js

@@ -123,14 +123,14 @@ function quoteFromPool(sellAmount, assetPoolAmount, runePoolAmount, maxSlippage)
 }
 var get_quote = function (quote) {
     return __awaiter(this, void 0, void 0, function () {
-        var tag, output, pools, poolIn, poolOut, BaseDecimal_1, asset, DECIMALS, BASE_UNIT, sellAmountInBaseUnits, quoteFromNode, URL_1, amountOutMin, inboundAddress, amountOutEstimated, memoInput, memo, type, chain, tx, inbounds, inbound, tokenAddress, depositAbi, routerContract, quoteSellAmountInEther, numberHex, data, gasLimit, block, baseFeePerGas, gasPrice, maxPriorityFeePerGas, maxFeePerGas, feeData, nonce, e_1;
+        var tag, output, pools, poolIn, poolOut, BaseDecimal_1, asset, DECIMALS, BASE_UNIT, sellAmountInBaseUnits, quoteFromNode, URL_1, amountOutMin, inboundAddress, amountOutEstimated, memoInput, memo, type, chain, tx, inbounds, inbound, tokenAddress, depositAbi, routerContract, quoteSellAmountInEther, numberBN, numberHex, data, gasLimit, block, baseFeePerGas, gasPrice, maxPriorityFeePerGas, maxFeePerGas, feeData, e_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     tag = TAG + " | get_quote | ";
                     _a.label = 1;
                 case 1:
-                    _a.trys.push([1, 11, , 12]);
+                    _a.trys.push([1, 10, , 11]);
                     output = {};
                     if (!quote.sellAsset)
                         throw new Error("missing sellAsset");
@@ -226,7 +226,7 @@ var get_quote = function (quote) {
                         type = 'transfer';
                     }
                     tx = void 0;
-                    if (!(chain === "ETH")) return [3 /*break*/, 9];
+                    if (!(chain === "ETH")) return [3 /*break*/, 8];
                     type = 'EVM';
                     return [4 /*yield*/, nodeRequest('/inbound_addresses')];
                 case 4:
@@ -255,7 +255,8 @@ var get_quote = function (quote) {
                     routerContract = new web3.eth.Contract(depositAbi, inbound.router);
                     log.info("routerContract: ", routerContract);
                     quoteSellAmountInEther = web3.utils.toWei(quote.sellAmount, 'ether');
-                    numberHex = web3.utils.toBN(quoteSellAmountInEther);
+                    numberBN = web3.utils.toBN(quoteSellAmountInEther);
+                    numberHex = '0x' + numberBN.toString(16);
                     console.log("numberHex: ", numberHex);
                     data = routerContract.methods
                         .deposit(inbound.address, '0x0000000000000000000000000000000000000000', // 0 = ETH
@@ -286,10 +287,15 @@ var get_quote = function (quote) {
                         maxFeePerGas: maxFeePerGas // EIP-1559 calculation
                     };
                     console.log("feeData: ", feeData);
-                    return [4 /*yield*/, web3.eth.getTransactionCount(quote.senderAddress, 'latest')];
-                case 8:
-                    nonce = _a.sent();
-                    console.log("nonce: ", nonce);
+                    // Calculate a 20% buffer and add it to the gasLimit
+                    // const buffer = gasLimit.mul(20).div(100); // 20% buffer
+                    // gasLimit = gasLimit.add(buffer);
+                    // //if gas limit is < 21000 then set to 21000
+                    // if (gasLimit.lt(ethers.BigNumber.from('36000'))) {
+                    //     gasLimit = ethers.BigNumber.from('36000');
+                    // }
+                    // const nonce = await web3.eth.getTransactionCount(quote.senderAddress, 'latest'); // 'latest' can be replaced with the desired block number
+                    // console.log("nonce: ",nonce)
                     tx = {
                         type: type,
                         chain: ChainToNetworkId[quote.sellAsset.split(".")[0]],
@@ -297,15 +303,15 @@ var get_quote = function (quote) {
                             to: inbound.router,
                             from: quote.senderAddress,
                             data: data,
-                            value: quoteSellAmountInEther,
-                            "gasLimit": gasLimit,
+                            value: numberHex,
+                            "gasLimit": Web3.utils.toHex(gasLimit),
                             "maxPriorityFeePerGas": maxPriorityFeePerGas,
                             "maxFeePerGas": maxFeePerGas,
-                            "nonce": nonce
+                            "nonce": null
                         }
                     };
-                    return [3 /*break*/, 10];
-                case 9:
+                    return [3 /*break*/, 9];
+                case 8:
                     tx = {
                         type: type,
                         chain: ChainToNetworkId[quote.sellAsset.split(".")[0]],
@@ -317,17 +323,17 @@ var get_quote = function (quote) {
                             memo: quoteFromNode.memo || memo
                         }
                     };
-                    _a.label = 10;
-                case 10:
+                    _a.label = 9;
+                case 9:
                     output.txs = [
                         tx
                     ];
                     return [2 /*return*/, output];
-                case 11:
+                case 10:
                     e_1 = _a.sent();
                     console.error(tag, "e: ", e_1);
                     throw e_1;
-                case 12: return [2 /*return*/];
+                case 11: return [2 /*return*/];
             }
         });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pioneer-platform/mayachain-client",
-  "version": "0.0.30",
+  "version": "0.0.32",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {