@pioneer-platform/uniswap-client 0.0.20 → 0.0.22

package/lib/index.js

@@ -64,7 +64,7 @@ var log = require('@pioneer-platform/loggerdog')();
 var _a = require("@pioneer-platform/pioneer-caip"), caipToNetworkId = _a.caipToNetworkId, shortListSymbolToCaip = _a.shortListSymbolToCaip, ChainToNetworkId = _a.ChainToNetworkId;
 var permit2_sdk_1 = require("@uniswap/permit2-sdk");
 var _b = require('@pioneer-platform/pioneer-coins'), createMemo = _b.createMemo, parseMemo = _b.parseMemo;
-var _c = require('@uniswap/v2-sdk'), Pair = _c.Pair, WETH = _c.WETH, Route = _c.Route, Trade = _c.Trade, TokenAmount = _c.TokenAmount; // Import necessary components from v2-sdk
+var _c = require('@uniswap/v2-sdk'), Pair = _c.Pair, Route = _c.Route, Trade = _c.Trade, TokenAmount = _c.TokenAmount, WETH = _c.WETH; // Import necessary components from v2-sdk
 var constants_1 = require("./constants");
 // import JSBI from 'jsbi'
 // import { ethers } from 'ethers'
@@ -93,10 +93,16 @@ module.exports = {
     getQuote: function (quote) {
         return get_quote(quote);
     },
+    getRateUsd: function (token, chainId) {
+        return getRateUsd(token, chainId);
+    },
     // //buildSwapTx
-    // buildApprovalTx: function (approval:any) {
-    //     return build_approval_tx(approval);
-    // },
+    buildSwapTx: function (quote, permitSig) {
+        return buildSwapTx(quote);
+    },
+    buildPermitTx: function (input) {
+        return build_permit_tx(input);
+    }
     // buildApprovalTx: function (approval:any) {
     //     return build_approval_tx(approval);
     // }
@@ -294,7 +300,7 @@ var getRoute = function (_a) {
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
-                    tag = " | getMinAmountOut | ";
+                    tag = " | getRoute | ";
                     _b.label = 1;
                 case 1:
                     _b.trys.push([1, 3, , 4]);
@@ -311,7 +317,7 @@ var getRoute = function (_a) {
                     return [2 /*return*/, route];
                 case 3:
                     e_1 = _b.sent();
-                    console.error(tag, "Error in getMinAmountOut: ", e_1);
+                    console.error(tag, "Error in getRoute: ", e_1);
                     throw e_1;
                 case 4: return [2 /*return*/];
             }
@@ -350,7 +356,7 @@ var getDeadline = function (provider) { return __awaiter(void 0, void 0, void 0,
     });
 }); };
 var buildSwapTx = function (_a) {
-    var trade = _a.trade, from = _a.from, chainId = _a.chainId, provider = _a.provider;
+    var trade = _a.trade, permit = _a.permit, from = _a.from, chainId = _a.chainId, provider = _a.provider;
     return __awaiter(this, void 0, void 0, function () {
         var tag, BIPS_BASE, slippageTolerance, deadline, responseRouter, data, value, nonce, gas, estimatedGas, e_2, gasPrice, adjustedGasPrice, tx, e_3;
         return __generator(this, function (_b) {
@@ -371,11 +377,19 @@ var buildSwapTx = function (_a) {
                 case 2:
                     deadline = _b.sent();
                     log.info(tag, "deadline: ", deadline);
+                    log.info(tag, "permit FINAL: ", permit);
+                    log.info(tag, "INPUT FINAL: ", trade, {
+                        recipient: from,
+                        slippageTolerance: slippageTolerance,
+                        deadlineOrPreviousBlockhash: deadline,
+                        inputTokenPermit: permit,
+                        // fee: options.feeOptions,
+                    });
                     responseRouter = universal_router_sdk_1.SwapRouter.swapERC20CallParameters(trade, {
                         recipient: from,
                         slippageTolerance: slippageTolerance,
                         deadlineOrPreviousBlockhash: deadline,
-                        // inputTokenPermit: options.permit,
+                        inputTokenPermit: permit,
                         // fee: options.feeOptions,
                     });
                     log.info(tag, "responseRouter: ", responseRouter);
@@ -420,10 +434,64 @@ var buildSwapTx = function (_a) {
         });
     });
 };
+var getRateUsd = function (token, chainId) {
+    return __awaiter(this, void 0, void 0, function () {
+        var tag, providerUrl, provider, sellTokenContract, path, sellTokenDecimals, _a, sellToken, buyToken, route, trade, amountOut, e_4;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    tag = TAG + " | getRateUsd | ";
+                    _b.label = 1;
+                case 1:
+                    _b.trys.push([1, 6, , 7]);
+                    providerUrl = EIP155_MAINNET_CHAINS['eip155:' + chainId].rpc;
+                    provider = new ethers.providers.JsonRpcProvider(providerUrl);
+                    sellTokenContract = new ethers.Contract(token, ERC20_ABI, provider);
+                    path = [sellTokenContract.address, EIP155_MAINNET_CHAINS['eip155:' + chainId].WETH];
+                    if (!(token !== ethers.constants.AddressZero)) return [3 /*break*/, 3];
+                    return [4 /*yield*/, new ethers.Contract(token, ERC20_ABI, provider).decimals()];
+                case 2:
+                    _a = _b.sent();
+                    return [3 /*break*/, 4];
+                case 3:
+                    _a = 18;
+                    _b.label = 4;
+                case 4:
+                    sellTokenDecimals = _a;
+                    log.info("".concat(tag, " sellTokenDecimals: ").concat(sellTokenDecimals));
+                    sellToken = new sdk_core_1.Token(parseInt(chainId), token, sellTokenDecimals);
+                    console.log('WETH[ChainId.MAINNET]: ', EIP155_MAINNET_CHAINS['eip155:' + chainId].WETH);
+                    buyToken = new sdk_core_1.Token(parseInt(chainId), EIP155_MAINNET_CHAINS['eip155:' + chainId].WETH, sellTokenDecimals);
+                    return [4 /*yield*/, getRoute({
+                            sellToken: sellToken,
+                            buyToken: buyToken,
+                            chainId: parseInt(chainId),
+                            amountIn: ethers.utils.parseUnits('1', sellTokenDecimals),
+                            provider: provider
+                        })];
+                case 5:
+                    route = _b.sent();
+                    console.log("route: ", route);
+                    if (!route)
+                        throw new Error("missing route, failed to find route");
+                    trade = route.trade;
+                    log.info(tag, "trade: ", trade);
+                    amountOut = trade.swaps[0].outputAmount;
+                    log.info(tag, "amountOut: ", amountOut);
+                    return [2 /*return*/, amountOut.toFixed(18)];
+                case 6:
+                    e_4 = _b.sent();
+                    console.error(e_4);
+                    return [3 /*break*/, 7];
+                case 7: 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;
+        var tag, data, value, nonce, gas, estimatedGas, e_5, gasPrice, adjustedGasPrice, tx, e_6;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
@@ -456,8 +524,8 @@ var buildApprovalTx = function (_a) {
                     gas = "0x".concat(estimatedGas.toString(16));
                     return [3 /*break*/, 6];
                 case 5:
-                    e_4 = _b.sent();
-                    console.error("Error in estimateGas: ", e_4);
+                    e_5 = _b.sent();
+                    console.error("Error in estimateGas: ", e_5);
                     //@TODO get custom gas limit defaults per chain
                     gas = "0x".concat(BigInt("335120").toString(16));
                     return [3 /*break*/, 6];
@@ -468,8 +536,8 @@ var buildApprovalTx = function (_a) {
                     tx = __assign(__assign({ from: from, to: contract.address, 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_5 = _b.sent();
-                    console.error(e_5);
+                    e_6 = _b.sent();
+                    console.error(e_6);
                     return [3 /*break*/, 9];
                 case 9: return [2 /*return*/];
             }
@@ -482,7 +550,7 @@ function toDeadline(expiration) {
 var build_permit_tx = function (_a) {
     var from = _a.from, token = _a.token, amount = _a.amount, chainId = _a.chainId;
     return __awaiter(this, void 0, void 0, function () {
-        var PERMIT_EXPIRATION, PERMIT_SIG_EXPIRATION, providerUrl, provider, nonce, permit, fullResponse, domain, types, values, typedData, tx, e_6;
+        var PERMIT_EXPIRATION, PERMIT_SIG_EXPIRATION, providerUrl, provider, nonce, permit, fullResponse, domain, types, values, typedData, tx, e_7;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
@@ -502,11 +570,12 @@ var build_permit_tx = function (_a) {
                             token: token,
                             amount: amount,
                             expiration: toDeadline(PERMIT_EXPIRATION),
-                            nonce: nonce,
+                            nonce: 0,
                         },
-                        spender: from,
+                        spender: EIP155_MAINNET_CHAINS['eip155:' + chainId].universalRouter,
                         sigDeadline: toDeadline(PERMIT_SIG_EXPIRATION),
                     };
+                    console.log("permit: ", permit);
                     fullResponse = permit2_sdk_1.AllowanceTransfer.getPermitData(permit, permit2_sdk_1.PERMIT2_ADDRESS, chainId);
                     log.info("fullResponse: ", fullResponse);
                     domain = fullResponse.domain, types = fullResponse.types, values = fullResponse.values;
@@ -531,8 +600,8 @@ var build_permit_tx = function (_a) {
                     };
                     return [2 /*return*/, tx];
                 case 2:
-                    e_6 = _b.sent();
-                    console.error(e_6);
+                    e_7 = _b.sent();
+                    console.error(e_7);
                     return [3 /*break*/, 3];
                 case 3: return [2 /*return*/];
             }
@@ -541,14 +610,14 @@ var build_permit_tx = function (_a) {
 };
 var get_quote = function (quote) {
     return __awaiter(this, void 0, void 0, function () {
-        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, tx2, e_7;
+        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, PERMIT_EXPIRATION, PERMIT_SIG_EXPIRATION, nonce, permit, tx, e_8;
         return __generator(this, function (_d) {
             switch (_d.label) {
                 case 0:
                     tag = TAG + " | get_quote | ";
                     _d.label = 1;
                 case 1:
-                    _d.trys.push([1, 15, , 16]);
+                    _d.trys.push([1, 16, , 17]);
                     output = {};
                     if (!quote.sellAsset)
                         throw new Error("missing sellAsset");
@@ -562,6 +631,8 @@ var get_quote = function (quote) {
                         throw new Error("missing recipientAddress");
                     if (!quote.slippage)
                         throw new Error("missing slippage");
+                    if (!quote.permit2)
+                        throw new Error("missing permit2, required for uniswap");
                     output.txs = [];
                     slippageTolerance = quote.slippage;
                     recipient = quote.recipientAddress;
@@ -686,29 +757,32 @@ var get_quote = function (quote) {
                     amountOut = trade.swaps[0].outputAmount;
                     log.info(tag, "amountOut: ", amountOut);
                     output.amountOut = amountOut.toFixed(18);
-                    return [4 /*yield*/, build_permit_tx({
-                            from: quote.senderAddress,
+                    PERMIT_EXPIRATION = 2592000000;
+                    PERMIT_SIG_EXPIRATION = 1800000;
+                    return [4 /*yield*/, provider.getTransactionCount(quote.senderAddress, "latest")];
+                case 14:
+                    nonce = _d.sent();
+                    permit = {
+                        details: {
                             token: sellToken.address,
                             amount: "1000000000000000000000000",
-                            chainId: chainIdInt
-                        })
-                        //
-                    ];
-                case 14:
+                            expiration: toDeadline(PERMIT_EXPIRATION),
+                            nonce: 0,
+                        },
+                        spender: EIP155_MAINNET_CHAINS['eip155:' + chainIdInt].universalRouter,
+                        sigDeadline: toDeadline(PERMIT_SIG_EXPIRATION),
+                    };
+                    permit.signature = quote.permit2;
+                    return [4 /*yield*/, buildSwapTx({ trade: trade, permit: permit, from: quote.senderAddress, chainId: chainIdInt, provider: provider })];
+                case 15:
                     tx = _d.sent();
-                    //
-                    output.txs.push(tx);
-                    tx2 = {
+                    log.info(tag, "tx: ", tx);
+                    output.txs.push({
                         type: "evm",
                         description: 'swap tokens',
                         chain: inputChain,
-                        inputs: ['permit2sig'],
-                        txParams: {}
-                    };
-                    output.txs.push(tx2);
-                    //amountOutMin
-                    // let tx = await buildTx({trade,from:quote.senderAddress, chainId:chainIdInt, provider})
-                    // log.info(tag,"tx: ",tx)
+                        txParams: tx
+                    });
                     output.meta = {
                         quoteMode: "ERC20-ERC20"
                     };
@@ -717,11 +791,11 @@ var get_quote = function (quote) {
                     output.type = 'EVM';
                     output.id = uuid();
                     return [2 /*return*/, output];
-                case 15:
-                    e_7 = _d.sent();
-                    console.error(tag, "e: ", e_7);
-                    throw e_7;
-                case 16: return [2 /*return*/];
+                case 16:
+                    e_8 = _d.sent();
+                    console.error(tag, "e: ", e_8);
+                    throw e_8;
+                case 17: return [2 /*return*/];
             }
         });
     });

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@pioneer-platform/uniswap-client",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
+    "@keepkey/keepkey-sdk": "^0.2.57",
     "@pioneer-platform/loggerdog": "^8.3.1",
     "@pioneer-platform/maya-network": "^8.3.7",
     "@pioneer-platform/pioneer-caip": "^9.2.23",
@@ -13,8 +14,8 @@
     "@uniswap/sdk": "^3.0.3",
     "@uniswap/sdk-core": "^4.0.7",
     "@uniswap/smart-order-router": "^3.16.25",
-    "@uniswap/universal-router-sdk": "^1.5.7",
     "@uniswap/token-lists": "^1.0.0-beta.34",
+    "@uniswap/universal-router-sdk": "^1.5.7",
     "@uniswap/v2-sdk": "^3.2.1",
     "@uniswap/v3-sdk": "^3.10.0",
     "axios": "^1.3.4",