@xyo-network/uniswap-crypto-market-plugin 2.80.5 → 2.81.0

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

@@ -1 +1 @@
-{"version":3,"file":"Uniswap3PoolSlot0Wrapper.d.ts","sourceRoot":"","sources":["../../../../src/lib/Ethers/Uniswap3PoolSlot0Wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAA;AAEnE,qBAAa,8BAA8B;IACzC,SAAS,CAAC,MAAM,EAAE,0BAA0B,CAAA;gBAChC,MAAM,EAAE,0BAA0B;IAI9C,IAAI,WAAW,WAEd;IAED,IAAI,sBAAsB,WAEzB;IAED,IAAI,0BAA0B,WAE7B;IAED,IAAI,gBAAgB,WAEnB;IAED,IAAI,YAAY,+BAEf;IAED,IAAI,IAAI,WAEP;IAED,IAAI,QAAQ,YAEX;CACF"}
+{"version":3,"file":"Uniswap3PoolSlot0Wrapper.d.ts","sourceRoot":"","sources":["../../../../src/lib/Ethers/Uniswap3PoolSlot0Wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAA;AAEnE,qBAAa,8BAA8B;IACzC,SAAS,CAAC,MAAM,EAAE,0BAA0B,CAAA;gBAChC,MAAM,EAAE,0BAA0B;IAI9C,IAAI,WAAW,WAEd;IAED,IAAI,sBAAsB,WAEzB;IAED,IAAI,0BAA0B,WAE7B;IAED,IAAI,gBAAgB,WAEnB;IAED,IAAI,YAAY,WAEf;IAED,IAAI,IAAI,WAEP;IAED,IAAI,QAAQ,YAEX;CACF"}

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

@@ -2,12 +2,12 @@ import { EthersUniswapV3Slot0Fields } from './UniswapV3Slot0Fields';
 export declare class EthersUniswap3PoolSlot0Wrapper {
     protected values: EthersUniswapV3Slot0Fields;
     constructor(values: EthersUniswapV3Slot0Fields);
-    get feeProtocol(): number;
-    get observationCardinality(): number;
-    get observationCardinalityNext(): number;
-    get observationIndex(): number;
-    get sqrtPriceX96(): import("ethers").BigNumber;
-    get tick(): number;
+    get feeProtocol(): bigint;
+    get observationCardinality(): bigint;
+    get observationCardinalityNext(): bigint;
+    get observationIndex(): bigint;
+    get sqrtPriceX96(): bigint;
+    get tick(): bigint;
     get unlocked(): boolean;
 }
 //# sourceMappingURL=Uniswap3PoolSlot0Wrapper.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Uniswap3PoolSlot0Wrapper.d.ts","sourceRoot":"","sources":["../../../../src/lib/Ethers/Uniswap3PoolSlot0Wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAA;AAEnE,qBAAa,8BAA8B;IACzC,SAAS,CAAC,MAAM,EAAE,0BAA0B,CAAA;gBAChC,MAAM,EAAE,0BAA0B;IAI9C,IAAI,WAAW,WAEd;IAED,IAAI,sBAAsB,WAEzB;IAED,IAAI,0BAA0B,WAE7B;IAED,IAAI,gBAAgB,WAEnB;IAED,IAAI,YAAY,+BAEf;IAED,IAAI,IAAI,WAEP;IAED,IAAI,QAAQ,YAEX;CACF"}
+{"version":3,"file":"Uniswap3PoolSlot0Wrapper.d.ts","sourceRoot":"","sources":["../../../../src/lib/Ethers/Uniswap3PoolSlot0Wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAA;AAEnE,qBAAa,8BAA8B;IACzC,SAAS,CAAC,MAAM,EAAE,0BAA0B,CAAA;gBAChC,MAAM,EAAE,0BAA0B;IAI9C,IAAI,WAAW,WAEd;IAED,IAAI,sBAAsB,WAEzB;IAED,IAAI,0BAA0B,WAE7B;IAED,IAAI,gBAAgB,WAEnB;IAED,IAAI,YAAY,WAEf;IAED,IAAI,IAAI,WAEP;IAED,IAAI,QAAQ,YAEX;CACF"}

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

@@ -1,3 +1,2 @@
-import { BigNumber } from '@ethersproject/bignumber';
-export type EthersUniswapV3Slot0Fields = [BigNumber, number, number, number, number, number, boolean];
+export type EthersUniswapV3Slot0Fields = [bigint, bigint, bigint, bigint, bigint, bigint, boolean];
 //# sourceMappingURL=UniswapV3Slot0Fields.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"UniswapV3Slot0Fields.d.ts","sourceRoot":"","sources":["../../../../src/lib/Ethers/UniswapV3Slot0Fields.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AAEpD,MAAM,MAAM,0BAA0B,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA"}
+{"version":3,"file":"UniswapV3Slot0Fields.d.ts","sourceRoot":"","sources":["../../../../src/lib/Ethers/UniswapV3Slot0Fields.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,0BAA0B,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA"}

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

@@ -1,3 +1,2 @@
-import { BigNumber } from '@ethersproject/bignumber';
-export type EthersUniswapV3Slot0Fields = [BigNumber, number, number, number, number, number, boolean];
+export type EthersUniswapV3Slot0Fields = [bigint, bigint, bigint, bigint, bigint, bigint, boolean];
 //# sourceMappingURL=UniswapV3Slot0Fields.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"UniswapV3Slot0Fields.d.ts","sourceRoot":"","sources":["../../../../src/lib/Ethers/UniswapV3Slot0Fields.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AAEpD,MAAM,MAAM,0BAA0B,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA"}
+{"version":3,"file":"UniswapV3Slot0Fields.d.ts","sourceRoot":"","sources":["../../../../src/lib/Ethers/UniswapV3Slot0Fields.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,0BAA0B,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA"}

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

@@ -1,3 +1,2 @@
-import { BigNumber } from '@ethersproject/bignumber';
-export type EthersUniswapV3Slot0Fields = [BigNumber, number, number, number, number, number, boolean];
+export type EthersUniswapV3Slot0Fields = [bigint, bigint, bigint, bigint, bigint, bigint, boolean];
 //# sourceMappingURL=UniswapV3Slot0Fields.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"UniswapV3Slot0Fields.d.ts","sourceRoot":"","sources":["../../../../src/lib/Ethers/UniswapV3Slot0Fields.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AAEpD,MAAM,MAAM,0BAA0B,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA"}
+{"version":3,"file":"UniswapV3Slot0Fields.d.ts","sourceRoot":"","sources":["../../../../src/lib/Ethers/UniswapV3Slot0Fields.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,0BAA0B,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA"}

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

@@ -1,4 +1,4 @@
-import { Provider } from '@ethersproject/providers';
+import { Provider } from 'ethers';
 import { EthersUniSwap3Pair } from './UniSwap3Pair';
 export declare const createUniswapPoolContracts: (provider: Provider, contracts: string[]) => EthersUniSwap3Pair[];
 //# sourceMappingURL=createUniswapPoolContracts.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"createUniswapPoolContracts.d.ts","sourceRoot":"","sources":["../../../../src/lib/Ethers/createUniswapPoolContracts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AAGnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAEnD,eAAO,MAAM,0BAA0B,aAAc,QAAQ,aAAa,MAAM,EAAE,yBAIjF,CAAA"}
+{"version":3,"file":"createUniswapPoolContracts.d.ts","sourceRoot":"","sources":["../../../../src/lib/Ethers/createUniswapPoolContracts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAGjC,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAEnD,eAAO,MAAM,0BAA0B,aAAc,QAAQ,aAAa,MAAM,EAAE,yBAIjF,CAAA"}

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

@@ -1,4 +1,4 @@
-import { Provider } from '@ethersproject/providers';
+import { Provider } from 'ethers';
 import { EthersUniSwap3Pair } from './UniSwap3Pair';
 export declare const createUniswapPoolContracts: (provider: Provider, contracts: string[]) => EthersUniSwap3Pair[];
 //# sourceMappingURL=createUniswapPoolContracts.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"createUniswapPoolContracts.d.ts","sourceRoot":"","sources":["../../../../src/lib/Ethers/createUniswapPoolContracts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AAGnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAEnD,eAAO,MAAM,0BAA0B,aAAc,QAAQ,aAAa,MAAM,EAAE,yBAIjF,CAAA"}
+{"version":3,"file":"createUniswapPoolContracts.d.ts","sourceRoot":"","sources":["../../../../src/lib/Ethers/createUniswapPoolContracts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAGjC,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAEnD,eAAO,MAAM,0BAA0B,aAAc,QAAQ,aAAa,MAAM,EAAE,yBAIjF,CAAA"}

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

@@ -1,4 +1,4 @@
-import { Provider } from '@ethersproject/providers';
+import { Provider } from 'ethers';
 import { EthersUniSwap3Pair } from './UniSwap3Pair';
 export declare const createUniswapPoolContracts: (provider: Provider, contracts: string[]) => EthersUniSwap3Pair[];
 //# sourceMappingURL=createUniswapPoolContracts.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"createUniswapPoolContracts.d.ts","sourceRoot":"","sources":["../../../../src/lib/Ethers/createUniswapPoolContracts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AAGnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAEnD,eAAO,MAAM,0BAA0B,aAAc,QAAQ,aAAa,MAAM,EAAE,yBAIjF,CAAA"}
+{"version":3,"file":"createUniswapPoolContracts.d.ts","sourceRoot":"","sources":["../../../../src/lib/Ethers/createUniswapPoolContracts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAGjC,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAEnD,eAAO,MAAM,0BAA0B,aAAc,QAAQ,aAAa,MAAM,EAAE,yBAIjF,CAAA"}

package/package.json

@@ -10,24 +10,19 @@
     "url": "https://github.com/XYOracleNetwork/plugins/issues"
   },
   "dependencies": {
-    "@ethersproject/address": "^5.7.0",
-    "@ethersproject/bignumber": "^5.7.0",
-    "@ethersproject/contracts": "^5.7.0",
-    "@ethersproject/networks": "^5.7.1",
-    "@ethersproject/providers": "^5.7.2",
-    "@ethersproject/solidity": "^5.7.0",
     "@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.79.8",
-    "@xyo-network/module-model": "^2.79.8",
-    "@xyo-network/payload-model": "^2.79.8",
-    "@xyo-network/payloadset-plugin": "^2.79.8",
-    "@xyo-network/typechain": "^2.2.11",
-    "@xyo-network/uniswap-crypto-market-payload-plugin": "~2.80.5",
-    "@xyo-network/uniswap-typechain": "^2.2.11",
-    "@xyo-network/witness-model": "^2.79.8"
+    "@xyo-network/abstract-witness": "^2.81.0",
+    "@xyo-network/module-model": "^2.81.0",
+    "@xyo-network/payload-model": "^2.81.0",
+    "@xyo-network/payloadset-plugin": "^2.81.0",
+    "@xyo-network/typechain": "^3.0.0",
+    "@xyo-network/uniswap-crypto-market-payload-plugin": "~2.81.0",
+    "@xyo-network/uniswap-typechain": "^3.0.0",
+    "@xyo-network/witness-model": "^2.81.0",
+    "ethers": "^6.8.1"
   },
   "peerDependencies": {
     "@uniswap/sdk": "^3.0.3",
@@ -41,10 +36,9 @@
     "@xylabs/jest-helpers": "^2.13.9",
     "@xylabs/ts-scripts-yarn3": "^3.2.2",
     "@xylabs/tsconfig": "^3.2.2",
-    "@xyo-network/account": "^2.79.8",
-    "@xyo-network/payload-wrapper": "^2.79.8",
-    "@xyo-network/witness-blockchain-abstract": "^2.79.8",
-    "ethers": "^5.7.2",
+    "@xyo-network/account": "^2.81.0",
+    "@xyo-network/payload-wrapper": "^2.81.0",
+    "@xyo-network/witness-blockchain-abstract": "^2.81.0",
     "jest": "^29.7.0",
     "typescript": "^5.2.2"
   },
@@ -88,6 +82,6 @@
     "url": "https://github.com/XYOracleNetwork/plugins.git"
   },
   "sideEffects": false,
-  "version": "2.80.5",
+  "version": "2.81.0",
   "type": "module"
 }

package/src/Witness.ts

@@ -1,4 +1,3 @@
-import { Provider } from '@ethersproject/providers'
 import { assertEx } from '@xylabs/assert'
 import { AbstractWitness } from '@xyo-network/abstract-witness'
 import { AnyConfigSchema } from '@xyo-network/module-model'
@@ -9,6 +8,7 @@ import {
   UniswapCryptoMarketWitnessConfigSchema,
 } from '@xyo-network/uniswap-crypto-market-payload-plugin'
 import { WitnessParams } from '@xyo-network/witness-model'
+import { Provider } from 'ethers'
 
 import { UniswapCryptoMarketWitnessConfig } from './Config'
 import { createUniswapPoolContracts, EthersUniSwap3Pair, pricesFromUniswap3, UniswapPoolContracts } from './lib'

package/src/lib/Ethers/UniSwap3Pair.ts

@@ -1,11 +1,11 @@
-import { Provider } from '@ethersproject/providers'
 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 { IUniswapV3Pool, IUniswapV3Pool__factory } from '@xyo-network/uniswap-typechain'
+import { Provider } from 'ethers'
 
 import { logErrors, logErrorsAsync } from '../logErrors'
 import { EthersUniswap3PoolSlot0Wrapper } from './Uniswap3PoolSlot0Wrapper'
@@ -22,7 +22,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]
@@ -42,18 +42,18 @@ export class EthersUniSwap3Pair {
         new Pool(
           await this.token(0),
           await this.token(1),
-          slot0.feeProtocol,
-          slot0.sqrtPriceX96.toHexString(),
-          (await this.poolContract().liquidity()).toHexString(),
-          slot0.tick,
+          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)
     })
   }
@@ -67,9 +67,11 @@ export class EthersUniSwap3Pair {
       const tokenPrices = tokens.map((token) => parseFloat(pool.priceOf(token).toSignificant()))
       const tokenSymbols = tokens.map((token, index) => assertEx(token.symbol, `Token[${index}] Missing Symbols`).toLowerCase())
       const result = {
-        tokens: tokenIndexes.map((value) => {
-          return { address: tokenContracts[value].address, symbol: tokenSymbols[value], value: tokenPrices[value] }
-        }),
+        tokens: await Promise.all(
+          tokenIndexes.map(async (value) => {
+            return { address: await tokenContracts[value].getAddress(), symbol: tokenSymbols[value], value: tokenPrices[value] }
+          }),
+        ),
       }
       return result
     })
@@ -79,7 +81,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)
     })
   }
