@xyo-network/crypto-asset-plugin 2.85.0 → 2.85.2

package/package.json

@@ -10,22 +10,22 @@
     "url": "https://github.com/XYOracleNetwork/plugins/issues"
   },
   "dependencies": {
-    "@xylabs/exists": "^2.13.20",
-    "@xyo-network/abstract-diviner": "^2.85.0",
-    "@xyo-network/coingecko-crypto-market-payload-plugin": "~2.85.0",
-    "@xyo-network/crypto-asset-payload-plugin": "~2.85.0",
-    "@xyo-network/diviner": "^2.85.0",
-    "@xyo-network/module-model": "^2.85.0",
-    "@xyo-network/payload-builder": "^2.85.0",
-    "@xyo-network/payload-model": "^2.85.0",
-    "@xyo-network/payloadset-plugin": "^2.85.0",
-    "@xyo-network/uniswap-crypto-market-payload-plugin": "~2.85.0"
+    "@xylabs/exists": "^2.13.23",
+    "@xyo-network/coingecko-crypto-market-payload-plugin": "~2.85.2",
+    "@xyo-network/crypto-asset-payload-plugin": "~2.85.2",
+    "@xyo-network/diviner-abstract": "^2.85.8",
+    "@xyo-network/diviner-model": "^2.85.8",
+    "@xyo-network/module-model": "^2.85.8",
+    "@xyo-network/payload-builder": "^2.85.8",
+    "@xyo-network/payload-model": "^2.85.8",
+    "@xyo-network/payloadset-plugin": "^2.85.8",
+    "@xyo-network/uniswap-crypto-market-payload-plugin": "~2.85.2"
   },
   "devDependencies": {
-    "@xylabs/assert": "^2.13.20",
+    "@xylabs/assert": "^2.13.23",
     "@xylabs/ts-scripts-yarn3": "^3.2.25",
     "@xylabs/tsconfig": "^3.2.25",
-    "@xyo-network/account": "^2.85.0",
+    "@xyo-network/account": "^2.85.8",
     "typescript": "^5.3.3"
   },
   "description": "Typescript/Javascript Plugins for XYO Platform",
@@ -67,6 +67,6 @@
     "url": "https://github.com/XYOracleNetwork/plugins.git"
   },
   "sideEffects": false,
-  "version": "2.85.0",
+  "version": "2.85.2",
   "type": "module"
 }

package/src/Diviner.ts

@@ -1,7 +1,7 @@
-import { AbstractDiviner } from '@xyo-network/abstract-diviner'
 import { CoingeckoCryptoMarketPayload, CoingeckoCryptoMarketSchema } from '@xyo-network/coingecko-crypto-market-payload-plugin'
 import { CryptoMarketAssetPayload, CryptoMarketAssetSchema } from '@xyo-network/crypto-asset-payload-plugin'
-import { DivinerConfig, DivinerModule, DivinerParams } from '@xyo-network/diviner'
+import { AbstractDiviner } from '@xyo-network/diviner-abstract'
+import { DivinerConfig, DivinerModule, DivinerParams } from '@xyo-network/diviner-model'
 import { AnyConfigSchema, Module } from '@xyo-network/module-model'
 import { Payload } from '@xyo-network/payload-model'
 import { UniswapCryptoMarketPayload, UniswapCryptoMarketSchema } from '@xyo-network/uniswap-crypto-market-payload-plugin'

package/src/index.ts

@@ -1,9 +1,3 @@
-import { CryptoMarketAssetPlugin } from './Plugin'
-
 export * from './Diviner'
+export { CryptoMarketAssetPlugin, CryptoMarketAssetPlugin as default } from './Plugin'
 export * from './Schema'
-
-export { CryptoMarketAssetPlugin }
-
-// eslint-disable-next-line import/no-default-export
-export default CryptoMarketAssetPlugin

package/src/lib/average.ts

