@pioneer-platform/uniswap-client 0.0.29 → 0.1.0

package/lib/utils/uniswapData.js

@@ -1,56 +1,24 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildTrade = exports.getPool = exports.getPair = exports.getUniswapPools = exports.FEE_AMOUNT = exports.USDC = exports.DAI = exports.WETH = exports.ETHER = void 0;
-var jsbi_1 = __importDefault(require("jsbi"));
-var ethers_1 = require("ethers");
-var router_sdk_1 = require("@uniswap/router-sdk");
-var v2_sdk_1 = require("@uniswap/v2-sdk");
-var v3_sdk_1 = require("@uniswap/v3-sdk");
+exports.FEE_AMOUNT = exports.USDC = exports.DAI = exports.WETH = exports.ETHER = void 0;
+exports.getUniswapPools = getUniswapPools;
+exports.getPair = getPair;
+exports.getPool = getPool;
+exports.buildTrade = buildTrade;
+const jsbi_1 = __importDefault(require("jsbi"));
+const ethers_1 = require("ethers");
+const router_sdk_1 = require("@uniswap/router-sdk");
+const v2_sdk_1 = require("@uniswap/v2-sdk");
+const v3_sdk_1 = require("@uniswap/v3-sdk");
 // import { SwapOptions } from '../../src'
-var sdk_core_1 = require("@uniswap/sdk-core");
-var UniswapV3Pool_json_1 = __importDefault(require("@uniswap/v3-core/artifacts/contracts/UniswapV3Pool.sol/UniswapV3Pool.json"));
+const sdk_core_1 = require("@uniswap/sdk-core");
+const UniswapV3Pool_json_1 = __importDefault(require("@uniswap/v3-core/artifacts/contracts/UniswapV3Pool.sol/UniswapV3Pool.json"));
 // import { TEST_RECIPIENT_ADDRESS } from './addresses'
-var V2_FACTORY = '0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f';
-var V2_ABI = [
+const V2_FACTORY = '0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f';
+const V2_ABI = [
     {
         constant: true,
         inputs: [],
@@ -77,103 +45,58 @@ var V2_ABI = [
         type: 'function',
     },
 ];
-var FORK_BLOCK = 16075500;
+const FORK_BLOCK = 16075500;
 exports.ETHER = sdk_core_1.Ether.onChain(1);
 exports.WETH = new sdk_core_1.Token(1, '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', 18, 'WETH', 'Wrapped Ether');
 exports.DAI = new sdk_core_1.Token(1, '0x6B175474E89094C44Da98b954EedeAC495271d0F', 18, 'DAI', 'dai');
 exports.USDC = new sdk_core_1.Token(1, '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48', 6, 'USDC', 'USD Coin');
 exports.FEE_AMOUNT = v3_sdk_1.FeeAmount.MEDIUM;
-function getUniswapPools(forkBlock) {
-    return __awaiter(this, void 0, void 0, function () {
-        var fork, WETH_USDC_V2, USDC_DAI_V2, WETH_USDC_V3, WETH_USDC_V3_LOW_FEE, USDC_DAI_V3;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    fork = forkBlock !== null && forkBlock !== void 0 ? forkBlock : FORK_BLOCK;
-                    return [4 /*yield*/, getPair(exports.WETH, exports.USDC, fork)];
-                case 1:
-                    WETH_USDC_V2 = _a.sent();
-                    return [4 /*yield*/, getPair(exports.USDC, exports.DAI, fork)];
-                case 2:
-                    USDC_DAI_V2 = _a.sent();
-                    return [4 /*yield*/, getPool(exports.WETH, exports.USDC, exports.FEE_AMOUNT, fork)];
-                case 3:
-                    WETH_USDC_V3 = _a.sent();
-                    return [4 /*yield*/, getPool(exports.WETH, exports.USDC, v3_sdk_1.FeeAmount.LOW, fork)];
-                case 4:
-                    WETH_USDC_V3_LOW_FEE = _a.sent();
-                    return [4 /*yield*/, getPool(exports.USDC, exports.DAI, v3_sdk_1.FeeAmount.LOW, fork)];
-                case 5:
-                    USDC_DAI_V3 = _a.sent();
-                    return [2 /*return*/, {
-                            WETH_USDC_V2: WETH_USDC_V2,
-                            USDC_DAI_V2: USDC_DAI_V2,
-                            WETH_USDC_V3: WETH_USDC_V3,
-                            WETH_USDC_V3_LOW_FEE: WETH_USDC_V3_LOW_FEE,
-                            USDC_DAI_V3: USDC_DAI_V3,
-                        }];
-            }
-        });
-    });
+async function getUniswapPools(forkBlock) {
+    const fork = forkBlock ?? FORK_BLOCK;
+    const WETH_USDC_V2 = await getPair(exports.WETH, exports.USDC, fork);
+    const USDC_DAI_V2 = await getPair(exports.USDC, exports.DAI, fork);
+    const WETH_USDC_V3 = await getPool(exports.WETH, exports.USDC, exports.FEE_AMOUNT, fork);
+    const WETH_USDC_V3_LOW_FEE = await getPool(exports.WETH, exports.USDC, v3_sdk_1.FeeAmount.LOW, fork);
+    const USDC_DAI_V3 = await getPool(exports.USDC, exports.DAI, v3_sdk_1.FeeAmount.LOW, fork);
+    return {
+        WETH_USDC_V2,
+        USDC_DAI_V2,
+        WETH_USDC_V3,
+        WETH_USDC_V3_LOW_FEE,
+        USDC_DAI_V3,
+    };
 }
