@0xtorch/core 0.0.34 → 0.0.36

package/actions/utils/createEvidenceNoneAccountActions.ts

@@ -1,4 +1,3 @@
-import { absoluteValue, minus, plus } from '@0xtorch/big-decimal'
 import type {
   AccountAction,
   AccountActionBuyCrypto,
@@ -8,7 +7,6 @@ import type {
   AccountActionSwapNft,
   AccountActionTrade,
   NormalActionTransfer,
-  Transfer,
   TransferCryptoCurrencyIn,
   TransferCryptoCurrencyOut,
   TransferFiatCurrencyIn,
@@ -18,6 +16,7 @@ import type {
   TransferNftOut,
   TransferOut,
 } from '../types'
+import { mergeSameAssetTransfers } from './mergeSameAssetTransfers'
 
 type CreateEvidenceNoneAccountActionsParameters = {
   readonly source: string
@@ -33,7 +32,10 @@ export const createEvidenceNoneAccountActions = ({
   accountIdSet,
 }: CreateEvidenceNoneAccountActionsParameters): readonly AccountAction[] => {
   // transfer を asset , account id 毎に merge
-  const transferList = createTransferList({ actionList, accountIdSet })
+  const transferList = mergeSameAssetTransfers(
+    actionList.flatMap((action) => action.transfers),
+    accountIdSet,
+  )
 
   // direction = none の transfer を move action に個別変換
   const moveActionList = transferList
@@ -64,7 +66,7 @@ export const createEvidenceNoneAccountActions = ({
     }))
   }
   // transfer 全てが in のみの場合は個別に income action に変換
-  else if (inOutTransferList.every((transfer) => transfer.direction === 'in')) {
+  if (inOutTransferList.every((transfer) => transfer.direction === 'in')) {
     const incomeActionList = inOutTransferList
       .filter((transfer): transfer is TransferIn => transfer.direction === 'in')
       .map(
@@ -86,9 +88,7 @@ export const createEvidenceNoneAccountActions = ({
     }))
   }
   // transfer 全てが out のみの場合は個別に transfer action に変換
-  else if (
-    inOutTransferList.every((transfer) => transfer.direction === 'out')
-  ) {
+  if (inOutTransferList.every((transfer) => transfer.direction === 'out')) {
     const transferActionList = inOutTransferList
       .filter(
         (transfer): transfer is TransferOut => transfer.direction === 'out',
@@ -112,9 +112,7 @@ export const createEvidenceNoneAccountActions = ({
     }))
   }
   // transfer asset 全てが NFT である場合、 swap-nft action に変換
-  else if (
-    inOutTransferList.every((transfer) => transfer.asset.type === 'Nft')
-  ) {
+  if (inOutTransferList.every((transfer) => transfer.asset.type === 'Nft')) {
     return [
       ...moveActionList,
       {
@@ -137,7 +135,7 @@ export const createEvidenceNoneAccountActions = ({
     }))
   }
   // in transfer asset 全て NFT , out transfer asset に NFT 含まない場合、 buy-nft action に変換
-  else if (
+  if (
     inOutTransferList
       .filter((transfer) => transfer.direction === 'in')
       .every((transfer) => transfer.asset.type === 'Nft') &&
@@ -177,7 +175,7 @@ export const createEvidenceNoneAccountActions = ({
     }))
   }
   // out transfer 全て NFT, in transfer に NFT を含まない場合、 sell-nft action に変換
-  else if (
+  if (
     inOutTransferList
       .filter((transfer) => transfer.direction === 'out')
       .every((transfer) => transfer.asset.type === 'Nft') &&
@@ -216,7 +214,7 @@ export const createEvidenceNoneAccountActions = ({
     }))
   }
   // in transfer asset 全て Crypto , out transfer asset 全て Fiat の場合、 buy-crypto action に変換
-  else if (
+  if (
     inOutTransferList
       .filter((transfer) => transfer.direction === 'in')
       .every((transfer) => transfer.asset.type === 'CryptoCurrency') &&
@@ -252,7 +250,7 @@ export const createEvidenceNoneAccountActions = ({
     }))
   }
   // in transfer asset 全て Fiat , out transfer asset 全て Crypto の場合、 sell-crypto action に変換
-  else if (
+  if (
     inOutTransferList
       .filter((transfer) => transfer.direction === 'in')
       .every((transfer) => transfer.asset.type === 'FiatCurrency') &&
@@ -288,193 +286,24 @@ export const createEvidenceNoneAccountActions = ({
     }))
   }
   // それ以外の場合、 trade action に変換
-  else {
-    return [
-      ...moveActionList,
-      {
-        type: 'NormalAccountAction',
-        action: 'trade',
-        source,
-        order: 0,
-        comment: undefined,
-        app: undefined,
-        evidence: 'none',
-        timestamp,
-        transfers: [
-          ...inOutTransferList.filter(
-            (transfer) => transfer.direction === 'in',
-          ),
-          ...inOutTransferList.filter(
-            (transfer) => transfer.direction === 'out',
-          ),
-        ],
-      } satisfies AccountActionTrade,
-    ].map((action, order) => ({
-      ...action,
-      order,
-    }))
-  }
-}
-
-const createTransferList = ({
-  actionList,
-  accountIdSet,
-}: Pick<
-  CreateEvidenceNoneAccountActionsParameters,
-  'accountIdSet' | 'actionList'
->): readonly Transfer[] => {
-  const mut_transfers: (Transfer & { readonly key: string })[] = []
-
-  for (const transfer of actionList.flatMap((action) => action.transfers)) {
-    if (
-      (transfer.from === undefined || !accountIdSet.has(transfer.from)) &&
-      (transfer.to === undefined || !accountIdSet.has(transfer.to))
-    ) {
-      continue
-    }
-
-    const transferKey = createTransferKey(transfer, accountIdSet)
-    const transferIndex = mut_transfers.findIndex(
-      ({ key }) => key === transferKey,
-    )
-
-    if (transferIndex === -1) {
-      mut_transfers.push({
-        ...transfer,
-        direction: createTransferDirection(transfer, accountIdSet),
-        key: transferKey,
-      })
-    } else {
-      const baseTransfer = mut_transfers[transferIndex]
-      // from=new-from/to=new-to の場合は加算
-      if (
-        baseTransfer.from === transfer.from &&
-        baseTransfer.to === transfer.to
-      ) {
-        mut_transfers[transferIndex] = {
-          ...baseTransfer,
-          amount: plus(baseTransfer.amount, transfer.amount),
-        }
-      }
-      // from=new-to/to=new-from の場合は減算
-      else if (
-        baseTransfer.from === transfer.to &&
-        baseTransfer.to === transfer.from
-      ) {
-        mut_transfers[transferIndex] = {
-          ...baseTransfer,
-          amount: minus(baseTransfer.amount, transfer.amount),
-        }
-      }
-      // from=new-from/to!=new-to の場合は to を undefined にして加算
-      else if (
-        baseTransfer.from === transfer.from &&
-        baseTransfer.to !== transfer.to
-      ) {
-        mut_transfers[transferIndex] = {
-          ...baseTransfer,
-          to: undefined,
-          amount: plus(baseTransfer.amount, transfer.amount),
-        }
-      }
-      // from!=new-from/to=new-to の場合は from を undefined にして加算
-      else if (
-        baseTransfer.from !== transfer.from &&
-        baseTransfer.to === transfer.to
-      ) {
-        mut_transfers[transferIndex] = {
-          ...baseTransfer,
-          from: undefined,
-          amount: plus(baseTransfer.amount, transfer.amount),
-        }
-      }
-      // from=new-to/to!=new-from の場合は to を undefined にして減算
-      else if (
-        baseTransfer.from === transfer.to &&
-        baseTransfer.to !== transfer.from
-      ) {
-        mut_transfers[transferIndex] = {
-          ...baseTransfer,
-          to: undefined,
-          amount: minus(baseTransfer.amount, transfer.amount),
-        }
-      }
-      // from!=new-to/to=new-from の場合は from を undefined にして減算
-      else if (
-        baseTransfer.from !== transfer.to &&
-        baseTransfer.to === transfer.from
-      ) {
-        mut_transfers[transferIndex] = {
-          ...baseTransfer,
-          from: undefined,
-          amount: minus(baseTransfer.amount, transfer.amount),
-        }
-      }
-    }
-  }
-
-  // amount がマイナスの場合は from/to , direction を逆にして amount をプラスにする
-  return mut_transfers
-    .filter((transfer) => transfer.amount.value !== 0n)
-    .map((transfer) =>
-      transfer.amount.value < 0
-        ? {
-            ...transfer,
-            from: transfer.to,
-            to: transfer.from,
-            direction: reverseTransferDirection(transfer.direction),
-            amount: absoluteValue(transfer.amount),
-          }
-        : transfer,
-    )
-}
-
-const createTransferDirection = (
-  transfer: Transfer,
-  accountIdSet: Set<string>,
-) => {
-  if (
-    transfer.from !== undefined &&
-    accountIdSet.has(transfer.from) &&
-    transfer.to !== undefined &&
-    accountIdSet.has(transfer.to)
-  ) {
-    return 'none'
-  } else if (transfer.from !== undefined && accountIdSet.has(transfer.from)) {
-    return 'out'
-  } else if (transfer.to !== undefined && accountIdSet.has(transfer.to)) {
-    return 'in'
-  } else {
-    return 'none'
-  }
-}
-
-const reverseTransferDirection = (
-  direction: Transfer['direction'],
-): Transfer['direction'] => {
-  switch (direction) {
-    case 'in': {
-      return 'out'
-    }
-    case 'none': {
-      return 'none'
-    }
-    case 'out': {
-      return 'in'
-    }
-  }
-}
-
-const createTransferKey = (
-  transfer: Transfer,
-  accountIdSet: Set<string>,
-): string => {
-  const addressKey = [transfer.from, transfer.to]
-    .filter(
-      (address): address is string =>
-        address !== undefined && accountIdSet.has(address),
-    )
-    .sort()
-    .join('/')
-  return `${transfer.asset.type}/${transfer.asset.id}/${addressKey}`
+  return [
+    ...moveActionList,
+    {
+      type: 'NormalAccountAction',
+      action: 'trade',
+      source,
+      order: 0,
+      comment: undefined,
+      app: undefined,
+      evidence: 'none',
+      timestamp,
+      transfers: [
+        ...inOutTransferList.filter((transfer) => transfer.direction === 'in'),
+        ...inOutTransferList.filter((transfer) => transfer.direction === 'out'),
+      ],
+    } satisfies AccountActionTrade,
+  ].map((action, order) => ({
+    ...action,
+    order,
+  }))
 }

package/actions/utils/mergeSameAssetTransfers.ts

@@ -0,0 +1,163 @@
+import { absoluteValue, minus, plus } from '@0xtorch/big-decimal'
+import type { Transfer } from '../types'
+
+export const mergeSameAssetTransfers = (
+  transfers: readonly Transfer[],
+  accountIds: Set<string>,
+): readonly Transfer[] => {
+  const mut_transfers: (Transfer & { readonly key: string })[] = []
+
+  for (const transfer of transfers) {
+    if (
+      (transfer.from === undefined || !accountIds.has(transfer.from)) &&
+      (transfer.to === undefined || !accountIds.has(transfer.to))
+    ) {
+      continue
+    }
+
+    const transferKey = createTransferKey(transfer, accountIds)
+    const transferIndex = mut_transfers.findIndex(
+      ({ key }) => key === transferKey,
+    )
+
+    if (transferIndex === -1) {
+      mut_transfers.push({
+        ...transfer,
+        direction: createTransferDirection(transfer, accountIds),
+        key: transferKey,
+      })
+    } else {
+      const baseTransfer = mut_transfers[transferIndex]
+      // from=new-from/to=new-to の場合は加算
+      if (
+        baseTransfer.from === transfer.from &&
+        baseTransfer.to === transfer.to
+      ) {
+        mut_transfers[transferIndex] = {
+          ...baseTransfer,
+          amount: plus(baseTransfer.amount, transfer.amount),
+        }
+      }
+      // from=new-to/to=new-from の場合は減算
+      else if (
+        baseTransfer.from === transfer.to &&
+        baseTransfer.to === transfer.from
+      ) {
+        mut_transfers[transferIndex] = {
+          ...baseTransfer,
+          amount: minus(baseTransfer.amount, transfer.amount),
+        }
+      }
+      // from=new-from/to!=new-to の場合は to を undefined にして加算
+      else if (
+        baseTransfer.from === transfer.from &&
+        baseTransfer.to !== transfer.to
+      ) {
+        mut_transfers[transferIndex] = {
+          ...baseTransfer,
+          to: undefined,
+          amount: plus(baseTransfer.amount, transfer.amount),
+        }
+      }
+      // from!=new-from/to=new-to の場合は from を undefined にして加算
+      else if (
+        baseTransfer.from !== transfer.from &&
+        baseTransfer.to === transfer.to
+      ) {
+        mut_transfers[transferIndex] = {
+          ...baseTransfer,
+          from: undefined,
+          amount: plus(baseTransfer.amount, transfer.amount),
+        }
+      }
+      // from=new-to/to!=new-from の場合は to を undefined にして減算
+      else if (
+        baseTransfer.from === transfer.to &&
+        baseTransfer.to !== transfer.from
+      ) {
+        mut_transfers[transferIndex] = {
+          ...baseTransfer,
+          to: undefined,
+          amount: minus(baseTransfer.amount, transfer.amount),
+        }
+      }
+      // from!=new-to/to=new-from の場合は from を undefined にして減算
+      else if (
+        baseTransfer.from !== transfer.to &&
+        baseTransfer.to === transfer.from
+      ) {
+        mut_transfers[transferIndex] = {
+          ...baseTransfer,
+          from: undefined,
+          amount: minus(baseTransfer.amount, transfer.amount),
+        }
+      }
+    }
+  }
+
+  // amount がマイナスの場合は from/to , direction を逆にして amount をプラスにする
+  return mut_transfers
+    .filter((transfer) => transfer.amount.value !== 0n)
+    .map((transfer) =>
+      transfer.amount.value < 0
+        ? {
+            ...transfer,
+            from: transfer.to,
+            to: transfer.from,
+            direction: reverseTransferDirection(transfer.direction),
+            amount: absoluteValue(transfer.amount),
+          }
+        : transfer,
+    )
+}
+
+const createTransferKey = (
+  transfer: Transfer,
+  accountIds: Set<string>,
+): string => {
+  const addressKey = [transfer.from, transfer.to]
+    .filter(
+      (address): address is string =>
+        address !== undefined && accountIds.has(address),
+    )
+    .sort()
+    .join('/')
+  return `${transfer.asset.type}/${transfer.asset.id}/${addressKey}`
+}
+
+const createTransferDirection = (
+  transfer: Transfer,
+  accountIds: Set<string>,
+) => {
+  if (
+    transfer.from !== undefined &&
+    accountIds.has(transfer.from) &&
+    transfer.to !== undefined &&
+    accountIds.has(transfer.to)
+  ) {
+    return 'none'
+  }
+  if (transfer.from !== undefined && accountIds.has(transfer.from)) {
+    return 'out'
+  }
+  if (transfer.to !== undefined && accountIds.has(transfer.to)) {
+    return 'in'
+  }
+  return 'none'
+}
+
+const reverseTransferDirection = (
+  direction: Transfer['direction'],
+): Transfer['direction'] => {
+  switch (direction) {
+    case 'in': {
+      return 'out'
+    }
+    case 'none': {
+      return 'none'
+    }
+    case 'out': {
+      return 'in'
+    }
+  }
+}

package/assets/definitions/coingeckoCryptoCurrencyDataSource.ts

@@ -34,6 +34,7 @@ export const coingeckoCryptoCurrencyDataSource = createCryptoCurrencyDataSource(
         )
       }
       const coingeckoIds = targetCurrencies.map(
+        // biome-ignore lint/style/noNonNullAssertion: <explanation>
         (currency) => currency.market.coingeckoId!,
       )
       const coins = await getCoinsMarkets(
@@ -84,6 +85,7 @@ export const coingeckoCryptoCurrencyDataSource = createCryptoCurrencyDataSource(
       // timestamp から from,to を生成する
       const sortedTimestampList = timestampList.toSorted((a, b) => a - b)
       const from = Math.floor(sortedTimestampList[0] / 1000)
+      // biome-ignore lint/style/noNonNullAssertion: <explanation>
       const to = Math.ceil(sortedTimestampList.at(-1)! / 1000)
 
       // from, to を 90 日間毎に分割する

package/index.ts

@@ -46,6 +46,7 @@ export {
   accountActionWithdrawSchema,
   accountActionWithdrawWithBondSchema,
   accountActionWrapSchema,
+  checkIfAccountActionsIsValid,
   createEvidenceNoneAccountActions,
   crossActionBundleSchema,
   crossTypeSchema,
@@ -58,6 +59,7 @@ export {
   isTransferNftIn,
   isTransferNftNone,
   isTransferNftOut,
+  mergeSameAssetTransfers,
   normalActionActionSchema,
   normalActionAddLiquiditySchema,
   normalActionApproveSchema,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xtorch/core",
-  "version": "0.0.34",
+  "version": "0.0.36",
   "description": "Cryptorch | TypeScript Analyze Interface for Crypto Data.",
   "keywords": [
     "cryptorch",
@@ -35,10 +35,7 @@
     "!tsconfig.build.json"
   ],
   "dependencies": {
-    "@0xtorch/big-decimal": "^0.0.7",
+    "@0xtorch/big-decimal": "^0.0.10",
     "zod": "^3.23.8"
-  },
-  "peerDependencies": {
-    "typescript": "^5.0.0"
   }
 }

package/utils/errors.ts

@@ -26,11 +26,10 @@ class BaseError extends Error {
     const details =
       arguments_.cause instanceof BaseError
         ? arguments_.cause.details
-        : // eslint-disable-next-line unicorn/no-nested-ternary
-          arguments_.cause?.message !== undefined &&
+        : arguments_.cause?.message !== undefined &&
             arguments_.cause?.message.length > 0
           ? arguments_.cause.message
-          : arguments_.details!
+          : arguments_.details ?? ''
 
     this.message = [
       shortMessage.length > 0 ? shortMessage : 'An error occurred.',
@@ -49,9 +48,8 @@ class BaseError extends Error {
 
   walk(): Error
   walk(function_: (error: unknown) => boolean): Error | null
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  // biome-ignore lint/suspicious/noExplicitAny: <explanation>
   walk(function_?: any): any {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
     return walk(this, function_)
   }
 }

package/utils/rest.ts

@@ -47,7 +47,6 @@ export const rest = async <TData>(
         signal: true,
       },
     )
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const data =
       response.headers.get('Content-Type')?.startsWith('application/json') ===
       true
@@ -57,8 +56,7 @@ export const rest = async <TData>(
     if (!response.ok) {
       const errorStringify =
         typeof data === 'object' && data !== null && 'error' in data
-          ? // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-            stringify(data.error)
+          ? stringify(data.error)
           : ''
       throw new HttpRequestError({
         body: body === undefined ? undefined : stringify(body),
@@ -77,15 +75,15 @@ export const rest = async <TData>(
       error instanceof ZodError
     ) {
       throw error
-    } else if (error instanceof Error) {
+    }
+    if (error instanceof Error) {
       throw new HttpRequestError({
         body: body === undefined ? undefined : stringify(body),
         details: error.message,
         url,
       })
-    } else {
-      throw error
     }
+    throw error
   }
 }
 

package/utils/stringify.ts

@@ -2,9 +2,7 @@ export const stringify: typeof JSON.stringify = (value, replacer, space) =>
   JSON.stringify(
     value,
     (key, value_) => {
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
       const value = typeof value_ === 'bigint' ? value_.toString() : value_
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-return
       return typeof replacer === 'function' ? replacer(key, value) : value
     },
     space,

package/utils/types.ts

@@ -8,5 +8,4 @@
  */
 export type Prettify<T> = {
   [K in keyof T]: T[K]
-  // eslint-disable-next-line @typescript-eslint/ban-types
 } & {}