@vlayer/sdk 0.1.0-nightly-20241022-004c3c4 → 0.1.0-nightly-20241028-74b5b0d

package/package.json

@@ -2,7 +2,7 @@
   "name": "@vlayer/sdk",
   "type": "module",
   "exports": "./src/index.ts",
-  "version": "0.1.0-nightly-20241022-004c3c4",
+  "version": "0.1.0-nightly-20241028-74b5b0d",
   "types": "src/index.ts",
   "scripts": {
     "build": "npm run gen:types",

package/src/api/helpers.ts

@@ -1,6 +1,8 @@
 import {
   type Abi,
+  Account,
   type Address,
+  type Chain,
   type ContractFunctionArgs,
   type ContractFunctionName,
   createTestClient,
@@ -10,6 +12,7 @@ import {
   publicActions,
   PublicClient,
   walletActions,
+  WriteContractParameters,
 } from "viem";
 
 import { privateKeyToAccount, generatePrivateKey } from "viem/accounts";
@@ -132,20 +135,27 @@ export async function writeContract<
   functionName: F,
   args: ContractFunctionArgs<T, "payable" | "nonpayable", F>,
   sender?: Address,
-  chainId: number = foundry.id,
+  chain: Chain = foundry,
 ) {
-  const ethClient = createAnvilClient(chainId);
+  const ethClient = createAnvilClient(chain.id);
   const selectedSender = sender || (await ethClient.getAddresses())[0];
 
   const txHash = await ethClient.writeContract({
-    abi,
     address,
+    abi: abi as Abi,
     functionName,
-    args,
+    args: args as readonly unknown[],
+    chain,
     account: selectedSender,
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  } as any);
-  // TODO: fix any to viem type
+    chainOverride: undefined,
+  } as WriteContractParameters<
+    Abi,
+    ContractFunctionName<Abi, "nonpayable" | "payable">,
+    ContractFunctionArgs<Abi, "nonpayable" | "payable", F>,
+    Chain | undefined,
+    Account | undefined,
+    Chain | undefined
+  >);
 
   const txReceipt = await ethClient.waitForTransactionReceipt({ hash: txHash });
 

package/src/api/lib/types/vlayer.ts

@@ -1,6 +1,5 @@
 import {
   Abi,
-  AbiFunction,
   AbiStateMutability,
   Address,
   ContractFunctionArgs,
@@ -46,10 +45,7 @@ export interface VCallResponse {
 }
 
 export type VlayerClient = {
-  prove: <
-    T extends readonly [AbiFunction, ...Abi[number][]],
-    F extends ContractFunctionName<T>,
-  >(args: {
+  prove: <T extends Abi, F extends ContractFunctionName<T>>(args: {
     address: Hex;
     proverAbi: T;
     functionName: F;

package/src/api/lib/types/webProofProvider.ts

@@ -1,4 +1,4 @@
-import { AbiFunction, Hex, Abi, ContractFunctionName } from "viem";
+import { Hex, Abi, ContractFunctionName } from "viem";
 import type { ContractFunctionArgsWithout } from "./viem";
 import { Branded, WebProof, WebProofStep } from "../../../web-proof-commons";
 
@@ -15,7 +15,7 @@ export type WebProofSetup = Branded<
 >;
 
 export type ProverCallCommitment<
-  T extends readonly [AbiFunction, ...Abi[number][]],
+  T extends Abi,
   F extends ContractFunctionName<T>,
 > = {
   address: Hex;
@@ -26,17 +26,14 @@ export type ProverCallCommitment<
 };
 
 export type GetWebProofArgs<
-  T extends readonly [AbiFunction, ...Abi[number][]],
+  T extends Abi,
   F extends ContractFunctionName<T>,
 > = {
   proverCallCommitment: ProverCallCommitment<T, F>;
 } & WebProofSetupInput;
 
 export type WebProofProvider = {
-  getWebProof: <
-    T extends readonly [AbiFunction, ...Abi[number][]],
-    F extends ContractFunctionName<T>,
-  >(
+  getWebProof: <T extends Abi, F extends ContractFunctionName<T>>(
     args: GetWebProofArgs<T, F>,
   ) => Promise<WebProof>;
 };

package/src/api/prover.ts

@@ -1,6 +1,5 @@
 import {
   type Abi,
-  AbiFunction,
   AbiStateMutability,
   type Address,
   ContractFunctionArgs,
@@ -12,10 +11,7 @@ import { type CallContext, type CallParams } from "types/vlayer";
 import { v_call } from "./v_call";
 import { foundry } from "viem/chains";
 
-export async function prove<
-  T extends readonly [AbiFunction, ...Abi[number][]],
-  F extends ContractFunctionName<T>,
->(
+export async function prove<T extends Abi, F extends ContractFunctionName<T>>(
   prover: Address,
   abi: T,
   functionName: F,