-exports.getUniswapPools = getUniswapPools;
 function getProvider() {
     return new ethers_1.ethers.providers.JsonRpcProvider(process.env['FORK_URL']);
 }
-function getPair(tokenA, tokenB, blockNumber) {
-    return __awaiter(this, void 0, void 0, function () {
-        var pairAddress, contract, _a, reserve0, reserve1, _b, token0, token1;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0:
-                    pairAddress = (0, v2_sdk_1.computePairAddress)({ factoryAddress: V2_FACTORY, tokenA: tokenA, tokenB: tokenB });
-                    contract = new ethers_1.ethers.Contract(pairAddress, V2_ABI, getProvider());
-                    return [4 /*yield*/, contract.getReserves({ blockTag: blockNumber })];
-                case 1:
-                    _a = _c.sent(), reserve0 = _a.reserve0, reserve1 = _a.reserve1;
-                    _b = tokenA.sortsBefore(tokenB) ? [tokenA, tokenB] : [tokenB, tokenA] // does safety checks
-                    , token0 = _b[0], token1 = _b[1];
-                    return [2 /*return*/, new v2_sdk_1.Pair(sdk_core_1.CurrencyAmount.fromRawAmount(token0, reserve0), sdk_core_1.CurrencyAmount.fromRawAmount(token1, reserve1))];
-            }
-        });
-    });
+async function getPair(tokenA, tokenB, blockNumber) {
+    const pairAddress = (0, v2_sdk_1.computePairAddress)({ factoryAddress: V2_FACTORY, tokenA, tokenB });
+    const contract = new ethers_1.ethers.Contract(pairAddress, V2_ABI, getProvider());
+    const { reserve0, reserve1 } = await contract.getReserves({ blockTag: blockNumber });
+    const [token0, token1] = tokenA.sortsBefore(tokenB) ? [tokenA, tokenB] : [tokenB, tokenA]; // does safety checks
+    return new v2_sdk_1.Pair(sdk_core_1.CurrencyAmount.fromRawAmount(token0, reserve0), sdk_core_1.CurrencyAmount.fromRawAmount(token1, reserve1));
 }
