@0xtorch/evm 0.0.43 → 0.0.45

package/_types/types/log.d.ts

@@ -15,24 +15,25 @@ type LogDecoded = {
 export type DecodedLog = z.infer<typeof decodedLogSchema> & {
     readonly type: 'DecodedLog';
 };
-export declare const parsedLogSchema: z.ZodObject<{
+export declare const parsedLogSchema: z.ZodObject<z.objectUtil.extendShape<{
     address: z.ZodEffects<z.ZodString, `0x${Lowercase<string>}`, string>;
-    transactionHash: z.ZodEffects<z.ZodString, `0x${string}`, string>;
-    data: z.ZodEffects<z.ZodString, `0x${string}`, string>;
     blockHash: z.ZodEffects<z.ZodString, `0x${string}`, string>;
     blockNumber: z.ZodBigInt;
+    data: z.ZodEffects<z.ZodString, `0x${string}`, string>;
     logIndex: z.ZodNumber;
+    transactionHash: z.ZodEffects<z.ZodString, `0x${string}`, string>;
     transactionIndex: z.ZodNumber;
     removed: z.ZodBoolean;
     topics: z.ZodArray<z.ZodEffects<z.ZodString, `0x${string}`, string>, "many">;
+}, {
     eventName: z.ZodString;
     args: z.ZodRecord<z.ZodString, z.ZodUnknown>;
-}, "strip", z.ZodTypeAny, {
+}>, "strip", z.ZodTypeAny, {
     address: `0x${Lowercase<string>}`;
     transactionHash: `0x${string}`;
-    data: `0x${string}`;
     blockHash: `0x${string}`;
     blockNumber: bigint;
+    data: `0x${string}`;
     logIndex: number;
     transactionIndex: number;
     removed: boolean;
@@ -42,9 +43,9 @@ export declare const parsedLogSchema: z.ZodObject<{
 }, {
     address: string;
     transactionHash: string;
-    data: string;
     blockHash: string;
     blockNumber: bigint;
+    data: string;
     logIndex: number;
     transactionIndex: number;
     removed: boolean;
@@ -52,16 +53,17 @@ export declare const parsedLogSchema: z.ZodObject<{
     eventName: string;
     args: Record<string, unknown>;
 }>;
-export declare const decodedLogSchema: z.ZodObject<{
+export declare const decodedLogSchema: z.ZodObject<z.objectUtil.extendShape<{
     address: z.ZodEffects<z.ZodString, `0x${Lowercase<string>}`, string>;
-    transactionHash: z.ZodEffects<z.ZodString, `0x${string}`, string>;
-    data: z.ZodEffects<z.ZodString, `0x${string}`, string>;
     blockHash: z.ZodEffects<z.ZodString, `0x${string}`, string>;
     blockNumber: z.ZodBigInt;
+    data: z.ZodEffects<z.ZodString, `0x${string}`, string>;
     logIndex: z.ZodNumber;
+    transactionHash: z.ZodEffects<z.ZodString, `0x${string}`, string>;
     transactionIndex: z.ZodNumber;
     removed: z.ZodBoolean;
     topics: z.ZodArray<z.ZodEffects<z.ZodString, `0x${string}`, string>, "many">;
+}, {
     eventName: z.ZodString;
     args: z.ZodArray<z.ZodObject<{
         indexed: z.ZodBoolean;
@@ -79,12 +81,12 @@ export declare const decodedLogSchema: z.ZodObject<{
         name: string;
         value?: unknown;
     }>, "many">;
-}, "strip", z.ZodTypeAny, {
+}>, "strip", z.ZodTypeAny, {
     address: `0x${Lowercase<string>}`;
     transactionHash: `0x${string}`;
-    data: `0x${string}`;
     blockHash: `0x${string}`;
     blockNumber: bigint;
+    data: `0x${string}`;
     logIndex: number;
     transactionIndex: number;
     removed: boolean;
@@ -99,9 +101,9 @@ export declare const decodedLogSchema: z.ZodObject<{
 }, {
     address: string;
     transactionHash: string;
-    data: string;
     blockHash: string;
     blockNumber: bigint;
+    data: string;
     logIndex: number;
     transactionIndex: number;
     removed: boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../../types/log.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAA;AAC/B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAGrC,MAAM,MAAM,OAAO,GAAG,WAAW,GAAG,UAAU,CAAA;AAE9C,KAAK,WAAW,GAAG;IACjB,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAA;IAC5B,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,CAAA;CACzC,CAAA;AAED,KAAK,UAAU,GAAG;IAChB,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAA;IACxB,QAAQ,CAAC,GAAG,EAAE,UAAU,CAAA;IACxB,qCAAqC;IACrC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAA;CAC1B,CAAA;AAED,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,GAAG;IAC1D,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAA;CAC5B,CAAA;AA+BD,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAG1B,CAAA;AAEF,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAU3B,CAAA"}
+{"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../../types/log.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAA;AAC/B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAGrC,MAAM,MAAM,OAAO,GAAG,WAAW,GAAG,UAAU,CAAA;AAE9C,KAAK,WAAW,GAAG;IACjB,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAA;IAC5B,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,CAAA;CACzC,CAAA;AAED,KAAK,UAAU,GAAG;IAChB,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAA;IACxB,QAAQ,CAAC,GAAG,EAAE,UAAU,CAAA;IACxB,qCAAqC;IACrC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAA;CAC1B,CAAA;AAED,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,GAAG;IAC1D,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAA;CAC5B,CAAA;AA+BD,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAG1B,CAAA;AAEF,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAU3B,CAAA"}

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.43",
+  "version": "0.0.45",
   "description": "Cryptorch EVM extension",
   "keywords": [
     "cryptorch",
@@ -38,10 +38,10 @@
   ],
   "dependencies": {
     "@0xtorch/big-decimal": "^0.0.10",
-    "@0xtorch/core": "^0.0.32",
+    "@0xtorch/core": "^0.0.33",
     "@supercharge/promise-pool": "^3.1.1",
     "viem": "^2.17.3",
-    "zod": "^3.22.4"
+    "zod": "^3.23.8"
   },
   "peerDependencies": {
     "typescript": "^5.3.3"

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>