@0xtorch/evm 0.0.44 → 0.0.46

package/_types/types/address.d.ts

@@ -10,39 +10,42 @@ export declare const evmAddressPremitiveSchema: z.ZodObject<{
 }, "strip", z.ZodTypeAny, {
     chainId: number;
     address: string;
+    abi?: string | undefined;
     label?: string | undefined;
     isSpam?: boolean | undefined;
     appId?: string | undefined;
-    abi?: string | undefined;
 }, {
     chainId: number;
     address: string;
+    abi?: string | undefined;
     label?: string | undefined;
     isSpam?: boolean | undefined;
     appId?: string | undefined;
-    abi?: string | undefined;
 }>;
-export declare const evmAddressSchema: z.ZodObject<{
+export declare const evmAddressSchema: z.ZodObject<z.objectUtil.extendShape<{
     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>;
+}, {
     address: z.ZodEffects<z.ZodString, `0x${Lowercase<string>}`, string>;
     abi: z.ZodOptional<z.ZodEffects<z.ZodString, Abi, string>>;
-}, "strip", z.ZodTypeAny, {
+}>, "strip", z.ZodTypeAny, {
     chainId: number;
     address: `0x${Lowercase<string>}`;
+    abi?: Abi | undefined;
     label?: string | undefined;
     isSpam?: boolean | undefined;
     appId?: string | undefined;
-    abi?: Abi | undefined;
 }, {
     chainId: number;
     address: string;
+    abi?: string | undefined;
     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>;

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

@@ -1 +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"}
+{"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/_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/clients/definitions/viemClient.ts

@@ -3,6 +3,7 @@ import type { AbiEvent } from 'abitype'
 import type {
   Abi,
   ContractFunctionName,
+  createPublicClient,
   GetLogsReturnType,
   MulticallParameters,
   MulticallReturnType,
@@ -24,6 +25,7 @@ import {
   multicall,
   readContract,
 } from '../externals/viem'
+import { createViemClient as createViemMiddleware } from '../externals/viem/middleware'
 import { defineClient } from './defineClient'
 
 type CreateViemClientParameters<TChain extends ViemChain> = {
@@ -37,6 +39,21 @@ export const createViemClient = <TChain extends ViemChain>({
 }: CreateViemClientParameters<TChain>) =>
   defineClient({
     httpRpcCount: httpRpcs.length,
+    call: async <T>(
+      caller: (client: ReturnType<typeof createPublicClient>) => Promise<T>,
+      config:
+        | {
+            readonly timeout?: number
+            readonly logger?: Logger
+          }
+        | undefined,
+    ) =>
+      createViemMiddleware(chain, httpRpcs).wrapper<T>(
+        caller,
+        undefined,
+        config?.timeout,
+        config?.logger,
+      ),
     estimateFeesPerGas: async (type, config) =>
       estimateFeesPerGas({ chain, httpRpcs, type }, config),
     getBalance: async (address, config) =>

package/clients/types.ts

@@ -4,6 +4,7 @@ import type {
   Abi,
   Block,
   ContractFunctionName,
+  createPublicClient,
   FeeValues,
   GetLogsReturnType,
   MulticallParameters,
@@ -17,7 +18,7 @@ import type { Hex, LowerHex } from '../types'
 
 export type Client = {
   readonly httpRpcCount: number
-  // TODO 主要関数を定義する
+  readonly call: FunctionCall
   readonly estimateFeesPerGas: FunctionEstimateFeesPerGas
   readonly getBalance: FunctionGetBalance
   readonly getBlock: FunctionGetBlock
@@ -30,6 +31,16 @@ export type Client = {
   readonly readContract: FunctionReadContract
 }
 
+type PublicClient = ReturnType<typeof createPublicClient>
+
+type FunctionCall = <T>(
+  caller: (client: PublicClient) => Promise<T>,
+  config?: {
+    readonly timeout?: number
+    readonly logger?: Logger
+  },
+) => Promise<T>
+
 type FunctionEstimateFeesPerGas = (
   type?: 'legacy' | 'eip1559',
   config?: {

package/decoder/tests.ts

@@ -6,6 +6,9 @@ import { toLowerHex } from '../types'
 
 const dummyClient: Client = {
   httpRpcCount: 0,
+  call: () => {
+    throw new Error('Not implemented')
+  },
   estimateFeesPerGas: () => {
     throw new Error('Not implemented')
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xtorch/evm",
-  "version": "0.0.44",
+  "version": "0.0.46",
   "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"