-exports.getPair = getPair;
-function getPool(tokenA, tokenB, feeAmount, blockNumber) {
-    return __awaiter(this, void 0, void 0, function () {
-        var _a, token0, token1, poolAddress, contract, liquidity, _b, sqrtPriceX96, tick;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0:
-                    _a = tokenA.sortsBefore(tokenB) ? [tokenA, tokenB] : [tokenB, tokenA] // does safety checks
-                    , token0 = _a[0], token1 = _a[1];
-                    poolAddress = v3_sdk_1.Pool.getAddress(token0, token1, feeAmount);
-                    contract = new ethers_1.ethers.Contract(poolAddress, UniswapV3Pool_json_1.default.abi, getProvider());
-                    return [4 /*yield*/, contract.liquidity({ blockTag: blockNumber })];
-                case 1:
-                    liquidity = _c.sent();
-                    return [4 /*yield*/, contract.slot0({ blockTag: blockNumber })];
-                case 2:
-                    _b = _c.sent(), sqrtPriceX96 = _b.sqrtPriceX96, tick = _b.tick;
-                    liquidity = jsbi_1.default.BigInt(liquidity.toString());
-                    sqrtPriceX96 = jsbi_1.default.BigInt(sqrtPriceX96.toString());
-                    return [2 /*return*/, new v3_sdk_1.Pool(token0, token1, feeAmount, sqrtPriceX96, liquidity, tick, [
-                            {
-                                index: (0, v3_sdk_1.nearestUsableTick)(v3_sdk_1.TickMath.MIN_TICK, v3_sdk_1.TICK_SPACINGS[feeAmount]),
-                                liquidityNet: liquidity,
-                                liquidityGross: liquidity,
-                            },
-                            {
-                                index: (0, v3_sdk_1.nearestUsableTick)(v3_sdk_1.TickMath.MAX_TICK, v3_sdk_1.TICK_SPACINGS[feeAmount]),
-                                liquidityNet: jsbi_1.default.multiply(liquidity, jsbi_1.default.BigInt('-1')),
-                                liquidityGross: liquidity,
-                            },
-                        ])];
-            }
-        });
-    });
+async function getPool(tokenA, tokenB, feeAmount, blockNumber) {
+    const [token0, token1] = tokenA.sortsBefore(tokenB) ? [tokenA, tokenB] : [tokenB, tokenA]; // does safety checks
+    const poolAddress = v3_sdk_1.Pool.getAddress(token0, token1, feeAmount);
+    const contract = new ethers_1.ethers.Contract(poolAddress, UniswapV3Pool_json_1.default.abi, getProvider());
+    let liquidity = await contract.liquidity({ blockTag: blockNumber });
+    let { sqrtPriceX96, tick } = await contract.slot0({ blockTag: blockNumber });
+    liquidity = jsbi_1.default.BigInt(liquidity.toString());
+    sqrtPriceX96 = jsbi_1.default.BigInt(sqrtPriceX96.toString());
+    return new v3_sdk_1.Pool(token0, token1, feeAmount, sqrtPriceX96, liquidity, tick, [
+        {
+            index: (0, v3_sdk_1.nearestUsableTick)(v3_sdk_1.TickMath.MIN_TICK, v3_sdk_1.TICK_SPACINGS[feeAmount]),
+            liquidityNet: liquidity,
+            liquidityGross: liquidity,
+        },
+        {
+            index: (0, v3_sdk_1.nearestUsableTick)(v3_sdk_1.TickMath.MAX_TICK, v3_sdk_1.TICK_SPACINGS[feeAmount]),
+            liquidityNet: jsbi_1.default.multiply(liquidity, jsbi_1.default.BigInt('-1')),
+            liquidityGross: liquidity,
+        },
+    ]);
 }
-exports.getPool = getPool;
 // use some sane defaults
 // export function swapOptions(options: Partial<SwapOptions>): SwapOptions {
 //   // If theres a fee this counts as "slippage" for the amount out, so take it into account
@@ -191,27 +114,26 @@ exports.getPool = getPool;
 function buildTrade(trades) {
     return new router_sdk_1.Trade({
         v2Routes: trades
-            .filter(function (trade) { return trade instanceof v2_sdk_1.Trade; })
-            .map(function (trade) { return ({
+            .filter((trade) => trade instanceof v2_sdk_1.Trade)
+            .map((trade) => ({
             routev2: trade.route,
             inputAmount: trade.inputAmount,
             outputAmount: trade.outputAmount,
-        }); }),
+        })),
         v3Routes: trades
-            .filter(function (trade) { return trade instanceof v3_sdk_1.Trade; })
-            .map(function (trade) { return ({
+            .filter((trade) => trade instanceof v3_sdk_1.Trade)
+            .map((trade) => ({
             routev3: trade.route,
             inputAmount: trade.inputAmount,
             outputAmount: trade.outputAmount,
-        }); }),
+        })),
         mixedRoutes: trades
-            .filter(function (trade) { return trade instanceof router_sdk_1.MixedRouteTrade; })
-            .map(function (trade) { return ({
+            .filter((trade) => trade instanceof router_sdk_1.MixedRouteTrade)
+            .map((trade) => ({
             mixedRoute: trade.route,
             inputAmount: trade.inputAmount,
             outputAmount: trade.outputAmount,
-        }); }),
+        })),
         tradeType: trades[0].tradeType,
     });
 }
