@0xtorch/evm 0.0.42 → 0.0.44

package/_types/index.d.ts

@@ -12,5 +12,7 @@ export type { Explorer } from './explorers';
 export { getTransactionDetail } from './getTransactionDetail';
 export { isHex, parsedLogSchema, toLowerHex } from './types';
 export type { Erc1155NftId, Erc1155Token, Erc1155Transfer, Erc20Token, Erc20Transfer, Erc721NftId, Erc721Token, Erc721Transfer, EvmAccount, Hex, InputData, InternalTransaction, LogData, LowerHex, TransactionDecoded, TransactionDetail, TransactionFull, TransactionSource, } from './types';
+export { evmAddressPremitiveSchema, evmAddressSchema } from './types/address';
+export type { EvmAddress, EvmAddressPrimitive } from './types/address';
 export { createErc1155NftId, createErc721NftId, createEvmActionSource, createEvmAddressId, createEvmCurrencyId, isErc1155NftId, isErc721NftId, } from './utils';
 //# sourceMappingURL=index.d.ts.map

package/_types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AACjE,OAAO,EACL,sBAAsB,EACtB,WAAW,EACX,aAAa,EACb,cAAc,EACd,WAAW,EACX,eAAe,EACf,QAAQ,EACR,uBAAuB,EACvB,kBAAkB,GACnB,MAAM,YAAY,CAAA;AACnB,YAAY,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAChF,YAAY,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAA;AAC3C,OAAO,EACL,mBAAmB,EACnB,2BAA2B,EAC3B,aAAa,EACb,qBAAqB,EACrB,kBAAkB,EAClB,0BAA0B,EAC1B,YAAY,EACZ,oBAAoB,EACpB,WAAW,EACX,mBAAmB,EACnB,sBAAsB,EACtB,4BAA4B,EAC5B,gBAAgB,EAChB,sBAAsB,EACtB,qBAAqB,EACrB,2BAA2B,EAC3B,eAAe,EACf,qBAAqB,EACrB,cAAc,EACd,oBAAoB,EACpB,mBAAmB,EACnB,yBAAyB,EACzB,iBAAiB,EACjB,uBAAuB,EACvB,gBAAgB,EAChB,sBAAsB,EACtB,uBAAuB,EACvB,6BAA6B,EAC7B,uBAAuB,EACvB,sBAAsB,EACtB,mBAAmB,EACnB,yBAAyB,EACzB,oBAAoB,EACpB,0BAA0B,EAC1B,gBAAgB,EAChB,sBAAsB,EACtB,mBAAmB,EACnB,yBAAyB,EACzB,qBAAqB,EACrB,2BAA2B,EAC3B,gBAAgB,EAChB,sBAAsB,EACtB,gBAAgB,EAChB,wBAAwB,EACxB,cAAc,EACd,sBAAsB,EACtB,8BAA8B,EAC9B,aAAa,EACb,qBAAqB,EACrB,oBAAoB,EACpB,4BAA4B,EAC5B,cAAc,EACd,sBAAsB,EACtB,aAAa,EACb,qBAAqB,EACrB,gBAAgB,EAChB,wBAAwB,EACxB,iBAAiB,EACjB,yBAAyB,EACzB,aAAa,EACb,qBAAqB,EACrB,gBAAgB,EAChB,wBAAwB,EACxB,kBAAkB,EAClB,0BAA0B,EAC1B,aAAa,EACb,qBAAqB,GACtB,MAAM,UAAU,CAAA;AACjB,YAAY,EAAE,KAAK,EAAE,MAAM,UAAU,CAAA;AACrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAA;AAC5C,OAAO,EACL,OAAO,EACP,8BAA8B,EAC9B,sBAAsB,EACtB,uBAAuB,GACxB,MAAM,WAAW,CAAA;AAClB,YAAY,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACxC,OAAO,EACL,gBAAgB,EAChB,eAAe,EACf,mBAAmB,GACpB,MAAM,aAAa,CAAA;AACpB,YAAY,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAC7D,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAC5D,YAAY,EACV,YAAY,EACZ,YAAY,EACZ,eAAe,EACf,UAAU,EACV,aAAa,EACb,WAAW,EACX,WAAW,EACX,cAAc,EACd,UAAU,EACV,GAAG,EACH,SAAS,EACT,mBAAmB,EACnB,OAAO,EACP,QAAQ,EACR,kBAAkB,EAClB,iBAAiB,EACjB,eAAe,EACf,iBAAiB,GAClB,MAAM,SAAS,CAAA;AAChB,OAAO,EACL,kBAAkB,EAClB,iBAAiB,EACjB,qBAAqB,EACrB,kBAAkB,EAClB,mBAAmB,EACnB,cAAc,EACd,aAAa,GACd,MAAM,SAAS,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"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"}

package/_types/types/address.d.ts

