@pioneer-platform/uniswap-client 0.0.14 → 0.0.17

package/lib/index.js

@@ -320,17 +320,38 @@ function getDefaultTransactionTtl(chainId) {
     return constants_1.DEFAULT_DEADLINE_FROM_NOW / 60;
 }
 exports.getDefaultTransactionTtl = getDefaultTransactionTtl;
+var getDeadline = function (provider) { return __awaiter(void 0, void 0, void 0, function () {
+    var block, deadline, error_1;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                _a.trys.push([0, 2, , 3]);
+                return [4 /*yield*/, provider.getBlock('latest')];
+            case 1:
+                block = _a.sent();
+                deadline = block.timestamp + 60 * 60;
+                console.log("Current Block Timestamp: ".concat(block.timestamp));
+                console.log("Deadline (60 minutes later): ".concat(deadline));
+                return [2 /*return*/, deadline];
+            case 2:
+                error_1 = _a.sent();
+                console.error('Error fetching block or calculating deadline:', error_1);
+                return [2 /*return*/, null];
+            case 3: return [2 /*return*/];
+        }
+    });
+}); };
 var buildTx = function (_a) {
     var trade = _a.trade, from = _a.from, chainId = _a.chainId, provider = _a.provider;
     return __awaiter(this, void 0, void 0, function () {
-        var tag, BIPS_BASE, slippageTolerance, responseRouter, data, value, nonce, gas, estimatedGas, e_2, gasPrice, adjustedGasPrice, tx, e_3;
+        var tag, BIPS_BASE, slippageTolerance, deadline, responseRouter, data, value, nonce, gas, estimatedGas, e_2, gasPrice, adjustedGasPrice, tx, e_3;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
                     tag = TAG + " | buildTx | ";
                     _b.label = 1;
                 case 1:
-                    _b.trys.push([1, 8, , 9]);
+                    _b.trys.push([1, 9, , 10]);
                     BIPS_BASE = BigNumber.from(10000);
                     slippageTolerance = new sdk_core_1.Percent(BigNumber.from(200), BIPS_BASE);
                     log.info(tag, "slippageTolerance: ", slippageTolerance);
@@ -338,10 +359,14 @@ var buildTx = function (_a) {
                     log.info(tag, "trade: ", trade.tradeType);
                     log.info(tag, "swaps: ", trade.swaps[0]);
                     log.info(tag, "routes: ", trade.routes[0]);
+                    return [4 /*yield*/, getDeadline(provider)];
+                case 2:
+                    deadline = _b.sent();
+                    log.info(tag, "deadline: ", deadline);
                     responseRouter = universal_router_sdk_1.SwapRouter.swapERC20CallParameters(trade, {
                         recipient: from,
                         slippageTolerance: slippageTolerance,
-                        // deadlineOrPreviousBlockhash: getDefaultTransactionTtl(chainId),
+                        deadlineOrPreviousBlockhash: deadline,
                         // inputTokenPermit: options.permit,
                         // fee: options.feeOptions,
                     });
@@ -349,6 +374,62 @@ var buildTx = function (_a) {
                     data = responseRouter.calldata;
                     value = responseRouter.value;
                     return [4 /*yield*/, provider.getTransactionCount(from, "latest")];
+                case 3:
+                    nonce = _b.sent();
+                    gas = "0x".concat(BigInt("135120").toString(16));
+                    _b.label = 4;
+                case 4:
+                    _b.trys.push([4, 6, , 7]);
+                    return [4 /*yield*/, provider.estimateGas({
+                            from: from,
+                            to: EIP155_MAINNET_CHAINS['eip155:' + chainId].universalRouter, // Uniswap Router address
+                            data: data,
+                            value: ethers.utils.parseEther("0"), // Value for token swaps
+                        })];
+                case 5:
+                    estimatedGas = _b.sent();
+                    console.log("estimatedGas: ", estimatedGas);
+                    gas = "0x".concat(estimatedGas.toString(16));
+                    return [3 /*break*/, 7];
+                case 6:
+                    e_2 = _b.sent();
+                    console.error("Error in estimateGas: ", e_2);
+                    //@TODO get custom gas limit defaults per chain
+                    gas = "0x".concat(BigInt("135120").toString(16));
+                    return [3 /*break*/, 7];
+                case 7: return [4 /*yield*/, provider.getGasPrice()];
+                case 8:
+                    gasPrice = _b.sent();
+                    adjustedGasPrice = gasPrice.mul(ethers.BigNumber.from(110)).div(ethers.BigNumber.from(100));
+                    tx = __assign(__assign({ from: from, to: EIP155_MAINNET_CHAINS['eip155:' + chainId].universalRouter, 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 9:
+                    e_3 = _b.sent();
+                    console.error(e_3);
+                    return [3 /*break*/, 10];
+                case 10: return [2 /*return*/];
+            }
+        });
+    });
+};
+var buildApprovalTx = function (_a) {
+    var from = _a.from, contract = _a.contract, address = _a.address, chainId = _a.chainId, provider = _a.provider;
+    return __awaiter(this, void 0, void 0, function () {
+        var tag, data, value, nonce, gas, estimatedGas, e_4, gasPrice, adjustedGasPrice, tx, e_5;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    tag = TAG + " | buildTx | ";
+                    _b.label = 1;
+                case 1:
+                    _b.trys.push([1, 8, , 9]);
+                    //
+                    // let result = await contract.approve(contract.address, address, ethers.constants.MaxUint256)
+                    console.log(tag, "from: ", from);
+                    data = contract.interface.encodeFunctionData("approve", [address, ethers.constants.MaxUint256]);
+                    console.log(tag, "data: ", data);
+                    value = '0x';
+                    return [4 /*yield*/, provider.getTransactionCount(from, "latest")];
                 case 2:
                     nonce = _b.sent();
                     gas = "0x".concat(BigInt("135120").toString(16));
@@ -367,8 +448,8 @@ var buildTx = function (_a) {
                     gas = "0x".concat(estimatedGas.toString(16));
                     return [3 /*break*/, 6];
                 case 5:
-                    e_2 = _b.sent();
-                    console.error("Error in estimateGas: ", e_2);
+                    e_4 = _b.sent();
+                    console.error("Error in estimateGas: ", e_4);
                     //@TODO get custom gas limit defaults per chain
                     gas = "0x".concat(BigInt("135120").toString(16));
                     return [3 /*break*/, 6];
@@ -379,8 +460,8 @@ var buildTx = function (_a) {
                     tx = __assign(__assign({ from: from, to: EIP155_MAINNET_CHAINS['eip155:' + chainId].universalRouter, 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 8:
-                    e_3 = _b.sent();
-                    console.error(e_3);
+                    e_5 = _b.sent();
+                    console.error(e_5);
                     return [3 /*break*/, 9];
                 case 9: return [2 /*return*/];
             }
@@ -389,14 +470,14 @@ var buildTx = function (_a) {
 };
 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_4;
+        var tag, output, slippageTolerance, recipient, inputChain, outputChain, providerUrl, chainIdInt, provider, sellTokenContract, buyTokenContract, buyTokenAddress_1, balance, sellTokenAddress_1, permit2, router, planner, sellAmountBigNumber, path, permit2Address, currentAllowance, allowanceTx, formattedAllowanceTx, _a, sellTokenAddress, buyTokenAddress, sellTokenDecimals, _b, buyTokenDecimals, _c, amountInBigNumber, sellToken, buyToken, route, trade, amountOut, tx, e_6;
         return __generator(this, function (_d) {
             switch (_d.label) {
                 case 0:
                     tag = TAG + " | get_quote | ";
                     _d.label = 1;
                 case 1:
-                    _d.trys.push([1, 14, , 15]);
+                    _d.trys.push([1, 15, , 16]);
                     output = {};
                     if (!quote.sellAsset)
                         throw new Error("missing sellAsset");
@@ -410,6 +491,7 @@ var get_quote = function (quote) {
                         throw new Error("missing recipientAddress");
                     if (!quote.slippage)
                         throw new Error("missing slippage");
+                    output.txs = [];
                     slippageTolerance = quote.slippage;
                     recipient = quote.recipientAddress;
                     inputChain = caipToNetworkId(quote.sellAsset);
@@ -421,6 +503,8 @@ var get_quote = function (quote) {
                     if (!providerUrl)
                         throw new Error("missing providerUrl");
                     log.info("providerUrl: ", providerUrl);
+                    chainIdInt = parseInt(inputChain.replace('eip155:', ''));
+                    log.info(tag, "chainIdInt: ", chainIdInt);
                     provider = new ethers.providers.JsonRpcProvider(providerUrl);
                     sellTokenContract = void 0, buyTokenContract = void 0;
                     if (!(quote.buyAsset.indexOf('erc20') > -1)) return [3 /*break*/, 3];
@@ -460,51 +544,56 @@ var get_quote = function (quote) {
                     }
                     if (!path)
                         throw new Error("missing path");
-                    if (!sellTokenContract) return [3 /*break*/, 5];
+                    if (!sellTokenContract) return [3 /*break*/, 6];
                     permit2Address = EIP155_MAINNET_CHAINS[inputChain].permit2;
                     if (!permit2Address)
                         throw new Error("missing permit2Address for chain: " + inputChain);
                     console.log("sellTokenContract: ", sellTokenContract);
                     log.info(tag, "permit2Address: ", permit2Address);
                     log.info(tag, "quote.senderAddress: ", quote.senderAddress.toLowerCase());
-                    return [4 /*yield*/, sellTokenContract.allowance(quote.senderAddress.toLowerCase(), permit2Address)];
+                    return [4 /*yield*/, sellTokenContract.allowance(quote.senderAddress.toLowerCase(), EIP155_MAINNET_CHAINS['eip155:' + chainIdInt].universalRouter)];
                 case 4:
                     currentAllowance = _d.sent();
                     console.log("currentAllowance: ", currentAllowance.toString());
                     console.log("sellAmountBigNumber: ", sellAmountBigNumber.toString());
-                    if (currentAllowance.lt(sellAmountBigNumber)) {
-                        // Requesting approval: Setting allowance to Max UINT256 for simplicity
-                        throw Error("TODO write code for allowance!");
-                    }
-                    _d.label = 5;
+                    if (!currentAllowance.lt(sellAmountBigNumber)) return [3 /*break*/, 6];
+                    return [4 /*yield*/, buildApprovalTx({ provider: provider, contract: sellTokenContract, address: EIP155_MAINNET_CHAINS['eip155:' + chainIdInt].universalRouter, from: quote.senderAddress, chainId: chainIdInt })];
                 case 5:
+                    allowanceTx = _d.sent();
+                    console.log("allowanceTx: ", allowanceTx);
+                    formattedAllowanceTx = {
+                        type: "evm",
+                        description: 'approve router to spend tokens',
+                        chain: inputChain,
+                        txParams: allowanceTx
+                    };
+                    output.txs.push(formattedAllowanceTx);
+                    _d.label = 6;
+                case 6:
                     _a = path.map(function (address) { return ethers.utils.getAddress(address); }), sellTokenAddress = _a[0], buyTokenAddress = _a[1];
                     console.info("".concat(tag, " sellTokenAddress: ").concat(sellTokenAddress, ", buyTokenAddress: ").concat(buyTokenAddress));
-                    if (!(sellTokenAddress !== ethers.constants.AddressZero)) return [3 /*break*/, 7];
+                    if (!(sellTokenAddress !== ethers.constants.AddressZero)) return [3 /*break*/, 8];
                     return [4 /*yield*/, new ethers.Contract(sellTokenAddress, ERC20_ABI, provider).decimals()];
-                case 6:
-                    _b = _d.sent();
-                    return [3 /*break*/, 8];
                 case 7:
-                    _b = 18;
-                    _d.label = 8;
+                    _b = _d.sent();
+                    return [3 /*break*/, 9];
                 case 8:
+                    _b = 18;
+                    _d.label = 9;
+                case 9:
                     sellTokenDecimals = _b;
-                    if (!(buyTokenAddress !== ethers.constants.AddressZero)) return [3 /*break*/, 10];
+                    if (!(buyTokenAddress !== ethers.constants.AddressZero)) return [3 /*break*/, 11];
                     return [4 /*yield*/, new ethers.Contract(buyTokenAddress, ERC20_ABI, provider).decimals()];
-                case 9:
-                    _c = _d.sent();
-                    return [3 /*break*/, 11];
                 case 10:
-                    _c = 18;
-                    _d.label = 11;
+                    _c = _d.sent();
+                    return [3 /*break*/, 12];
                 case 11:
+                    _c = 18;
+                    _d.label = 12;
+                case 12:
                     buyTokenDecimals = _c;
                     log.info("".concat(tag, " sellTokenDecimals: ").concat(sellTokenDecimals, ", buyTokenDecimals: ").concat(buyTokenDecimals));
                     amountInBigNumber = ethers.utils.parseUnits(quote.sellAmount.toString(), sellTokenDecimals);
-                    log.info("".concat(tag, " amountInBigNumber: ").concat(amountInBigNumber.toString()));
-                    chainIdInt = parseInt(inputChain.replace('eip155:', ''));
-                    log.info(tag, "chainIdInt: ", chainIdInt);
                     sellToken = sellTokenAddress === ethers.constants.AddressZero ?
                         WETH[sdk_core_1.ChainId.MAINNET] : new sdk_core_1.Token(chainIdInt, sellTokenAddress, sellTokenDecimals);
                     buyToken = buyTokenAddress === ethers.constants.AddressZero ?
@@ -516,7 +605,7 @@ var get_quote = function (quote) {
                             amountIn: amountInBigNumber,
                             provider: provider
                         })];
-                case 12:
+                case 13:
                     route = _d.sent();
                     console.log("route: ", route);
                     if (!route)
@@ -527,7 +616,7 @@ var get_quote = function (quote) {
                     log.info(tag, "amountOut: ", amountOut);
                     output.amountOut = amountOut.toFixed(18);
                     return [4 /*yield*/, buildTx({ trade: trade, from: quote.senderAddress, chainId: chainIdInt, provider: provider })];
-                case 13:
+                case 14:
                     tx = _d.sent();
                     log.info(tag, "tx: ", tx);
                     output.meta = {
@@ -537,17 +626,18 @@ var get_quote = function (quote) {
                     output.complete = true;
                     output.type = 'EVM';
                     output.id = uuid();
-                    output.txs = [{
-                            type: "evm",
-                            chain: inputChain,
-                            txParams: tx
-                        }];
+                    output.txs.push({
+                        type: "evm",
+                        description: 'swap tokens',
+                        chain: inputChain,
+                        txParams: tx
+                    });
                     return [2 /*return*/, output];
-                case 14:
-                    e_4 = _d.sent();
-                    console.error(tag, "e: ", e_4);
-                    throw e_4;
-                case 15: return [2 /*return*/];
+                case 15:
+                    e_6 = _d.sent();
+                    console.error(tag, "e: ", e_6);
+                    throw e_6;
+                case 16: return [2 /*return*/];
             }
         });
     });

package/package.json

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