genlayer-js 0.3.0 → 0.3.2

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 
 
+## 0.3.2 (2024-11-06)
+
+## 0.3.1 (2024-10-28)
+
 ## 0.3.0 (2024-10-25)
 
 

package/dist/{clients-CJ820ePR.d.ts → clients-ByaMqS8n.d.ts}

@@ -1,4 +1,4 @@
-import { Transport, Account, Client } from 'viem';
+import { Client, Transport, PublicActions, Account } from 'viem';
 import { S as SimulatorChain } from './chains-CtZJFz4Q.js';
 
 type Address$1 = `0x${string}` & {
@@ -74,27 +74,27 @@ type GenLayerMethod = {
     method: "eth_getTransactionCount";
     params: [address: string];
 };
-type GenLayerClient<TTransport extends Transport, TSimulatorChain extends SimulatorChain, TAccount extends Account> = Client<TTransport, TSimulatorChain, TAccount> & {
-    request: Client<TTransport, TSimulatorChain, TAccount>["request"] & {
+type GenLayerClient<TSimulatorChain extends SimulatorChain> = Omit<Client<Transport, TSimulatorChain>, "transport" | "getTransaction" | "readContract"> & Omit<PublicActions<Transport, TSimulatorChain>, "readContract" | "getTransaction"> & {
+    request: Client<Transport, TSimulatorChain>["request"] & {
         <TMethod extends GenLayerMethod>(args: Extract<GenLayerMethod, {
             method: TMethod["method"];
         }>): Promise<unknown>;
     };
     readContract: (args: {
-        account: Account;
+        account?: Account;
         address: Address$1;
         functionName: string;
-        args: any[];
+        args: CalldataEncodable[];
     }) => Promise<any>;
     writeContract: (args: {
-        account: Account;
+        account?: Account;
         address: Address$1;
         functionName: string;
-        args: any[];
+        args: CalldataEncodable[];
         value: bigint;
     }) => Promise<any>;
     deployContract: (args: {
-        account: Account;
+        account?: Account;
         code: string;
         args: CalldataEncodable[];
     }) => Promise<any>;
@@ -104,6 +104,10 @@ type GenLayerClient<TTransport extends Transport, TSimulatorChain extends Simula
     getCurrentNonce: (args: {
         address: string;
     }) => Promise<number>;
+    waitForTransactionReceipt: (args: {
+        hash: TransactionHash;
+        status?: TransactionStatus;
+    }) => Promise<GenLayerTransaction>;
 };
 
 export { type Address$1 as A, type CalldataEncodable as C, type GenLayerClient as G, type MethodDescription as M, type TransactionData as T, type GenLayerMethod as a, type TransactionHash as b, TransactionStatus as c, type GenLayerTransaction as d, type TransactionDataElement as e };

package/dist/{clients-BamlAEcy.d.cts → clients-DiSeCTYZ.d.cts}

@@ -1,4 +1,4 @@
-import { Transport, Account, Client } from 'viem';
+import { Client, Transport, PublicActions, Account } from 'viem';
 import { S as SimulatorChain } from './chains-CtZJFz4Q.cjs';
 
 type Address$1 = `0x${string}` & {
@@ -74,27 +74,27 @@ type GenLayerMethod = {
     method: "eth_getTransactionCount";
     params: [address: string];
 };
-type GenLayerClient<TTransport extends Transport, TSimulatorChain extends SimulatorChain, TAccount extends Account> = Client<TTransport, TSimulatorChain, TAccount> & {
-    request: Client<TTransport, TSimulatorChain, TAccount>["request"] & {
+type GenLayerClient<TSimulatorChain extends SimulatorChain> = Omit<Client<Transport, TSimulatorChain>, "transport" | "getTransaction" | "readContract"> & Omit<PublicActions<Transport, TSimulatorChain>, "readContract" | "getTransaction"> & {
+    request: Client<Transport, TSimulatorChain>["request"] & {
         <TMethod extends GenLayerMethod>(args: Extract<GenLayerMethod, {
             method: TMethod["method"];
         }>): Promise<unknown>;
     };
     readContract: (args: {
-        account: Account;
+        account?: Account;
         address: Address$1;
         functionName: string;
-        args: any[];
+        args: CalldataEncodable[];
     }) => Promise<any>;
     writeContract: (args: {
-        account: Account;
+        account?: Account;
         address: Address$1;
         functionName: string;
-        args: any[];
+        args: CalldataEncodable[];
         value: bigint;
     }) => Promise<any>;
     deployContract: (args: {
-        account: Account;
+        account?: Account;
         code: string;
         args: CalldataEncodable[];
     }) => Promise<any>;
@@ -104,6 +104,10 @@ type GenLayerClient<TTransport extends Transport, TSimulatorChain extends Simula
     getCurrentNonce: (args: {
         address: string;
     }) => Promise<number>;
+    waitForTransactionReceipt: (args: {
+        hash: TransactionHash;
+        status?: TransactionStatus;
+    }) => Promise<GenLayerTransaction>;
 };
 
 export { type Address$1 as A, type CalldataEncodable as C, type GenLayerClient as G, type MethodDescription as M, type TransactionData as T, type GenLayerMethod as a, type TransactionHash as b, TransactionStatus as c, type GenLayerTransaction as d, type TransactionDataElement as e };

package/dist/index.cjs

@@ -23,9 +23,13 @@ function accountActions(client) {
       });
     },
     getCurrentNonce: async ({ address }) => {
+      const addressToUse = address || _optionalChain([client, 'access', _3 => _3.account, 'optionalAccess', _4 => _4.address]);
+      if (!addressToUse) {
+        throw new Error("No address provided and no account is connected");
+      }
       return client.request({
         method: "eth_getTransactionCount",
-        params: [address || _optionalChain([client, 'access', _3 => _3.account, 'optionalAccess', _4 => _4.address])]
+        params: [addressToUse]
       });
     }
   };
@@ -318,14 +322,8 @@ var createClient = (config = { chain: _chunkBAGFDCQEcjs.simulator }) => {
     chain: chainConfig,
     transport: _viem.http.call(void 0, rpcUrl),
     ...config.account ? { account: config.account } : {}
-  }).extend(_viem.publicActions).extend((client) => accountActions(client)).extend(
-    (client) => transactionActions(client)
-  ).extend(
-    (client) => contractActions(client)
-  );
-  const genLayerClient = overrideContractActions(
-    baseClient
-  );
+  }).extend(_viem.publicActions).extend((client) => accountActions(client)).extend((client) => transactionActions(client)).extend((client) => contractActions(client));
+  const genLayerClient = overrideContractActions(baseClient);
   return genLayerClient;
 };
 

