@pioneer-platform/uniswap-client 0.0.6 → 0.0.8

package/lib/index.js

@@ -310,33 +310,63 @@ var isZero = function isZero(hexNumberString) {
     return hexNumberString === '0' || /^0x0*$/.test(hexNumberString);
 };
 var buildTx = function (_a) {
-    var trade = _a.trade, from = _a.from, chainId = _a.chainId;
+    var trade = _a.trade, from = _a.from, chainId = _a.chainId, provider = _a.provider;
     return __awaiter(this, void 0, void 0, function () {
-        var BIPS_BASE, slippageTolerance, _b, data, value, tx;
+        var BIPS_BASE, slippageTolerance, _b, data, value, nonce, gas, estimatedGas, e_2, gasPrice, adjustedGasPrice, tx, e_3;
         return __generator(this, function (_c) {
-            try {
-                BIPS_BASE = BigNumber.from(10000);
-                slippageTolerance = new sdk_core_1.Percent(BigNumber.from(200), BIPS_BASE);
-                _b = router_sdk_1.SwapRouter.swapCallParameters(trade, {
-                    slippageTolerance: slippageTolerance,
-                    // slippageTolerance: new Percent(JSBI.BigInt(200), BIPS_BASE),
-                    // deadlineOrPreviousBlockhash: options.deadline?.toString(),
-                    // inputTokenPermit: options.permit,
-                    // fee: options.feeOptions,
-                }), data = _b.calldata, value = _b.value;
-                tx = __assign({ from: from, to: (0, universal_router_sdk_1.UNIVERSAL_ROUTER_ADDRESS)(chainId), data: data }, (value && !isZero(value) ? { value: (0, v3_sdk_1.toHex)(value) } : {}));
-                return [2 /*return*/, tx];
-            }
-            catch (e) {
-                console.error(e);
+            switch (_c.label) {
+                case 0:
+                    _c.trys.push([0, 7, , 8]);
+                    BIPS_BASE = BigNumber.from(10000);
+                    slippageTolerance = new sdk_core_1.Percent(BigNumber.from(200), BIPS_BASE);
+                    _b = router_sdk_1.SwapRouter.swapCallParameters(trade, {
+                        slippageTolerance: slippageTolerance,
+                        // slippageTolerance: new Percent(JSBI.BigInt(200), BIPS_BASE),
+                        // deadlineOrPreviousBlockhash: options.deadline?.toString(),
+                        // inputTokenPermit: options.permit,
+                        // fee: options.feeOptions,
+                    }), data = _b.calldata, value = _b.value;
+                    return [4 /*yield*/, provider.getTransactionCount(from, "latest")];
+                case 1:
+                    nonce = _c.sent();
+                    gas = "0x".concat(BigInt("135120").toString(16));
+                    _c.label = 2;
+                case 2:
+                    _c.trys.push([2, 4, , 5]);
+                    return [4 /*yield*/, provider.estimateGas({
+                            from: from,
+                            to: (0, universal_router_sdk_1.UNIVERSAL_ROUTER_ADDRESS)(chainId), // Uniswap Router address
+                            data: data,
+                            value: ethers.utils.parseEther("0"), // Value for token swaps
+                        })];
+                case 3:
+                    estimatedGas = _c.sent();
+                    console.log("estimatedGas: ", estimatedGas);
+                    gas = "0x".concat(estimatedGas.toString(16));
+                    return [3 /*break*/, 5];
+                case 4:
+                    e_2 = _c.sent();
+                    //@TODO get custom gas limit defaults per chain
+                    gas = "0x".concat(BigInt("135120").toString(16));
+                    return [3 /*break*/, 5];
+                case 5: return [4 /*yield*/, provider.getGasPrice()];
+                case 6:
+                    gasPrice = _c.sent();
+                    adjustedGasPrice = gasPrice.mul(ethers.BigNumber.from(110)).div(ethers.BigNumber.from(100));
+                    tx = __assign(__assign({ from: from, to: (0, universal_router_sdk_1.UNIVERSAL_ROUTER_ADDRESS)(chainId), chainId: chainId, data: data }, (value && !isZero(value) ? { value: (0, v3_sdk_1.toHex)(value) } : {})), { gas: gas, gasPrice: (0, v3_sdk_1.toHex)(adjustedGasPrice), nonce: (0, v3_sdk_1.toHex)(nonce) });
+                    return [2 /*return*/, tx];
+                case 7:
+                    e_3 = _c.sent();
+                    console.error(e_3);
+                    return [3 /*break*/, 8];
+                case 8: return [2 /*return*/];
             }
-            return [2 /*return*/];
         });
     });
 };
 var get_quote = function (quote) {
     return __awaiter(this, void 0, void 0, function () {
-        var tag, output, slippageTolerance, recipient, inputChain, outputChain, providerUrl, provider, sellTokenContract, buyTokenContract, buyTokenAddress_1, balance, sellTokenAddress_1, permit2, router, planner, sellAmountBigNumber, path, permit2Address, currentAllowance, _a, sellTokenAddress, buyTokenAddress, sellTokenDecimals, _b, buyTokenDecimals, _c, amountInBigNumber, chainIdInt, sellToken, buyToken, route, trade, amountOut, tx, e_2;
+        var tag, output, slippageTolerance, recipient, inputChain, outputChain, providerUrl, provider, sellTokenContract, buyTokenContract, buyTokenAddress_1, balance, sellTokenAddress_1, permit2, router, planner, sellAmountBigNumber, path, permit2Address, currentAllowance, _a, sellTokenAddress, buyTokenAddress, sellTokenDecimals, _b, buyTokenDecimals, _c, amountInBigNumber, chainIdInt, sellToken, buyToken, route, trade, amountOut, tx, e_4;
         return __generator(this, function (_d) {
             switch (_d.label) {
                 case 0:
@@ -471,7 +501,7 @@ var get_quote = function (quote) {
                     amountOut = trade.swaps[0].outputAmount;
                     log.info(tag, "amountOut: ", amountOut);
                     output.amountOut = amountOut.toFixed(18);
-                    return [4 /*yield*/, buildTx({ trade: trade, from: quote.senderAddress, chainId: chainIdInt })];
+                    return [4 /*yield*/, buildTx({ trade: trade, from: quote.senderAddress, chainId: chainIdInt, provider: provider })];
                 case 13:
                     tx = _d.sent();
                     log.info(tag, "tx: ", tx);
@@ -482,12 +512,16 @@ var get_quote = function (quote) {
                     output.complete = true;
                     output.type = 'EVM';
                     output.id = uuid();
-                    output.txs = [tx];
+                    output.txs = [{
+                            type: "evm",
+                            chain: inputChain,
+                            txParams: tx
+                        }];
                     return [2 /*return*/, output];
                 case 14:
-                    e_2 = _d.sent();
-                    console.error(tag, "e: ", e_2);
-                    throw e_2;
+                    e_4 = _d.sent();
+                    console.error(tag, "e: ", e_4);
+                    throw e_4;
                 case 15: return [2 /*return*/];
             }
         });

package/package.json

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