@pioneer-platform/uniswap-client 0.0.13 → 0.0.15

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,40 +374,40 @@ var buildTx = function (_a) {
                     data = responseRouter.calldata;
                     value = responseRouter.value;
                     return [4 /*yield*/, provider.getTransactionCount(from, "latest")];
-                case 2:
+                case 3:
                     nonce = _b.sent();
                     gas = "0x".concat(BigInt("135120").toString(16));
-                    _b.label = 3;
-                case 3:
-                    _b.trys.push([3, 5, , 6]);
+                    _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 4:
+                case 5:
                     estimatedGas = _b.sent();
                     console.log("estimatedGas: ", estimatedGas);
                     gas = "0x".concat(estimatedGas.toString(16));
-                    return [3 /*break*/, 6];
-                case 5:
+                    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*/, 6];
-                case 6: return [4 /*yield*/, provider.getGasPrice()];
-                case 7:
+                    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 8:
+                case 9:
                     e_3 = _b.sent();
                     console.error(e_3);
-                    return [3 /*break*/, 9];
-                case 9: return [2 /*return*/];
+                    return [3 /*break*/, 10];
+                case 10: return [2 /*return*/];
             }
         });
     });
@@ -424,9 +449,9 @@ var get_quote = function (quote) {
                     provider = new ethers.providers.JsonRpcProvider(providerUrl);
                     sellTokenContract = void 0, buyTokenContract = void 0;
                     if (!(quote.buyAsset.indexOf('erc20') > -1)) return [3 /*break*/, 3];
-                    buyTokenAddress_1 = quote.buyAsset.split(":")[2];
+                    buyTokenAddress_1 = quote.buyAsset.split(":")[2].toLowerCase();
                     log.info("buyTokenAddress: ", buyTokenAddress_1);
-                    buyTokenContract = new ethers.Contract(buyTokenAddress_1, ERC20_ABI, provider);
+                    buyTokenContract = new ethers.Contract(buyTokenAddress_1.toLowerCase(), ERC20_ABI, provider);
                     return [4 /*yield*/, buyTokenContract.balanceOf(quote.senderAddress)];
                 case 2:
                     balance = _d.sent();
@@ -434,7 +459,7 @@ var get_quote = function (quote) {
                     _d.label = 3;
                 case 3:
                     if (quote.sellAsset.indexOf('erc20') > -1) {
-                        sellTokenAddress_1 = quote.sellAsset.split(":")[2];
+                        sellTokenAddress_1 = quote.sellAsset.split(":")[2].toLowerCase();
                         log.info("sellTokenAddress: ", sellTokenAddress_1);
                         sellTokenContract = new ethers.Contract(sellTokenAddress_1, ERC20_ABI, provider);
                     }
@@ -464,8 +489,10 @@ var get_quote = function (quote) {
                     permit2Address = EIP155_MAINNET_CHAINS[inputChain].permit2;
                     if (!permit2Address)
                         throw new Error("missing permit2Address for chain: " + inputChain);
-                    console.log("sellTokenContract: ", sellTokenContract.toString());
-                    return [4 /*yield*/, sellTokenContract.allowance(quote.senderAddress, permit2Address)];
+                    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)];
                 case 4:
                     currentAllowance = _d.sent();
                     console.log("currentAllowance: ", currentAllowance.toString());

package/package.json

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