@0xtorch/core 0.0.33 → 0.0.35

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
@@ -136,11 +138,15 @@ export const createEvidenceNoneAccountActions = ({
       order,
     }))
   }
-  // in transfer asset 全て NFT である場合、 buy-nft action に変換
+  // in transfer asset 全て NFT , out transfer asset に NFT 含まない場合、 buy-nft action に変換
   else if (
     inOutTransferList
       .filter((transfer) => transfer.direction === 'in')
-      .every((transfer) => transfer.asset.type === 'Nft')
+      .every((transfer) => transfer.asset.type === 'Nft') &&
+    inOutTransferList.filter(
+      (transfer) =>
+        transfer.direction === 'out' && transfer.asset.type === 'Nft',
+    ).length === 0
   ) {
     return [
       ...moveActionList,
@@ -172,11 +178,15 @@ export const createEvidenceNoneAccountActions = ({
       order,
     }))
   }
-  // out transfer 全て NFT である場合、 sell-nft action に変換
+  // out transfer 全て NFT, in transfer に NFT を含まない場合、 sell-nft action に変換
   else if (
     inOutTransferList
       .filter((transfer) => transfer.direction === 'out')
-      .every((transfer) => transfer.asset.type === 'Nft')
+      .every((transfer) => transfer.asset.type === 'Nft') &&
+    inOutTransferList.filter(
+      (transfer) =>
+        transfer.direction === 'in' && transfer.asset.type === 'Nft',
+    ).length === 0
   ) {
     return [
       ...moveActionList,
@@ -307,166 +317,3 @@ export const createEvidenceNoneAccountActions = ({
     }))
   }
 }
-
-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}`
-}

package/actions/utils/mergeSameAssetTransfers.ts

@@ -0,0 +1,162 @@
+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'
+  } else if (transfer.from !== undefined && accountIds.has(transfer.from)) {
+    return 'out'
+  } else if (transfer.to !== undefined && accountIds.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'
+    }
+  }
+}

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.33",
+  "version": "0.0.35",
   "description": "Cryptorch | TypeScript Analyze Interface for Crypto Data.",
   "keywords": [
     "cryptorch",