@@ -7,33 +7,26 @@ const isNumber = (val: number | undefined): val is number => {
 
 const parseStringifiedNumber = (value: string | undefined): number | undefined => {
   if (!value) return undefined
-  const parsed = parseFloat(value)
-  return isNaN(parsed) ? undefined : parsed
+  const parsed = Number.parseFloat(value)
+  return Number.isNaN(parsed) ? undefined : parsed
 }
 
 const averageStringifiedNumbers = (...prices: (string | undefined)[]): number | undefined => {
   const numbers = prices.map(parseStringifiedNumber).filter(isNumber)
-  return numbers.length ? numbers.reduce((sum, n) => sum + n, 0) / numbers.length : undefined
+  return numbers.length > 0 ? numbers.reduce((sum, n) => sum + n, 0) / numbers.length : undefined
 }
 
 export const average = (...input: (CryptoMarketAssetPayload | undefined)[]): Record<string, AssetInfo> => {
   // Get all the assets represented
   const payloads = input.filter(exists)
-  const tokens = new Set<Token>(payloads.map((payload) => Object.keys(payload.assets).map<Token>((t) => t as Token)).flatMap((t) => t))
+  const tokens = new Set<Token>(payloads.flatMap((payload) => Object.keys(payload.assets).map<Token>((t) => t as Token)))
   // Get all the valuations used
   const valuations = new Set<Token | Currency>(
-    [...tokens]
-      .map((asset) => {
-        const assetInfo = payloads.map((p) => p.assets?.[asset]).filter(exists)
-        const valueBasis = new Set<Currency | Token>(
-          assetInfo
-            .map((v) => Object.keys(v.value) as unknown as Currency | Token)
-            .flatMap((v) => v)
-            .filter(exists),
-        )
-        return [...valueBasis]
-      })
-      .flatMap((v) => v),
+    [...tokens].flatMap((asset) => {
+      const assetInfo = payloads.map((p) => p.assets?.[asset]).filter(exists)
+      const valueBasis = new Set<Currency | Token>(assetInfo.flatMap((v) => Object.keys(v.value) as unknown as Currency | Token).filter(exists))
+      return [...valueBasis]
+    }),
   )
   // For each of the tokens, calculate the average valuation for each of valuation bases
   const assets: Record<string, AssetInfo> = Object.fromEntries(

package/src/lib/divineCoinGeckoPrices.ts

@@ -10,7 +10,7 @@ const valuationExists = (value: [string, Partial<Record<string, number>> | undef
 
 const otherValueExists = (value: [string, number | undefined]): value is [string, number] => {
   const possiblyNumber = value[1]
-  return typeof possiblyNumber === 'number' && !isNaN(possiblyNumber)
+  return typeof possiblyNumber === 'number' && !Number.isNaN(possiblyNumber)
 }
 
 export const divineCoinGeckoPrices = async (payload: CoingeckoCryptoMarketPayload | undefined): Promise<CryptoMarketAssetPayload> => {

package/src/lib/divineUniswapPrices.ts

@@ -1,3 +1,4 @@
+import { assertEx } from '@xylabs/assert'
 import { exists } from '@xylabs/exists'
 import { AssetInfo, CryptoMarketAssetPayload, CryptoMarketAssetSchema, Currency, Token, ValueBasis } from '@xyo-network/crypto-asset-payload-plugin'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
@@ -22,21 +23,18 @@ const pairsContainingToken = (uniswapPayload: UniswapCryptoMarketPayload, token:
 }
 
 const tokensFromPairs = (pairs: UniswapCryptoPair[]) => {
-  return pairs
-    .map((p) => p.tokens)
-    .flat()
-    .map((t) => t.symbol.toLowerCase() as Token)
+  return pairs.flatMap((p) => p.tokens).map((t) => t.symbol.toLowerCase() as Token)
 }
 
 const valuesFromTokenPairs = (tokensPairs: UniswapCryptoToken[][], token: Token): ValueBasis => {
   return Object.fromEntries(
     tokensPairs
       .map((pair) => {
-        const current = pair.filter((p) => p.symbol.toLowerCase() === token)?.[0]
-        const other = pair.filter((p) => p.symbol.toLowerCase() !== token)?.[0]
-        return [other.symbol.toLowerCase(), current.value.toString()]
+        const current = pair.find((p) => p.symbol.toLowerCase() === token)
+        const other = pair.find((p) => p.symbol.toLowerCase() !== token)
+        return [other?.symbol.toLowerCase(), current?.value.toString()]
       })
-      .map((x) => [mapUniswapToken(x[0]), x[1]]),
+      .map((x) => [mapUniswapToken(assertEx(x[0], 'Undefined Token')), x[1]]),
   )
 }
 

package/src/test/sampleCoinGecko.ts

@@ -3,72 +3,72 @@ import { CoingeckoCryptoMarketPayload, CoingeckoCryptoMarketSchema } from '@xyo-
 export const sampleCoinGeckoPayload: CoingeckoCryptoMarketPayload = {
   assets: {
     ada: {
-      btc: 0.00002163,
-      eth: 0.00030472,
-      eur: 0.488106,
-      usd: 0.495442,
+      btc: 0.000_021_63,
+      eth: 0.000_304_72,
+      eur: 0.488_106,
+      usd: 0.495_442,
     },
     btc: {
       btc: 1,
-      eth: 14.068021,
-      eur: 22545,
-      usd: 22884,
+      eth: 14.068_021,
+      eur: 22_545,
+      usd: 22_884,
     },
     busd: {
-      btc: 0.00004342,
-      eth: 0.00061145,
-      eur: 0.979882,
-      usd: 0.994609,
+      btc: 0.000_043_42,
+      eth: 0.000_611_45,
+      eur: 0.979_882,
+      usd: 0.994_609,
     },
     doge: {
-      btc: 0.00000288,
-      eth: 0.00004062,
-      eur: 0.065066,
-      usd: 0.066044,
+      btc: 0.000_002_88,
+      eth: 0.000_040_62,
+      eur: 0.065_066,
+      usd: 0.066_044,
     },
     dot: {
-      btc: 0.00033067,
-      eth: 0.00465702,
+      btc: 0.000_330_67,
+      eth: 0.004_657_02,
       eur: 7.46,
       usd: 7.58,
     },
     eth: {
-      btc: 0.07099216,
+      btc: 0.070_992_16,
       eth: 1,
       eur: 1602.25,
       usd: 1626.33,
     },
     sol: {
-      btc: 0.00173417,
-      eth: 0.02442315,
+      btc: 0.001_734_17,
+      eth: 0.024_423_15,
       eur: 39.14,
       usd: 39.73,
     },
     usdc: {
-      btc: 0.00004371,
-      eth: 0.00061556,
-      eur: 0.986471,
+      btc: 0.000_043_71,
+      eth: 0.000_615_56,
+      eur: 0.986_471,
       usd: 1.001,
     },
     usdt: {
-      btc: 0.0000437,
-      eth: 0.00061548,
-      eur: 0.986332,
+      btc: 0.000_043_7,
+      eth: 0.000_615_48,
+      eur: 0.986_332,
       usd: 1.001,
     },
     wbtc: {
-      btc: 1.000635,
-      eth: 14.092397,
-      eur: 22584,
-      usd: 22923,
+      btc: 1.000_635,
+      eth: 14.092_397,
+      eur: 22_584,
+      usd: 22_923,
     },
     xyo: {
-      btc: 6.28282e-7,
-      eth: 0.00000885,
-      eur: 0.01417995,
-      usd: 0.01439307,
+      btc: 6.282_82e-7,
+      eth: 0.000_008_85,
+      eur: 0.014_179_95,
+      usd: 0.014_393_07,
     },
   },
   schema: CoingeckoCryptoMarketSchema,
-  timestamp: 1659012060785,
+  timestamp: 1_659_012_060_785,
 }

package/src/test/sampleUniswap.ts

@@ -7,12 +7,12 @@ export const sampleUniswapPayload: UniswapCryptoMarketPayload = {
         {
           address: '0x55296f69f40Ea6d20E478533C15A6B08B654E758',
           symbol: 'xyo',
-          value: 0.00000896773,
+          value: 0.000_008_967_73,
         },
         {
           address: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
           symbol: 'weth',
-          value: 111511,
+          value: 111_511,
         },
       ],
     },
@@ -21,7 +21,7 @@ export const sampleUniswapPayload: UniswapCryptoMarketPayload = {
         {
           address: '0x55296f69f40Ea6d20E478533C15A6B08B654E758',
           symbol: 'xyo',
-          value: 0.0148782,
+          value: 0.014_878_2,
         },
         {
           address: '0xdAC17F958D2ee523a2206206994597C13D831ec7',
@@ -35,7 +35,7 @@ export const sampleUniswapPayload: UniswapCryptoMarketPayload = {
         {
           address: '0x55296f69f40Ea6d20E478533C15A6B08B654E758',
           symbol: 'xyo',
-          value: 0.014039,
+          value: 0.014_039,
         },
         {
           address: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
@@ -49,12 +49,12 @@ export const sampleUniswapPayload: UniswapCryptoMarketPayload = {
         {
           address: '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599',
           symbol: 'wbtc',
-          value: 1527240,
+          value: 1_527_240,
         },
         {
           address: '0x55296f69f40Ea6d20E478533C15A6B08B654E758',
           symbol: 'xyo',
-          value: 6.54777e-7,
+          value: 6.547_77e-7,
         },
       ],
     },
@@ -68,7 +68,7 @@ export const sampleUniswapPayload: UniswapCryptoMarketPayload = {
         {
           address: '0x55296f69f40Ea6d20E478533C15A6B08B654E758',
           symbol: 'xyo',
-          value: 0.00220354,
+          value: 0.002_203_54,
         },
       ],
     },
@@ -82,7 +82,7 @@ export const sampleUniswapPayload: UniswapCryptoMarketPayload = {
         {
           address: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
           symbol: 'weth',
-          value: 0.0710048,
+          value: 0.071_004_8,
         },
       ],
     },
@@ -91,12 +91,12 @@ export const sampleUniswapPayload: UniswapCryptoMarketPayload = {
         {
           address: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
           symbol: 'dai',
-          value: 1.00004,
+          value: 1.000_04,
         },
         {
           address: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
           symbol: 'usdc',
-          value: 0.999959,
+          value: 0.999_959,
         },
       ],
     },
@@ -105,7 +105,7 @@ export const sampleUniswapPayload: UniswapCryptoMarketPayload = {
         {
           address: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
           symbol: 'usdc',
-          value: 0.000616944,
+          value: 0.000_616_944,
         },
         {
           address: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
@@ -119,7 +119,7 @@ export const sampleUniswapPayload: UniswapCryptoMarketPayload = {
         {
           address: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
           symbol: 'usdc',
-          value: 0.000617196,
+          value: 0.000_617_196,
         },
         {
           address: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
@@ -133,12 +133,12 @@ export const sampleUniswapPayload: UniswapCryptoMarketPayload = {
         {
           address: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
           symbol: 'dai',
-          value: 1.00002,
+          value: 1.000_02,
         },
         {
           address: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
           symbol: 'usdc',
-          value: 0.999983,
+          value: 0.999_983,
         },
       ],
     },
@@ -147,12 +147,12 @@ export const sampleUniswapPayload: UniswapCryptoMarketPayload = {
         {
           address: '0x853d955aCEf822Db058eb8505911ED77F175b99e',
           symbol: 'frax',
-          value: 0.999762,
+          value: 0.999_762,
         },
         {
           address: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
           symbol: 'usdc',
-          value: 1.00024,
+          value: 1.000_24,
         },
       ],
     },
@@ -161,12 +161,12 @@ export const sampleUniswapPayload: UniswapCryptoMarketPayload = {
         {
           address: '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599',
           symbol: 'wbtc',
-          value: 22826.3,
+          value: 22_826.3,
         },
         {
           address: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
           symbol: 'usdc',
-          value: 0.000043809,
+          value: 0.000_043_809,
         },
       ],
     },
@@ -175,16 +175,16 @@ export const sampleUniswapPayload: UniswapCryptoMarketPayload = {
         {
           address: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
           symbol: 'usdc',
-          value: 0.999853,
+          value: 0.999_853,
         },
         {
           address: '0xdAC17F958D2ee523a2206206994597C13D831ec7',
           symbol: 'usdt',
-          value: 1.00015,
+          value: 1.000_15,
         },
       ],
     },
   ],
   schema: UniswapCryptoMarketSchema,
-  timestamp: 1659012011418,
+  timestamp: 1_659_012_011_418,
 }