@@ -0,0 +1,49 @@
+import type { Abi } from 'viem';
+import { z } from 'zod';
+export declare const evmAddressPremitiveSchema: z.ZodObject<{
+    chainId: z.ZodNumber;
+    address: z.ZodString;
+    label: z.ZodOptional<z.ZodString>;
+    isSpam: z.ZodOptional<z.ZodBoolean>;
+    appId: z.ZodOptional<z.ZodString>;
+    abi: z.ZodOptional<z.ZodString>;
+}, "strip", z.ZodTypeAny, {
+    chainId: number;
+    address: string;
+    label?: string | undefined;
+    isSpam?: boolean | undefined;
+    appId?: string | undefined;
+    abi?: string | undefined;
+}, {
+    chainId: number;
+    address: string;
+    label?: string | undefined;
+    isSpam?: boolean | undefined;
+    appId?: string | undefined;
+    abi?: string | undefined;
+}>;
+export declare const evmAddressSchema: z.ZodObject<{
+    chainId: z.ZodNumber;
+    label: z.ZodOptional<z.ZodString>;
+    isSpam: z.ZodOptional<z.ZodBoolean>;
+    appId: z.ZodOptional<z.ZodString>;
+    address: z.ZodEffects<z.ZodString, `0x${Lowercase<string>}`, string>;
+    abi: z.ZodOptional<z.ZodEffects<z.ZodString, Abi, string>>;
+}, "strip", z.ZodTypeAny, {
+    chainId: number;
+    address: `0x${Lowercase<string>}`;
+    label?: string | undefined;
+    isSpam?: boolean | undefined;
+    appId?: string | undefined;
+    abi?: Abi | undefined;
+}, {
+    chainId: number;
+    address: string;
+    label?: string | undefined;
+    isSpam?: boolean | undefined;
+    appId?: string | undefined;
+    abi?: string | undefined;
+}>;
+export type EvmAddressPrimitive = z.infer<typeof evmAddressPremitiveSchema>;
+export type EvmAddress = z.infer<typeof evmAddressSchema>;
+//# sourceMappingURL=address.d.ts.map

package/_types/types/address.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"address.d.ts","sourceRoot":"","sources":["../../types/address.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAA;AAC/B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAGvB,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;EAOpC,CAAA;AAEF,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;EAiB3B,CAAA;AAEF,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,yBAAyB,CAAC,CAAA;AAE3E,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAA"}

package/analyzer/json/components/transfer.ts

@@ -448,12 +448,13 @@ const getAmountByTransferCustomAmountComponent = <
   readonly chain: Chain
 } & Target<Price>): BigDecimal => {
   const { plus, value } = component
-  if ('decimals' in value) {
+  if (typeof value === 'string') {
+    const valueBigDecimal = createBigDecimal(value)
     return plus
-      ? value
+      ? valueBigDecimal
       : {
-          value: value.value * -1n,
-          decimals: value.decimals,
+          value: valueBigDecimal.value * -1n,
+          decimals: valueBigDecimal.decimals,
         }
   }
   switch (value.type) {

package/analyzer/json/schemas/generator.ts

@@ -1,4 +1,3 @@
-import { createBigDecimal } from '@0xtorch/big-decimal'
 import { crossTypeSchema, normalActionActionSchema } from '@0xtorch/core'
 import { z } from 'zod'
 import { isHex, toLowerHex } from '../../../types'
@@ -318,10 +317,7 @@ export const transferCustomAmountComponentSchema = z.object({
   plus: z.boolean(),
   value: z.union([
     // big-decimal
-    z
-      .string()
-      .regex(/^\d+(\.\d+)?$/)
-      .transform((x) => createBigDecimal(x)),
+    z.string().regex(/^\d+(\.\d+)?$/),
     // value
     valueComponentSchema,
     // internal

package/index.ts

@@ -118,6 +118,8 @@ export type {
   TransactionFull,
   TransactionSource,
 } from './types'
+export { evmAddressPremitiveSchema, evmAddressSchema } from './types/address'
+export type { EvmAddress, EvmAddressPrimitive } from './types/address'
 export {
   createErc1155NftId,
   createErc721NftId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xtorch/evm",
-  "version": "0.0.42",
+  "version": "0.0.44",
   "description": "Cryptorch EVM extension",
   "keywords": [
     "cryptorch",

package/types/address.ts

@@ -0,0 +1,36 @@
+import { Abi as AbiSchema } from 'abitype/zod'
+import type { Abi } from 'viem'
+import { z } from 'zod'
+import { isHex, toLowerHex } from './hex'
+
+export const evmAddressPremitiveSchema = z.object({
+  chainId: z.number().int(),
+  address: z.string().regex(/^0x[\dA-Fa-f]{40}$/),
+  label: z.string().optional(),
+  isSpam: z.boolean().optional(),
+  appId: z.string().optional(),
+  abi: z.string().optional(),
+})
+
+export const evmAddressSchema = evmAddressPremitiveSchema.extend({
+  address: z
+    .string()
+    .regex(/^0x[\dA-Fa-f]{40}$/)
+    .transform((v) => (isHex(v) ? toLowerHex(v) : '0x')),
+  abi: z
+    .string()
+    .transform((value, context): Abi => {
+      try {
+        const abi = AbiSchema.parse(JSON.parse(value))
+        return abi
+      } catch {
+        context.addIssue({ code: 'custom', message: 'Invalid ABI format' })
+        return z.NEVER
+      }
+    })
+    .optional(),
+})
+
+export type EvmAddressPrimitive = z.infer<typeof evmAddressPremitiveSchema>
+
+export type EvmAddress = z.infer<typeof evmAddressSchema>