package/dist/index.d.cts

@@ -1,7 +1,7 @@
 import * as viem from 'viem';
-import { Transport, Account } from 'viem';
+import { Account } from 'viem';
 import { S as SimulatorChain } from './chains-CtZJFz4Q.cjs';
-import { G as GenLayerClient } from './clients-BamlAEcy.cjs';
+import { G as GenLayerClient } from './clients-DiSeCTYZ.cjs';
 import * as abitype from 'abitype';
 import * as viem__types_experimental_eip7702_types_authorization from 'viem/_types/experimental/eip7702/types/authorization';
 import * as viem_accounts from 'viem/accounts';
@@ -31,7 +31,7 @@ interface ClientConfig {
     endpoint?: string;
     account?: Account;
 }
-declare const createClient: (config?: ClientConfig) => GenLayerClient<Transport, SimulatorChain, Account>;
+declare const createClient: (config?: ClientConfig) => GenLayerClient<SimulatorChain>;
 
 declare const generatePrivateKey: () => `0x${string}`;
 declare const createAccount: (accountPrivateKey?: `0x${string}`) => {

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import * as viem from 'viem';
-import { Transport, Account } from 'viem';
+import { Account } from 'viem';
 import { S as SimulatorChain } from './chains-CtZJFz4Q.js';
-import { G as GenLayerClient } from './clients-CJ820ePR.js';
+import { G as GenLayerClient } from './clients-ByaMqS8n.js';
 import * as abitype from 'abitype';
 import * as viem__types_experimental_eip7702_types_authorization from 'viem/_types/experimental/eip7702/types/authorization';
 import * as viem_accounts from 'viem/accounts';
@@ -31,7 +31,7 @@ interface ClientConfig {
     endpoint?: string;
     account?: Account;
 }
-declare const createClient: (config?: ClientConfig) => GenLayerClient<Transport, SimulatorChain, Account>;
+declare const createClient: (config?: ClientConfig) => GenLayerClient<SimulatorChain>;
 
 declare const generatePrivateKey: () => `0x${string}`;
 declare const createAccount: (accountPrivateKey?: `0x${string}`) => {

package/dist/index.js

@@ -23,9 +23,13 @@ function accountActions(client) {
       });
     },
     getCurrentNonce: async ({ address }) => {
+      const addressToUse = address || client.account?.address;
+      if (!addressToUse) {
+        throw new Error("No address provided and no account is connected");
+      }
       return client.request({
         method: "eth_getTransactionCount",
-        params: [address || client.account?.address]
+        params: [addressToUse]
       });
     }
   };
