@0xtorch/core 0.0.28 → 0.0.30

package/assets/definitions/fantom.ts

@@ -10,5 +10,6 @@ export const fantom = createCryptoCurrency({
     coingeckoId: 'fantom',
     marketCapUsd: undefined,
   },
+  priceDatasourceId: undefined,
   updatedAt: Date.now(),
 })

package/assets/definitions/kava.ts

@@ -10,5 +10,6 @@ export const kava = createCryptoCurrency({
     coingeckoId: 'kava',
     marketCapUsd: undefined,
   },
+  priceDatasourceId: undefined,
   updatedAt: Date.now(),
 })

package/assets/definitions/mantle.ts

@@ -10,5 +10,6 @@ export const mantle = createCryptoCurrency({
     coingeckoId: 'mantle',
     marketCapUsd: undefined,
   },
+  priceDatasourceId: undefined,
   updatedAt: Date.now(),
 })

package/assets/definitions/maticNetwork.ts

@@ -10,5 +10,6 @@ export const maticNetwork = createCryptoCurrency({
     coingeckoId: 'matic-network',
     marketCapUsd: undefined,
   },
+  priceDatasourceId: undefined,
   updatedAt: Date.now(),
 })

package/assets/definitions/metis.ts

@@ -10,5 +10,6 @@ export const metis = createCryptoCurrency({
     coingeckoId: 'metis-token',
     marketCapUsd: undefined,
   },
+  priceDatasourceId: undefined,
   updatedAt: Date.now(),
 })

package/assets/definitions/moonbeam.ts

@@ -10,5 +10,6 @@ export const moonbeam = createCryptoCurrency({
     coingeckoId: 'moonbeam',
     marketCapUsd: undefined,
   },
+  priceDatasourceId: undefined,
   updatedAt: Date.now(),
 })

package/assets/definitions/moonriver.ts

@@ -10,5 +10,6 @@ export const moonriver = createCryptoCurrency({
     coingeckoId: 'moonriver',
     marketCapUsd: undefined,
   },
+  priceDatasourceId: undefined,
   updatedAt: Date.now(),
 })

package/assets/definitions/oasys.ts

@@ -10,5 +10,6 @@ export const oasys = createCryptoCurrency({
     coingeckoId: 'oasys',
     marketCapUsd: undefined,
   },
+  priceDatasourceId: undefined,
   updatedAt: Date.now(),
 })

package/assets/definitions/ronin.ts

@@ -10,5 +10,6 @@ export const ronin = createCryptoCurrency({
     coingeckoId: 'ronin',
     marketCapUsd: undefined,
   },
+  priceDatasourceId: undefined,
   updatedAt: Date.now(),
 })

package/assets/definitions/solana.ts

@@ -10,5 +10,6 @@ export const solana = createCryptoCurrency({
     coingeckoId: 'solana',
     marketCapUsd: undefined,
   },
+  priceDatasourceId: undefined,
   updatedAt: Date.now(),
 })

package/assets/schemas/cryptoCurrency.ts

@@ -20,9 +20,11 @@ export const cryptoCurrencySchema = z
     symbol: z.string(),
     icon: z.string().optional(),
     market: cryptoCurrencyMarketSchema,
+    priceDatasourceId: z.string().optional(),
     updatedAt: z.number().int(),
   })
   .transform((v) => ({
     ...v,
     icon: v.icon,
+    priceDatasourceId: v.priceDatasourceId,
   }))

package/assets/types/dataSource.ts

@@ -9,10 +9,9 @@ export type GetCurrentPriceParameters = {
 }
 
 export type GetHistoricalPricesParameters = {
-  readonly targetCurrencies: readonly CryptoCurrency[]
+  readonly targetCurrency: CryptoCurrency
   readonly vsCurrency: FiatCurrency
-  readonly from: number
-  readonly to: number
+  readonly timestampList: readonly number[]
 }
 
 export type CryptoCurrencyDataSource = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xtorch/core",
-  "version": "0.0.28",
+  "version": "0.0.30",
   "description": "Cryptorch | TypeScript Analyze Interface for Crypto Data.",
   "keywords": [
     "cryptorch",

package/setAccountActionPrices.ts

@@ -1,3 +1,4 @@
+import { createBigDecimal } from '@0xtorch/big-decimal'
 import type { AccountAction } from './actions'
 import type {
   CryptoCurrency,
@@ -22,12 +23,11 @@ export const setAccountActionPrices = async ({
 
   // 取得期間をもとに価格を取得
   const cryptoCurrencyPricesOfTarget = await Promise.all(
-    targets.map(({ currency, from, to }) =>
+    targets.map(({ currency, timestampList }) =>
       cryptoCurrencyDataSource.getHistoricalPrices({
-        targetCurrencies: [currency],
+        targetCurrency: currency,
         vsCurrency: fiat,
-        from: from - 1000 * 60 * 60,
-        to: to + 1000 * 60 * 60,
+        timestampList: [...new Set(timestampList)],
       }),
     ),
   )
@@ -36,13 +36,12 @@ export const setAccountActionPrices = async ({
     .toSorted((a, b) => a.timestamp - b.timestamp)
 
   // 価格を設定して返す
-  return actions.map((action) => setPrices(action, prices))
+  return actions.map((action) => setPrices(action, prices, fiat))
 }
 
 type CryptoCurrencyTarget = {
   readonly currency: CryptoCurrency
-  readonly from: number
-  readonly to: number
+  readonly timestampList: readonly number[]
 }
 
 const getCryptoCurrencyTargets = (
@@ -60,15 +59,13 @@ const getCryptoCurrencyTargets = (
       if (targetIndex === -1) {
         mut_targets.push({
           currency: transfer.asset,
-          from: action.timestamp,
-          to: action.timestamp,
+          timestampList: [action.timestamp],
         })
       } else {
         const target = mut_targets[targetIndex]
         mut_targets[targetIndex] = {
           currency: target.currency,
-          from: Math.min(target.from, action.timestamp),
-          to: Math.max(target.to, action.timestamp),
+          timestampList: [...target.timestampList, action.timestamp],
         }
       }
     }
@@ -79,6 +76,7 @@ const getCryptoCurrencyTargets = (
 const setPrices = (
   action: AccountAction,
   prices: readonly CryptoCurrencyPrice[],
+  fiat: FiatCurrency,
 ): AccountAction =>
   ({
     ...action,
@@ -91,7 +89,17 @@ const setPrices = (
           }
         }
         case 'FiatCurrency': {
-          return transfer
+          return transfer.asset.id === fiat.id
+            ? {
+                ...transfer,
+                price: {
+                  timestamp: action.timestamp,
+                  cryptoCurrencyId: '',
+                  fiatCurrencyId: fiat,
+                  price: createBigDecimal(1n),
+                },
+              }
+            : transfer
         }
         case 'Nft': {
           return transfer

package/tests/utils.ts

@@ -13,13 +13,12 @@ export const cryptoCurrencyDataSourceTest: CryptoCurrencyDataSource = {
       timestamp,
     }))
   },
-  getHistoricalPrices: ({ targetCurrencies, vsCurrency, from, to }) => {
+  getHistoricalPrices: ({ targetCurrency, vsCurrency, timestampList }) => {
     // TODO implement
     console.debug('getHistoricalPrices', {
-      targetCurrencies,
+      targetCurrency,
       vsCurrency,
-      from,
-      to,
+      timestampList,
     })
     throw new Error('Not implemented')
   },