@0xtorch/evm 0.0.59 → 0.0.61

package/analyzer/json/analyze.ts

@@ -455,31 +455,30 @@ const getParameterCompareValues = <
             }
           }
         }
-      } else {
-        if (transaction.internalTransactions.length <= compare.index) {
-          return undefined
-        }
-        const internal = transaction.internalTransactions[compare.index]
-        switch (compare.key) {
-          case 'from': {
-            return {
-              values: [internal.from],
-              type: 'every',
-            }
-          }
-          case 'to': {
-            return internal.to === undefined
-              ? undefined
-              : {
-                  values: [internal.to],
-                  type: 'every',
-                }
+      }
+      if (transaction.internalTransactions.length <= compare.index) {
+        return undefined
+      }
+      const internal = transaction.internalTransactions[compare.index]
+      switch (compare.key) {
+        case 'from': {
+          return {
+            values: [internal.from],
+            type: 'every',
           }
-          case 'value': {
-            return {
-              values: [internal.value.toString()],
-              type: 'every',
-            }
+        }
+        case 'to': {
+          return internal.to === undefined
+            ? undefined
+            : {
+                values: [internal.to],
+                type: 'every',
+              }
+        }
+        case 'value': {
+          return {
+            values: [internal.value.toString()],
+            type: 'every',
           }
         }
       }
@@ -511,21 +510,20 @@ const getParameterCompareValues = <
           values: values as string[],
           type: compare.index,
         }
-      } else {
-        if (targetLogs.length <= compare.index) {
-          return undefined
-        }
-        const log = targetLogs[compare.index]
-        if (log.type !== 'decoded') {
-          return undefined
-        }
-        if (log.log.args.length <= compare.argIndex) {
-          return undefined
-        }
-        return {
-          values: [String(log.log.args[compare.argIndex].value).toLowerCase()],
-          type: 'every',
-        }
+      }
+      if (targetLogs.length <= compare.index) {
+        return undefined
+      }
+      const log = targetLogs[compare.index]
+      if (log.type !== 'decoded') {
+        return undefined
+      }
+      if (log.log.args.length <= compare.argIndex) {
+        return undefined
+      }
+      return {
+        values: [String(log.log.args[compare.argIndex].value).toLowerCase()],
+        type: 'every',
       }
     }
   }

package/analyzer/json/components/comment.ts

@@ -24,9 +24,11 @@ export const createCommentByCommentComponent = <
 }: CreateCommentByCommentComponentParameters<Price>): string => {
   if (typeof component === 'string') {
     return component
-  } else if (typeof component === 'number') {
+  }
+  if (typeof component === 'number') {
     return component.toString()
-  } else if (typeof component === 'bigint') {
+  }
+  if (typeof component === 'bigint') {
     return component.toString()
   }
   switch (component.type) {

package/analyzer/json/components/erc1155.ts

@@ -40,12 +40,11 @@ export const getErc1155Component = <
   )
   if (component.index === 'any') {
     return filteredTransfers
-  } else {
-    if (filteredTransfers.length <= component.index) {
-      throw new Error('filteredTransfers.length <= component.index')
-    }
-    return [filteredTransfers[component.index]]
   }
+  if (filteredTransfers.length <= component.index) {
+    throw new Error('filteredTransfers.length <= component.index')
+  }
+  return [filteredTransfers[component.index]]
 }
 
 type IsMatchErc1155ComponentParameters<
@@ -124,7 +123,8 @@ export const isMatchErc1155Component = <
     })
     if (value === 'plus' && transfer.value <= 0) {
       return false
-    } else if (value !== 'plus' && value !== transfer.value) {
+    }
+    if (value !== 'plus' && value !== transfer.value) {
       return false
     }
   }

package/analyzer/json/components/erc20.ts

@@ -40,12 +40,11 @@ export const getErc20Component = <
   )
   if (component.index === 'any') {
     return filteredTransfers
-  } else {
-    if (filteredTransfers.length <= component.index) {
-      throw new Error('filteredTransfers.length <= condition.index')
-    }
-    return [filteredTransfers[component.index]]
   }
+  if (filteredTransfers.length <= component.index) {
+    throw new Error('filteredTransfers.length <= condition.index')
+  }
+  return [filteredTransfers[component.index]]
 }
 
 type IsMatchErc20ComponentParameters<
@@ -121,7 +120,8 @@ export const isMatchErc20Component = <
     })
     if (value === 'plus' && transfer.value <= 0) {
       return false
-    } else if (value !== 'plus' && value !== transfer.value) {
+    }
+    if (value !== 'plus' && value !== transfer.value) {
       return false
     }
   }

package/analyzer/json/components/erc721.ts

@@ -37,12 +37,11 @@ export const getErc721Component = <
   )
   if (component.index === 'any') {
     return filteredTransfers
-  } else {
-    if (filteredTransfers.length <= component.index) {
-      throw new Error('filteredTransfers.length <= component.index')
-    }
-    return [filteredTransfers[component.index]]
   }
+  if (filteredTransfers.length <= component.index) {
+    throw new Error('filteredTransfers.length <= component.index')
+  }
+  return [filteredTransfers[component.index]]
 }
 
 type IsMatchErc721ComponentParameters<