@@ -318,14 +322,8 @@ var createClient = (config = { chain: simulator }) => {
     chain: chainConfig,
     transport: http(rpcUrl),
     ...config.account ? { account: config.account } : {}
-  }).extend(publicActions).extend((client) => accountActions(client)).extend(
-    (client) => transactionActions(client)
-  ).extend(
-    (client) => contractActions(client)
-  );
-  const genLayerClient = overrideContractActions(
-    baseClient
-  );
+  }).extend(publicActions).extend((client) => accountActions(client)).extend((client) => transactionActions(client)).extend((client) => contractActions(client));
+  const genLayerClient = overrideContractActions(baseClient);
   return genLayerClient;
 };
 

package/dist/types/index.cjs

@@ -3,9 +3,5 @@
 var _chunkYI62SDKVcjs = require('../chunk-YI62SDKV.cjs');
 require('../chunk-75ZPJI57.cjs');
 
-// src/types/accounts.ts
-var _viem = require('viem');
 
-
-
-exports.Account = _viem.Account; exports.TransactionStatus = _chunkYI62SDKVcjs.TransactionStatus;
+exports.TransactionStatus = _chunkYI62SDKVcjs.TransactionStatus;

package/dist/types/index.d.cts

@@ -1,4 +1,4 @@
-export { A as Address, C as CalldataEncodable, G as GenLayerClient, a as GenLayerMethod, d as GenLayerTransaction, M as MethodDescription, T as TransactionData, e as TransactionDataElement, b as TransactionHash, c as TransactionStatus } from '../clients-BamlAEcy.cjs';
+export { A as Address, C as CalldataEncodable, G as GenLayerClient, a as GenLayerMethod, d as GenLayerTransaction, M as MethodDescription, T as TransactionData, e as TransactionDataElement, b as TransactionHash, c as TransactionStatus } from '../clients-DiSeCTYZ.cjs';
 export { S as SimulatorChain } from '../chains-CtZJFz4Q.cjs';
 export { Account } from 'viem';
 

package/dist/types/index.d.ts

@@ -1,4 +1,4 @@
-export { A as Address, C as CalldataEncodable, G as GenLayerClient, a as GenLayerMethod, d as GenLayerTransaction, M as MethodDescription, T as TransactionData, e as TransactionDataElement, b as TransactionHash, c as TransactionStatus } from '../clients-CJ820ePR.js';
+export { A as Address, C as CalldataEncodable, G as GenLayerClient, a as GenLayerMethod, d as GenLayerTransaction, M as MethodDescription, T as TransactionData, e as TransactionDataElement, b as TransactionHash, c as TransactionStatus } from '../clients-ByaMqS8n.js';
 export { S as SimulatorChain } from '../chains-CtZJFz4Q.js';
 export { Account } from 'viem';
 

package/dist/types/index.js

@@ -2,10 +2,6 @@ import {
   TransactionStatus
 } from "../chunk-M7SA3INM.js";
 import "../chunk-MLKGABMK.js";