-exports.buildTrade = buildTrade;

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@pioneer-platform/uniswap-client",
-  "version": "0.0.29",
+  "version": "0.1.0",
   "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.9",
-    "@pioneer-platform/pioneer-caip": "^9.2.34",
-    "@pioneer-platform/pioneer-coins": "^9.2.24",
-    "@pioneer-platform/pioneer-discovery": "^0.0.7",
+    "@pioneer-platform/loggerdog": "^8.4.0",
+    "@pioneer-platform/maya-network": "^8.4.0",
+    "@pioneer-platform/pioneer-caip": "^9.3.0",
+    "@pioneer-platform/pioneer-coins": "^9.4.0",
+    "@pioneer-platform/pioneer-discovery": "^0.1.0",
     "@types/ms": "^0.7.34",
     "@types/ms.macro": "^2.0.2",
     "@uniswap/router-sdk": "1.9.0",
@@ -21,33 +21,33 @@
     "@uniswap/universal-router-sdk": "1.8.2",
     "@uniswap/v2-sdk": "4.3.0",
     "@uniswap/v3-sdk": "3.11.0",
-    "axios": "^1.3.4",
+    "axios": "^1.6.0",
     "dayjs": "^1.11.10",
     "dotenv": "^8.2.0",
     "ms": "^2.1.3",
     "ms.macro": "^2.0.0",
     "uuidv4": "^6.2.13"
   },
-  "scripts": {
-    "npm": "npm i",
-    "test": "npm run build && node __tests__/test-module.js",
-    "test-sdk": "npm run build && node __tests__/test-module-sdk.js",
-    "build": "tsc -p .",
-    "prepublish": "npm run build",
-    "refresh": "rm -rf ./node_modules ./package-lock.json && npm install"
-  },
   "devDependencies": {
     "@types/async-retry": "^1.4.8",
     "@types/bunyan": "^1.8.11",
     "@types/jest": "^25.2.3",
-    "@types/node": "^13.13.21",
+    "@types/node": "^18.16.0",
     "@types/source-map-support": "^0.5.3",
     "babel-plugin-macros": "^3.1.0",
     "jest": "^26.4.2",
     "onchange": "^7.0.2",
     "serve": "^11.3.2",
     "ts-jest": "^29.0.5",
-    "typescript": "^5.0.2"
+    "typescript": "^5.0.4"
   },
-  "gitHead": "e4a7114f00103ee48533c369dba4a02021ddcbe4"
-}
+  "gitHead": "a76012f6693a12181c4744e53e977a9eaeef0ed3",
+  "scripts": {
+    "npm": "pnpm i",
+    "test": "pnpm run build && node __tests__/test-module.js",
+    "test-sdk": "pnpm run build && node __tests__/test-module-sdk.js",
+    "build": "tsc -p .",
+    "prepublish": "pnpm run build",
+    "refresh": "rm -rf ./node_modules ./package-lock.json && pnpm install"
+  }
+}

package/tsconfig.json

@@ -1,14 +1,33 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "es2020",
     "module": "commonjs",
-    "lib": ["es6", "es2015", "dom"],
+    "lib": ["es2020", "dom"],
     "declaration": true,
-    "outDir": "lib",
-    "rootDir": "src",
-    "strict": true,
-    "types": ["node"],
+    "outDir": "./lib",
+    "rootDir": "./src",
+    "strict": false,
+    "noImplicitAny": false,
+    "strictNullChecks": false,
+    "strictFunctionTypes": false,
+    "strictBindCallApply": false,
+    "strictPropertyInitialization": false,
+    "noImplicitThis": false,
+    "alwaysStrict": false,
     "esModuleInterop": true,
-    "resolveJsonModule": true
-  }
+    "resolveJsonModule": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "include": ["src/**/*.ts"],
+  "exclude": [
+    "node_modules", 
+    "**/__tests__/*", 
+    "src/abis/**/*", 
+    "src/uniswap/**/*",
+    "src/utils/**/*",
+    "src/routing/**/*",
+    "src/constants/**/*",
+    "src/rpc/**/*"
+  ]
 }