@@ -91,7 +97,13 @@ export class EthersUniSwap3Pair {
       const tokenContract = await this.tokenContract(index)
       this._tokens[index] =
         this._tokens[index] ??
-        new Token(ChainId.MAINNET, tokenContract.address, await tokenContract.decimals(), await tokenContract.symbol(), await tokenContract.name())
+        new Token(
+          ChainId.MAINNET,
+          await tokenContract.getAddress(),
+          Number(await tokenContract.decimals()),
+          await tokenContract.symbol(),
+          await tokenContract.name(),
+        )
       return assertEx(this._tokens[index])
     })
   }

package/src/lib/Ethers/UniswapV3Slot0Fields.ts

@@ -1,3 +1 @@
-import { BigNumber } from '@ethersproject/bignumber'
-
-export type EthersUniswapV3Slot0Fields = [BigNumber, number, number, number, number, number, boolean]
+export type EthersUniswapV3Slot0Fields = [bigint, bigint, bigint, bigint, bigint, bigint, boolean]

package/src/lib/Ethers/createUniswapPoolContracts.ts

@@ -1,4 +1,4 @@
-import { Provider } from '@ethersproject/providers'
+import { Provider } from 'ethers'
 
 import { logErrors } from '../logErrors'
 import { EthersUniSwap3Pair } from './UniSwap3Pair'