-
-// src/types/accounts.ts
-import { Account } from "viem";
 export {
-  Account,
   TransactionStatus
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "genlayer-js",
   "type": "module",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "GenLayer JavaScript SDK",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/accounts/actions.ts

@@ -6,7 +6,7 @@ export function accountActions<
   transport extends Transport = Transport,
   chain extends SimulatorChain | undefined = SimulatorChain | undefined,
   account extends Account | undefined = Account | undefined,
->(client: GenLayerClient<Transport, SimulatorChain, Account>) {
+>(client: GenLayerClient<SimulatorChain>) {
   return {
     fundAccount: async ({address, amount}: {address: string; amount: number}): Promise<TransactionHash> => {
       if (client.chain?.id !== simulator.id) {
@@ -19,9 +19,15 @@ export function accountActions<
       }) as Promise<TransactionHash>;
     },
     getCurrentNonce: async ({address}: {address: string}): Promise<number> => {
+      const addressToUse = address || client.account?.address;
+
+      if (!addressToUse) {
+        throw new Error("No address provided and no account is connected");
+      }
+
       return client.request({
         method: "eth_getTransactionCount",
-        params: [address || client.account?.address],
+        params: [addressToUse],
       }) as Promise<number>;
     },
   };

package/src/client/client.ts

@@ -1,4 +1,4 @@
-import {Account, createClient as createViemClient, http, publicActions, Transport} from "viem";
+import {Account, createClient as createViemClient, http, publicActions} from "viem";
 import {simulator} from "../chains/simulator";
 import {accountActions} from "../accounts/actions";
 import {contractActions, overrideContractActions} from "../contracts/actions";
@@ -31,17 +31,11 @@ export const createClient = (config: ClientConfig = {chain: simulator}) => {
     ...(config.account ? {account: config.account} : {}),
   })
     .extend(publicActions)
-    .extend(client => accountActions(client as unknown as GenLayerClient<Transport, SimulatorChain, Account>))
-    .extend(client =>
-      transactionActions(client as unknown as GenLayerClient<Transport, SimulatorChain, Account>),
-    )
-    .extend(client =>
-      contractActions(client as unknown as GenLayerClient<Transport, SimulatorChain, Account>),
-    );
+    .extend(client => accountActions(client as unknown as GenLayerClient<SimulatorChain>))
+    .extend(client => transactionActions(client as unknown as GenLayerClient<SimulatorChain>))
+    .extend(client => contractActions(client as unknown as GenLayerClient<SimulatorChain>));
 
-  const genLayerClient = overrideContractActions(
-    baseClient as unknown as GenLayerClient<Transport, SimulatorChain, Account>,
-  );
+  const genLayerClient = overrideContractActions(baseClient as unknown as GenLayerClient<SimulatorChain>);
 
   return genLayerClient;
 };

package/src/contracts/actions.ts

@@ -1,9 +1,7 @@
-import {Transport, Account, Address} from "viem";
-
 import {encode, serialize, encodeAndSerialize} from "@/abi/calldata/encoder";
-import {ContractSchema, SimulatorChain, GenLayerClient, CalldataEncodable} from "@/types";
+import {Account, ContractSchema, SimulatorChain, GenLayerClient, CalldataEncodable, Address} from "@/types";
 
