@xyo-network/uniswap-crypto-market-plugin 2.81.0-rc.1 → 2.81.1

package/dist/browser/index.cjs

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,19 +15,12 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
+  ChainId: () => ChainId,
   EthersUniSwap3Pair: () => EthersUniSwap3Pair,
   EthersUniswap3PoolSlot0Wrapper: () => EthersUniswap3PoolSlot0Wrapper,
   UniswapCryptoMarketPlugin: () => UniswapCryptoMarketPlugin,
@@ -70,13 +61,12 @@ var logErrorsAsync = async (func) => {
 };
 
 // src/lib/Ethers/UniSwap3Pair.ts
-var import_sdk = require("@uniswap/sdk");
-var import_sdk_core = require("@uniswap/sdk-core");
-var import_v3_sdk = require("@uniswap/v3-sdk");
 var import_assert = require("@xylabs/assert");
 var import_delay = require("@xylabs/delay");
 var import_typechain = require("@xyo-network/typechain");
-var UniswapTypechain = __toESM(require("@xyo-network/uniswap-typechain"), 1);
+var import_uniswap_sdk_core = require("@xyo-network/uniswap-sdk-core");
+var import_uniswap_typechain = require("@xyo-network/uniswap-typechain");
+var import_uniswap_v3_sdk = require("@xyo-network/uniswap-v3-sdk");
 
 // src/lib/Ethers/Uniswap3PoolSlot0Wrapper.ts
 var EthersUniswap3PoolSlot0Wrapper = class {
@@ -108,10 +98,17 @@ var EthersUniswap3PoolSlot0Wrapper = class {
 };
 
 // src/lib/Ethers/UniSwap3Pair.ts
+var ChainId = /* @__PURE__ */ ((ChainId2) => {
+  ChainId2[ChainId2["MAINNET"] = 1] = "MAINNET";
+  ChainId2[ChainId2["ROPSTEN"] = 3] = "ROPSTEN";
+  ChainId2[ChainId2["RINKEBY"] = 4] = "RINKEBY";
+  ChainId2[ChainId2["G\xD6RLI"] = 5] = "G\xD6RLI";
+  ChainId2[ChainId2["KOVAN"] = 42] = "KOVAN";
+  return ChainId2;
+})(ChainId || {});
 var waitNotNull = async (closure) => {
-  while (closure() === null) {
+  while (closure() === null)
     await (0, import_delay.delay)(10);
-  }
 };
 var EthersUniSwap3Pair = class {
   address;
@@ -130,12 +127,12 @@ var EthersUniSwap3Pair = class {
       await waitNotNull(() => this._pool);
       this._pool = this._pool || null;
       const slot0 = await this.slot0();
-      this._pool = this._pool ?? new import_v3_sdk.Pool(
+      this._pool = this._pool !== null ? this._pool : new import_uniswap_v3_sdk.Pool(
         await this.token(0),
         await this.token(1),
         Number(slot0.feeProtocol),
-        slot0.sqrtPriceX96.toString(16),
-        (await this.poolContract().liquidity()).toString(16),
+        `0x${slot0.sqrtPriceX96.toString(16)}`,
+        `0x${(await this.poolContract().liquidity()).toString(16)}`,
         Number(slot0.tick)
       );
       return (0, import_assert.assertEx)(this._pool);
@@ -143,7 +140,7 @@ var EthersUniSwap3Pair = class {
   }
   poolContract() {
     return logErrors(() => {
-      this._poolContract = this._poolContract ?? UniswapTypechain.IUniswapV3Pool__factory.connect(this.address, this.provider);
+      this._poolContract = this._poolContract ?? import_uniswap_typechain.IUniswapV3Pool__factory.connect(this.address, this.provider);
       return (0, import_assert.assertEx)(this._poolContract);
     });
   }
@@ -169,7 +166,11 @@ var EthersUniSwap3Pair = class {
     return await logErrorsAsync(async () => {
       await waitNotNull(() => this._slot0);
       this._slot0 = this._slot0 || null;
-      this._slot0 = this._slot0 ?? new EthersUniswap3PoolSlot0Wrapper(await this.poolContract().slot0());
+      if (this._slot0 === null) {
+        const poolContract = this.poolContract();
+        const slot = await poolContract.slot0();
+        this._slot0 = this._slot0 ?? new EthersUniswap3PoolSlot0Wrapper(slot);
+      }
       return (0, import_assert.assertEx)(this._slot0);
     });
   }
@@ -178,8 +179,8 @@ var EthersUniSwap3Pair = class {
       await waitNotNull(() => this._tokens[index]);
       this._tokens[index] = this._tokens[index] || null;
       const tokenContract = await this.tokenContract(index);
-      this._tokens[index] = this._tokens[index] ?? new import_sdk_core.Token(
-        import_sdk.ChainId.MAINNET,
+      this._tokens[index] = this._tokens[index] ?? new import_uniswap_sdk_core.Token(
+        1 /* MAINNET */,
         await tokenContract.getAddress(),
         Number(await tokenContract.decimals()),
         await tokenContract.symbol(),

package/dist/browser/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts","../../src/Plugin.ts","../../src/Witness.ts","../../src/lib/logErrors.ts","../../src/lib/Ethers/UniSwap3Pair.ts","../../src/lib/Ethers/Uniswap3PoolSlot0Wrapper.ts","../../src/lib/Ethers/createUniswapPoolContracts.ts","../../src/lib/pricesFromUniswap3.ts","../../src/lib/UniswapPoolContracts.ts"],"sourcesContent":["import { UniswapCryptoMarketPlugin } from './Plugin'\n\nexport * from './Config'\nexport * from './lib'\nexport * from './Witness'\n\nexport { UniswapCryptoMarketPlugin }\n\n// eslint-disable-next-line import/no-default-export\nexport default UniswapCryptoMarketPlugin\n","import { PayloadSetSchema } from '@xyo-network/payload-model'\nimport { createPayloadSetWitnessPlugin } from '@xyo-network/payloadset-plugin'\nimport { UniswapCryptoMarketSchema } from '@xyo-network/uniswap-crypto-market-payload-plugin'\n\nimport { UniswapCryptoMarketWitness } from './Witness'\n\nexport const UniswapCryptoMarketPlugin = () =>\n  createPayloadSetWitnessPlugin<UniswapCryptoMarketWitness>(\n    { required: { [UniswapCryptoMarketSchema]: 1 }, schema: PayloadSetSchema },\n    {\n      witness: async (params) => {\n        const result = await UniswapCryptoMarketWitness.create(params)\n        return result\n      },\n    },\n  )\n","import { assertEx } from '@xylabs/assert'\nimport { AbstractWitness } from '@xyo-network/abstract-witness'\nimport { AnyConfigSchema } from '@xyo-network/module-model'\nimport { Payload } from '@xyo-network/payload-model'\nimport {\n  UniswapCryptoMarketPayload,\n  UniswapCryptoMarketSchema,\n  UniswapCryptoMarketWitnessConfigSchema,\n} from '@xyo-network/uniswap-crypto-market-payload-plugin'\nimport { WitnessParams } from '@xyo-network/witness-model'\nimport { Provider } from 'ethers'\n\nimport { UniswapCryptoMarketWitnessConfig } from './Config'\nimport { createUniswapPoolContracts, EthersUniSwap3Pair, pricesFromUniswap3, UniswapPoolContracts } from './lib'\n\nexport type UniswapCryptoMarketWitnessParams = WitnessParams<\n  AnyConfigSchema<UniswapCryptoMarketWitnessConfig>,\n  {\n    provider?: Provider\n  }\n>\n\nexport class UniswapCryptoMarketWitness<\n  TParams extends UniswapCryptoMarketWitnessParams = UniswapCryptoMarketWitnessParams,\n> extends AbstractWitness<TParams> {\n  static override configSchemas = [UniswapCryptoMarketWitnessConfigSchema]\n\n  protected pairs?: EthersUniSwap3Pair[]\n  protected get provider() {\n    return this.params.provider\n  }\n\n  protected override async observeHandler(): Promise<Payload[]> {\n    await this.started('throw')\n    const pairs = await pricesFromUniswap3(assertEx(this.pairs))\n    const timestamp = Date.now()\n\n    const payload: UniswapCryptoMarketPayload = {\n      pairs,\n      schema: UniswapCryptoMarketSchema,\n      timestamp,\n    }\n\n    return [payload]\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    this.pairs = createUniswapPoolContracts(assertEx(this.provider, 'Provider Required'), this.config?.pools ?? UniswapPoolContracts)\n    return true\n  }\n}\n","export const logErrors = <T>(func: () => T) => {\n  try {\n    return func()\n  } catch (ex) {\n    console.error(ex)\n    throw ex\n  }\n}\n\nexport const logErrorsAsync = async <T>(func: () => Promise<T>) => {\n  try {\n    return await func()\n  } catch (ex) {\n    console.error(ex)\n    throw ex\n  }\n}\n","import { ChainId } from '@uniswap/sdk'\nimport { Token } from '@uniswap/sdk-core'\nimport { Pool } from '@uniswap/v3-sdk'\nimport { assertEx } from '@xylabs/assert'\nimport { delay } from '@xylabs/delay'\nimport { IERC20Metadata, IERC20Metadata__factory } from '@xyo-network/typechain'\nimport * as UniswapTypechain from '@xyo-network/uniswap-typechain'\nimport { Provider } from 'ethers'\n\nimport { logErrors, logErrorsAsync } from '../logErrors'\nimport { EthersUniswap3PoolSlot0Wrapper } from './Uniswap3PoolSlot0Wrapper'\n\n//null is used as 'in-progress'\nconst waitNotNull = async (closure: () => unknown) => {\n  while (closure() === null) {\n    await delay(10)\n  }\n}\n\nexport class EthersUniSwap3Pair {\n  protected address: string\n  protected provider: Provider\n\n  private _pool?: Pool | null\n  private _poolContract?: UniswapTypechain.IUniswapV3Pool\n  private _slot0?: EthersUniswap3PoolSlot0Wrapper | null\n  private _tokenContracts: (IERC20Metadata | null | undefined)[] = [undefined, undefined]\n  private _tokens: (Token | null | undefined)[] = [undefined, undefined]\n\n  constructor(address: string, provider: Provider) {\n    this.address = address\n    this.provider = provider\n  }\n\n  async pool(): Promise<Pool> {\n    return await logErrorsAsync(async () => {\n      await waitNotNull(() => this._pool)\n      this._pool = this._pool || null\n      const slot0 = await this.slot0()\n      this._pool =\n        this._pool ??\n        new Pool(\n          await this.token(0),\n          await this.token(1),\n          Number(slot0.feeProtocol),\n          slot0.sqrtPriceX96.toString(16),\n          (await this.poolContract().liquidity()).toString(16),\n          Number(slot0.tick),\n        )\n      return assertEx(this._pool)\n    })\n  }\n\n  poolContract(): UniswapTypechain.IUniswapV3Pool {\n    return logErrors(() => {\n      this._poolContract = this._poolContract ?? UniswapTypechain.IUniswapV3Pool__factory.connect(this.address, this.provider)\n      return assertEx(this._poolContract)\n    })\n  }\n\n  async price() {\n    return await logErrorsAsync(async () => {\n      const tokenIndexes: (0 | 1)[] = [0, 1]\n      const pool = await this.pool()\n      const tokens = await Promise.all(tokenIndexes.map((value) => this.token(value)))\n      const tokenContracts = await Promise.all(tokenIndexes.map((value) => this.tokenContract(value)))\n      const tokenPrices = tokens.map((token) => parseFloat(pool.priceOf(token).toSignificant()))\n      const tokenSymbols = tokens.map((token, index) => assertEx(token.symbol, `Token[${index}] Missing Symbols`).toLowerCase())\n      const result = {\n        tokens: await Promise.all(\n          tokenIndexes.map(async (value) => {\n            return { address: await tokenContracts[value].getAddress(), symbol: tokenSymbols[value], value: tokenPrices[value] }\n          }),\n        ),\n      }\n      return result\n    })\n  }\n\n  async slot0(): Promise<EthersUniswap3PoolSlot0Wrapper> {\n    return await logErrorsAsync(async () => {\n      await waitNotNull(() => this._slot0)\n      this._slot0 = this._slot0 || null\n      this._slot0 = this._slot0 ?? new EthersUniswap3PoolSlot0Wrapper(await this.poolContract().slot0())\n      return assertEx(this._slot0)\n    })\n  }\n\n  async token(index: 0 | 1): Promise<Token> {\n    return await logErrorsAsync(async () => {\n      await waitNotNull(() => this._tokens[index])\n      this._tokens[index] = this._tokens[index] || null\n      const tokenContract = await this.tokenContract(index)\n      this._tokens[index] =\n        this._tokens[index] ??\n        new Token(\n          ChainId.MAINNET,\n          await tokenContract.getAddress(),\n          Number(await tokenContract.decimals()),\n          await tokenContract.symbol(),\n          await tokenContract.name(),\n        )\n      return assertEx(this._tokens[index])\n    })\n  }\n\n  async tokenContract(index: 0 | 1): Promise<IERC20Metadata> {\n    return await logErrorsAsync(async () => {\n      await waitNotNull(() => this._tokenContracts[index])\n      this._tokenContracts[index] = this._tokenContracts[index] || null\n      this._tokenContracts[index] =\n        this._tokenContracts[index] ??\n        IERC20Metadata__factory.connect(await (index === 0 ? this.poolContract().token0() : this.poolContract().token1()), this.provider)\n      return assertEx(this._tokenContracts[index])\n    })\n  }\n}\n","import { EthersUniswapV3Slot0Fields } from './UniswapV3Slot0Fields'\n\nexport class EthersUniswap3PoolSlot0Wrapper {\n  protected values: EthersUniswapV3Slot0Fields\n  constructor(values: EthersUniswapV3Slot0Fields) {\n    this.values = values\n  }\n\n  get feeProtocol() {\n    return this.values[5]\n  }\n\n  get observationCardinality() {\n    return this.values[3]\n  }\n\n  get observationCardinalityNext() {\n    return this.values[4]\n  }\n\n  get observationIndex() {\n    return this.values[2]\n  }\n\n  get sqrtPriceX96() {\n    return this.values[0]\n  }\n\n  get tick() {\n    return this.values[1]\n  }\n\n  get unlocked() {\n    return this.values[6]\n  }\n}\n","import { Provider } from 'ethers'\n\nimport { logErrors } from '../logErrors'\nimport { EthersUniSwap3Pair } from './UniSwap3Pair'\n\nexport const createUniswapPoolContracts = (provider: Provider, contracts: string[]) => {\n  return logErrors(() => {\n    return contracts.map((contract) => new EthersUniSwap3Pair(contract, provider))\n  })\n}\n","import { fulfilled } from '@xylabs/promise'\nimport { UniswapCryptoPair } from '@xyo-network/uniswap-crypto-market-payload-plugin'\n\nimport { EthersUniSwap3Pair } from './Ethers'\nimport { logErrorsAsync } from './logErrors'\n\nexport const pricesFromUniswap3 = async (pools: EthersUniSwap3Pair[]): Promise<UniswapCryptoPair[]> => {\n  return await logErrorsAsync(async () => {\n    const promiseResults = await Promise.allSettled(\n      pools.map(async (pool): Promise<UniswapCryptoPair> => {\n        const result = await pool.price()\n        return result\n      }),\n    )\n    return promiseResults.filter(fulfilled).map((result) => result.value)\n  })\n}\n","export const UniswapPoolContracts = [\n  /*xyo/weth*/ '0xE331DE28cd81B768C19A366b0e4e4675c45eC2dA',\n  /*xyo/usdt*/ '0xd0AF1981f52146a6939385451dAeA0726e13a484',\n  /*xyo/dai*/ '0x9D7e5647CE3c7C2d835F2F5e82C8fDb36B0BB0fe',\n  /*wbtc/xyo*/ '0x0cF7494c9dE661467403aBeE8454b3BBf0179a84',\n  /*link/xyo*/ '0x4693456599a8a4975862A0E720C5de7E1D09A1e4',\n  /*wbtc/weth*/ '0xCBCdF9626bC03E24f779434178A73a0B4bad62eD',\n  /*dai/usdc*/ '0x5777d92f208679DB4b9778590Fa3CAB3aC9e2168',\n  /*usdc/weth*/ '0x8ad599c3A0ff1De082011EFDDc58f1908eb6e6D8',\n  /*usdc/weth*/ '0x88e6A0c2dDD26FEEb64F039a2c41296FcB3f5640',\n  /*dai/usdc*/ '0x6c6Bc977E13Df9b0de53b251522280BB72383700',\n  /*frax/usdc*/ '0xc63B0708E2F7e69CB8A1df0e1389A98C35A76D52',\n  /*wbtc/usdc*/ '0x99ac8cA7087fA4A2A1FB6357269965A2014ABc35',\n  /*usdc/usdt*/ '0x3416cF6C708Da44DB2624D63ea0AAef7113527C6',\n]\n"],"mappings":"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","names":["import_uniswap_crypto_market_payload_plugin","import_assert"]}
+{"version":3,"sources":["../../src/index.ts","../../src/Plugin.ts","../../src/Witness.ts","../../src/lib/logErrors.ts","../../src/lib/Ethers/UniSwap3Pair.ts","../../src/lib/Ethers/Uniswap3PoolSlot0Wrapper.ts","../../src/lib/Ethers/createUniswapPoolContracts.ts","../../src/lib/pricesFromUniswap3.ts","../../src/lib/UniswapPoolContracts.ts"],"sourcesContent":["import { UniswapCryptoMarketPlugin } from './Plugin'\n\nexport * from './Config'\nexport * from './lib'\nexport * from './Witness'\n\nexport { UniswapCryptoMarketPlugin }\n\n// eslint-disable-next-line import/no-default-export\nexport default UniswapCryptoMarketPlugin\n","import { PayloadSetSchema } from '@xyo-network/payload-model'\nimport { createPayloadSetWitnessPlugin } from '@xyo-network/payloadset-plugin'\nimport { UniswapCryptoMarketSchema } from '@xyo-network/uniswap-crypto-market-payload-plugin'\n\nimport { UniswapCryptoMarketWitness } from './Witness'\n\nexport const UniswapCryptoMarketPlugin = () =>\n  createPayloadSetWitnessPlugin<UniswapCryptoMarketWitness>(\n    { required: { [UniswapCryptoMarketSchema]: 1 }, schema: PayloadSetSchema },\n    {\n      witness: async (params) => {\n        const result = await UniswapCryptoMarketWitness.create(params)\n        return result\n      },\n    },\n  )\n","import { assertEx } from '@xylabs/assert'\nimport { AbstractWitness } from '@xyo-network/abstract-witness'\nimport { AnyConfigSchema } from '@xyo-network/module-model'\nimport { Payload } from '@xyo-network/payload-model'\nimport {\n  UniswapCryptoMarketPayload,\n  UniswapCryptoMarketSchema,\n  UniswapCryptoMarketWitnessConfigSchema,\n} from '@xyo-network/uniswap-crypto-market-payload-plugin'\nimport { WitnessParams } from '@xyo-network/witness-model'\nimport { Provider } from 'ethers'\n\nimport { UniswapCryptoMarketWitnessConfig } from './Config'\nimport { createUniswapPoolContracts, EthersUniSwap3Pair, pricesFromUniswap3, UniswapPoolContracts } from './lib'\n\nexport type UniswapCryptoMarketWitnessParams = WitnessParams<\n  AnyConfigSchema<UniswapCryptoMarketWitnessConfig>,\n  {\n    provider?: Provider\n  }\n>\n\nexport class UniswapCryptoMarketWitness<\n  TParams extends UniswapCryptoMarketWitnessParams = UniswapCryptoMarketWitnessParams,\n> extends AbstractWitness<TParams> {\n  static override configSchemas = [UniswapCryptoMarketWitnessConfigSchema]\n\n  protected pairs?: EthersUniSwap3Pair[]\n  protected get provider() {\n    return this.params.provider\n  }\n\n  protected override async observeHandler(): Promise<Payload[]> {\n    await this.started('throw')\n    const pairs = await pricesFromUniswap3(assertEx(this.pairs))\n    const timestamp = Date.now()\n\n    const payload: UniswapCryptoMarketPayload = {\n      pairs,\n      schema: UniswapCryptoMarketSchema,\n      timestamp,\n    }\n\n    return [payload]\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    this.pairs = createUniswapPoolContracts(assertEx(this.provider, 'Provider Required'), this.config?.pools ?? UniswapPoolContracts)\n    return true\n  }\n}\n","export const logErrors = <T>(func: () => T) => {\n  try {\n    return func()\n  } catch (ex) {\n    console.error(ex)\n    throw ex\n  }\n}\n\nexport const logErrorsAsync = async <T>(func: () => Promise<T>) => {\n  try {\n    return await func()\n  } catch (ex) {\n    console.error(ex)\n    throw ex\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport { delay } from '@xylabs/delay'\nimport { IERC20Metadata, IERC20Metadata__factory } from '@xyo-network/typechain'\nimport { Token } from '@xyo-network/uniswap-sdk-core'\nimport { IUniswapV3Pool, IUniswapV3Pool__factory, IUniswapV3PoolState, IUniswapV3PoolState__factory } from '@xyo-network/uniswap-typechain'\nimport { Pool } from '@xyo-network/uniswap-v3-sdk'\nimport { Provider } from 'ethers'\n\nimport { logErrors, logErrorsAsync } from '../logErrors'\nimport { EthersUniswap3PoolSlot0Wrapper } from './Uniswap3PoolSlot0Wrapper'\n\nexport enum ChainId {\n  MAINNET = 1,\n  ROPSTEN = 3,\n  RINKEBY = 4,\n  GÖRLI = 5,\n  KOVAN = 42,\n}\n\n//null is used as 'in-progress'\nconst waitNotNull = async (closure: () => unknown) => {\n  while (closure() === null) await delay(10)\n}\n\nexport class EthersUniSwap3Pair {\n  protected address: string\n  protected provider: Provider\n\n  private _pool?: Pool | null\n  private _poolContract?: IUniswapV3Pool\n  private _slot0?: EthersUniswap3PoolSlot0Wrapper | null\n  private _tokenContracts: (IERC20Metadata | null | undefined)[] = [undefined, undefined]\n  private _tokens: (Token | null | undefined)[] = [undefined, undefined]\n\n  constructor(address: string, provider: Provider) {\n    this.address = address\n    this.provider = provider\n  }\n\n  async pool(): Promise<Pool> {\n    return await logErrorsAsync(async () => {\n      await waitNotNull(() => this._pool)\n      this._pool = this._pool || null\n      const slot0 = await this.slot0()\n      this._pool =\n        this._pool !== null\n          ? this._pool\n          : new Pool(\n              await this.token(0),\n              await this.token(1),\n              Number(slot0.feeProtocol),\n              `0x${slot0.sqrtPriceX96.toString(16)}`,\n              `0x${(await this.poolContract().liquidity()).toString(16)}`,\n              Number(slot0.tick),\n            )\n      return assertEx(this._pool)\n    })\n  }\n\n  poolContract() {\n    return logErrors(() => {\n      this._poolContract = this._poolContract ?? IUniswapV3Pool__factory.connect(this.address, this.provider)\n      return assertEx(this._poolContract)\n    })\n  }\n\n  async price() {\n    return await logErrorsAsync(async () => {\n      const tokenIndexes: (0 | 1)[] = [0, 1]\n      const pool = await this.pool()\n      const tokens = await Promise.all(tokenIndexes.map((value) => this.token(value)))\n      const tokenContracts = await Promise.all(tokenIndexes.map((value) => this.tokenContract(value)))\n      const tokenPrices = tokens.map((token) => parseFloat(pool.priceOf(token).toSignificant()))\n      const tokenSymbols = tokens.map((token, index) => assertEx(token.symbol, `Token[${index}] Missing Symbols`).toLowerCase())\n      const result = {\n        tokens: await Promise.all(\n          tokenIndexes.map(async (value) => {\n            return { address: await tokenContracts[value].getAddress(), symbol: tokenSymbols[value], value: tokenPrices[value] }\n          }),\n        ),\n      }\n      return result\n    })\n  }\n\n  async slot0(): Promise<EthersUniswap3PoolSlot0Wrapper> {\n    return await logErrorsAsync(async () => {\n      await waitNotNull(() => this._slot0)\n      this._slot0 = this._slot0 || null\n      if (this._slot0 === null) {\n        const poolContract = this.poolContract()\n        const slot = await poolContract.slot0()\n        this._slot0 = this._slot0 ?? new EthersUniswap3PoolSlot0Wrapper(slot)\n      }\n      return assertEx(this._slot0)\n    })\n  }\n\n  async token(index: 0 | 1): Promise<Token> {\n    return await logErrorsAsync(async () => {\n      await waitNotNull(() => this._tokens[index])\n      this._tokens[index] = this._tokens[index] || null\n      const tokenContract = await this.tokenContract(index)\n      this._tokens[index] =\n        this._tokens[index] ??\n        new Token(\n          ChainId.MAINNET,\n          await tokenContract.getAddress(),\n          Number(await tokenContract.decimals()),\n          await tokenContract.symbol(),\n          await tokenContract.name(),\n        )\n      return assertEx(this._tokens[index])\n    })\n  }\n\n  async tokenContract(index: 0 | 1): Promise<IERC20Metadata> {\n    return await logErrorsAsync(async () => {\n      await waitNotNull(() => this._tokenContracts[index])\n      this._tokenContracts[index] = this._tokenContracts[index] || null\n      this._tokenContracts[index] =\n        this._tokenContracts[index] ??\n        IERC20Metadata__factory.connect(await (index === 0 ? this.poolContract().token0() : this.poolContract().token1()), this.provider)\n      return assertEx(this._tokenContracts[index])\n    })\n  }\n}\n","import { EthersUniswapV3Slot0Fields } from './UniswapV3Slot0Fields'\n\nexport class EthersUniswap3PoolSlot0Wrapper {\n  protected values: EthersUniswapV3Slot0Fields\n  constructor(values: EthersUniswapV3Slot0Fields) {\n    this.values = values\n  }\n\n  get feeProtocol() {\n    return this.values[5]\n  }\n\n  get observationCardinality() {\n    return this.values[3]\n  }\n\n  get observationCardinalityNext() {\n    return this.values[4]\n  }\n\n  get observationIndex() {\n    return this.values[2]\n  }\n\n  get sqrtPriceX96() {\n    return this.values[0]\n  }\n\n  get tick() {\n    return this.values[1]\n  }\n\n  get unlocked() {\n    return this.values[6]\n  }\n}\n","import { Provider } from 'ethers'\n\nimport { logErrors } from '../logErrors'\nimport { EthersUniSwap3Pair } from './UniSwap3Pair'\n\nexport const createUniswapPoolContracts = (provider: Provider, contracts: string[]) => {\n  return logErrors(() => {\n    return contracts.map((contract) => new EthersUniSwap3Pair(contract, provider))\n  })\n}\n","import { fulfilled } from '@xylabs/promise'\nimport { UniswapCryptoPair } from '@xyo-network/uniswap-crypto-market-payload-plugin'\n\nimport { EthersUniSwap3Pair } from './Ethers'\nimport { logErrorsAsync } from './logErrors'\n\nexport const pricesFromUniswap3 = async (pools: EthersUniSwap3Pair[]): Promise<UniswapCryptoPair[]> => {\n  return await logErrorsAsync(async () => {\n    const promiseResults = await Promise.allSettled(\n      pools.map(async (pool): Promise<UniswapCryptoPair> => {\n        const result = await pool.price()\n        return result\n      }),\n    )\n    return promiseResults.filter(fulfilled).map((result) => result.value)\n  })\n}\n","export const UniswapPoolContracts = [\n  /*xyo/weth*/ '0xE331DE28cd81B768C19A366b0e4e4675c45eC2dA',\n  /*xyo/usdt*/ '0xd0AF1981f52146a6939385451dAeA0726e13a484',\n  /*xyo/dai*/ '0x9D7e5647CE3c7C2d835F2F5e82C8fDb36B0BB0fe',\n  /*wbtc/xyo*/ '0x0cF7494c9dE661467403aBeE8454b3BBf0179a84',\n  /*link/xyo*/ '0x4693456599a8a4975862A0E720C5de7E1D09A1e4',\n  /*wbtc/weth*/ '0xCBCdF9626bC03E24f779434178A73a0B4bad62eD',\n  /*dai/usdc*/ '0x5777d92f208679DB4b9778590Fa3CAB3aC9e2168',\n  /*usdc/weth*/ '0x8ad599c3A0ff1De082011EFDDc58f1908eb6e6D8',\n  /*usdc/weth*/ '0x88e6A0c2dDD26FEEb64F039a2c41296FcB3f5640',\n  /*dai/usdc*/ '0x6c6Bc977E13Df9b0de53b251522280BB72383700',\n  /*frax/usdc*/ '0xc63B0708E2F7e69CB8A1df0e1389A98C35A76D52',\n  /*wbtc/usdc*/ '0x99ac8cA7087fA4A2A1FB6357269965A2014ABc35',\n  /*usdc/usdt*/ '0x3416cF6C708Da44DB2624D63ea0AAef7113527C6',\n]\n"],"mappings":"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","names":["import_uniswap_crypto_market_payload_plugin","import_assert","ChainId"]}

package/dist/browser/index.js

@@ -30,13 +30,12 @@ var logErrorsAsync = async (func) => {
 };
 
 // src/lib/Ethers/UniSwap3Pair.ts
-import { ChainId } from "@uniswap/sdk";
-import { Token } from "@uniswap/sdk-core";
-import { Pool } from "@uniswap/v3-sdk";
 import { assertEx } from "@xylabs/assert";
 import { delay } from "@xylabs/delay";
 import { IERC20Metadata__factory } from "@xyo-network/typechain";
-import * as UniswapTypechain from "@xyo-network/uniswap-typechain";
+import { Token } from "@xyo-network/uniswap-sdk-core";
+import { IUniswapV3Pool__factory } from "@xyo-network/uniswap-typechain";
+import { Pool } from "@xyo-network/uniswap-v3-sdk";
 
 // src/lib/Ethers/Uniswap3PoolSlot0Wrapper.ts
 var EthersUniswap3PoolSlot0Wrapper = class {
@@ -68,10 +67,17 @@ var EthersUniswap3PoolSlot0Wrapper = class {
 };
 
 // src/lib/Ethers/UniSwap3Pair.ts
+var ChainId = /* @__PURE__ */ ((ChainId2) => {
+  ChainId2[ChainId2["MAINNET"] = 1] = "MAINNET";
+  ChainId2[ChainId2["ROPSTEN"] = 3] = "ROPSTEN";
+  ChainId2[ChainId2["RINKEBY"] = 4] = "RINKEBY";
+  ChainId2[ChainId2["G\xD6RLI"] = 5] = "G\xD6RLI";
+  ChainId2[ChainId2["KOVAN"] = 42] = "KOVAN";
+  return ChainId2;
+})(ChainId || {});
 var waitNotNull = async (closure) => {
-  while (closure() === null) {
+  while (closure() === null)
     await delay(10);
-  }
 };
 var EthersUniSwap3Pair = class {
   address;
@@ -90,12 +96,12 @@ var EthersUniSwap3Pair = class {
       await waitNotNull(() => this._pool);
       this._pool = this._pool || null;
       const slot0 = await this.slot0();
-      this._pool = this._pool ?? new Pool(
+      this._pool = this._pool !== null ? this._pool : new Pool(
         await this.token(0),
         await this.token(1),
         Number(slot0.feeProtocol),
-        slot0.sqrtPriceX96.toString(16),
-        (await this.poolContract().liquidity()).toString(16),
+        `0x${slot0.sqrtPriceX96.toString(16)}`,
+        `0x${(await this.poolContract().liquidity()).toString(16)}`,
         Number(slot0.tick)
       );
       return assertEx(this._pool);
@@ -103,7 +109,7 @@ var EthersUniSwap3Pair = class {
   }
   poolContract() {
     return logErrors(() => {
-      this._poolContract = this._poolContract ?? UniswapTypechain.IUniswapV3Pool__factory.connect(this.address, this.provider);
+      this._poolContract = this._poolContract ?? IUniswapV3Pool__factory.connect(this.address, this.provider);
       return assertEx(this._poolContract);
     });
   }
@@ -129,7 +135,11 @@ var EthersUniSwap3Pair = class {
     return await logErrorsAsync(async () => {
       await waitNotNull(() => this._slot0);
       this._slot0 = this._slot0 || null;
-      this._slot0 = this._slot0 ?? new EthersUniswap3PoolSlot0Wrapper(await this.poolContract().slot0());
+      if (this._slot0 === null) {
+        const poolContract = this.poolContract();
+        const slot = await poolContract.slot0();
+        this._slot0 = this._slot0 ?? new EthersUniswap3PoolSlot0Wrapper(slot);
+      }
       return assertEx(this._slot0);
     });
   }
@@ -139,7 +149,7 @@ var EthersUniSwap3Pair = class {
       this._tokens[index] = this._tokens[index] || null;
       const tokenContract = await this.tokenContract(index);
       this._tokens[index] = this._tokens[index] ?? new Token(
-        ChainId.MAINNET,
+        1 /* MAINNET */,
         await tokenContract.getAddress(),
         Number(await tokenContract.decimals()),
         await tokenContract.symbol(),
@@ -248,6 +258,7 @@ var UniswapCryptoMarketPlugin = () => createPayloadSetWitnessPlugin(
 // src/index.ts
 var src_default = UniswapCryptoMarketPlugin;
 export {
+  ChainId,
   EthersUniSwap3Pair,
   EthersUniswap3PoolSlot0Wrapper,
   UniswapCryptoMarketPlugin,

package/dist/browser/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Plugin.ts","../../src/Witness.ts","../../src/lib/logErrors.ts","../../src/lib/Ethers/UniSwap3Pair.ts","../../src/lib/Ethers/Uniswap3PoolSlot0Wrapper.ts","../../src/lib/Ethers/createUniswapPoolContracts.ts","../../src/lib/pricesFromUniswap3.ts","../../src/lib/UniswapPoolContracts.ts","../../src/index.ts"],"sourcesContent":["import { PayloadSetSchema } from '@xyo-network/payload-model'\nimport { createPayloadSetWitnessPlugin } from '@xyo-network/payloadset-plugin'\nimport { UniswapCryptoMarketSchema } from '@xyo-network/uniswap-crypto-market-payload-plugin'\n\nimport { UniswapCryptoMarketWitness } from './Witness'\n\nexport const UniswapCryptoMarketPlugin = () =>\n  createPayloadSetWitnessPlugin<UniswapCryptoMarketWitness>(\n    { required: { [UniswapCryptoMarketSchema]: 1 }, schema: PayloadSetSchema },\n    {\n      witness: async (params) => {\n        const result = await UniswapCryptoMarketWitness.create(params)\n        return result\n      },\n    },\n  )\n","import { assertEx } from '@xylabs/assert'\nimport { AbstractWitness } from '@xyo-network/abstract-witness'\nimport { AnyConfigSchema } from '@xyo-network/module-model'\nimport { Payload } from '@xyo-network/payload-model'\nimport {\n  UniswapCryptoMarketPayload,\n  UniswapCryptoMarketSchema,\n  UniswapCryptoMarketWitnessConfigSchema,\n} from '@xyo-network/uniswap-crypto-market-payload-plugin'\nimport { WitnessParams } from '@xyo-network/witness-model'\nimport { Provider } from 'ethers'\n\nimport { UniswapCryptoMarketWitnessConfig } from './Config'\nimport { createUniswapPoolContracts, EthersUniSwap3Pair, pricesFromUniswap3, UniswapPoolContracts } from './lib'\n\nexport type UniswapCryptoMarketWitnessParams = WitnessParams<\n  AnyConfigSchema<UniswapCryptoMarketWitnessConfig>,\n  {\n    provider?: Provider\n  }\n>\n\nexport class UniswapCryptoMarketWitness<\n  TParams extends UniswapCryptoMarketWitnessParams = UniswapCryptoMarketWitnessParams,\n> extends AbstractWitness<TParams> {\n  static override configSchemas = [UniswapCryptoMarketWitnessConfigSchema]\n\n  protected pairs?: EthersUniSwap3Pair[]\n  protected get provider() {\n    return this.params.provider\n  }\n\n  protected override async observeHandler(): Promise<Payload[]> {\n    await this.started('throw')\n    const pairs = await pricesFromUniswap3(assertEx(this.pairs))\n    const timestamp = Date.now()\n\n    const payload: UniswapCryptoMarketPayload = {\n      pairs,\n      schema: UniswapCryptoMarketSchema,\n      timestamp,\n    }\n\n    return [payload]\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    this.pairs = createUniswapPoolContracts(assertEx(this.provider, 'Provider Required'), this.config?.pools ?? UniswapPoolContracts)\n    return true\n  }\n}\n","export const logErrors = <T>(func: () => T) => {\n  try {\n    return func()\n  } catch (ex) {\n    console.error(ex)\n    throw ex\n  }\n}\n\nexport const logErrorsAsync = async <T>(func: () => Promise<T>) => {\n  try {\n    return await func()\n  } catch (ex) {\n    console.error(ex)\n    throw ex\n  }\n}\n","import { ChainId } from '@uniswap/sdk'\nimport { Token } from '@uniswap/sdk-core'\nimport { Pool } from '@uniswap/v3-sdk'\nimport { assertEx } from '@xylabs/assert'\nimport { delay } from '@xylabs/delay'\nimport { IERC20Metadata, IERC20Metadata__factory } from '@xyo-network/typechain'\nimport * as UniswapTypechain from '@xyo-network/uniswap-typechain'\nimport { Provider } from 'ethers'\n\nimport { logErrors, logErrorsAsync } from '../logErrors'\nimport { EthersUniswap3PoolSlot0Wrapper } from './Uniswap3PoolSlot0Wrapper'\n\n//null is used as 'in-progress'\nconst waitNotNull = async (closure: () => unknown) => {\n  while (closure() === null) {\n    await delay(10)\n  }\n}\n\nexport class EthersUniSwap3Pair {\n  protected address: string\n  protected provider: Provider\n\n  private _pool?: Pool | null\n  private _poolContract?: UniswapTypechain.IUniswapV3Pool\n  private _slot0?: EthersUniswap3PoolSlot0Wrapper | null\n  private _tokenContracts: (IERC20Metadata | null | undefined)[] = [undefined, undefined]\n  private _tokens: (Token | null | undefined)[] = [undefined, undefined]\n\n  constructor(address: string, provider: Provider) {\n    this.address = address\n    this.provider = provider\n  }\n\n  async pool(): Promise<Pool> {\n    return await logErrorsAsync(async () => {\n      await waitNotNull(() => this._pool)\n      this._pool = this._pool || null\n      const slot0 = await this.slot0()\n      this._pool =\n        this._pool ??\n        new Pool(\n          await this.token(0),\n          await this.token(1),\n          Number(slot0.feeProtocol),\n          slot0.sqrtPriceX96.toString(16),\n          (await this.poolContract().liquidity()).toString(16),\n          Number(slot0.tick),\n        )\n      return assertEx(this._pool)\n    })\n  }\n\n  poolContract(): UniswapTypechain.IUniswapV3Pool {\n    return logErrors(() => {\n      this._poolContract = this._poolContract ?? UniswapTypechain.IUniswapV3Pool__factory.connect(this.address, this.provider)\n      return assertEx(this._poolContract)\n    })\n  }\n\n  async price() {\n    return await logErrorsAsync(async () => {\n      const tokenIndexes: (0 | 1)[] = [0, 1]\n      const pool = await this.pool()\n      const tokens = await Promise.all(tokenIndexes.map((value) => this.token(value)))\n      const tokenContracts = await Promise.all(tokenIndexes.map((value) => this.tokenContract(value)))\n      const tokenPrices = tokens.map((token) => parseFloat(pool.priceOf(token).toSignificant()))\n      const tokenSymbols = tokens.map((token, index) => assertEx(token.symbol, `Token[${index}] Missing Symbols`).toLowerCase())\n      const result = {\n        tokens: await Promise.all(\n          tokenIndexes.map(async (value) => {\n            return { address: await tokenContracts[value].getAddress(), symbol: tokenSymbols[value], value: tokenPrices[value] }\n          }),\n        ),\n      }\n      return result\n    })\n  }\n\n  async slot0(): Promise<EthersUniswap3PoolSlot0Wrapper> {\n    return await logErrorsAsync(async () => {\n      await waitNotNull(() => this._slot0)\n      this._slot0 = this._slot0 || null\n      this._slot0 = this._slot0 ?? new EthersUniswap3PoolSlot0Wrapper(await this.poolContract().slot0())\n      return assertEx(this._slot0)\n    })\n  }\n\n  async token(index: 0 | 1): Promise<Token> {\n    return await logErrorsAsync(async () => {\n      await waitNotNull(() => this._tokens[index])\n      this._tokens[index] = this._tokens[index] || null\n      const tokenContract = await this.tokenContract(index)\n      this._tokens[index] =\n        this._tokens[index] ??\n        new Token(\n          ChainId.MAINNET,\n          await tokenContract.getAddress(),\n          Number(await tokenContract.decimals()),\n          await tokenContract.symbol(),\n          await tokenContract.name(),\n        )\n      return assertEx(this._tokens[index])\n    })\n  }\n\n  async tokenContract(index: 0 | 1): Promise<IERC20Metadata> {\n    return await logErrorsAsync(async () => {\n      await waitNotNull(() => this._tokenContracts[index])\n      this._tokenContracts[index] = this._tokenContracts[index] || null\n      this._tokenContracts[index] =\n        this._tokenContracts[index] ??\n        IERC20Metadata__factory.connect(await (index === 0 ? this.poolContract().token0() : this.poolContract().token1()), this.provider)\n      return assertEx(this._tokenContracts[index])\n    })\n  }\n}\n","import { EthersUniswapV3Slot0Fields } from './UniswapV3Slot0Fields'\n\nexport class EthersUniswap3PoolSlot0Wrapper {\n  protected values: EthersUniswapV3Slot0Fields\n  constructor(values: EthersUniswapV3Slot0Fields) {\n    this.values = values\n  }\n\n  get feeProtocol() {\n    return this.values[5]\n  }\n\n  get observationCardinality() {\n    return this.values[3]\n  }\n\n  get observationCardinalityNext() {\n    return this.values[4]\n  }\n\n  get observationIndex() {\n    return this.values[2]\n  }\n\n  get sqrtPriceX96() {\n    return this.values[0]\n  }\n\n  get tick() {\n    return this.values[1]\n  }\n\n  get unlocked() {\n    return this.values[6]\n  }\n}\n","import { Provider } from 'ethers'\n\nimport { logErrors } from '../logErrors'\nimport { EthersUniSwap3Pair } from './UniSwap3Pair'\n\nexport const createUniswapPoolContracts = (provider: Provider, contracts: string[]) => {\n  return logErrors(() => {\n    return contracts.map((contract) => new EthersUniSwap3Pair(contract, provider))\n  })\n}\n","import { fulfilled } from '@xylabs/promise'\nimport { UniswapCryptoPair } from '@xyo-network/uniswap-crypto-market-payload-plugin'\n\nimport { EthersUniSwap3Pair } from './Ethers'\nimport { logErrorsAsync } from './logErrors'\n\nexport const pricesFromUniswap3 = async (pools: EthersUniSwap3Pair[]): Promise<UniswapCryptoPair[]> => {\n  return await logErrorsAsync(async () => {\n    const promiseResults = await Promise.allSettled(\n      pools.map(async (pool): Promise<UniswapCryptoPair> => {\n        const result = await pool.price()\n        return result\n      }),\n    )\n    return promiseResults.filter(fulfilled).map((result) => result.value)\n  })\n}\n","export const UniswapPoolContracts = [\n  /*xyo/weth*/ '0xE331DE28cd81B768C19A366b0e4e4675c45eC2dA',\n  /*xyo/usdt*/ '0xd0AF1981f52146a6939385451dAeA0726e13a484',\n  /*xyo/dai*/ '0x9D7e5647CE3c7C2d835F2F5e82C8fDb36B0BB0fe',\n  /*wbtc/xyo*/ '0x0cF7494c9dE661467403aBeE8454b3BBf0179a84',\n  /*link/xyo*/ '0x4693456599a8a4975862A0E720C5de7E1D09A1e4',\n  /*wbtc/weth*/ '0xCBCdF9626bC03E24f779434178A73a0B4bad62eD',\n  /*dai/usdc*/ '0x5777d92f208679DB4b9778590Fa3CAB3aC9e2168',\n  /*usdc/weth*/ '0x8ad599c3A0ff1De082011EFDDc58f1908eb6e6D8',\n  /*usdc/weth*/ '0x88e6A0c2dDD26FEEb64F039a2c41296FcB3f5640',\n  /*dai/usdc*/ '0x6c6Bc977E13Df9b0de53b251522280BB72383700',\n  /*frax/usdc*/ '0xc63B0708E2F7e69CB8A1df0e1389A98C35A76D52',\n  /*wbtc/usdc*/ '0x99ac8cA7087fA4A2A1FB6357269965A2014ABc35',\n  /*usdc/usdt*/ '0x3416cF6C708Da44DB2624D63ea0AAef7113527C6',\n]\n","import { UniswapCryptoMarketPlugin } from './Plugin'\n\nexport * from './Config'\nexport * from './lib'\nexport * from './Witness'\n\nexport { UniswapCryptoMarketPlugin }\n\n// eslint-disable-next-line import/no-default-export\nexport default UniswapCryptoMarketPlugin\n"],"mappings":"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","names":["UniswapCryptoMarketSchema","assertEx","assertEx","UniswapCryptoMarketSchema"]}
+{"version":3,"sources":["../../src/Plugin.ts","../../src/Witness.ts","../../src/lib/logErrors.ts","../../src/lib/Ethers/UniSwap3Pair.ts","../../src/lib/Ethers/Uniswap3PoolSlot0Wrapper.ts","../../src/lib/Ethers/createUniswapPoolContracts.ts","../../src/lib/pricesFromUniswap3.ts","../../src/lib/UniswapPoolContracts.ts","../../src/index.ts"],"sourcesContent":["import { PayloadSetSchema } from '@xyo-network/payload-model'\nimport { createPayloadSetWitnessPlugin } from '@xyo-network/payloadset-plugin'\nimport { UniswapCryptoMarketSchema } from '@xyo-network/uniswap-crypto-market-payload-plugin'\n\nimport { UniswapCryptoMarketWitness } from './Witness'\n\nexport const UniswapCryptoMarketPlugin = () =>\n  createPayloadSetWitnessPlugin<UniswapCryptoMarketWitness>(\n    { required: { [UniswapCryptoMarketSchema]: 1 }, schema: PayloadSetSchema },\n    {\n      witness: async (params) => {\n        const result = await UniswapCryptoMarketWitness.create(params)\n        return result\n      },\n    },\n  )\n","import { assertEx } from '@xylabs/assert'\nimport { AbstractWitness } from '@xyo-network/abstract-witness'\nimport { AnyConfigSchema } from '@xyo-network/module-model'\nimport { Payload } from '@xyo-network/payload-model'\nimport {\n  UniswapCryptoMarketPayload,\n  UniswapCryptoMarketSchema,\n  UniswapCryptoMarketWitnessConfigSchema,\n} from '@xyo-network/uniswap-crypto-market-payload-plugin'\nimport { WitnessParams } from '@xyo-network/witness-model'\nimport { Provider } from 'ethers'\n\nimport { UniswapCryptoMarketWitnessConfig } from './Config'\nimport { createUniswapPoolContracts, EthersUniSwap3Pair, pricesFromUniswap3, UniswapPoolContracts } from './lib'\n\nexport type UniswapCryptoMarketWitnessParams = WitnessParams<\n  AnyConfigSchema<UniswapCryptoMarketWitnessConfig>,\n  {\n    provider?: Provider\n  }\n>\n\nexport class UniswapCryptoMarketWitness<\n  TParams extends UniswapCryptoMarketWitnessParams = UniswapCryptoMarketWitnessParams,\n> extends AbstractWitness<TParams> {\n  static override configSchemas = [UniswapCryptoMarketWitnessConfigSchema]\n\n  protected pairs?: EthersUniSwap3Pair[]\n  protected get provider() {\n    return this.params.provider\n  }\n\n  protected override async observeHandler(): Promise<Payload[]> {\n    await this.started('throw')\n    const pairs = await pricesFromUniswap3(assertEx(this.pairs))\n    const timestamp = Date.now()\n\n    const payload: UniswapCryptoMarketPayload = {\n      pairs,\n      schema: UniswapCryptoMarketSchema,\n      timestamp,\n    }\n\n    return [payload]\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    this.pairs = createUniswapPoolContracts(assertEx(this.provider, 'Provider Required'), this.config?.pools ?? UniswapPoolContracts)\n    return true\n  }\n}\n","export const logErrors = <T>(func: () => T) => {\n  try {\n    return func()\n  } catch (ex) {\n    console.error(ex)\n    throw ex\n  }\n}\n\nexport const logErrorsAsync = async <T>(func: () => Promise<T>) => {\n  try {\n    return await func()\n  } catch (ex) {\n    console.error(ex)\n    throw ex\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport { delay } from '@xylabs/delay'\nimport { IERC20Metadata, IERC20Metadata__factory } from '@xyo-network/typechain'\nimport { Token } from '@xyo-network/uniswap-sdk-core'\nimport { IUniswapV3Pool, IUniswapV3Pool__factory, IUniswapV3PoolState, IUniswapV3PoolState__factory } from '@xyo-network/uniswap-typechain'\nimport { Pool } from '@xyo-network/uniswap-v3-sdk'\nimport { Provider } from 'ethers'\n\nimport { logErrors, logErrorsAsync } from '../logErrors'\nimport { EthersUniswap3PoolSlot0Wrapper } from './Uniswap3PoolSlot0Wrapper'\n\nexport enum ChainId {\n  MAINNET = 1,\n  ROPSTEN = 3,\n  RINKEBY = 4,\n  GÖRLI = 5,\n  KOVAN = 42,\n}\n\n//null is used as 'in-progress'\nconst waitNotNull = async (closure: () => unknown) => {\n  while (closure() === null) await delay(10)\n}\n\nexport class EthersUniSwap3Pair {\n  protected address: string\n  protected provider: Provider\n\n  private _pool?: Pool | null\n  private _poolContract?: IUniswapV3Pool\n  private _slot0?: EthersUniswap3PoolSlot0Wrapper | null\n  private _tokenContracts: (IERC20Metadata | null | undefined)[] = [undefined, undefined]\n  private _tokens: (Token | null | undefined)[] = [undefined, undefined]\n\n  constructor(address: string, provider: Provider) {\n    this.address = address\n    this.provider = provider\n  }\n\n  async pool(): Promise<Pool> {\n    return await logErrorsAsync(async () => {\n      await waitNotNull(() => this._pool)\n      this._pool = this._pool || null\n      const slot0 = await this.slot0()\n      this._pool =\n        this._pool !== null\n          ? this._pool\n          : new Pool(\n              await this.token(0),\n              await this.token(1),\n              Number(slot0.feeProtocol),\n              `0x${slot0.sqrtPriceX96.toString(16)}`,\n              `0x${(await this.poolContract().liquidity()).toString(16)}`,\n              Number(slot0.tick),\n            )\n      return assertEx(this._pool)\n    })\n  }\n\n  poolContract() {\n    return logErrors(() => {\n      this._poolContract = this._poolContract ?? IUniswapV3Pool__factory.connect(this.address, this.provider)\n      return assertEx(this._poolContract)\n    })\n  }\n\n  async price() {\n    return await logErrorsAsync(async () => {\n      const tokenIndexes: (0 | 1)[] = [0, 1]\n      const pool = await this.pool()\n      const tokens = await Promise.all(tokenIndexes.map((value) => this.token(value)))\n      const tokenContracts = await Promise.all(tokenIndexes.map((value) => this.tokenContract(value)))\n      const tokenPrices = tokens.map((token) => parseFloat(pool.priceOf(token).toSignificant()))\n      const tokenSymbols = tokens.map((token, index) => assertEx(token.symbol, `Token[${index}] Missing Symbols`).toLowerCase())\n      const result = {\n        tokens: await Promise.all(\n          tokenIndexes.map(async (value) => {\n            return { address: await tokenContracts[value].getAddress(), symbol: tokenSymbols[value], value: tokenPrices[value] }\n          }),\n        ),\n      }\n      return result\n    })\n  }\n\n  async slot0(): Promise<EthersUniswap3PoolSlot0Wrapper> {\n    return await logErrorsAsync(async () => {\n      await waitNotNull(() => this._slot0)\n      this._slot0 = this._slot0 || null\n      if (this._slot0 === null) {\n        const poolContract = this.poolContract()\n        const slot = await poolContract.slot0()\n        this._slot0 = this._slot0 ?? new EthersUniswap3PoolSlot0Wrapper(slot)\n      }\n      return assertEx(this._slot0)\n    })\n  }\n\n  async token(index: 0 | 1): Promise<Token> {\n    return await logErrorsAsync(async () => {\n      await waitNotNull(() => this._tokens[index])\n      this._tokens[index] = this._tokens[index] || null\n      const tokenContract = await this.tokenContract(index)\n      this._tokens[index] =\n        this._tokens[index] ??\n        new Token(\n          ChainId.MAINNET,\n          await tokenContract.getAddress(),\n          Number(await tokenContract.decimals()),\n          await tokenContract.symbol(),\n          await tokenContract.name(),\n        )\n      return assertEx(this._tokens[index])\n    })\n  }\n\n  async tokenContract(index: 0 | 1): Promise<IERC20Metadata> {\n    return await logErrorsAsync(async () => {\n      await waitNotNull(() => this._tokenContracts[index])\n      this._tokenContracts[index] = this._tokenContracts[index] || null\n      this._tokenContracts[index] =\n        this._tokenContracts[index] ??\n        IERC20Metadata__factory.connect(await (index === 0 ? this.poolContract().token0() : this.poolContract().token1()), this.provider)\n      return assertEx(this._tokenContracts[index])\n    })\n  }\n}\n","import { EthersUniswapV3Slot0Fields } from './UniswapV3Slot0Fields'\n\nexport class EthersUniswap3PoolSlot0Wrapper {\n  protected values: EthersUniswapV3Slot0Fields\n  constructor(values: EthersUniswapV3Slot0Fields) {\n    this.values = values\n  }\n\n  get feeProtocol() {\n    return this.values[5]\n  }\n\n  get observationCardinality() {\n    return this.values[3]\n  }\n\n  get observationCardinalityNext() {\n    return this.values[4]\n  }\n\n  get observationIndex() {\n    return this.values[2]\n  }\n\n  get sqrtPriceX96() {\n    return this.values[0]\n  }\n\n  get tick() {\n    return this.values[1]\n  }\n\n  get unlocked() {\n    return this.values[6]\n  }\n}\n","import { Provider } from 'ethers'\n\nimport { logErrors } from '../logErrors'\nimport { EthersUniSwap3Pair } from './UniSwap3Pair'\n\nexport const createUniswapPoolContracts = (provider: Provider, contracts: string[]) => {\n  return logErrors(() => {\n    return contracts.map((contract) => new EthersUniSwap3Pair(contract, provider))\n  })\n}\n","import { fulfilled } from '@xylabs/promise'\nimport { UniswapCryptoPair } from '@xyo-network/uniswap-crypto-market-payload-plugin'\n\nimport { EthersUniSwap3Pair } from './Ethers'\nimport { logErrorsAsync } from './logErrors'\n\nexport const pricesFromUniswap3 = async (pools: EthersUniSwap3Pair[]): Promise<UniswapCryptoPair[]> => {\n  return await logErrorsAsync(async () => {\n    const promiseResults = await Promise.allSettled(\n      pools.map(async (pool): Promise<UniswapCryptoPair> => {\n        const result = await pool.price()\n        return result\n      }),\n    )\n    return promiseResults.filter(fulfilled).map((result) => result.value)\n  })\n}\n","export const UniswapPoolContracts = [\n  /*xyo/weth*/ '0xE331DE28cd81B768C19A366b0e4e4675c45eC2dA',\n  /*xyo/usdt*/ '0xd0AF1981f52146a6939385451dAeA0726e13a484',\n  /*xyo/dai*/ '0x9D7e5647CE3c7C2d835F2F5e82C8fDb36B0BB0fe',\n  /*wbtc/xyo*/ '0x0cF7494c9dE661467403aBeE8454b3BBf0179a84',\n  /*link/xyo*/ '0x4693456599a8a4975862A0E720C5de7E1D09A1e4',\n  /*wbtc/weth*/ '0xCBCdF9626bC03E24f779434178A73a0B4bad62eD',\n  /*dai/usdc*/ '0x5777d92f208679DB4b9778590Fa3CAB3aC9e2168',\n  /*usdc/weth*/ '0x8ad599c3A0ff1De082011EFDDc58f1908eb6e6D8',\n  /*usdc/weth*/ '0x88e6A0c2dDD26FEEb64F039a2c41296FcB3f5640',\n  /*dai/usdc*/ '0x6c6Bc977E13Df9b0de53b251522280BB72383700',\n  /*frax/usdc*/ '0xc63B0708E2F7e69CB8A1df0e1389A98C35A76D52',\n  /*wbtc/usdc*/ '0x99ac8cA7087fA4A2A1FB6357269965A2014ABc35',\n  /*usdc/usdt*/ '0x3416cF6C708Da44DB2624D63ea0AAef7113527C6',\n]\n","import { UniswapCryptoMarketPlugin } from './Plugin'\n\nexport * from './Config'\nexport * from './lib'\nexport * from './Witness'\n\nexport { UniswapCryptoMarketPlugin }\n\n// eslint-disable-next-line import/no-default-export\nexport default UniswapCryptoMarketPlugin\n"],"mappings":"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","names":["UniswapCryptoMarketSchema","assertEx","ChainId","assertEx","UniswapCryptoMarketSchema"]}

package/dist/browser/lib/Ethers/UniSwap3Pair.d.cts

@@ -1,9 +1,16 @@
-import { Token } from '@uniswap/sdk-core';
-import { Pool } from '@uniswap/v3-sdk';
 import { IERC20Metadata } from '@xyo-network/typechain';
-import * as UniswapTypechain from '@xyo-network/uniswap-typechain';
+import { Token } from '@xyo-network/uniswap-sdk-core';
+import { IUniswapV3Pool } from '@xyo-network/uniswap-typechain';
+import { Pool } from '@xyo-network/uniswap-v3-sdk';
 import { Provider } from 'ethers';
 import { EthersUniswap3PoolSlot0Wrapper } from './Uniswap3PoolSlot0Wrapper';
+export declare enum ChainId {
+    MAINNET = 1,
+    ROPSTEN = 3,
+    RINKEBY = 4,
+    GÖRLI = 5,
+    KOVAN = 42
+}
 export declare class EthersUniSwap3Pair {
     protected address: string;
     protected provider: Provider;
@@ -14,7 +21,7 @@ export declare class EthersUniSwap3Pair {
     private _tokens;
     constructor(address: string, provider: Provider);
     pool(): Promise<Pool>;
-    poolContract(): UniswapTypechain.IUniswapV3Pool;
+    poolContract(): IUniswapV3Pool;
     price(): Promise<{
         tokens: {
             address: string;

package/dist/browser/lib/Ethers/UniSwap3Pair.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"UniSwap3Pair.d.ts","sourceRoot":"","sources":["../../../../src/lib/Ethers/UniSwap3Pair.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAGtC,OAAO,EAAE,cAAc,EAA2B,MAAM,wBAAwB,CAAA;AAChF,OAAO,KAAK,gBAAgB,MAAM,gCAAgC,CAAA;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAGjC,OAAO,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAA;AAS3E,qBAAa,kBAAkB;IAC7B,SAAS,CAAC,OAAO,EAAE,MAAM,CAAA;IACzB,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAA;IAE5B,OAAO,CAAC,KAAK,CAAC,CAAa;IAC3B,OAAO,CAAC,aAAa,CAAC,CAAiC;IACvD,OAAO,CAAC,MAAM,CAAC,CAAuC;IACtD,OAAO,CAAC,eAAe,CAAgE;IACvF,OAAO,CAAC,OAAO,CAAuD;gBAE1D,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAKzC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAmB3B,YAAY,IAAI,gBAAgB,CAAC,cAAc;IAOzC,KAAK;;;;;;;IAmBL,KAAK,IAAI,OAAO,CAAC,8BAA8B,CAAC;IAShD,KAAK,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC;IAkBnC,aAAa,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;CAU3D"}
+{"version":3,"file":"UniSwap3Pair.d.ts","sourceRoot":"","sources":["../../../../src/lib/Ethers/UniSwap3Pair.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAA2B,MAAM,wBAAwB,CAAA;AAChF,OAAO,EAAE,KAAK,EAAE,MAAM,+BAA+B,CAAA;AACrD,OAAO,EAAE,cAAc,EAA8E,MAAM,gCAAgC,CAAA;AAC3I,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAA;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAGjC,OAAO,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAA;AAE3E,oBAAY,OAAO;IACjB,OAAO,IAAI;IACX,OAAO,IAAI;IACX,OAAO,IAAI;IACX,KAAK,IAAI;IACT,KAAK,KAAK;CACX;AAOD,qBAAa,kBAAkB;IAC7B,SAAS,CAAC,OAAO,EAAE,MAAM,CAAA;IACzB,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAA;IAE5B,OAAO,CAAC,KAAK,CAAC,CAAa;IAC3B,OAAO,CAAC,aAAa,CAAC,CAAgB;IACtC,OAAO,CAAC,MAAM,CAAC,CAAuC;IACtD,OAAO,CAAC,eAAe,CAAgE;IACvF,OAAO,CAAC,OAAO,CAAuD;gBAE1D,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAKzC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAoB3B,YAAY;IAON,KAAK;;;;;;;IAmBL,KAAK,IAAI,OAAO,CAAC,8BAA8B,CAAC;IAahD,KAAK,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC;IAkBnC,aAAa,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;CAU3D"}

package/dist/browser/lib/Ethers/UniSwap3Pair.d.mts

@@ -1,9 +1,16 @@
-import { Token } from '@uniswap/sdk-core';
-import { Pool } from '@uniswap/v3-sdk';
 import { IERC20Metadata } from '@xyo-network/typechain';
-import * as UniswapTypechain from '@xyo-network/uniswap-typechain';
+import { Token } from '@xyo-network/uniswap-sdk-core';
+import { IUniswapV3Pool } from '@xyo-network/uniswap-typechain';
+import { Pool } from '@xyo-network/uniswap-v3-sdk';
 import { Provider } from 'ethers';
 import { EthersUniswap3PoolSlot0Wrapper } from './Uniswap3PoolSlot0Wrapper';
+export declare enum ChainId {
+    MAINNET = 1,
+    ROPSTEN = 3,
+    RINKEBY = 4,
+    GÖRLI = 5,
+    KOVAN = 42
+}
 export declare class EthersUniSwap3Pair {
     protected address: string;
     protected provider: Provider;
@@ -14,7 +21,7 @@ export declare class EthersUniSwap3Pair {
     private _tokens;
     constructor(address: string, provider: Provider);
     pool(): Promise<Pool>;
-    poolContract(): UniswapTypechain.IUniswapV3Pool;
+    poolContract(): IUniswapV3Pool;
     price(): Promise<{
         tokens: {
             address: string;

package/dist/browser/lib/Ethers/UniSwap3Pair.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"UniSwap3Pair.d.ts","sourceRoot":"","sources":["../../../../src/lib/Ethers/UniSwap3Pair.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAGtC,OAAO,EAAE,cAAc,EAA2B,MAAM,wBAAwB,CAAA;AAChF,OAAO,KAAK,gBAAgB,MAAM,gCAAgC,CAAA;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAGjC,OAAO,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAA;AAS3E,qBAAa,kBAAkB;IAC7B,SAAS,CAAC,OAAO,EAAE,MAAM,CAAA;IACzB,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAA;IAE5B,OAAO,CAAC,KAAK,CAAC,CAAa;IAC3B,OAAO,CAAC,aAAa,CAAC,CAAiC;IACvD,OAAO,CAAC,MAAM,CAAC,CAAuC;IACtD,OAAO,CAAC,eAAe,CAAgE;IACvF,OAAO,CAAC,OAAO,CAAuD;gBAE1D,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAKzC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAmB3B,YAAY,IAAI,gBAAgB,CAAC,cAAc;IAOzC,KAAK;;;;;;;IAmBL,KAAK,IAAI,OAAO,CAAC,8BAA8B,CAAC;IAShD,KAAK,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC;IAkBnC,aAAa,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;CAU3D"}
+{"version":3,"file":"UniSwap3Pair.d.ts","sourceRoot":"","sources":["../../../../src/lib/Ethers/UniSwap3Pair.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAA2B,MAAM,wBAAwB,CAAA;AAChF,OAAO,EAAE,KAAK,EAAE,MAAM,+BAA+B,CAAA;AACrD,OAAO,EAAE,cAAc,EAA8E,MAAM,gCAAgC,CAAA;AAC3I,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAA;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAGjC,OAAO,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAA;AAE3E,oBAAY,OAAO;IACjB,OAAO,IAAI;IACX,OAAO,IAAI;IACX,OAAO,IAAI;IACX,KAAK,IAAI;IACT,KAAK,KAAK;CACX;AAOD,qBAAa,kBAAkB;IAC7B,SAAS,CAAC,OAAO,EAAE,MAAM,CAAA;IACzB,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAA;IAE5B,OAAO,CAAC,KAAK,CAAC,CAAa;IAC3B,OAAO,CAAC,aAAa,CAAC,CAAgB;IACtC,OAAO,CAAC,MAAM,CAAC,CAAuC;IACtD,OAAO,CAAC,eAAe,CAAgE;IACvF,OAAO,CAAC,OAAO,CAAuD;gBAE1D,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAKzC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAoB3B,YAAY;IAON,KAAK;;;;;;;IAmBL,KAAK,IAAI,OAAO,CAAC,8BAA8B,CAAC;IAahD,KAAK,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC;IAkBnC,aAAa,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;CAU3D"}

package/dist/browser/lib/Ethers/UniSwap3Pair.d.ts

@@ -1,9 +1,16 @@
-import { Token } from '@uniswap/sdk-core';
-import { Pool } from '@uniswap/v3-sdk';
 import { IERC20Metadata } from '@xyo-network/typechain';
-import * as UniswapTypechain from '@xyo-network/uniswap-typechain';
+import { Token } from '@xyo-network/uniswap-sdk-core';
+import { IUniswapV3Pool } from '@xyo-network/uniswap-typechain';
+import { Pool } from '@xyo-network/uniswap-v3-sdk';
 import { Provider } from 'ethers';
 import { EthersUniswap3PoolSlot0Wrapper } from './Uniswap3PoolSlot0Wrapper';
+export declare enum ChainId {
+    MAINNET = 1,
+    ROPSTEN = 3,
+    RINKEBY = 4,
+    GÖRLI = 5,
+    KOVAN = 42
+}
 export declare class EthersUniSwap3Pair {
     protected address: string;
     protected provider: Provider;
@@ -14,7 +21,7 @@ export declare class EthersUniSwap3Pair {
     private _tokens;
     constructor(address: string, provider: Provider);
     pool(): Promise<Pool>;
-    poolContract(): UniswapTypechain.IUniswapV3Pool;
+    poolContract(): IUniswapV3Pool;
     price(): Promise<{
         tokens: {
             address: string;

package/dist/browser/lib/Ethers/UniSwap3Pair.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UniSwap3Pair.d.ts","sourceRoot":"","sources":["../../../../src/lib/Ethers/UniSwap3Pair.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAGtC,OAAO,EAAE,cAAc,EAA2B,MAAM,wBAAwB,CAAA;AAChF,OAAO,KAAK,gBAAgB,MAAM,gCAAgC,CAAA;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAGjC,OAAO,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAA;AAS3E,qBAAa,kBAAkB;IAC7B,SAAS,CAAC,OAAO,EAAE,MAAM,CAAA;IACzB,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAA;IAE5B,OAAO,CAAC,KAAK,CAAC,CAAa;IAC3B,OAAO,CAAC,aAAa,CAAC,CAAiC;IACvD,OAAO,CAAC,MAAM,CAAC,CAAuC;IACtD,OAAO,CAAC,eAAe,CAAgE;IACvF,OAAO,CAAC,OAAO,CAAuD;gBAE1D,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAKzC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAmB3B,YAAY,IAAI,gBAAgB,CAAC,cAAc;IAOzC,KAAK;;;;;;;IAmBL,KAAK,IAAI,OAAO,CAAC,8BAA8B,CAAC;IAShD,KAAK,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC;IAkBnC,aAAa,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;CAU3D"}
+{"version":3,"file":"UniSwap3Pair.d.ts","sourceRoot":"","sources":["../../../../src/lib/Ethers/UniSwap3Pair.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAA2B,MAAM,wBAAwB,CAAA;AAChF,OAAO,EAAE,KAAK,EAAE,MAAM,+BAA+B,CAAA;AACrD,OAAO,EAAE,cAAc,EAA8E,MAAM,gCAAgC,CAAA;AAC3I,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAA;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAGjC,OAAO,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAA;AAE3E,oBAAY,OAAO;IACjB,OAAO,IAAI;IACX,OAAO,IAAI;IACX,OAAO,IAAI;IACX,KAAK,IAAI;IACT,KAAK,KAAK;CACX;AAOD,qBAAa,kBAAkB;IAC7B,SAAS,CAAC,OAAO,EAAE,MAAM,CAAA;IACzB,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAA;IAE5B,OAAO,CAAC,KAAK,CAAC,CAAa;IAC3B,OAAO,CAAC,aAAa,CAAC,CAAgB;IACtC,OAAO,CAAC,MAAM,CAAC,CAAuC;IACtD,OAAO,CAAC,eAAe,CAAgE;IACvF,OAAO,CAAC,OAAO,CAAuD;gBAE1D,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAKzC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAoB3B,YAAY;IAON,KAAK;;;;;;;IAmBL,KAAK,IAAI,OAAO,CAAC,8BAA8B,CAAC;IAahD,KAAK,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC;IAkBnC,aAAa,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;CAU3D"}

package/dist/node/index.cjs

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,19 +15,12 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
+  ChainId: () => ChainId,
   EthersUniSwap3Pair: () => EthersUniSwap3Pair,
   EthersUniswap3PoolSlot0Wrapper: () => EthersUniswap3PoolSlot0Wrapper,
   UniswapCryptoMarketPlugin: () => UniswapCryptoMarketPlugin,
@@ -70,13 +61,12 @@ var logErrorsAsync = async (func) => {
 };
 
 // src/lib/Ethers/UniSwap3Pair.ts
-var import_sdk = require("@uniswap/sdk");
-var import_sdk_core = require("@uniswap/sdk-core");
-var import_v3_sdk = require("@uniswap/v3-sdk");
 var import_assert = require("@xylabs/assert");
 var import_delay = require("@xylabs/delay");
 var import_typechain = require("@xyo-network/typechain");
-var UniswapTypechain = __toESM(require("@xyo-network/uniswap-typechain"), 1);
+var import_uniswap_sdk_core = require("@xyo-network/uniswap-sdk-core");
+var import_uniswap_typechain = require("@xyo-network/uniswap-typechain");
+var import_uniswap_v3_sdk = require("@xyo-network/uniswap-v3-sdk");
 
 // src/lib/Ethers/Uniswap3PoolSlot0Wrapper.ts
 var EthersUniswap3PoolSlot0Wrapper = class {
@@ -108,10 +98,17 @@ var EthersUniswap3PoolSlot0Wrapper = class {
 };
 
 // src/lib/Ethers/UniSwap3Pair.ts
+var ChainId = /* @__PURE__ */ ((ChainId2) => {
+  ChainId2[ChainId2["MAINNET"] = 1] = "MAINNET";
+  ChainId2[ChainId2["ROPSTEN"] = 3] = "ROPSTEN";
+  ChainId2[ChainId2["RINKEBY"] = 4] = "RINKEBY";
+  ChainId2[ChainId2["G\xD6RLI"] = 5] = "G\xD6RLI";
+  ChainId2[ChainId2["KOVAN"] = 42] = "KOVAN";
+  return ChainId2;
+})(ChainId || {});
 var waitNotNull = async (closure) => {
-  while (closure() === null) {
+  while (closure() === null)
     await (0, import_delay.delay)(10);
-  }
 };
 var EthersUniSwap3Pair = class {
   address;
@@ -130,12 +127,12 @@ var EthersUniSwap3Pair = class {
       await waitNotNull(() => this._pool);
       this._pool = this._pool || null;
       const slot0 = await this.slot0();
-      this._pool = this._pool ?? new import_v3_sdk.Pool(
+      this._pool = this._pool !== null ? this._pool : new import_uniswap_v3_sdk.Pool(
         await this.token(0),
         await this.token(1),
         Number(slot0.feeProtocol),
-        slot0.sqrtPriceX96.toString(16),
-        (await this.poolContract().liquidity()).toString(16),
+        `0x${slot0.sqrtPriceX96.toString(16)}`,
+        `0x${(await this.poolContract().liquidity()).toString(16)}`,
         Number(slot0.tick)
       );
       return (0, import_assert.assertEx)(this._pool);
@@ -143,7 +140,7 @@ var EthersUniSwap3Pair = class {
   }
   poolContract() {
     return logErrors(() => {
-      this._poolContract = this._poolContract ?? UniswapTypechain.IUniswapV3Pool__factory.connect(this.address, this.provider);
+      this._poolContract = this._poolContract ?? import_uniswap_typechain.IUniswapV3Pool__factory.connect(this.address, this.provider);
       return (0, import_assert.assertEx)(this._poolContract);
     });
   }
@@ -169,7 +166,11 @@ var EthersUniSwap3Pair = class {
     return await logErrorsAsync(async () => {
       await waitNotNull(() => this._slot0);
       this._slot0 = this._slot0 || null;
-      this._slot0 = this._slot0 ?? new EthersUniswap3PoolSlot0Wrapper(await this.poolContract().slot0());
+      if (this._slot0 === null) {
+        const poolContract = this.poolContract();
+        const slot = await poolContract.slot0();
+        this._slot0 = this._slot0 ?? new EthersUniswap3PoolSlot0Wrapper(slot);
+      }
       return (0, import_assert.assertEx)(this._slot0);
     });
   }
@@ -178,8 +179,8 @@ var EthersUniSwap3Pair = class {
       await waitNotNull(() => this._tokens[index]);
       this._tokens[index] = this._tokens[index] || null;
       const tokenContract = await this.tokenContract(index);
-      this._tokens[index] = this._tokens[index] ?? new import_sdk_core.Token(
-        import_sdk.ChainId.MAINNET,
+      this._tokens[index] = this._tokens[index] ?? new import_uniswap_sdk_core.Token(
+        1 /* MAINNET */,
         await tokenContract.getAddress(),
         Number(await tokenContract.decimals()),
         await tokenContract.symbol(),
@@ -290,6 +291,7 @@ var UniswapCryptoMarketPlugin = () => (0, import_payloadset_plugin.createPayload
 var src_default = UniswapCryptoMarketPlugin;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  ChainId,
   EthersUniSwap3Pair,
   EthersUniswap3PoolSlot0Wrapper,
   UniswapCryptoMarketPlugin,

package/dist/node/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts","../../src/Plugin.ts","../../src/Witness.ts","../../src/lib/logErrors.ts","../../src/lib/Ethers/UniSwap3Pair.ts","../../src/lib/Ethers/Uniswap3PoolSlot0Wrapper.ts","../../src/lib/Ethers/createUniswapPoolContracts.ts","../../src/lib/pricesFromUniswap3.ts","../../src/lib/UniswapPoolContracts.ts"],"sourcesContent":["import { UniswapCryptoMarketPlugin } from './Plugin'\n\nexport * from './Config'\nexport * from './lib'\nexport * from './Witness'\n\nexport { UniswapCryptoMarketPlugin }\n\n// eslint-disable-next-line import/no-default-export\nexport default UniswapCryptoMarketPlugin\n","import { PayloadSetSchema } from '@xyo-network/payload-model'\nimport { createPayloadSetWitnessPlugin } from '@xyo-network/payloadset-plugin'\nimport { UniswapCryptoMarketSchema } from '@xyo-network/uniswap-crypto-market-payload-plugin'\n\nimport { UniswapCryptoMarketWitness } from './Witness'\n\nexport const UniswapCryptoMarketPlugin = () =>\n  createPayloadSetWitnessPlugin<UniswapCryptoMarketWitness>(\n    { required: { [UniswapCryptoMarketSchema]: 1 }, schema: PayloadSetSchema },\n    {\n      witness: async (params) => {\n        const result = await UniswapCryptoMarketWitness.create(params)\n        return result\n      },\n    },\n  )\n","import { assertEx } from '@xylabs/assert'\nimport { AbstractWitness } from '@xyo-network/abstract-witness'\nimport { AnyConfigSchema } from '@xyo-network/module-model'\nimport { Payload } from '@xyo-network/payload-model'\nimport {\n  UniswapCryptoMarketPayload,\n  UniswapCryptoMarketSchema,\n  UniswapCryptoMarketWitnessConfigSchema,\n} from '@xyo-network/uniswap-crypto-market-payload-plugin'\nimport { WitnessParams } from '@xyo-network/witness-model'\nimport { Provider } from 'ethers'\n\nimport { UniswapCryptoMarketWitnessConfig } from './Config'\nimport { createUniswapPoolContracts, EthersUniSwap3Pair, pricesFromUniswap3, UniswapPoolContracts } from './lib'\n\nexport type UniswapCryptoMarketWitnessParams = WitnessParams<\n  AnyConfigSchema<UniswapCryptoMarketWitnessConfig>,\n  {\n    provider?: Provider\n  }\n>\n\nexport class UniswapCryptoMarketWitness<\n  TParams extends UniswapCryptoMarketWitnessParams = UniswapCryptoMarketWitnessParams,\n> extends AbstractWitness<TParams> {\n  static override configSchemas = [UniswapCryptoMarketWitnessConfigSchema]\n\n  protected pairs?: EthersUniSwap3Pair[]\n  protected get provider() {\n    return this.params.provider\n  }\n\n  protected override async observeHandler(): Promise<Payload[]> {\n    await this.started('throw')\n    const pairs = await pricesFromUniswap3(assertEx(this.pairs))\n    const timestamp = Date.now()\n\n    const payload: UniswapCryptoMarketPayload = {\n      pairs,\n      schema: UniswapCryptoMarketSchema,\n      timestamp,\n    }\n\n    return [payload]\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    this.pairs = createUniswapPoolContracts(assertEx(this.provider, 'Provider Required'), this.config?.pools ?? UniswapPoolContracts)\n    return true\n  }\n}\n","export const logErrors = <T>(func: () => T) => {\n  try {\n    return func()\n  } catch (ex) {\n    console.error(ex)\n    throw ex\n  }\n}\n\nexport const logErrorsAsync = async <T>(func: () => Promise<T>) => {\n  try {\n    return await func()\n  } catch (ex) {\n    console.error(ex)\n    throw ex\n  }\n}\n","import { ChainId } from '@uniswap/sdk'\nimport { Token } from '@uniswap/sdk-core'\nimport { Pool } from '@uniswap/v3-sdk'\nimport { assertEx } from '@xylabs/assert'\nimport { delay } from '@xylabs/delay'\nimport { IERC20Metadata, IERC20Metadata__factory } from '@xyo-network/typechain'\nimport * as UniswapTypechain from '@xyo-network/uniswap-typechain'\nimport { Provider } from 'ethers'\n\nimport { logErrors, logErrorsAsync } from '../logErrors'\nimport { EthersUniswap3PoolSlot0Wrapper } from './Uniswap3PoolSlot0Wrapper'\n\n//null is used as 'in-progress'\nconst waitNotNull = async (closure: () => unknown) => {\n  while (closure() === null) {\n    await delay(10)\n  }\n}\n\nexport class EthersUniSwap3Pair {\n  protected address: string\n  protected provider: Provider\n\n  private _pool?: Pool | null\n  private _poolContract?: UniswapTypechain.IUniswapV3Pool\n  private _slot0?: EthersUniswap3PoolSlot0Wrapper | null\n  private _tokenContracts: (IERC20Metadata | null | undefined)[] = [undefined, undefined]\n  private _tokens: (Token | null | undefined)[] = [undefined, undefined]\n\n  constructor(address: string, provider: Provider) {\n    this.address = address\n    this.provider = provider\n  }\n\n  async pool(): Promise<Pool> {\n    return await logErrorsAsync(async () => {\n      await waitNotNull(() => this._pool)\n      this._pool = this._pool || null\n      const slot0 = await this.slot0()\n      this._pool =\n        this._pool ??\n        new Pool(\n          await this.token(0),\n          await this.token(1),\n          Number(slot0.feeProtocol),\n          slot0.sqrtPriceX96.toString(16),\n          (await this.poolContract().liquidity()).toString(16),\n          Number(slot0.tick),\n        )\n      return assertEx(this._pool)\n    })\n  }\n\n  poolContract(): UniswapTypechain.IUniswapV3Pool {\n    return logErrors(() => {\n      this._poolContract = this._poolContract ?? UniswapTypechain.IUniswapV3Pool__factory.connect(this.address, this.provider)\n      return assertEx(this._poolContract)\n    })\n  }\n\n  async price() {\n    return await logErrorsAsync(async () => {\n      const tokenIndexes: (0 | 1)[] = [0, 1]\n      const pool = await this.pool()\n      const tokens = await Promise.all(tokenIndexes.map((value) => this.token(value)))\n      const tokenContracts = await Promise.all(tokenIndexes.map((value) => this.tokenContract(value)))\n      const tokenPrices = tokens.map((token) => parseFloat(pool.priceOf(token).toSignificant()))\n      const tokenSymbols = tokens.map((token, index) => assertEx(token.symbol, `Token[${index}] Missing Symbols`).toLowerCase())\n      const result = {\n        tokens: await Promise.all(\n          tokenIndexes.map(async (value) => {\n            return { address: await tokenContracts[value].getAddress(), symbol: tokenSymbols[value], value: tokenPrices[value] }\n          }),\n        ),\n      }\n      return result\n    })\n  }\n\n  async slot0(): Promise<EthersUniswap3PoolSlot0Wrapper> {\n    return await logErrorsAsync(async () => {\n      await waitNotNull(() => this._slot0)\n      this._slot0 = this._slot0 || null\n      this._slot0 = this._slot0 ?? new EthersUniswap3PoolSlot0Wrapper(await this.poolContract().slot0())\n      return assertEx(this._slot0)\n    })\n  }\n\n  async token(index: 0 | 1): Promise<Token> {\n    return await logErrorsAsync(async () => {\n      await waitNotNull(() => this._tokens[index])\n      this._tokens[index] = this._tokens[index] || null\n      const tokenContract = await this.tokenContract(index)\n      this._tokens[index] =\n        this._tokens[index] ??\n        new Token(\n          ChainId.MAINNET,\n          await tokenContract.getAddress(),\n          Number(await tokenContract.decimals()),\n          await tokenContract.symbol(),\n          await tokenContract.name(),\n        )\n      return assertEx(this._tokens[index])\n    })\n  }\n\n  async tokenContract(index: 0 | 1): Promise<IERC20Metadata> {\n    return await logErrorsAsync(async () => {\n      await waitNotNull(() => this._tokenContracts[index])\n      this._tokenContracts[index] = this._tokenContracts[index] || null\n      this._tokenContracts[index] =\n        this._tokenContracts[index] ??\n        IERC20Metadata__factory.connect(await (index === 0 ? this.poolContract().token0() : this.poolContract().token1()), this.provider)\n      return assertEx(this._tokenContracts[index])\n    })\n  }\n}\n","import { EthersUniswapV3Slot0Fields } from './UniswapV3Slot0Fields'\n\nexport class EthersUniswap3PoolSlot0Wrapper {\n  protected values: EthersUniswapV3Slot0Fields\n  constructor(values: EthersUniswapV3Slot0Fields) {\n    this.values = values\n  }\n\n  get feeProtocol() {\n    return this.values[5]\n  }\n\n  get observationCardinality() {\n    return this.values[3]\n  }\n\n  get observationCardinalityNext() {\n    return this.values[4]\n  }\n\n  get observationIndex() {\n    return this.values[2]\n  }\n\n  get sqrtPriceX96() {\n    return this.values[0]\n  }\n\n  get tick() {\n    return this.values[1]\n  }\n\n  get unlocked() {\n    return this.values[6]\n  }\n}\n","import { Provider } from 'ethers'\n\nimport { logErrors } from '../logErrors'\nimport { EthersUniSwap3Pair } from './UniSwap3Pair'\n\nexport const createUniswapPoolContracts = (provider: Provider, contracts: string[]) => {\n  return logErrors(() => {\n    return contracts.map((contract) => new EthersUniSwap3Pair(contract, provider))\n  })\n}\n","import { fulfilled } from '@xylabs/promise'\nimport { UniswapCryptoPair } from '@xyo-network/uniswap-crypto-market-payload-plugin'\n\nimport { EthersUniSwap3Pair } from './Ethers'\nimport { logErrorsAsync } from './logErrors'\n\nexport const pricesFromUniswap3 = async (pools: EthersUniSwap3Pair[]): Promise<UniswapCryptoPair[]> => {\n  return await logErrorsAsync(async () => {\n    const promiseResults = await Promise.allSettled(\n      pools.map(async (pool): Promise<UniswapCryptoPair> => {\n        const result = await pool.price()\n        return result\n      }),\n    )\n    return promiseResults.filter(fulfilled).map((result) => result.value)\n  })\n}\n","export const UniswapPoolContracts = [\n  /*xyo/weth*/ '0xE331DE28cd81B768C19A366b0e4e4675c45eC2dA',\n  /*xyo/usdt*/ '0xd0AF1981f52146a6939385451dAeA0726e13a484',\n  /*xyo/dai*/ '0x9D7e5647CE3c7C2d835F2F5e82C8fDb36B0BB0fe',\n  /*wbtc/xyo*/ '0x0cF7494c9dE661467403aBeE8454b3BBf0179a84',\n  /*link/xyo*/ '0x4693456599a8a4975862A0E720C5de7E1D09A1e4',\n  /*wbtc/weth*/ '0xCBCdF9626bC03E24f779434178A73a0B4bad62eD',\n  /*dai/usdc*/ '0x5777d92f208679DB4b9778590Fa3CAB3aC9e2168',\n  /*usdc/weth*/ '0x8ad599c3A0ff1De082011EFDDc58f1908eb6e6D8',\n  /*usdc/weth*/ '0x88e6A0c2dDD26FEEb64F039a2c41296FcB3f5640',\n  /*dai/usdc*/ '0x6c6Bc977E13Df9b0de53b251522280BB72383700',\n  /*frax/usdc*/ '0xc63B0708E2F7e69CB8A1df0e1389A98C35A76D52',\n  /*wbtc/usdc*/ '0x99ac8cA7087fA4A2A1FB6357269965A2014ABc35',\n  /*usdc/usdt*/ '0x3416cF6C708Da44DB2624D63ea0AAef7113527C6',\n]\n"],"mappings":"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","names":["import_uniswap_crypto_market_payload_plugin","import_assert"]}
+{"version":3,"sources":["../../src/index.ts","../../src/Plugin.ts","../../src/Witness.ts","../../src/lib/logErrors.ts","../../src/lib/Ethers/UniSwap3Pair.ts","../../src/lib/Ethers/Uniswap3PoolSlot0Wrapper.ts","../../src/lib/Ethers/createUniswapPoolContracts.ts","../../src/lib/pricesFromUniswap3.ts","../../src/lib/UniswapPoolContracts.ts"],"sourcesContent":["import { UniswapCryptoMarketPlugin } from './Plugin'\n\nexport * from './Config'\nexport * from './lib'\nexport * from './Witness'\n\nexport { UniswapCryptoMarketPlugin }\n\n// eslint-disable-next-line import/no-default-export\nexport default UniswapCryptoMarketPlugin\n","import { PayloadSetSchema } from '@xyo-network/payload-model'\nimport { createPayloadSetWitnessPlugin } from '@xyo-network/payloadset-plugin'\nimport { UniswapCryptoMarketSchema } from '@xyo-network/uniswap-crypto-market-payload-plugin'\n\nimport { UniswapCryptoMarketWitness } from './Witness'\n\nexport const UniswapCryptoMarketPlugin = () =>\n  createPayloadSetWitnessPlugin<UniswapCryptoMarketWitness>(\n    { required: { [UniswapCryptoMarketSchema]: 1 }, schema: PayloadSetSchema },\n    {\n      witness: async (params) => {\n        const result = await UniswapCryptoMarketWitness.create(params)\n        return result\n      },\n    },\n  )\n","import { assertEx } from '@xylabs/assert'\nimport { AbstractWitness } from '@xyo-network/abstract-witness'\nimport { AnyConfigSchema } from '@xyo-network/module-model'\nimport { Payload } from '@xyo-network/payload-model'\nimport {\n  UniswapCryptoMarketPayload,\n  UniswapCryptoMarketSchema,\n  UniswapCryptoMarketWitnessConfigSchema,\n} from '@xyo-network/uniswap-crypto-market-payload-plugin'\nimport { WitnessParams } from '@xyo-network/witness-model'\nimport { Provider } from 'ethers'\n\nimport { UniswapCryptoMarketWitnessConfig } from './Config'\nimport { createUniswapPoolContracts, EthersUniSwap3Pair, pricesFromUniswap3, UniswapPoolContracts } from './lib'\n\nexport type UniswapCryptoMarketWitnessParams = WitnessParams<\n  AnyConfigSchema<UniswapCryptoMarketWitnessConfig>,\n  {\n    provider?: Provider\n  }\n>\n\nexport class UniswapCryptoMarketWitness<\n  TParams extends UniswapCryptoMarketWitnessParams = UniswapCryptoMarketWitnessParams,\n> extends AbstractWitness<TParams> {\n  static override configSchemas = [UniswapCryptoMarketWitnessConfigSchema]\n\n  protected pairs?: EthersUniSwap3Pair[]\n  protected get provider() {\n    return this.params.provider\n  }\n\n  protected override async observeHandler(): Promise<Payload[]> {\n    await this.started('throw')\n    const pairs = await pricesFromUniswap3(assertEx(this.pairs))\n    const timestamp = Date.now()\n\n    const payload: UniswapCryptoMarketPayload = {\n      pairs,\n      schema: UniswapCryptoMarketSchema,\n      timestamp,\n    }\n\n    return [payload]\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    this.pairs = createUniswapPoolContracts(assertEx(this.provider, 'Provider Required'), this.config?.pools ?? UniswapPoolContracts)\n    return true\n  }\n}\n","export const logErrors = <T>(func: () => T) => {\n  try {\n    return func()\n  } catch (ex) {\n    console.error(ex)\n    throw ex\n  }\n}\n\nexport const logErrorsAsync = async <T>(func: () => Promise<T>) => {\n  try {\n    return await func()\n  } catch (ex) {\n    console.error(ex)\n    throw ex\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport { delay } from '@xylabs/delay'\nimport { IERC20Metadata, IERC20Metadata__factory } from '@xyo-network/typechain'\nimport { Token } from '@xyo-network/uniswap-sdk-core'\nimport { IUniswapV3Pool, IUniswapV3Pool__factory, IUniswapV3PoolState, IUniswapV3PoolState__factory } from '@xyo-network/uniswap-typechain'\nimport { Pool } from '@xyo-network/uniswap-v3-sdk'\nimport { Provider } from 'ethers'\n\nimport { logErrors, logErrorsAsync } from '../logErrors'\nimport { EthersUniswap3PoolSlot0Wrapper } from './Uniswap3PoolSlot0Wrapper'\n\nexport enum ChainId {\n  MAINNET = 1,\n  ROPSTEN = 3,\n  RINKEBY = 4,\n  GÖRLI = 5,\n  KOVAN = 42,\n}\n\n//null is used as 'in-progress'\nconst waitNotNull = async (closure: () => unknown) => {\n  while (closure() === null) await delay(10)\n}\n\nexport class EthersUniSwap3Pair {\n  protected address: string\n  protected provider: Provider\n\n  private _pool?: Pool | null\n  private _poolContract?: IUniswapV3Pool\n  private _slot0?: EthersUniswap3PoolSlot0Wrapper | null\n  private _tokenContracts: (IERC20Metadata | null | undefined)[] = [undefined, undefined]\n  private _tokens: (Token | null | undefined)[] = [undefined, undefined]\n\n  constructor(address: string, provider: Provider) {\n    this.address = address\n    this.provider = provider\n  }\n\n  async pool(): Promise<Pool> {\n    return await logErrorsAsync(async () => {\n      await waitNotNull(() => this._pool)\n      this._pool = this._pool || null\n      const slot0 = await this.slot0()\n      this._pool =\n        this._pool !== null\n          ? this._pool\n          : new Pool(\n              await this.token(0),\n              await this.token(1),\n              Number(slot0.feeProtocol),\n              `0x${slot0.sqrtPriceX96.toString(16)}`,\n              `0x${(await this.poolContract().liquidity()).toString(16)}`,\n              Number(slot0.tick),\n            )\n      return assertEx(this._pool)\n    })\n  }\n\n  poolContract() {\n    return logErrors(() => {\n      this._poolContract = this._poolContract ?? IUniswapV3Pool__factory.connect(this.address, this.provider)\n      return assertEx(this._poolContract)\n    })\n  }\n\n  async price() {\n    return await logErrorsAsync(async () => {\n      const tokenIndexes: (0 | 1)[] = [0, 1]\n      const pool = await this.pool()\n      const tokens = await Promise.all(tokenIndexes.map((value) => this.token(value)))\n      const tokenContracts = await Promise.all(tokenIndexes.map((value) => this.tokenContract(value)))\n      const tokenPrices = tokens.map((token) => parseFloat(pool.priceOf(token).toSignificant()))\n      const tokenSymbols = tokens.map((token, index) => assertEx(token.symbol, `Token[${index}] Missing Symbols`).toLowerCase())\n      const result = {\n        tokens: await Promise.all(\n          tokenIndexes.map(async (value) => {\n            return { address: await tokenContracts[value].getAddress(), symbol: tokenSymbols[value], value: tokenPrices[value] }\n          }),\n        ),\n      }\n      return result\n    })\n  }\n\n  async slot0(): Promise<EthersUniswap3PoolSlot0Wrapper> {\n    return await logErrorsAsync(async () => {\n      await waitNotNull(() => this._slot0)\n      this._slot0 = this._slot0 || null\n      if (this._slot0 === null) {\n        const poolContract = this.poolContract()\n        const slot = await poolContract.slot0()\n        this._slot0 = this._slot0 ?? new EthersUniswap3PoolSlot0Wrapper(slot)\n      }\n      return assertEx(this._slot0)\n    })\n  }\n\n  async token(index: 0 | 1): Promise<Token> {\n    return await logErrorsAsync(async () => {\n      await waitNotNull(() => this._tokens[index])\n      this._tokens[index] = this._tokens[index] || null\n      const tokenContract = await this.tokenContract(index)\n      this._tokens[index] =\n        this._tokens[index] ??\n        new Token(\n          ChainId.MAINNET,\n          await tokenContract.getAddress(),\n          Number(await tokenContract.decimals()),\n          await tokenContract.symbol(),\n          await tokenContract.name(),\n        )\n      return assertEx(this._tokens[index])\n    })\n  }\n\n  async tokenContract(index: 0 | 1): Promise<IERC20Metadata> {\n    return await logErrorsAsync(async () => {\n      await waitNotNull(() => this._tokenContracts[index])\n      this._tokenContracts[index] = this._tokenContracts[index] || null\n      this._tokenContracts[index] =\n        this._tokenContracts[index] ??\n        IERC20Metadata__factory.connect(await (index === 0 ? this.poolContract().token0() : this.poolContract().token1()), this.provider)\n      return assertEx(this._tokenContracts[index])\n    })\n  }\n}\n","import { EthersUniswapV3Slot0Fields } from './UniswapV3Slot0Fields'\n\nexport class EthersUniswap3PoolSlot0Wrapper {\n  protected values: EthersUniswapV3Slot0Fields\n  constructor(values: EthersUniswapV3Slot0Fields) {\n    this.values = values\n  }\n\n  get feeProtocol() {\n    return this.values[5]\n  }\n\n  get observationCardinality() {\n    return this.values[3]\n  }\n\n  get observationCardinalityNext() {\n    return this.values[4]\n  }\n\n  get observationIndex() {\n    return this.values[2]\n  }\n\n  get sqrtPriceX96() {\n    return this.values[0]\n  }\n\n  get tick() {\n    return this.values[1]\n  }\n\n  get unlocked() {\n    return this.values[6]\n  }\n}\n","import { Provider } from 'ethers'\n\nimport { logErrors } from '../logErrors'\nimport { EthersUniSwap3Pair } from './UniSwap3Pair'\n\nexport const createUniswapPoolContracts = (provider: Provider, contracts: string[]) => {\n  return logErrors(() => {\n    return contracts.map((contract) => new EthersUniSwap3Pair(contract, provider))\n  })\n}\n","import { fulfilled } from '@xylabs/promise'\nimport { UniswapCryptoPair } from '@xyo-network/uniswap-crypto-market-payload-plugin'\n\nimport { EthersUniSwap3Pair } from './Ethers'\nimport { logErrorsAsync } from './logErrors'\n\nexport const pricesFromUniswap3 = async (pools: EthersUniSwap3Pair[]): Promise<UniswapCryptoPair[]> => {\n  return await logErrorsAsync(async () => {\n    const promiseResults = await Promise.allSettled(\n      pools.map(async (pool): Promise<UniswapCryptoPair> => {\n        const result = await pool.price()\n        return result\n      }),\n    )\n    return promiseResults.filter(fulfilled).map((result) => result.value)\n  })\n}\n","export const UniswapPoolContracts = [\n  /*xyo/weth*/ '0xE331DE28cd81B768C19A366b0e4e4675c45eC2dA',\n  /*xyo/usdt*/ '0xd0AF1981f52146a6939385451dAeA0726e13a484',\n  /*xyo/dai*/ '0x9D7e5647CE3c7C2d835F2F5e82C8fDb36B0BB0fe',\n  /*wbtc/xyo*/ '0x0cF7494c9dE661467403aBeE8454b3BBf0179a84',\n  /*link/xyo*/ '0x4693456599a8a4975862A0E720C5de7E1D09A1e4',\n  /*wbtc/weth*/ '0xCBCdF9626bC03E24f779434178A73a0B4bad62eD',\n  /*dai/usdc*/ '0x5777d92f208679DB4b9778590Fa3CAB3aC9e2168',\n  /*usdc/weth*/ '0x8ad599c3A0ff1De082011EFDDc58f1908eb6e6D8',\n  /*usdc/weth*/ '0x88e6A0c2dDD26FEEb64F039a2c41296FcB3f5640',\n  /*dai/usdc*/ '0x6c6Bc977E13Df9b0de53b251522280BB72383700',\n  /*frax/usdc*/ '0xc63B0708E2F7e69CB8A1df0e1389A98C35A76D52',\n  /*wbtc/usdc*/ '0x99ac8cA7087fA4A2A1FB6357269965A2014ABc35',\n  /*usdc/usdt*/ '0x3416cF6C708Da44DB2624D63ea0AAef7113527C6',\n]\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACAA,2BAAiC;AACjC,+BAA8C;AAC9C,IAAAA,+CAA0C;;;ACF1C,IAAAC,iBAAyB;AACzB,8BAAgC;AAGhC,kDAIO;;;ACRA,IAAM,YAAY,CAAI,SAAkB;AAC7C,MAAI;AACF,WAAO,KAAK;AAAA,EACd,SAAS,IAAI;AACX,YAAQ,MAAM,EAAE;AAChB,UAAM;AAAA,EACR;AACF;AAEO,IAAM,iBAAiB,OAAU,SAA2B;AACjE,MAAI;AACF,WAAO,MAAM,KAAK;AAAA,EACpB,SAAS,IAAI;AACX,YAAQ,MAAM,EAAE;AAChB,UAAM;AAAA,EACR;AACF;;;AChBA,oBAAyB;AACzB,mBAAsB;AACtB,uBAAwD;AACxD,8BAAsB;AACtB,+BAA2G;AAC3G,4BAAqB;;;ACHd,IAAM,iCAAN,MAAqC;AAAA,EAChC;AAAA,EACV,YAAY,QAAoC;AAC9C,SAAK,SAAS;AAAA,EAChB;AAAA,EAEA,IAAI,cAAc;AAChB,WAAO,KAAK,OAAO,CAAC;AAAA,EACtB;AAAA,EAEA,IAAI,yBAAyB;AAC3B,WAAO,KAAK,OAAO,CAAC;AAAA,EACtB;AAAA,EAEA,IAAI,6BAA6B;AAC/B,WAAO,KAAK,OAAO,CAAC;AAAA,EACtB;AAAA,EAEA,IAAI,mBAAmB;AACrB,WAAO,KAAK,OAAO,CAAC;AAAA,EACtB;AAAA,EAEA,IAAI,eAAe;AACjB,WAAO,KAAK,OAAO,CAAC;AAAA,EACtB;AAAA,EAEA,IAAI,OAAO;AACT,WAAO,KAAK,OAAO,CAAC;AAAA,EACtB;AAAA,EAEA,IAAI,WAAW;AACb,WAAO,KAAK,OAAO,CAAC;AAAA,EACtB;AACF;;;ADxBO,IAAK,UAAL,kBAAKC,aAAL;AACL,EAAAA,kBAAA,aAAU,KAAV;AACA,EAAAA,kBAAA,aAAU,KAAV;AACA,EAAAA,kBAAA,aAAU,KAAV;AACA,EAAAA,kBAAA,cAAQ,KAAR;AACA,EAAAA,kBAAA,WAAQ,MAAR;AALU,SAAAA;AAAA,GAAA;AASZ,IAAM,cAAc,OAAO,YAA2B;AACpD,SAAO,QAAQ,MAAM;AAAM,cAAM,oBAAM,EAAE;AAC3C;AAEO,IAAM,qBAAN,MAAyB;AAAA,EACpB;AAAA,EACA;AAAA,EAEF;AAAA,EACA;AAAA,EACA;AAAA,EACA,kBAAyD,CAAC,QAAW,MAAS;AAAA,EAC9E,UAAwC,CAAC,QAAW,MAAS;AAAA,EAErE,YAAY,SAAiB,UAAoB;AAC/C,SAAK,UAAU;AACf,SAAK,WAAW;AAAA,EAClB;AAAA,EAEA,MAAM,OAAsB;AAC1B,WAAO,MAAM,eAAe,YAAY;AACtC,YAAM,YAAY,MAAM,KAAK,KAAK;AAClC,WAAK,QAAQ,KAAK,SAAS;AAC3B,YAAM,QAAQ,MAAM,KAAK,MAAM;AAC/B,WAAK,QACH,KAAK,UAAU,OACX,KAAK,QACL,IAAI;AAAA,QACF,MAAM,KAAK,MAAM,CAAC;AAAA,QAClB,MAAM,KAAK,MAAM,CAAC;AAAA,QAClB,OAAO,MAAM,WAAW;AAAA,QACxB,KAAK,MAAM,aAAa,SAAS,EAAE,CAAC;AAAA,QACpC,MAAM,MAAM,KAAK,aAAa,EAAE,UAAU,GAAG,SAAS,EAAE,CAAC;AAAA,QACzD,OAAO,MAAM,IAAI;AAAA,MACnB;AACN,iBAAO,wBAAS,KAAK,KAAK;AAAA,IAC5B,CAAC;AAAA,EACH;AAAA,EAEA,eAAe;AACb,WAAO,UAAU,MAAM;AACrB,WAAK,gBAAgB,KAAK,iBAAiB,iDAAwB,QAAQ,KAAK,SAAS,KAAK,QAAQ;AACtG,iBAAO,wBAAS,KAAK,aAAa;AAAA,IACpC,CAAC;AAAA,EACH;AAAA,EAEA,MAAM,QAAQ;AACZ,WAAO,MAAM,eAAe,YAAY;AACtC,YAAM,eAA0B,CAAC,GAAG,CAAC;AACrC,YAAM,OAAO,MAAM,KAAK,KAAK;AAC7B,YAAM,SAAS,MAAM,QAAQ,IAAI,aAAa,IAAI,CAAC,UAAU,KAAK,MAAM,KAAK,CAAC,CAAC;AAC/E,YAAM,iBAAiB,MAAM,QAAQ,IAAI,aAAa,IAAI,CAAC,UAAU,KAAK,cAAc,KAAK,CAAC,CAAC;AAC/F,YAAM,cAAc,OAAO,IAAI,CAAC,UAAU,WAAW,KAAK,QAAQ,KAAK,EAAE,cAAc,CAAC,CAAC;AACzF,YAAM,eAAe,OAAO,IAAI,CAAC,OAAO,cAAU,wBAAS,MAAM,QAAQ,SAAS,KAAK,mBAAmB,EAAE,YAAY,CAAC;AACzH,YAAM,SAAS;AAAA,QACb,QAAQ,MAAM,QAAQ;AAAA,UACpB,aAAa,IAAI,OAAO,UAAU;AAChC,mBAAO,EAAE,SAAS,MAAM,eAAe,KAAK,EAAE,WAAW,GAAG,QAAQ,aAAa,KAAK,GAAG,OAAO,YAAY,KAAK,EAAE;AAAA,UACrH,CAAC;AAAA,QACH;AAAA,MACF;AACA,aAAO;AAAA,IACT,CAAC;AAAA,EACH;AAAA,EAEA,MAAM,QAAiD;AACrD,WAAO,MAAM,eAAe,YAAY;AACtC,YAAM,YAAY,MAAM,KAAK,MAAM;AACnC,WAAK,SAAS,KAAK,UAAU;AAC7B,UAAI,KAAK,WAAW,MAAM;AACxB,cAAM,eAAe,KAAK,aAAa;AACvC,cAAM,OAAO,MAAM,aAAa,MAAM;AACtC,aAAK,SAAS,KAAK,UAAU,IAAI,+BAA+B,IAAI;AAAA,MACtE;AACA,iBAAO,wBAAS,KAAK,MAAM;AAAA,IAC7B,CAAC;AAAA,EACH;AAAA,EAEA,MAAM,MAAM,OAA8B;AACxC,WAAO,MAAM,eAAe,YAAY;AACtC,YAAM,YAAY,MAAM,KAAK,QAAQ,KAAK,CAAC;AAC3C,WAAK,QAAQ,KAAK,IAAI,KAAK,QAAQ,KAAK,KAAK;AAC7C,YAAM,gBAAgB,MAAM,KAAK,cAAc,KAAK;AACpD,WAAK,QAAQ,KAAK,IAChB,KAAK,QAAQ,KAAK,KAClB,IAAI;AAAA,QACF;AAAA,QACA,MAAM,cAAc,WAAW;AAAA,QAC/B,OAAO,MAAM,cAAc,SAAS,CAAC;AAAA,QACrC,MAAM,cAAc,OAAO;AAAA,QAC3B,MAAM,cAAc,KAAK;AAAA,MAC3B;AACF,iBAAO,wBAAS,KAAK,QAAQ,KAAK,CAAC;AAAA,IACrC,CAAC;AAAA,EACH;AAAA,EAEA,MAAM,cAAc,OAAuC;AACzD,WAAO,MAAM,eAAe,YAAY;AACtC,YAAM,YAAY,MAAM,KAAK,gBAAgB,KAAK,CAAC;AACnD,WAAK,gBAAgB,KAAK,IAAI,KAAK,gBAAgB,KAAK,KAAK;AAC7D,WAAK,gBAAgB,KAAK,IACxB,KAAK,gBAAgB,KAAK,KAC1B,yCAAwB,QAAQ,OAAO,UAAU,IAAI,KAAK,aAAa,EAAE,OAAO,IAAI,KAAK,aAAa,EAAE,OAAO,IAAI,KAAK,QAAQ;AAClI,iBAAO,wBAAS,KAAK,gBAAgB,KAAK,CAAC;AAAA,IAC7C,CAAC;AAAA,EACH;AACF;;;AEzHO,IAAM,6BAA6B,CAAC,UAAoB,cAAwB;AACrF,SAAO,UAAU,MAAM;AACrB,WAAO,UAAU,IAAI,CAAC,aAAa,IAAI,mBAAmB,UAAU,QAAQ,CAAC;AAAA,EAC/E,CAAC;AACH;;;ACTA,qBAA0B;AAMnB,IAAM,qBAAqB,OAAO,UAA8D;AACrG,SAAO,MAAM,eAAe,YAAY;AACtC,UAAM,iBAAiB,MAAM,QAAQ;AAAA,MACnC,MAAM,IAAI,OAAO,SAAqC;AACpD,cAAM,SAAS,MAAM,KAAK,MAAM;AAChC,eAAO;AAAA,MACT,CAAC;AAAA,IACH;AACA,WAAO,eAAe,OAAO,wBAAS,EAAE,IAAI,CAAC,WAAW,OAAO,KAAK;AAAA,EACtE,CAAC;AACH;;;AChBO,IAAM,uBAAuB;AAAA;AAAA,EACrB;AAAA;AAAA,EACA;AAAA;AAAA,EACD;AAAA;AAAA,EACC;AAAA;AAAA,EACA;AAAA;AAAA,EACC;AAAA;AAAA,EACD;AAAA;AAAA,EACC;AAAA;AAAA,EACA;AAAA;AAAA,EACD;AAAA;AAAA,EACC;AAAA;AAAA,EACA;AAAA;AAAA,EACA;AAChB;;;ANQO,IAAM,6BAAN,cAEG,wCAAyB;AAAA,EACjC,OAAgB,gBAAgB,CAAC,kFAAsC;AAAA,EAE7D;AAAA,EACV,IAAc,WAAW;AACvB,WAAO,KAAK,OAAO;AAAA,EACrB;AAAA,EAEA,MAAyB,iBAAqC;AAC5D,UAAM,KAAK,QAAQ,OAAO;AAC1B,UAAM,QAAQ,MAAM,uBAAmB,yBAAS,KAAK,KAAK,CAAC;AAC3D,UAAM,YAAY,KAAK,IAAI;AAE3B,UAAM,UAAsC;AAAA,MAC1C;AAAA,MACA,QAAQ;AAAA,MACR;AAAA,IACF;AAEA,WAAO,CAAC,OAAO;AAAA,EACjB;AAAA,EAEA,MAAyB,eAAe;AA9C1C;AA+CI,UAAM,MAAM,aAAa;AACzB,SAAK,QAAQ,+BAA2B,yBAAS,KAAK,UAAU,mBAAmB,KAAG,UAAK,WAAL,mBAAa,UAAS,oBAAoB;AAChI,WAAO;AAAA,EACT;AACF;;;AD7CO,IAAM,4BAA4B,UACvC;AAAA,EACE,EAAE,UAAU,EAAE,CAAC,sEAAyB,GAAG,EAAE,GAAG,QAAQ,sCAAiB;AAAA,EACzE;AAAA,IACE,SAAS,OAAO,WAAW;AACzB,YAAM,SAAS,MAAM,2BAA2B,OAAO,MAAM;AAC7D,aAAO;AAAA,IACT;AAAA,EACF;AACF;;;ADNF,IAAO,cAAQ;","names":["import_uniswap_crypto_market_payload_plugin","import_assert","ChainId"]}

package/dist/node/index.js

@@ -30,13 +30,12 @@ var logErrorsAsync = async (func) => {
 };
 
 // src/lib/Ethers/UniSwap3Pair.ts
-import { ChainId } from "@uniswap/sdk";
-import { Token } from "@uniswap/sdk-core";
-import { Pool } from "@uniswap/v3-sdk";
 import { assertEx } from "@xylabs/assert";
 import { delay } from "@xylabs/delay";
 import { IERC20Metadata__factory } from "@xyo-network/typechain";
-import * as UniswapTypechain from "@xyo-network/uniswap-typechain";
+import { Token } from "@xyo-network/uniswap-sdk-core";
+import { IUniswapV3Pool__factory } from "@xyo-network/uniswap-typechain";
+import { Pool } from "@xyo-network/uniswap-v3-sdk";
 
 // src/lib/Ethers/Uniswap3PoolSlot0Wrapper.ts
 var EthersUniswap3PoolSlot0Wrapper = class {
@@ -68,10 +67,17 @@ var EthersUniswap3PoolSlot0Wrapper = class {
 };
 
 // src/lib/Ethers/UniSwap3Pair.ts
+var ChainId = /* @__PURE__ */ ((ChainId2) => {
+  ChainId2[ChainId2["MAINNET"] = 1] = "MAINNET";
+  ChainId2[ChainId2["ROPSTEN"] = 3] = "ROPSTEN";
+  ChainId2[ChainId2["RINKEBY"] = 4] = "RINKEBY";
+  ChainId2[ChainId2["G\xD6RLI"] = 5] = "G\xD6RLI";
+  ChainId2[ChainId2["KOVAN"] = 42] = "KOVAN";
+  return ChainId2;
+})(ChainId || {});
 var waitNotNull = async (closure) => {
-  while (closure() === null) {
+  while (closure() === null)
     await delay(10);
-  }
 };
 var EthersUniSwap3Pair = class {
   address;
@@ -90,12 +96,12 @@ var EthersUniSwap3Pair = class {
       await waitNotNull(() => this._pool);
       this._pool = this._pool || null;
       const slot0 = await this.slot0();
-      this._pool = this._pool ?? new Pool(
+      this._pool = this._pool !== null ? this._pool : new Pool(
         await this.token(0),
         await this.token(1),
         Number(slot0.feeProtocol),
-        slot0.sqrtPriceX96.toString(16),
-        (await this.poolContract().liquidity()).toString(16),
+        `0x${slot0.sqrtPriceX96.toString(16)}`,
+        `0x${(await this.poolContract().liquidity()).toString(16)}`,
         Number(slot0.tick)
       );
       return assertEx(this._pool);
@@ -103,7 +109,7 @@ var EthersUniSwap3Pair = class {
   }
   poolContract() {
     return logErrors(() => {
-      this._poolContract = this._poolContract ?? UniswapTypechain.IUniswapV3Pool__factory.connect(this.address, this.provider);
+      this._poolContract = this._poolContract ?? IUniswapV3Pool__factory.connect(this.address, this.provider);
       return assertEx(this._poolContract);
     });
   }
@@ -129,7 +135,11 @@ var EthersUniSwap3Pair = class {
     return await logErrorsAsync(async () => {
       await waitNotNull(() => this._slot0);
       this._slot0 = this._slot0 || null;
-      this._slot0 = this._slot0 ?? new EthersUniswap3PoolSlot0Wrapper(await this.poolContract().slot0());
+      if (this._slot0 === null) {
+        const poolContract = this.poolContract();
+        const slot = await poolContract.slot0();
+        this._slot0 = this._slot0 ?? new EthersUniswap3PoolSlot0Wrapper(slot);
+      }
       return assertEx(this._slot0);
     });
   }
@@ -139,7 +149,7 @@ var EthersUniSwap3Pair = class {
       this._tokens[index] = this._tokens[index] || null;
       const tokenContract = await this.tokenContract(index);
       this._tokens[index] = this._tokens[index] ?? new Token(
-        ChainId.MAINNET,
+        1 /* MAINNET */,
         await tokenContract.getAddress(),
         Number(await tokenContract.decimals()),
         await tokenContract.symbol(),
@@ -249,6 +259,7 @@ var UniswapCryptoMarketPlugin = () => createPayloadSetWitnessPlugin(
 // src/index.ts
 var src_default = UniswapCryptoMarketPlugin;
 export {
+  ChainId,
   EthersUniSwap3Pair,
   EthersUniswap3PoolSlot0Wrapper,
   UniswapCryptoMarketPlugin,

package/dist/node/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Plugin.ts","../../src/Witness.ts","../../src/lib/logErrors.ts","../../src/lib/Ethers/UniSwap3Pair.ts","../../src/lib/Ethers/Uniswap3PoolSlot0Wrapper.ts","../../src/lib/Ethers/createUniswapPoolContracts.ts","../../src/lib/pricesFromUniswap3.ts","../../src/lib/UniswapPoolContracts.ts","../../src/index.ts"],"sourcesContent":["import { PayloadSetSchema } from '@xyo-network/payload-model'\nimport { createPayloadSetWitnessPlugin } from '@xyo-network/payloadset-plugin'\nimport { UniswapCryptoMarketSchema } from '@xyo-network/uniswap-crypto-market-payload-plugin'\n\nimport { UniswapCryptoMarketWitness } from './Witness'\n\nexport const UniswapCryptoMarketPlugin = () =>\n  createPayloadSetWitnessPlugin<UniswapCryptoMarketWitness>(\n    { required: { [UniswapCryptoMarketSchema]: 1 }, schema: PayloadSetSchema },\n    {\n      witness: async (params) => {\n        const result = await UniswapCryptoMarketWitness.create(params)\n        return result\n      },\n    },\n  )\n","import { assertEx } from '@xylabs/assert'\nimport { AbstractWitness } from '@xyo-network/abstract-witness'\nimport { AnyConfigSchema } from '@xyo-network/module-model'\nimport { Payload } from '@xyo-network/payload-model'\nimport {\n  UniswapCryptoMarketPayload,\n  UniswapCryptoMarketSchema,\n  UniswapCryptoMarketWitnessConfigSchema,\n} from '@xyo-network/uniswap-crypto-market-payload-plugin'\nimport { WitnessParams } from '@xyo-network/witness-model'\nimport { Provider } from 'ethers'\n\nimport { UniswapCryptoMarketWitnessConfig } from './Config'\nimport { createUniswapPoolContracts, EthersUniSwap3Pair, pricesFromUniswap3, UniswapPoolContracts } from './lib'\n\nexport type UniswapCryptoMarketWitnessParams = WitnessParams<\n  AnyConfigSchema<UniswapCryptoMarketWitnessConfig>,\n  {\n    provider?: Provider\n  }\n>\n\nexport class UniswapCryptoMarketWitness<\n  TParams extends UniswapCryptoMarketWitnessParams = UniswapCryptoMarketWitnessParams,\n> extends AbstractWitness<TParams> {\n  static override configSchemas = [UniswapCryptoMarketWitnessConfigSchema]\n\n  protected pairs?: EthersUniSwap3Pair[]\n  protected get provider() {\n    return this.params.provider\n  }\n\n  protected override async observeHandler(): Promise<Payload[]> {\n    await this.started('throw')\n    const pairs = await pricesFromUniswap3(assertEx(this.pairs))\n    const timestamp = Date.now()\n\n    const payload: UniswapCryptoMarketPayload = {\n      pairs,\n      schema: UniswapCryptoMarketSchema,\n      timestamp,\n    }\n\n    return [payload]\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    this.pairs = createUniswapPoolContracts(assertEx(this.provider, 'Provider Required'), this.config?.pools ?? UniswapPoolContracts)\n    return true\n  }\n}\n","export const logErrors = <T>(func: () => T) => {\n  try {\n    return func()\n  } catch (ex) {\n    console.error(ex)\n    throw ex\n  }\n}\n\nexport const logErrorsAsync = async <T>(func: () => Promise<T>) => {\n  try {\n    return await func()\n  } catch (ex) {\n    console.error(ex)\n    throw ex\n  }\n}\n","import { ChainId } from '@uniswap/sdk'\nimport { Token } from '@uniswap/sdk-core'\nimport { Pool } from '@uniswap/v3-sdk'\nimport { assertEx } from '@xylabs/assert'\nimport { delay } from '@xylabs/delay'\nimport { IERC20Metadata, IERC20Metadata__factory } from '@xyo-network/typechain'\nimport * as UniswapTypechain from '@xyo-network/uniswap-typechain'\nimport { Provider } from 'ethers'\n\nimport { logErrors, logErrorsAsync } from '../logErrors'\nimport { EthersUniswap3PoolSlot0Wrapper } from './Uniswap3PoolSlot0Wrapper'\n\n//null is used as 'in-progress'\nconst waitNotNull = async (closure: () => unknown) => {\n  while (closure() === null) {\n    await delay(10)\n  }\n}\n\nexport class EthersUniSwap3Pair {\n  protected address: string\n  protected provider: Provider\n\n  private _pool?: Pool | null\n  private _poolContract?: UniswapTypechain.IUniswapV3Pool\n  private _slot0?: EthersUniswap3PoolSlot0Wrapper | null\n  private _tokenContracts: (IERC20Metadata | null | undefined)[] = [undefined, undefined]\n  private _tokens: (Token | null | undefined)[] = [undefined, undefined]\n\n  constructor(address: string, provider: Provider) {\n    this.address = address\n    this.provider = provider\n  }\n\n  async pool(): Promise<Pool> {\n    return await logErrorsAsync(async () => {\n      await waitNotNull(() => this._pool)\n      this._pool = this._pool || null\n      const slot0 = await this.slot0()\n      this._pool =\n        this._pool ??\n        new Pool(\n          await this.token(0),\n          await this.token(1),\n          Number(slot0.feeProtocol),\n          slot0.sqrtPriceX96.toString(16),\n          (await this.poolContract().liquidity()).toString(16),\n          Number(slot0.tick),\n        )\n      return assertEx(this._pool)\n    })\n  }\n\n  poolContract(): UniswapTypechain.IUniswapV3Pool {\n    return logErrors(() => {\n      this._poolContract = this._poolContract ?? UniswapTypechain.IUniswapV3Pool__factory.connect(this.address, this.provider)\n      return assertEx(this._poolContract)\n    })\n  }\n\n  async price() {\n    return await logErrorsAsync(async () => {\n      const tokenIndexes: (0 | 1)[] = [0, 1]\n      const pool = await this.pool()\n      const tokens = await Promise.all(tokenIndexes.map((value) => this.token(value)))\n      const tokenContracts = await Promise.all(tokenIndexes.map((value) => this.tokenContract(value)))\n      const tokenPrices = tokens.map((token) => parseFloat(pool.priceOf(token).toSignificant()))\n      const tokenSymbols = tokens.map((token, index) => assertEx(token.symbol, `Token[${index}] Missing Symbols`).toLowerCase())\n      const result = {\n        tokens: await Promise.all(\n          tokenIndexes.map(async (value) => {\n            return { address: await tokenContracts[value].getAddress(), symbol: tokenSymbols[value], value: tokenPrices[value] }\n          }),\n        ),\n      }\n      return result\n    })\n  }\n\n  async slot0(): Promise<EthersUniswap3PoolSlot0Wrapper> {\n    return await logErrorsAsync(async () => {\n      await waitNotNull(() => this._slot0)\n      this._slot0 = this._slot0 || null\n      this._slot0 = this._slot0 ?? new EthersUniswap3PoolSlot0Wrapper(await this.poolContract().slot0())\n      return assertEx(this._slot0)\n    })\n  }\n\n  async token(index: 0 | 1): Promise<Token> {\n    return await logErrorsAsync(async () => {\n      await waitNotNull(() => this._tokens[index])\n      this._tokens[index] = this._tokens[index] || null\n      const tokenContract = await this.tokenContract(index)\n      this._tokens[index] =\n        this._tokens[index] ??\n        new Token(\n          ChainId.MAINNET,\n          await tokenContract.getAddress(),\n          Number(await tokenContract.decimals()),\n          await tokenContract.symbol(),\n          await tokenContract.name(),\n        )\n      return assertEx(this._tokens[index])\n    })\n  }\n\n  async tokenContract(index: 0 | 1): Promise<IERC20Metadata> {\n    return await logErrorsAsync(async () => {\n      await waitNotNull(() => this._tokenContracts[index])\n      this._tokenContracts[index] = this._tokenContracts[index] || null\n      this._tokenContracts[index] =\n        this._tokenContracts[index] ??\n        IERC20Metadata__factory.connect(await (index === 0 ? this.poolContract().token0() : this.poolContract().token1()), this.provider)\n      return assertEx(this._tokenContracts[index])\n    })\n  }\n}\n","import { EthersUniswapV3Slot0Fields } from './UniswapV3Slot0Fields'\n\nexport class EthersUniswap3PoolSlot0Wrapper {\n  protected values: EthersUniswapV3Slot0Fields\n  constructor(values: EthersUniswapV3Slot0Fields) {\n    this.values = values\n  }\n\n  get feeProtocol() {\n    return this.values[5]\n  }\n\n  get observationCardinality() {\n    return this.values[3]\n  }\n\n  get observationCardinalityNext() {\n    return this.values[4]\n  }\n\n  get observationIndex() {\n    return this.values[2]\n  }\n\n  get sqrtPriceX96() {\n    return this.values[0]\n  }\n\n  get tick() {\n    return this.values[1]\n  }\n\n  get unlocked() {\n    return this.values[6]\n  }\n}\n","import { Provider } from 'ethers'\n\nimport { logErrors } from '../logErrors'\nimport { EthersUniSwap3Pair } from './UniSwap3Pair'\n\nexport const createUniswapPoolContracts = (provider: Provider, contracts: string[]) => {\n  return logErrors(() => {\n    return contracts.map((contract) => new EthersUniSwap3Pair(contract, provider))\n  })\n}\n","import { fulfilled } from '@xylabs/promise'\nimport { UniswapCryptoPair } from '@xyo-network/uniswap-crypto-market-payload-plugin'\n\nimport { EthersUniSwap3Pair } from './Ethers'\nimport { logErrorsAsync } from './logErrors'\n\nexport const pricesFromUniswap3 = async (pools: EthersUniSwap3Pair[]): Promise<UniswapCryptoPair[]> => {\n  return await logErrorsAsync(async () => {\n    const promiseResults = await Promise.allSettled(\n      pools.map(async (pool): Promise<UniswapCryptoPair> => {\n        const result = await pool.price()\n        return result\n      }),\n    )\n    return promiseResults.filter(fulfilled).map((result) => result.value)\n  })\n}\n","export const UniswapPoolContracts = [\n  /*xyo/weth*/ '0xE331DE28cd81B768C19A366b0e4e4675c45eC2dA',\n  /*xyo/usdt*/ '0xd0AF1981f52146a6939385451dAeA0726e13a484',\n  /*xyo/dai*/ '0x9D7e5647CE3c7C2d835F2F5e82C8fDb36B0BB0fe',\n  /*wbtc/xyo*/ '0x0cF7494c9dE661467403aBeE8454b3BBf0179a84',\n  /*link/xyo*/ '0x4693456599a8a4975862A0E720C5de7E1D09A1e4',\n  /*wbtc/weth*/ '0xCBCdF9626bC03E24f779434178A73a0B4bad62eD',\n  /*dai/usdc*/ '0x5777d92f208679DB4b9778590Fa3CAB3aC9e2168',\n  /*usdc/weth*/ '0x8ad599c3A0ff1De082011EFDDc58f1908eb6e6D8',\n  /*usdc/weth*/ '0x88e6A0c2dDD26FEEb64F039a2c41296FcB3f5640',\n  /*dai/usdc*/ '0x6c6Bc977E13Df9b0de53b251522280BB72383700',\n  /*frax/usdc*/ '0xc63B0708E2F7e69CB8A1df0e1389A98C35A76D52',\n  /*wbtc/usdc*/ '0x99ac8cA7087fA4A2A1FB6357269965A2014ABc35',\n  /*usdc/usdt*/ '0x3416cF6C708Da44DB2624D63ea0AAef7113527C6',\n]\n","import { UniswapCryptoMarketPlugin } from './Plugin'\n\nexport * from './Config'\nexport * from './lib'\nexport * from './Witness'\n\nexport { UniswapCryptoMarketPlugin }\n\n// eslint-disable-next-line import/no-default-export\nexport default UniswapCryptoMarketPlugin\n"],"mappings":"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","names":["UniswapCryptoMarketSchema","assertEx","assertEx","UniswapCryptoMarketSchema"]}
+{"version":3,"sources":["../../src/Plugin.ts","../../src/Witness.ts","../../src/lib/logErrors.ts","../../src/lib/Ethers/UniSwap3Pair.ts","../../src/lib/Ethers/Uniswap3PoolSlot0Wrapper.ts","../../src/lib/Ethers/createUniswapPoolContracts.ts","../../src/lib/pricesFromUniswap3.ts","../../src/lib/UniswapPoolContracts.ts","../../src/index.ts"],"sourcesContent":["import { PayloadSetSchema } from '@xyo-network/payload-model'\nimport { createPayloadSetWitnessPlugin } from '@xyo-network/payloadset-plugin'\nimport { UniswapCryptoMarketSchema } from '@xyo-network/uniswap-crypto-market-payload-plugin'\n\nimport { UniswapCryptoMarketWitness } from './Witness'\n\nexport const UniswapCryptoMarketPlugin = () =>\n  createPayloadSetWitnessPlugin<UniswapCryptoMarketWitness>(\n    { required: { [UniswapCryptoMarketSchema]: 1 }, schema: PayloadSetSchema },\n    {\n      witness: async (params) => {\n        const result = await UniswapCryptoMarketWitness.create(params)\n        return result\n      },\n    },\n  )\n","import { assertEx } from '@xylabs/assert'\nimport { AbstractWitness } from '@xyo-network/abstract-witness'\nimport { AnyConfigSchema } from '@xyo-network/module-model'\nimport { Payload } from '@xyo-network/payload-model'\nimport {\n  UniswapCryptoMarketPayload,\n  UniswapCryptoMarketSchema,\n  UniswapCryptoMarketWitnessConfigSchema,\n} from '@xyo-network/uniswap-crypto-market-payload-plugin'\nimport { WitnessParams } from '@xyo-network/witness-model'\nimport { Provider } from 'ethers'\n\nimport { UniswapCryptoMarketWitnessConfig } from './Config'\nimport { createUniswapPoolContracts, EthersUniSwap3Pair, pricesFromUniswap3, UniswapPoolContracts } from './lib'\n\nexport type UniswapCryptoMarketWitnessParams = WitnessParams<\n  AnyConfigSchema<UniswapCryptoMarketWitnessConfig>,\n  {\n    provider?: Provider\n  }\n>\n\nexport class UniswapCryptoMarketWitness<\n  TParams extends UniswapCryptoMarketWitnessParams = UniswapCryptoMarketWitnessParams,\n> extends AbstractWitness<TParams> {\n  static override configSchemas = [UniswapCryptoMarketWitnessConfigSchema]\n\n  protected pairs?: EthersUniSwap3Pair[]\n  protected get provider() {\n    return this.params.provider\n  }\n\n  protected override async observeHandler(): Promise<Payload[]> {\n    await this.started('throw')\n    const pairs = await pricesFromUniswap3(assertEx(this.pairs))\n    const timestamp = Date.now()\n\n    const payload: UniswapCryptoMarketPayload = {\n      pairs,\n      schema: UniswapCryptoMarketSchema,\n      timestamp,\n    }\n\n    return [payload]\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    this.pairs = createUniswapPoolContracts(assertEx(this.provider, 'Provider Required'), this.config?.pools ?? UniswapPoolContracts)\n    return true\n  }\n}\n","export const logErrors = <T>(func: () => T) => {\n  try {\n    return func()\n  } catch (ex) {\n    console.error(ex)\n    throw ex\n  }\n}\n\nexport const logErrorsAsync = async <T>(func: () => Promise<T>) => {\n  try {\n    return await func()\n  } catch (ex) {\n    console.error(ex)\n    throw ex\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport { delay } from '@xylabs/delay'\nimport { IERC20Metadata, IERC20Metadata__factory } from '@xyo-network/typechain'\nimport { Token } from '@xyo-network/uniswap-sdk-core'\nimport { IUniswapV3Pool, IUniswapV3Pool__factory, IUniswapV3PoolState, IUniswapV3PoolState__factory } from '@xyo-network/uniswap-typechain'\nimport { Pool } from '@xyo-network/uniswap-v3-sdk'\nimport { Provider } from 'ethers'\n\nimport { logErrors, logErrorsAsync } from '../logErrors'\nimport { EthersUniswap3PoolSlot0Wrapper } from './Uniswap3PoolSlot0Wrapper'\n\nexport enum ChainId {\n  MAINNET = 1,\n  ROPSTEN = 3,\n  RINKEBY = 4,\n  GÖRLI = 5,\n  KOVAN = 42,\n}\n\n//null is used as 'in-progress'\nconst waitNotNull = async (closure: () => unknown) => {\n  while (closure() === null) await delay(10)\n}\n\nexport class EthersUniSwap3Pair {\n  protected address: string\n  protected provider: Provider\n\n  private _pool?: Pool | null\n  private _poolContract?: IUniswapV3Pool\n  private _slot0?: EthersUniswap3PoolSlot0Wrapper | null\n  private _tokenContracts: (IERC20Metadata | null | undefined)[] = [undefined, undefined]\n  private _tokens: (Token | null | undefined)[] = [undefined, undefined]\n\n  constructor(address: string, provider: Provider) {\n    this.address = address\n    this.provider = provider\n  }\n\n  async pool(): Promise<Pool> {\n    return await logErrorsAsync(async () => {\n      await waitNotNull(() => this._pool)\n      this._pool = this._pool || null\n      const slot0 = await this.slot0()\n      this._pool =\n        this._pool !== null\n          ? this._pool\n          : new Pool(\n              await this.token(0),\n              await this.token(1),\n              Number(slot0.feeProtocol),\n              `0x${slot0.sqrtPriceX96.toString(16)}`,\n              `0x${(await this.poolContract().liquidity()).toString(16)}`,\n              Number(slot0.tick),\n            )\n      return assertEx(this._pool)\n    })\n  }\n\n  poolContract() {\n    return logErrors(() => {\n      this._poolContract = this._poolContract ?? IUniswapV3Pool__factory.connect(this.address, this.provider)\n      return assertEx(this._poolContract)\n    })\n  }\n\n  async price() {\n    return await logErrorsAsync(async () => {\n      const tokenIndexes: (0 | 1)[] = [0, 1]\n      const pool = await this.pool()\n      const tokens = await Promise.all(tokenIndexes.map((value) => this.token(value)))\n      const tokenContracts = await Promise.all(tokenIndexes.map((value) => this.tokenContract(value)))\n      const tokenPrices = tokens.map((token) => parseFloat(pool.priceOf(token).toSignificant()))\n      const tokenSymbols = tokens.map((token, index) => assertEx(token.symbol, `Token[${index}] Missing Symbols`).toLowerCase())\n      const result = {\n        tokens: await Promise.all(\n          tokenIndexes.map(async (value) => {\n            return { address: await tokenContracts[value].getAddress(), symbol: tokenSymbols[value], value: tokenPrices[value] }\n          }),\n        ),\n      }\n      return result\n    })\n  }\n\n  async slot0(): Promise<EthersUniswap3PoolSlot0Wrapper> {\n    return await logErrorsAsync(async () => {\n      await waitNotNull(() => this._slot0)\n      this._slot0 = this._slot0 || null\n      if (this._slot0 === null) {\n        const poolContract = this.poolContract()\n        const slot = await poolContract.slot0()\n        this._slot0 = this._slot0 ?? new EthersUniswap3PoolSlot0Wrapper(slot)\n      }\n      return assertEx(this._slot0)\n    })\n  }\n\n  async token(index: 0 | 1): Promise<Token> {\n    return await logErrorsAsync(async () => {\n      await waitNotNull(() => this._tokens[index])\n      this._tokens[index] = this._tokens[index] || null\n      const tokenContract = await this.tokenContract(index)\n      this._tokens[index] =\n        this._tokens[index] ??\n        new Token(\n          ChainId.MAINNET,\n          await tokenContract.getAddress(),\n          Number(await tokenContract.decimals()),\n          await tokenContract.symbol(),\n          await tokenContract.name(),\n        )\n      return assertEx(this._tokens[index])\n    })\n  }\n\n  async tokenContract(index: 0 | 1): Promise<IERC20Metadata> {\n    return await logErrorsAsync(async () => {\n      await waitNotNull(() => this._tokenContracts[index])\n      this._tokenContracts[index] = this._tokenContracts[index] || null\n      this._tokenContracts[index] =\n        this._tokenContracts[index] ??\n        IERC20Metadata__factory.connect(await (index === 0 ? this.poolContract().token0() : this.poolContract().token1()), this.provider)\n      return assertEx(this._tokenContracts[index])\n    })\n  }\n}\n","import { EthersUniswapV3Slot0Fields } from './UniswapV3Slot0Fields'\n\nexport class EthersUniswap3PoolSlot0Wrapper {\n  protected values: EthersUniswapV3Slot0Fields\n  constructor(values: EthersUniswapV3Slot0Fields) {\n    this.values = values\n  }\n\n  get feeProtocol() {\n    return this.values[5]\n  }\n\n  get observationCardinality() {\n    return this.values[3]\n  }\n\n  get observationCardinalityNext() {\n    return this.values[4]\n  }\n\n  get observationIndex() {\n    return this.values[2]\n  }\n\n  get sqrtPriceX96() {\n    return this.values[0]\n  }\n\n  get tick() {\n    return this.values[1]\n  }\n\n  get unlocked() {\n    return this.values[6]\n  }\n}\n","import { Provider } from 'ethers'\n\nimport { logErrors } from '../logErrors'\nimport { EthersUniSwap3Pair } from './UniSwap3Pair'\n\nexport const createUniswapPoolContracts = (provider: Provider, contracts: string[]) => {\n  return logErrors(() => {\n    return contracts.map((contract) => new EthersUniSwap3Pair(contract, provider))\n  })\n}\n","import { fulfilled } from '@xylabs/promise'\nimport { UniswapCryptoPair } from '@xyo-network/uniswap-crypto-market-payload-plugin'\n\nimport { EthersUniSwap3Pair } from './Ethers'\nimport { logErrorsAsync } from './logErrors'\n\nexport const pricesFromUniswap3 = async (pools: EthersUniSwap3Pair[]): Promise<UniswapCryptoPair[]> => {\n  return await logErrorsAsync(async () => {\n    const promiseResults = await Promise.allSettled(\n      pools.map(async (pool): Promise<UniswapCryptoPair> => {\n        const result = await pool.price()\n        return result\n      }),\n    )\n    return promiseResults.filter(fulfilled).map((result) => result.value)\n  })\n}\n","export const UniswapPoolContracts = [\n  /*xyo/weth*/ '0xE331DE28cd81B768C19A366b0e4e4675c45eC2dA',\n  /*xyo/usdt*/ '0xd0AF1981f52146a6939385451dAeA0726e13a484',\n  /*xyo/dai*/ '0x9D7e5647CE3c7C2d835F2F5e82C8fDb36B0BB0fe',\n  /*wbtc/xyo*/ '0x0cF7494c9dE661467403aBeE8454b3BBf0179a84',\n  /*link/xyo*/ '0x4693456599a8a4975862A0E720C5de7E1D09A1e4',\n  /*wbtc/weth*/ '0xCBCdF9626bC03E24f779434178A73a0B4bad62eD',\n  /*dai/usdc*/ '0x5777d92f208679DB4b9778590Fa3CAB3aC9e2168',\n  /*usdc/weth*/ '0x8ad599c3A0ff1De082011EFDDc58f1908eb6e6D8',\n  /*usdc/weth*/ '0x88e6A0c2dDD26FEEb64F039a2c41296FcB3f5640',\n  /*dai/usdc*/ '0x6c6Bc977E13Df9b0de53b251522280BB72383700',\n  /*frax/usdc*/ '0xc63B0708E2F7e69CB8A1df0e1389A98C35A76D52',\n  /*wbtc/usdc*/ '0x99ac8cA7087fA4A2A1FB6357269965A2014ABc35',\n  /*usdc/usdt*/ '0x3416cF6C708Da44DB2624D63ea0AAef7113527C6',\n]\n","import { UniswapCryptoMarketPlugin } from './Plugin'\n\nexport * from './Config'\nexport * from './lib'\nexport * from './Witness'\n\nexport { UniswapCryptoMarketPlugin }\n\n// eslint-disable-next-line import/no-default-export\nexport default UniswapCryptoMarketPlugin\n"],"mappings":"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","names":["UniswapCryptoMarketSchema","assertEx","ChainId","assertEx","UniswapCryptoMarketSchema"]}

package/dist/node/lib/Ethers/UniSwap3Pair.d.cts

@@ -1,9 +1,16 @@
-import { Token } from '@uniswap/sdk-core';
-import { Pool } from '@uniswap/v3-sdk';
 import { IERC20Metadata } from '@xyo-network/typechain';
-import * as UniswapTypechain from '@xyo-network/uniswap-typechain';
+import { Token } from '@xyo-network/uniswap-sdk-core';
+import { IUniswapV3Pool } from '@xyo-network/uniswap-typechain';
+import { Pool } from '@xyo-network/uniswap-v3-sdk';
 import { Provider } from 'ethers';
 import { EthersUniswap3PoolSlot0Wrapper } from './Uniswap3PoolSlot0Wrapper';
+export declare enum ChainId {
+    MAINNET = 1,
+    ROPSTEN = 3,
+    RINKEBY = 4,
+    GÖRLI = 5,
+    KOVAN = 42
+}
 export declare class EthersUniSwap3Pair {
     protected address: string;
     protected provider: Provider;
@@ -14,7 +21,7 @@ export declare class EthersUniSwap3Pair {
     private _tokens;
     constructor(address: string, provider: Provider);
     pool(): Promise<Pool>;
-    poolContract(): UniswapTypechain.IUniswapV3Pool;
+    poolContract(): IUniswapV3Pool;
     price(): Promise<{
         tokens: {
             address: string;

package/dist/node/lib/Ethers/UniSwap3Pair.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"UniSwap3Pair.d.ts","sourceRoot":"","sources":["../../../../src/lib/Ethers/UniSwap3Pair.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAGtC,OAAO,EAAE,cAAc,EAA2B,MAAM,wBAAwB,CAAA;AAChF,OAAO,KAAK,gBAAgB,MAAM,gCAAgC,CAAA;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAGjC,OAAO,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAA;AAS3E,qBAAa,kBAAkB;IAC7B,SAAS,CAAC,OAAO,EAAE,MAAM,CAAA;IACzB,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAA;IAE5B,OAAO,CAAC,KAAK,CAAC,CAAa;IAC3B,OAAO,CAAC,aAAa,CAAC,CAAiC;IACvD,OAAO,CAAC,MAAM,CAAC,CAAuC;IACtD,OAAO,CAAC,eAAe,CAAgE;IACvF,OAAO,CAAC,OAAO,CAAuD;gBAE1D,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAKzC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAmB3B,YAAY,IAAI,gBAAgB,CAAC,cAAc;IAOzC,KAAK;;;;;;;IAmBL,KAAK,IAAI,OAAO,CAAC,8BAA8B,CAAC;IAShD,KAAK,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC;IAkBnC,aAAa,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;CAU3D"}
+{"version":3,"file":"UniSwap3Pair.d.ts","sourceRoot":"","sources":["../../../../src/lib/Ethers/UniSwap3Pair.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAA2B,MAAM,wBAAwB,CAAA;AAChF,OAAO,EAAE,KAAK,EAAE,MAAM,+BAA+B,CAAA;AACrD,OAAO,EAAE,cAAc,EAA8E,MAAM,gCAAgC,CAAA;AAC3I,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAA;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAGjC,OAAO,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAA;AAE3E,oBAAY,OAAO;IACjB,OAAO,IAAI;IACX,OAAO,IAAI;IACX,OAAO,IAAI;IACX,KAAK,IAAI;IACT,KAAK,KAAK;CACX;AAOD,qBAAa,kBAAkB;IAC7B,SAAS,CAAC,OAAO,EAAE,MAAM,CAAA;IACzB,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAA;IAE5B,OAAO,CAAC,KAAK,CAAC,CAAa;IAC3B,OAAO,CAAC,aAAa,CAAC,CAAgB;IACtC,OAAO,CAAC,MAAM,CAAC,CAAuC;IACtD,OAAO,CAAC,eAAe,CAAgE;IACvF,OAAO,CAAC,OAAO,CAAuD;gBAE1D,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAKzC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAoB3B,YAAY;IAON,KAAK;;;;;;;IAmBL,KAAK,IAAI,OAAO,CAAC,8BAA8B,CAAC;IAahD,KAAK,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC;IAkBnC,aAAa,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;CAU3D"}

package/dist/node/lib/Ethers/UniSwap3Pair.d.mts

@@ -1,9 +1,16 @@
-import { Token } from '@uniswap/sdk-core';
-import { Pool } from '@uniswap/v3-sdk';
 import { IERC20Metadata } from '@xyo-network/typechain';
-import * as UniswapTypechain from '@xyo-network/uniswap-typechain';
+import { Token } from '@xyo-network/uniswap-sdk-core';
+import { IUniswapV3Pool } from '@xyo-network/uniswap-typechain';
+import { Pool } from '@xyo-network/uniswap-v3-sdk';
 import { Provider } from 'ethers';
 import { EthersUniswap3PoolSlot0Wrapper } from './Uniswap3PoolSlot0Wrapper';
+export declare enum ChainId {
+    MAINNET = 1,
+    ROPSTEN = 3,
+    RINKEBY = 4,
+    GÖRLI = 5,
+    KOVAN = 42
+}
 export declare class EthersUniSwap3Pair {
     protected address: string;
     protected provider: Provider;
@@ -14,7 +21,7 @@ export declare class EthersUniSwap3Pair {
     private _tokens;
     constructor(address: string, provider: Provider);
     pool(): Promise<Pool>;
-    poolContract(): UniswapTypechain.IUniswapV3Pool;
+    poolContract(): IUniswapV3Pool;
     price(): Promise<{
         tokens: {
             address: string;

package/dist/node/lib/Ethers/UniSwap3Pair.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"UniSwap3Pair.d.ts","sourceRoot":"","sources":["../../../../src/lib/Ethers/UniSwap3Pair.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAGtC,OAAO,EAAE,cAAc,EAA2B,MAAM,wBAAwB,CAAA;AAChF,OAAO,KAAK,gBAAgB,MAAM,gCAAgC,CAAA;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAGjC,OAAO,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAA;AAS3E,qBAAa,kBAAkB;IAC7B,SAAS,CAAC,OAAO,EAAE,MAAM,CAAA;IACzB,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAA;IAE5B,OAAO,CAAC,KAAK,CAAC,CAAa;IAC3B,OAAO,CAAC,aAAa,CAAC,CAAiC;IACvD,OAAO,CAAC,MAAM,CAAC,CAAuC;IACtD,OAAO,CAAC,eAAe,CAAgE;IACvF,OAAO,CAAC,OAAO,CAAuD;gBAE1D,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAKzC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAmB3B,YAAY,IAAI,gBAAgB,CAAC,cAAc;IAOzC,KAAK;;;;;;;IAmBL,KAAK,IAAI,OAAO,CAAC,8BAA8B,CAAC;IAShD,KAAK,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC;IAkBnC,aAAa,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;CAU3D"}
+{"version":3,"file":"UniSwap3Pair.d.ts","sourceRoot":"","sources":["../../../../src/lib/Ethers/UniSwap3Pair.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAA2B,MAAM,wBAAwB,CAAA;AAChF,OAAO,EAAE,KAAK,EAAE,MAAM,+BAA+B,CAAA;AACrD,OAAO,EAAE,cAAc,EAA8E,MAAM,gCAAgC,CAAA;AAC3I,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAA;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAGjC,OAAO,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAA;AAE3E,oBAAY,OAAO;IACjB,OAAO,IAAI;IACX,OAAO,IAAI;IACX,OAAO,IAAI;IACX,KAAK,IAAI;IACT,KAAK,KAAK;CACX;AAOD,qBAAa,kBAAkB;IAC7B,SAAS,CAAC,OAAO,EAAE,MAAM,CAAA;IACzB,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAA;IAE5B,OAAO,CAAC,KAAK,CAAC,CAAa;IAC3B,OAAO,CAAC,aAAa,CAAC,CAAgB;IACtC,OAAO,CAAC,MAAM,CAAC,CAAuC;IACtD,OAAO,CAAC,eAAe,CAAgE;IACvF,OAAO,CAAC,OAAO,CAAuD;gBAE1D,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAKzC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAoB3B,YAAY;IAON,KAAK;;;;;;;IAmBL,KAAK,IAAI,OAAO,CAAC,8BAA8B,CAAC;IAahD,KAAK,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC;IAkBnC,aAAa,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;CAU3D"}

package/dist/node/lib/Ethers/UniSwap3Pair.d.ts

@@ -1,9 +1,16 @@
-import { Token } from '@uniswap/sdk-core';
-import { Pool } from '@uniswap/v3-sdk';
 import { IERC20Metadata } from '@xyo-network/typechain';
-import * as UniswapTypechain from '@xyo-network/uniswap-typechain';
+import { Token } from '@xyo-network/uniswap-sdk-core';
+import { IUniswapV3Pool } from '@xyo-network/uniswap-typechain';
+import { Pool } from '@xyo-network/uniswap-v3-sdk';
 import { Provider } from 'ethers';
 import { EthersUniswap3PoolSlot0Wrapper } from './Uniswap3PoolSlot0Wrapper';
+export declare enum ChainId {
+    MAINNET = 1,
+    ROPSTEN = 3,
+    RINKEBY = 4,
+    GÖRLI = 5,
+    KOVAN = 42
+}
 export declare class EthersUniSwap3Pair {
     protected address: string;
     protected provider: Provider;
@@ -14,7 +21,7 @@ export declare class EthersUniSwap3Pair {
     private _tokens;
     constructor(address: string, provider: Provider);
     pool(): Promise<Pool>;
-    poolContract(): UniswapTypechain.IUniswapV3Pool;
+    poolContract(): IUniswapV3Pool;
     price(): Promise<{
         tokens: {
             address: string;

package/dist/node/lib/Ethers/UniSwap3Pair.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UniSwap3Pair.d.ts","sourceRoot":"","sources":["../../../../src/lib/Ethers/UniSwap3Pair.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAGtC,OAAO,EAAE,cAAc,EAA2B,MAAM,wBAAwB,CAAA;AAChF,OAAO,KAAK,gBAAgB,MAAM,gCAAgC,CAAA;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAGjC,OAAO,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAA;AAS3E,qBAAa,kBAAkB;IAC7B,SAAS,CAAC,OAAO,EAAE,MAAM,CAAA;IACzB,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAA;IAE5B,OAAO,CAAC,KAAK,CAAC,CAAa;IAC3B,OAAO,CAAC,aAAa,CAAC,CAAiC;IACvD,OAAO,CAAC,MAAM,CAAC,CAAuC;IACtD,OAAO,CAAC,eAAe,CAAgE;IACvF,OAAO,CAAC,OAAO,CAAuD;gBAE1D,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAKzC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAmB3B,YAAY,IAAI,gBAAgB,CAAC,cAAc;IAOzC,KAAK;;;;;;;IAmBL,KAAK,IAAI,OAAO,CAAC,8BAA8B,CAAC;IAShD,KAAK,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC;IAkBnC,aAAa,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;CAU3D"}
+{"version":3,"file":"UniSwap3Pair.d.ts","sourceRoot":"","sources":["../../../../src/lib/Ethers/UniSwap3Pair.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAA2B,MAAM,wBAAwB,CAAA;AAChF,OAAO,EAAE,KAAK,EAAE,MAAM,+BAA+B,CAAA;AACrD,OAAO,EAAE,cAAc,EAA8E,MAAM,gCAAgC,CAAA;AAC3I,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAA;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAGjC,OAAO,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAA;AAE3E,oBAAY,OAAO;IACjB,OAAO,IAAI;IACX,OAAO,IAAI;IACX,OAAO,IAAI;IACX,KAAK,IAAI;IACT,KAAK,KAAK;CACX;AAOD,qBAAa,kBAAkB;IAC7B,SAAS,CAAC,OAAO,EAAE,MAAM,CAAA;IACzB,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAA;IAE5B,OAAO,CAAC,KAAK,CAAC,CAAa;IAC3B,OAAO,CAAC,aAAa,CAAC,CAAgB;IACtC,OAAO,CAAC,MAAM,CAAC,CAAuC;IACtD,OAAO,CAAC,eAAe,CAAgE;IACvF,OAAO,CAAC,OAAO,CAAuD;gBAE1D,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAKzC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAoB3B,YAAY;IAON,KAAK;;;;;;;IAmBL,KAAK,IAAI,OAAO,CAAC,8BAA8B,CAAC;IAahD,KAAK,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC;IAkBnC,aAAa,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;CAU3D"}

package/package.json

@@ -10,37 +10,33 @@
     "url": "https://github.com/XYOracleNetwork/plugins/issues"
   },
   "dependencies": {
+    "@uniswap/swap-router-contracts": "^1.3.1",
+    "@uniswap/v3-periphery": "^1.4.4",
     "@xylabs/assert": "^2.13.9",
     "@xylabs/bignumber": "^2.13.9",
     "@xylabs/delay": "^2.13.9",
     "@xylabs/promise": "^2.13.9",
-    "@xyo-network/abstract-witness": "^2.81.0-rc.1",
-    "@xyo-network/module-model": "^2.81.0-rc.1",
-    "@xyo-network/payload-model": "^2.81.0-rc.1",
-    "@xyo-network/payloadset-plugin": "^2.81.0-rc.1",
-    "@xyo-network/typechain": "^3.0.0",
-    "@xyo-network/uniswap-crypto-market-payload-plugin": "~2.81.0-rc.1",
-    "@xyo-network/uniswap-typechain": "^3.0.0",
-    "@xyo-network/witness-model": "^2.81.0-rc.1",
+    "@xyo-network/abstract-witness": "^2.81.2",
+    "@xyo-network/module-model": "^2.81.2",
+    "@xyo-network/payload-model": "^2.81.2",
+    "@xyo-network/payloadset-plugin": "^2.81.2",
+    "@xyo-network/typechain": "^3.0.5",
+    "@xyo-network/uniswap-crypto-market-payload-plugin": "~2.81.1",
+    "@xyo-network/uniswap-sdk-core": "^4.1.0",
+    "@xyo-network/uniswap-typechain": "^3.0.5",
+    "@xyo-network/uniswap-v3-sdk": "^3.12.2",
+    "@xyo-network/witness-model": "^2.81.2",
     "ethers": "^6.8.1"
   },
-  "peerDependencies": {
-    "@uniswap/sdk": "^3.0.3",
-    "@uniswap/sdk-core": "^3.2.3",
-    "@uniswap/v3-sdk": "^3.9.0"
-  },
   "devDependencies": {
-    "@uniswap/sdk": "^3.0.3",
-    "@uniswap/sdk-core": "^4.0.9",
-    "@uniswap/v3-sdk": "^3.10.0",
     "@xylabs/jest-helpers": "^2.13.9",
-    "@xylabs/ts-scripts-yarn3": "^3.2.2",
-    "@xylabs/tsconfig": "^3.2.2",
-    "@xyo-network/account": "^2.81.0-rc.1",
-    "@xyo-network/payload-wrapper": "^2.81.0-rc.1",
-    "@xyo-network/witness-blockchain-abstract": "^2.81.0-rc.1",
+    "@xylabs/ts-scripts-yarn3": "^3.2.8",
+    "@xylabs/tsconfig": "^3.2.8",
+    "@xyo-network/account": "^2.81.2",
+    "@xyo-network/payload-wrapper": "^2.81.2",
+    "@xyo-network/witness-blockchain-abstract": "^2.81.2",
     "jest": "^29.7.0",
-    "typescript": "^5.2.2"
+    "typescript": "^5.3.2"
   },
   "description": "Typescript/Javascript Plugins for XYO Platform",
   "docs": "dist/docs.json",
@@ -82,7 +78,6 @@
     "url": "https://github.com/XYOracleNetwork/plugins.git"
   },
   "sideEffects": false,
-  "version": "2.81.0-rc.1",
-  "type": "module",
-  "stableVersion": "2.80.5"
+  "version": "2.81.1",
+  "type": "module"
 }

package/src/lib/Ethers/UniSwap3Pair.ts

@@ -1,20 +1,25 @@
-import { ChainId } from '@uniswap/sdk'
-import { Token } from '@uniswap/sdk-core'
-import { Pool } from '@uniswap/v3-sdk'
 import { assertEx } from '@xylabs/assert'
 import { delay } from '@xylabs/delay'
 import { IERC20Metadata, IERC20Metadata__factory } from '@xyo-network/typechain'
-import * as UniswapTypechain from '@xyo-network/uniswap-typechain'
+import { Token } from '@xyo-network/uniswap-sdk-core'
+import { IUniswapV3Pool, IUniswapV3Pool__factory, IUniswapV3PoolState, IUniswapV3PoolState__factory } from '@xyo-network/uniswap-typechain'
+import { Pool } from '@xyo-network/uniswap-v3-sdk'
 import { Provider } from 'ethers'
 
 import { logErrors, logErrorsAsync } from '../logErrors'
 import { EthersUniswap3PoolSlot0Wrapper } from './Uniswap3PoolSlot0Wrapper'
 
+export enum ChainId {
+  MAINNET = 1,
+  ROPSTEN = 3,
+  RINKEBY = 4,
+  GÖRLI = 5,
+  KOVAN = 42,
+}
+
 //null is used as 'in-progress'
 const waitNotNull = async (closure: () => unknown) => {
-  while (closure() === null) {
-    await delay(10)
-  }
+  while (closure() === null) await delay(10)
 }
 
 export class EthersUniSwap3Pair {
@@ -22,7 +27,7 @@ export class EthersUniSwap3Pair {
   protected provider: Provider
 
   private _pool?: Pool | null
-  private _poolContract?: UniswapTypechain.IUniswapV3Pool
+  private _poolContract?: IUniswapV3Pool
   private _slot0?: EthersUniswap3PoolSlot0Wrapper | null
   private _tokenContracts: (IERC20Metadata | null | undefined)[] = [undefined, undefined]
   private _tokens: (Token | null | undefined)[] = [undefined, undefined]
@@ -38,22 +43,23 @@ export class EthersUniSwap3Pair {
       this._pool = this._pool || null
       const slot0 = await this.slot0()
       this._pool =
-        this._pool ??
-        new Pool(
-          await this.token(0),
-          await this.token(1),
-          Number(slot0.feeProtocol),
-          slot0.sqrtPriceX96.toString(16),
-          (await this.poolContract().liquidity()).toString(16),
-          Number(slot0.tick),
-        )
+        this._pool !== null
+          ? this._pool
+          : new Pool(
+              await this.token(0),
+              await this.token(1),
+              Number(slot0.feeProtocol),
+              `0x${slot0.sqrtPriceX96.toString(16)}`,
+              `0x${(await this.poolContract().liquidity()).toString(16)}`,
+              Number(slot0.tick),
+            )
       return assertEx(this._pool)
     })
   }
 
-  poolContract(): UniswapTypechain.IUniswapV3Pool {
+  poolContract() {
     return logErrors(() => {
-      this._poolContract = this._poolContract ?? UniswapTypechain.IUniswapV3Pool__factory.connect(this.address, this.provider)
+      this._poolContract = this._poolContract ?? IUniswapV3Pool__factory.connect(this.address, this.provider)
       return assertEx(this._poolContract)
     })
   }
@@ -81,7 +87,11 @@ export class EthersUniSwap3Pair {
     return await logErrorsAsync(async () => {
       await waitNotNull(() => this._slot0)
       this._slot0 = this._slot0 || null
-      this._slot0 = this._slot0 ?? new EthersUniswap3PoolSlot0Wrapper(await this.poolContract().slot0())
+      if (this._slot0 === null) {
+        const poolContract = this.poolContract()
+        const slot = await poolContract.slot0()
+        this._slot0 = this._slot0 ?? new EthersUniswap3PoolSlot0Wrapper(slot)
+      }
       return assertEx(this._slot0)
     })
   }