package/analyzer/json/components/id.ts

@@ -24,9 +24,11 @@ export const createIdByIdComponent = <
 }: CreateIdByIdComponentParameters<Price>): string => {
   if (typeof component === 'string') {
     return component
-  } else if (typeof component === 'number') {
+  }
+  if (typeof component === 'number') {
     return component.toString()
-  } else if (typeof component === 'bigint') {
+  }
+  if (typeof component === 'bigint') {
     return component.toString()
   }
   switch (component.type) {

package/analyzer/json/components/internal.ts

@@ -42,12 +42,11 @@ export const getInternalComponent = <
   )
   if (component.index === 'any') {
     return filteredInternals
-  } else {
-    if (filteredInternals.length <= component.index) {
-      throw new Error('filteredInternals.length <= component.index')
-    }
-    return [filteredInternals[component.index]]
   }
+  if (filteredInternals.length <= component.index) {
+    throw new Error('filteredInternals.length <= component.index')
+  }
+  return [filteredInternals[component.index]]
 }
 
 type IsMatchInternalComponentParameters<
@@ -109,7 +108,8 @@ export const isMatchInternalComponent = <
     })
     if (value === 'plus' && internal.value <= 0) {
       return false
-    } else if (value !== 'plus' && value !== internal.value) {
+    }
+    if (value !== 'plus' && value !== internal.value) {
       return false
     }
   }

package/analyzer/json/components/logArgument.ts

@@ -43,26 +43,25 @@ export const getLogArgumentComponent = <
       }
       return log.log.args[component.argIndex].value
     })
-  } else {
-    if (filteredLogs.length <= component.index) {
-      throw new Error('filteredLogs.length <= condition.index')
-    }
-    const log = filteredLogs[component.index]
-    if (log.type !== 'decoded') {
-      throw new Error('log is not decoded')
-    }
-    if (typeof component.argIndex === 'string') {
-      switch (component.argIndex) {
-        case 'address': {
-          return [log.log.address]
-        }
+  }
+  if (filteredLogs.length <= component.index) {
+    throw new Error('filteredLogs.length <= condition.index')
+  }
+  const log = filteredLogs[component.index]
+  if (log.type !== 'decoded') {
+    throw new Error('log is not decoded')
+  }
+  if (typeof component.argIndex === 'string') {
+    switch (component.argIndex) {
+      case 'address': {
+        return [log.log.address]
       }
     }
-    if (log.log.args.length <= component.argIndex) {
-      throw new Error('log.log.args.length <= condition.argIndex')
-    }
-    return [log.log.args[component.argIndex].value]
   }
+  if (log.log.args.length <= component.argIndex) {
+    throw new Error('log.log.args.length <= condition.argIndex')
+  }
+  return [log.log.args[component.argIndex].value]
 }
 
 type IsMatchLogArgumentComponentParameters<

package/analyzer/json/components/targetAsset.ts

@@ -2,7 +2,7 @@ import type { CryptoCurrencyPrice, Nft } from '@0xtorch/core'
 import type { Chain } from '../../../chains'
 import type { LowerHex, TransactionDecoded } from '../../../types'
 import { isHex, toLowerHex } from '../../../types'
-import { createErc1155NftId, createErc721NftId } from '../../../utils'
+import { createErc721NftId, createErc1155NftId } from '../../../utils'
 import type { Target, TargetAssetComponent } from '../types'
 import { getErc1155Component } from './erc1155'
 import { getLogArgumentComponent } from './logArgument'

package/analyzer/json/components/transfer.ts

@@ -17,9 +17,9 @@ import type {
   TransferCustomAmountComponent,
   TransferCustomAssetComponent,
 } from '../types'
-import { getErc1155Component } from './erc1155'
 import { getErc20Component } from './erc20'
 import { getErc721Component } from './erc721'
+import { getErc1155Component } from './erc1155'
 import { getInternalComponent } from './internal'
 import { getLogArgumentComponent } from './logArgument'
 
@@ -539,13 +539,15 @@ const getAmountByTransferCustomAmountComponent = <
           // TODO decimals を component で渡すようにする
           decimals: 18,
         }
-      } else if (typeof argument === 'number') {
+      }
+      if (typeof argument === 'number') {
         return {
           value: BigInt(Math.floor(argument)),
           // TODO decimals を component で渡すようにする
           decimals: 18,
         }
-      } else if (
+      }
+      if (
         typeof argument === 'string' &&
         (/^\d+$/.test(argument) || isHex(argument))
       ) {
@@ -554,9 +556,8 @@ const getAmountByTransferCustomAmountComponent = <
           // TODO decimals を component で渡すようにする
           decimals: 18,
         }
-      } else {
-        throw new Error(`Invalid amount: ${String(argument)}`)
       }
+      throw new Error(`Invalid amount: ${String(argument)}`)
     }
   }
 }

package/analyzer/json/condition/address.ts

@@ -1,9 +1,9 @@
 import type { CryptoCurrencyPrice } from '@0xtorch/core'
 import type { LowerHex, TransactionDecoded } from '../../../types'
 import { isHex, toLowerHex } from '../../../types'
