@pioneer-platform/uniswap-client 0.0.19 → 0.0.21

package/lib/index.js

@@ -94,9 +94,9 @@ module.exports = {
         return get_quote(quote);
     },
     // //buildSwapTx
-    // buildApprovalTx: function (approval:any) {
-    //     return build_approval_tx(approval);
-    // },
+    buildSwapTx: function (quote, permitSig) {
+        return buildSwapTx(quote);
+    },
     // buildApprovalTx: function (approval:any) {
     //     return build_approval_tx(approval);
     // }
@@ -350,7 +350,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 +371,12 @@ var buildSwapTx = function (_a) {
                 case 2:
                     deadline = _b.sent();
                     log.info(tag, "deadline: ", deadline);
+                    permit.signature = "0x3e1d72164c5656b61bb438fd0527cf317451d334e54468ab58dfd54eb12cae6f3aafdff7d8f7952e6935a463a7920c1a16298694a976496d40918d718260cc781b";
                     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);
@@ -482,11 +483,11 @@ 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, _b, domain, types, values, tx, e_6;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
+        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:
-                    _c.trys.push([0, 2, , 3]);
+                    _b.trys.push([0, 2, , 3]);
                     PERMIT_EXPIRATION = 2592000000;
                     PERMIT_SIG_EXPIRATION = 1800000;
                     providerUrl = EIP155_MAINNET_CHAINS['eip155:' + chainId].rpc;
@@ -496,7 +497,7 @@ var build_permit_tx = function (_a) {
                     provider = new ethers.providers.JsonRpcProvider(providerUrl);
                     return [4 /*yield*/, provider.getTransactionCount(from, "latest")];
                 case 1:
-                    nonce = _c.sent();
+                    nonce = _b.sent();
                     permit = {
                         details: {
                             token: token,
@@ -507,14 +508,31 @@ var build_permit_tx = function (_a) {
                         spender: from,
                         sigDeadline: toDeadline(PERMIT_SIG_EXPIRATION),
                     };
-                    _b = permit2_sdk_1.AllowanceTransfer.getPermitData(permit, permit2_sdk_1.PERMIT2_ADDRESS, chainId), domain = _b.domain, types = _b.types, values = _b.values;
+                    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: { domain: domain, types: types, values: values }
+                        txParams: typedData // Ensuring txParams contains the correctly formatted EIP-712 data
                     };
                     return [2 /*return*/, tx];
                 case 2:
-                    e_6 = _c.sent();
+                    e_6 = _b.sent();
                     console.error(e_6);
                     return [3 /*break*/, 3];
                 case 3: return [2 /*return*/];
@@ -524,14 +542,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_7;
         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");
@@ -669,29 +687,31 @@ 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: nonce,
+                        },
+                        spender: quote.senderAddress,
+                        sigDeadline: toDeadline(PERMIT_SIG_EXPIRATION),
+                    };
+                    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"
                     };
@@ -700,11 +720,11 @@ var get_quote = function (quote) {
                     output.type = 'EVM';
                     output.id = uuid();
                     return [2 /*return*/, output];
-                case 15:
+                case 16:
                     e_7 = _d.sent();
                     console.error(tag, "e: ", e_7);
                     throw e_7;
-                case 16: return [2 /*return*/];
+                case 17: return [2 /*return*/];
             }
         });
     });

package/package.json

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