@pioneer-platform/uniswap-client 0.0.18 → 0.0.20

package/lib/index.js

@@ -62,6 +62,7 @@ var TAG = " | Uniswap | ";
 var uuid = require('uuidv4').uuid;
 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 constants_1 = require("./constants");
@@ -92,6 +93,13 @@ module.exports = {
     getQuote: function (quote) {
         return get_quote(quote);
     },
+    // //buildSwapTx
+    // buildApprovalTx: function (approval:any) {
+    //     return build_approval_tx(approval);
+    // },
+    // buildApprovalTx: function (approval:any) {
+    //     return build_approval_tx(approval);
+    // }
 };
 // Router Helpers
 exports.MAX_UINT = '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff';
@@ -168,7 +176,7 @@ var EIP155_MAINNET_CHAINS = {
         name: 'Ethereum',
         logo: '/chain-logos/eip155-1.png',
         rgb: '99, 125, 234',
-        permit2: universal_router_sdk_1.PERMIT2_ADDRESS,
+        permit2: permit2_sdk_1.PERMIT2_ADDRESS,
         universalRouter: universal_router_sdk_1.UNIVERSAL_ROUTER_ADDRESS,
         rpc: 'https://eth.llamarpc.com',
         defaultGasLimit: 250000,
@@ -341,7 +349,7 @@ var getDeadline = function (provider) { return __awaiter(void 0, void 0, void 0,
         }
     });
 }); };
-var buildTx = function (_a) {
+var buildSwapTx = 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, deadline, responseRouter, data, value, nonce, gas, estimatedGas, e_2, gasPrice, adjustedGasPrice, tx, e_3;
@@ -395,7 +403,7 @@ var buildTx = function (_a) {
                     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));
+                    gas = "0x".concat(BigInt("335120").toString(16));
                     return [3 /*break*/, 7];
                 case 7: return [4 /*yield*/, provider.getGasPrice()];
                 case 8:
@@ -451,7 +459,7 @@ var buildApprovalTx = function (_a) {
                     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));
+                    gas = "0x".concat(BigInt("335120").toString(16));
                     return [3 /*break*/, 6];
                 case 6: return [4 /*yield*/, provider.getGasPrice()];
                 case 7:
@@ -468,9 +476,72 @@ var buildApprovalTx = function (_a) {
         });
     });
 };
+function toDeadline(expiration) {
+    return Math.floor((Date.now() + expiration) / 1000);
+}
+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;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _b.trys.push([0, 2, , 3]);
+                    PERMIT_EXPIRATION = 2592000000;
+                    PERMIT_SIG_EXPIRATION = 1800000;
+                    providerUrl = EIP155_MAINNET_CHAINS['eip155:' + chainId].rpc;
+                    if (!providerUrl)
+                        throw new Error("missing providerUrl");
+                    log.info("providerUrl: ", providerUrl);
+                    provider = new ethers.providers.JsonRpcProvider(providerUrl);
+                    return [4 /*yield*/, provider.getTransactionCount(from, "latest")];
+                case 1:
+                    nonce = _b.sent();
+                    permit = {
+                        details: {
+                            token: token,
+                            amount: amount,
+                            expiration: toDeadline(PERMIT_EXPIRATION),
+                            nonce: nonce,
+                        },
+                        spender: from,
+                        sigDeadline: toDeadline(PERMIT_SIG_EXPIRATION),
+                    };
+                    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;
+                    // Ensure 'EIP712Domain' is included in the types definitions
+                    // If it's not already present or not recognized for some reason, define it explicitly
+                    if (!types['EIP712Domain']) {
+                        types['EIP712Domain'] = [
+                            { name: "name", type: "string" },
+                            { name: "chainId", type: "uint256" },
+                            { name: "verifyingContract", type: "address" },
+                        ];
+                    }
+                    typedData = {
+                        domain: domain,
+                        types: types,
+                        message: values, // Use 'values' as the 'message' for EIP712 signing
+                        primaryType: "PermitSingle" // Assuming 'PermitSingle' as the primaryType based on your types definition
+                    };
+                    tx = {
+                        type: 'signTypedData',
+                        txParams: typedData // Ensuring txParams contains the correctly formatted EIP-712 data
+                    };
+                    return [2 /*return*/, tx];
+                case 2:
+                    e_6 = _b.sent();
+                    console.error(e_6);
+                    return [3 /*break*/, 3];
+                case 3: return [2 /*return*/];
+            }
+        });
+    });
+};
 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, e_6;
+        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;
         return __generator(this, function (_d) {
             switch (_d.label) {
                 case 0:
@@ -522,7 +593,7 @@ var get_quote = function (quote) {
                         log.info("sellTokenAddress: ", sellTokenAddress_1);
                         sellTokenContract = new ethers.Contract(sellTokenAddress_1, ERC20_ABI, provider);
                     }
-                    permit2 = universal_router_sdk_1.PERMIT2_ADDRESS;
+                    permit2 = permit2_sdk_1.PERMIT2_ADDRESS;
                     router = universal_router_sdk_1.UNIVERSAL_ROUTER_ADDRESS;
                     planner = new universal_router_sdk_1.RoutePlanner();
                     sellAmountBigNumber = ethers.utils.parseUnits(quote.sellAmount.toString(), 'ether');
@@ -551,7 +622,7 @@ var get_quote = function (quote) {
                     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(), EIP155_MAINNET_CHAINS['eip155:' + chainIdInt].universalRouter)];
+                    return [4 /*yield*/, sellTokenContract.allowance(quote.senderAddress.toLowerCase(), permit2)];
                 case 4:
                     currentAllowance = _d.sent();
                     console.log("currentAllowance: ", currentAllowance.toString());
@@ -615,10 +686,29 @@ 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, provider: provider })];
+                    return [4 /*yield*/, build_permit_tx({
+                            from: quote.senderAddress,
+                            token: sellToken.address,
+                            amount: "1000000000000000000000000",
+                            chainId: chainIdInt
+                        })
+                        //
+                    ];
                 case 14:
                     tx = _d.sent();
-                    log.info(tag, "tx: ", tx);
+                    //
+                    output.txs.push(tx);
+                    tx2 = {
+                        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)
                     output.meta = {
                         quoteMode: "ERC20-ERC20"
                     };
@@ -626,17 +716,11 @@ var get_quote = function (quote) {
                     output.complete = true;
                     output.type = 'EVM';
                     output.id = uuid();
-                    output.txs.push({
-                        type: "evm",
-                        description: 'swap tokens',
-                        chain: inputChain,
-                        txParams: tx
-                    });
                     return [2 /*return*/, output];
                 case 15:
-                    e_6 = _d.sent();
-                    console.error(tag, "e: ", e_6);
-                    throw e_6;
+                    e_7 = _d.sent();
+                    console.error(tag, "e: ", e_7);
+                    throw e_7;
                 case 16: return [2 /*return*/];
             }
         });

package/package.json

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