-import { getErc1155RawComponent } from '../components/erc1155Raw'
 import { getErc20RawComponent } from '../components/erc20Raw'
 import { getErc721RawComponent } from '../components/erc721Raw'
+import { getErc1155RawComponent } from '../components/erc1155Raw'
 import { getInternalRawComponent } from '../components/internalRaw'
 import { getLogArgumentRawComponent } from '../components/logArgumentRaw'
 import type { AddressCondition, Target } from '../types'

package/analyzer/json/condition/value.ts

@@ -1,7 +1,7 @@
 import type { CryptoCurrencyPrice } from '@0xtorch/core'
 import type { TransactionDecoded } from '../../../types'
-import { getErc1155RawComponent } from '../components/erc1155Raw'
 import { getErc20RawComponent } from '../components/erc20Raw'
+import { getErc1155RawComponent } from '../components/erc1155Raw'
 import { getInternalRawComponent } from '../components/internalRaw'
 import { getLogArgumentRawComponent } from '../components/logArgumentRaw'
 import type { Target, ValueCondition } from '../types'
@@ -25,7 +25,8 @@ export const getValueByValueCondition = <
 }: GetValueByValueConditionParameters<Price>): 'plus' | bigint => {
   if (typeof condition === 'string') {
     return condition
-  } else if (typeof condition === 'bigint') {
+  }
+  if (typeof condition === 'bigint') {
     return condition
   }
   switch (condition.type) {
@@ -64,13 +65,14 @@ export const getValueByValueCondition = <
       })
       if (typeof argument === 'bigint') {
         return argument
-      } else if (typeof argument === 'number') {
+      }
+      if (typeof argument === 'number') {
         return BigInt(Math.floor(argument))
-      } else if (typeof argument === 'string' && /^-?\d+$/.test(argument)) {
+      }
+      if (typeof argument === 'string' && /^-?\d+$/.test(argument)) {
         return BigInt(argument)
-      } else {
-        throw new TypeError('argument is not bigint')
       }
+      throw new TypeError('argument is not bigint')
     }
   }
 }

package/analyzer/json/generator.ts

@@ -6,17 +6,17 @@ import type {
 import { parseBaseNormalActionToNormalAction } from '@0xtorch/core'
 import type { Chain } from '../../chains'
 import type {
-  Erc1155Transfer,
   Erc20Transfer,
   Erc721Transfer,
+  Erc1155Transfer,
   InternalTransaction,
   LogData,
   TransactionDecoded,
 } from '../../types'
 import { createCommentByCommentComponent } from './components/comment'
-import { isMatchErc1155Component } from './components/erc1155'
 import { isMatchErc20Component } from './components/erc20'
 import { isMatchErc721Component } from './components/erc721'
+import { isMatchErc1155Component } from './components/erc1155'
 import { createIdByIdComponent } from './components/id'
 import { isMatchInternalComponent } from './components/internal'
 import { isMatchLogArgumentComponent } from './components/logArgument'

package/analyzer/json/schemas/generator.ts

@@ -135,7 +135,9 @@ export const valueConditionSchema = z.union([
 
 export const logArgumentValueConditionSchema = z.union([
   // string
-  z.string().transform((x) => x.toLowerCase() as Lowercase<string>),
+  z
+    .string()
+    .transform((x) => x.toLowerCase() as Lowercase<string>),
   // transaction from/to
   transactionAddressComponentSchema,
   // transaction value
@@ -317,7 +319,9 @@ export const transferCustomAmountComponentSchema = z.object({
   plus: z.boolean(),
   value: z.union([
     // big-decimal
-    z.string().regex(/^\d+(\.\d+)?$/),
+    z
+      .string()
+      .regex(/^\d+(\.\d+)?$/),
     // value
     valueComponentSchema,
     // internal

package/analyzer/json/types.ts

@@ -1,9 +1,9 @@
 import type { CryptoCurrencyPrice } from '@0xtorch/core'
 import type { z } from 'zod'
 import type {
-  Erc1155Transfer,
   Erc20Transfer,
   Erc721Transfer,
+  Erc1155Transfer,
   InternalTransaction,
   LogData,
 } from '../../types'
@@ -24,12 +24,12 @@ import type {
   actionGeneratorSchema,
   addressConditionSchema,
   commentComponentSchema,
-  erc1155ComponentSchema,
-  erc1155RawComponentSchema,
   erc20ComponentSchema,
   erc20RawComponentSchema,
   erc721ComponentSchema,
   erc721RawComponentSchema,
+  erc1155ComponentSchema,
+  erc1155RawComponentSchema,
   idComponentSchema,
   internalComponentSchema,
   internalRawComponentSchema,

package/analyzer/parsers/transfer.ts

@@ -10,9 +10,9 @@ import type {
 } from '@0xtorch/core'
 import type { Chain } from '../../chains'
 import type {
-  Erc1155Transfer,
   Erc20Transfer,
   Erc721Transfer,
+  Erc1155Transfer,
   InternalTransaction,
   TransactionDecoded,
 } from '../../types'