-export const contractActions = (client: GenLayerClient<Transport, SimulatorChain, Account>) => {
+export const contractActions = (client: GenLayerClient<SimulatorChain>) => {
   return {
     getContractSchema: async (address: string): Promise<ContractSchema> => {
       const schema = (await client.request({
@@ -22,9 +20,9 @@ export const contractActions = (client: GenLayerClient<Transport, SimulatorChain
   };
 };
 
-export const overrideContractActions = (client: GenLayerClient<Transport, SimulatorChain, Account>) => {
+export const overrideContractActions = (client: GenLayerClient<SimulatorChain>) => {
   client.readContract = async (args: {
-    account: Account;
+    account?: Account;
     address: Address;
     functionName: string;
     args: CalldataEncodable[];
@@ -45,7 +43,7 @@ export const overrideContractActions = (client: GenLayerClient<Transport, Simula
   };
 
   client.writeContract = async (args: {
-    account: Account;
+    account?: Account;
     address: Address;
     functionName: string;
     args: CalldataEncodable[];
@@ -81,7 +79,7 @@ export const overrideContractActions = (client: GenLayerClient<Transport, Simula
     return result;
   };
 
-  client.deployContract = async (args: {account: Account; code: string; args: CalldataEncodable[]}) => {
+  client.deployContract = async (args: {account?: Account; code: string; args: CalldataEncodable[]}) => {
     const {account, code, args: constructorArgs} = args;
     const data = [code, encode({args: constructorArgs})];
     const serializedData = serialize(data);

package/src/transactions/actions.ts

@@ -2,13 +2,9 @@ import {GenLayerClient} from "../types/clients";
 import {TransactionHash, TransactionStatus, GenLayerTransaction} from "../types/transactions";
 import {transactionsConfig} from "../config/transactions";
 import {sleep} from "../utils/async";
-import {ITransactionActions} from "./ITransactionActions";
-import {Account, Transport} from "viem";
 import {SimulatorChain} from "@/types";
 
-export const transactionActions = (
-  client: GenLayerClient<Transport, SimulatorChain, Account>,
-): ITransactionActions => ({
+export const transactionActions = (client: GenLayerClient<SimulatorChain>) => ({
   waitForTransactionReceipt: async ({
     hash,
     status = TransactionStatus.FINALIZED,
@@ -20,7 +16,7 @@ export const transactionActions = (
     interval?: number;
     retries?: number;
   }): Promise<GenLayerTransaction> => {
-    const transaction = (await client.getTransaction({hash})) as GenLayerTransaction;
+    const transaction = await client.getTransaction({hash});
 
     if (!transaction) {
       throw new Error("Transaction not found");

package/src/types/accounts.ts

@@ -1,2 +1,2 @@
-export {Account} from "viem";
+export type {Account} from "viem";
 export type Address = `0x${string}` & {length: 42};

package/src/types/clients.ts

@@ -1,7 +1,7 @@
-import {Account, Transport, Client} from "viem";
-import {GenLayerTransaction, TransactionHash} from "./transactions";
+import {Transport, Client, PublicActions} from "viem";
+import {GenLayerTransaction, TransactionHash, TransactionStatus} from "./transactions";
 import {SimulatorChain} from "./chains";
-import {Address} from "./accounts";
+import {Address, Account} from "./accounts";
 import {CalldataEncodable} from "./calldata";
 
 export type GenLayerMethod =
@@ -13,30 +13,40 @@ export type GenLayerMethod =
   | {method: "gen_getContractSchemaForCode"; params: [contractCode: string]}
   | {method: "eth_getTransactionCount"; params: [address: string]};
 
-export type GenLayerClient<
-  TTransport extends Transport,
-  TSimulatorChain extends SimulatorChain,
-  TAccount extends Account,
-> = Client<TTransport, TSimulatorChain, TAccount> & {
-  request: Client<TTransport, TSimulatorChain, TAccount>["request"] & {
-    <TMethod extends GenLayerMethod>(
-      args: Extract<GenLayerMethod, {method: TMethod["method"]}>,
-    ): Promise<unknown>;
+/*
+  Take all the properties from PublicActions<Transport, TSimulatorChain>
+  Remove the transport, readContract, and getTransaction properties
+  The resulting type will have everything from PublicActions EXCEPT those
+  two properties which are added later
+*/
+export type GenLayerClient<TSimulatorChain extends SimulatorChain> = Omit<
+  Client<Transport, TSimulatorChain>,
+  "transport" | "getTransaction" | "readContract"
+> &
+  Omit<PublicActions<Transport, TSimulatorChain>, "readContract" | "getTransaction"> & {
+    request: Client<Transport, TSimulatorChain>["request"] & {
+      <TMethod extends GenLayerMethod>(
+        args: Extract<GenLayerMethod, {method: TMethod["method"]}>,
+      ): Promise<unknown>;
+    };
+    readContract: (args: {
+      account?: Account;
+      address: Address;
+      functionName: string;
+      args: CalldataEncodable[];
+    }) => Promise<any>;
+    writeContract: (args: {
+      account?: Account;
+      address: Address;
+      functionName: string;
+      args: CalldataEncodable[];
+      value: bigint;
+    }) => Promise<any>;
+    deployContract: (args: {account?: Account; code: string; args: CalldataEncodable[]}) => Promise<any>;
+    getTransaction: (args: {hash: TransactionHash}) => Promise<GenLayerTransaction>;
+    getCurrentNonce: (args: {address: string}) => Promise<number>;
+    waitForTransactionReceipt: (args: {
+      hash: TransactionHash;
+      status?: TransactionStatus;
+    }) => Promise<GenLayerTransaction>;
   };
-  readContract: (args: {
-    account: Account;
-    address: Address;
-    functionName: string;
-    args: any[];
-  }) => Promise<any>;
-  writeContract: (args: {
-    account: Account;
-    address: Address;
-    functionName: string;
-    args: any[];
-    value: bigint;
-  }) => Promise<any>;
-  deployContract: (args: {account: Account; code: string; args: CalldataEncodable[]}) => Promise<any>;
-  getTransaction: (args: {hash: TransactionHash}) => Promise<GenLayerTransaction>;
-  getCurrentNonce: (args: {address: string}) => Promise<number>;
-};