genlayer-js 0.4.8 → 0.6.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 
 
+## 0.6.0 (2025-01-09)
+
+
+### Features
+
+* add stateStatus in readContract ([#50](https://github.com/yeagerai/genlayer-js/issues/50)) ([a9bcf8d](https://github.com/yeagerai/genlayer-js/commit/a9bcf8d83890448b85282ceb0c33060a19ea4e9a))
+
+## 0.5.0 (2025-01-08)
+
+
+### Features
+
+* add customtransport to use both wallet and local private keys ([#48](https://github.com/yeagerai/genlayer-js/issues/48)) ([905a123](https://github.com/yeagerai/genlayer-js/commit/905a12358c154e6ae865773b809952c8cc9c75b9))
+
 ## 0.4.8 (2024-12-18)
 
 

package/README.md

@@ -52,6 +52,7 @@ const result = await client.readContract({
   address: contractAddress,
   functionName: 'get_complete_storage',
   args: []
+  stateStatus: "accepted",
 })
 ```
 

package/dist/index.cjs

@@ -4,7 +4,7 @@
 var _chunkIINRDYKFcjs = require('./chunk-IINRDYKF.cjs');
 
 
-var _chunkYI62SDKVcjs = require('./chunk-YI62SDKV.cjs');
+var _chunkX6WK4DK4cjs = require('./chunk-X6WK4DK4.cjs');
 require('./chunk-75ZPJI57.cjs');
 
 // src/client/client.ts
@@ -22,14 +22,14 @@ function accountActions(client) {
         params: [address, amount]
       });
     },
-    getCurrentNonce: async ({ address }) => {
+    getCurrentNonce: async ({ address, block = "latest" }) => {
       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: [addressToUse]
+        params: [addressToUse, block]
       });
     }
   };
@@ -76,7 +76,7 @@ function decodeImpl(data, index) {
     case BigInt(SPECIAL_ADDR): {
       const res = data.slice(index.i, index.i + 20);
       index.i += 20;
-      return new (0, _chunkYI62SDKVcjs.Address)(res);
+      return new (0, _chunkX6WK4DK4cjs.Address)(res);
     }
   }
   const type = Number(cur & 0xffn) & (1 << BITS_IN_TYPE) - 1;
@@ -241,7 +241,7 @@ function encodeImpl(to, data) {
         }
       } else if (data instanceof Map) {
         encodeMap(to, data);
-      } else if (data instanceof _chunkYI62SDKVcjs.Address) {
+      } else if (data instanceof _chunkX6WK4DK4cjs.Address) {
         to.push(SPECIAL_ADDR);
         for (const c of data.bytes) {
           to.push(c);
@@ -265,9 +265,6 @@ function encode(data) {
 function serialize(data) {
   return _viem.toRlp.call(void 0, data.map((param) => _viem.toHex.call(void 0, param)));
 }
-function encodeAndSerialize(data) {
-  return serialize([encode(data)]);
-}
 
 // src/contracts/actions.ts
 var contractActions = (client) => {
@@ -290,12 +287,14 @@ var contractActions = (client) => {
 };
 var overrideContractActions = (client) => {
   client.readContract = async (args) => {
-    const { account, address, functionName, args: params } = args;
-    const encodedData = encodeAndSerialize({ method: functionName, args: params });
+    const { account, address, functionName, args: params, stateStatus = "ACCEPTED" /* ACCEPTED */ } = args;
+    const encodedData = [encode({ method: functionName, args: params }), stateStatus];
+    const serializedData = serialize(encodedData);
+    const senderAddress = _nullishCoalesce(_optionalChain([account, 'optionalAccess', _5 => _5.address]), () => ( _optionalChain([client, 'access', _6 => _6.account, 'optionalAccess', _7 => _7.address])));
     const requestParams = {
       to: address,
-      from: _nullishCoalesce(_optionalChain([account, 'optionalAccess', _5 => _5.address]), () => ( _optionalChain([client, 'access', _6 => _6.account, 'optionalAccess', _7 => _7.address]))),
-      data: encodedData
+      from: senderAddress,
+      data: serializedData
     };
     const result = await client.request({
       method: "eth_call",
@@ -313,12 +312,24 @@ var overrideContractActions = (client) => {
     const data = [encode({ method: functionName, args: params }), leaderOnly];
     const serializedData = serialize(data);
     const senderAccount = account || client.account;
+    if (_optionalChain([senderAccount, 'optionalAccess', _8 => _8.type]) !== "local") {
+      const transaction = {
+        from: _optionalChain([senderAccount, 'optionalAccess', _9 => _9.address]),
+        to: address,
+        data: serializedData,
+        value: `0x${value.toString(16)}`
+      };
+      return await client.request({
+        method: "eth_sendTransaction",
+        params: [transaction]
+      });
+    }
     if (!senderAccount) {
       throw new Error(
         "No account set. Configure the client with an account or pass an account to this function."
       );
     }
-    if (!_optionalChain([senderAccount, 'optionalAccess', _8 => _8.signTransaction])) {
+    if (!_optionalChain([senderAccount, 'optionalAccess', _10 => _10.signTransaction])) {
       throw new Error("Account does not support signTransaction");
     }
     const nonce = await client.getCurrentNonce({ address: senderAccount.address });
@@ -329,23 +340,34 @@ var overrideContractActions = (client) => {
       type: "legacy",
       nonce
     });
-    const result = await client.request({
+    return await client.request({
       method: "eth_sendRawTransaction",
       params: [signedTransaction]
     });
-    return result;
   };
   client.deployContract = async (args) => {
     const { account, code, args: constructorArgs, leaderOnly = false } = args;
     const data = [code, encode({ args: constructorArgs }), leaderOnly];
     const serializedData = serialize(data);
     const senderAccount = account || client.account;
+    if (_optionalChain([senderAccount, 'optionalAccess', _11 => _11.type]) !== "local") {
+      const transaction = {
+        from: _optionalChain([senderAccount, 'optionalAccess', _12 => _12.address]),
+        to: null,
+        data: serializedData,
+        value: "0x0"
+      };
+      return await client.request({
+        method: "eth_sendTransaction",
+        params: [transaction]
+      });
+    }
     if (!senderAccount) {
       throw new Error(
         "No account set. Configure the client with an account or pass an account to this function."
       );
     }
-    if (!_optionalChain([senderAccount, 'optionalAccess', _9 => _9.signTransaction])) {
+    if (!_optionalChain([senderAccount, 'optionalAccess', _13 => _13.signTransaction])) {
       throw new Error("Account does not support signTransaction");
     }
     const nonce = await client.getCurrentNonce({ address: senderAccount.address });
@@ -354,11 +376,10 @@ var overrideContractActions = (client) => {
       type: "legacy",
       nonce
     });
-    const result = await client.request({
+    return await client.request({
       method: "eth_sendRawTransaction",
       params: [signedTransaction]
     });
-    return result;
   };
   return client;
 };
@@ -406,13 +427,48 @@ var transactionActions = (client) => ({
 var createClient = (config = { chain: _chunkIINRDYKFcjs.simulator }) => {
   const chainConfig = config.chain || _chunkIINRDYKFcjs.simulator;
   const rpcUrl = config.endpoint || chainConfig.rpcUrls.default.http[0];
+  const isAddress = typeof config.account !== "object";
+  const customTransport = {
+    async request({ method, params }) {
+      if (method.startsWith("eth_") && isAddress) {
+        try {
+          return await _optionalChain([window, 'access', _14 => _14.ethereum, 'optionalAccess', _15 => _15.request, 'call', _16 => _16({ method, params })]);
+        } catch (err) {
+          console.warn(`Error using window.ethereum for method ${method}:`, err);
+          throw err;
+        }
+      } else {
+        try {
+          const response = await fetch(rpcUrl, {
+            method: "POST",
+            headers: {
+              "Content-Type": "application/json"
+            },
+            body: JSON.stringify({
+              jsonrpc: "2.0",
+              id: Date.now(),
+              method,
+              params
+            })
+          });
+          const data = await response.json();
+          if (data.error) {
+            throw new Error(data.error.message);
+          }
+          return data.result;
+        } catch (err) {
+          console.error(`Error fetching ${method} from GenLayer RPC:`, err);
+          throw err;
+        }
+      }
+    }
+  };
   const baseClient = _viem.createClient.call(void 0, {
     chain: chainConfig,
-    transport: _viem.http.call(void 0, rpcUrl),
+    transport: _viem.custom.call(void 0, customTransport),
     ...config.account ? { account: config.account } : {}
   }).extend(_viem.publicActions).extend((client) => accountActions(client)).extend((client) => transactionActions(client)).extend((client) => contractActions(client));
-  const genLayerClient = overrideContractActions(baseClient);
-  return genLayerClient;
+  return overrideContractActions(baseClient);
 };
 
 // src/accounts/account.ts

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 import * as viem from 'viem';
-import { Account } from 'viem';
+import { Account, Address } from 'viem';
 import { S as SimulatorChain } from './chains-BV4Glo-M.cjs';
 import { GenLayerClient } from './types/index.cjs';
 import * as abitype from 'abitype';
@@ -29,7 +29,7 @@ interface ClientConfig {
         };
     };
     endpoint?: string;
-    account?: Account;
+    account?: Account | Address;
 }
 declare const createClient: (config?: ClientConfig) => GenLayerClient<SimulatorChain>;
 

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as viem from 'viem';
-import { Account } from 'viem';
+import { Account, Address } from 'viem';
 import { S as SimulatorChain } from './chains-BV4Glo-M.js';
 import { GenLayerClient } from './types/index.js';
 import * as abitype from 'abitype';
@@ -29,7 +29,7 @@ interface ClientConfig {
         };
     };
     endpoint?: string;
-    account?: Account;
+    account?: Account | Address;
 }
 declare const createClient: (config?: ClientConfig) => GenLayerClient<SimulatorChain>;
 

package/dist/index.js

@@ -4,11 +4,11 @@ import {
 } from "./chunk-3TYB36DW.js";
 import {
   Address
-} from "./chunk-M7SA3INM.js";
+} from "./chunk-G7EQ6KPE.js";
 import "./chunk-MLKGABMK.js";
 
 // src/client/client.ts
-import { createClient as createViemClient, http, publicActions } from "viem";
+import { createClient as createViemClient, publicActions, custom } from "viem";
 
 // src/accounts/actions.ts
 function accountActions(client) {
@@ -22,14 +22,14 @@ function accountActions(client) {
         params: [address, amount]
       });
     },
-    getCurrentNonce: async ({ address }) => {
+    getCurrentNonce: async ({ address, block = "latest" }) => {
       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: [addressToUse]
+        params: [addressToUse, block]
       });
     }
   };
@@ -265,9 +265,6 @@ function encode(data) {
 function serialize(data) {
   return toRlp(data.map((param) => toHex(param)));
 }
-function encodeAndSerialize(data) {
-  return serialize([encode(data)]);
-}
 
 // src/contracts/actions.ts
 var contractActions = (client) => {
@@ -290,12 +287,14 @@ var contractActions = (client) => {
 };
 var overrideContractActions = (client) => {
   client.readContract = async (args) => {
-    const { account, address, functionName, args: params } = args;
-    const encodedData = encodeAndSerialize({ method: functionName, args: params });
+    const { account, address, functionName, args: params, stateStatus = "ACCEPTED" /* ACCEPTED */ } = args;
+    const encodedData = [encode({ method: functionName, args: params }), stateStatus];
+    const serializedData = serialize(encodedData);
+    const senderAddress = account?.address ?? client.account?.address;
     const requestParams = {
       to: address,
-      from: account?.address ?? client.account?.address,
-      data: encodedData
+      from: senderAddress,
+      data: serializedData
     };
     const result = await client.request({
       method: "eth_call",
@@ -313,6 +312,18 @@ var overrideContractActions = (client) => {
     const data = [encode({ method: functionName, args: params }), leaderOnly];
     const serializedData = serialize(data);
     const senderAccount = account || client.account;
+    if (senderAccount?.type !== "local") {
+      const transaction = {
+        from: senderAccount?.address,
+        to: address,
+        data: serializedData,
+        value: `0x${value.toString(16)}`
+      };
+      return await client.request({
+        method: "eth_sendTransaction",
+        params: [transaction]
+      });
+    }
     if (!senderAccount) {
       throw new Error(
         "No account set. Configure the client with an account or pass an account to this function."
@@ -329,17 +340,28 @@ var overrideContractActions = (client) => {
       type: "legacy",
       nonce
     });
-    const result = await client.request({
+    return await client.request({
       method: "eth_sendRawTransaction",
       params: [signedTransaction]
     });
-    return result;
   };
   client.deployContract = async (args) => {
     const { account, code, args: constructorArgs, leaderOnly = false } = args;
     const data = [code, encode({ args: constructorArgs }), leaderOnly];
     const serializedData = serialize(data);
     const senderAccount = account || client.account;
+    if (senderAccount?.type !== "local") {
+      const transaction = {
+        from: senderAccount?.address,
+        to: null,
+        data: serializedData,
+        value: "0x0"
+      };
+      return await client.request({
+        method: "eth_sendTransaction",
+        params: [transaction]
+      });
+    }
     if (!senderAccount) {
       throw new Error(
         "No account set. Configure the client with an account or pass an account to this function."
@@ -354,11 +376,10 @@ var overrideContractActions = (client) => {
       type: "legacy",
       nonce
     });
-    const result = await client.request({
+    return await client.request({
       method: "eth_sendRawTransaction",
       params: [signedTransaction]
     });
-    return result;
   };
   return client;
 };
@@ -406,13 +427,48 @@ var transactionActions = (client) => ({
 var createClient = (config = { chain: simulator }) => {
   const chainConfig = config.chain || simulator;
   const rpcUrl = config.endpoint || chainConfig.rpcUrls.default.http[0];
+  const isAddress = typeof config.account !== "object";
+  const customTransport = {
+    async request({ method, params }) {
+      if (method.startsWith("eth_") && isAddress) {
+        try {
+          return await window.ethereum?.request({ method, params });
+        } catch (err) {
+          console.warn(`Error using window.ethereum for method ${method}:`, err);
+          throw err;
+        }
+      } else {
+        try {
+          const response = await fetch(rpcUrl, {
+            method: "POST",
+            headers: {
+              "Content-Type": "application/json"
+            },
+            body: JSON.stringify({
+              jsonrpc: "2.0",
+              id: Date.now(),
+              method,
+              params
+            })
+          });
+          const data = await response.json();
+          if (data.error) {
+            throw new Error(data.error.message);
+          }
+          return data.result;
+        } catch (err) {
+          console.error(`Error fetching ${method} from GenLayer RPC:`, err);
+          throw err;
+        }
+      }
+    }
+  };
   const baseClient = createViemClient({
     chain: chainConfig,
-    transport: http(rpcUrl),
+    transport: custom(customTransport),
     ...config.account ? { account: config.account } : {}
   }).extend(publicActions).extend((client) => accountActions(client)).extend((client) => transactionActions(client)).extend((client) => contractActions(client));
-  const genLayerClient = overrideContractActions(baseClient);
-  return genLayerClient;
+  return overrideContractActions(baseClient);
 };
 
 // src/accounts/account.ts

package/dist/types/index.cjs

@@ -1,7 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkYI62SDKVcjs = require('../chunk-YI62SDKV.cjs');
+var _chunkX6WK4DK4cjs = require('../chunk-X6WK4DK4.cjs');
 require('../chunk-75ZPJI57.cjs');
 
 
-exports.TransactionStatus = _chunkYI62SDKVcjs.TransactionStatus;
+exports.TransactionStatus = _chunkX6WK4DK4cjs.TransactionStatus;

package/dist/types/index.d.cts

@@ -118,7 +118,7 @@ type GenLayerMethod = {
     params: [address: string, filter?: "all" | "from" | "to"];
 } | {
     method: "eth_getTransactionCount";
-    params: [address: string];
+    params: [address: string, block: string];
 };
 type GenLayerClient<TSimulatorChain extends SimulatorChain> = Omit<Client<Transport, TSimulatorChain>, "transport" | "getTransaction" | "readContract"> & Omit<PublicActions<Transport, TSimulatorChain>, "readContract" | "getTransaction" | "waitForTransactionReceipt"> & {
     request: Client<Transport, TSimulatorChain>["request"] & {
@@ -131,6 +131,7 @@ type GenLayerClient<TSimulatorChain extends SimulatorChain> = Omit<Client<Transp
         address: Address$1;
         functionName: string;
         args: CalldataEncodable[];
+        stateStatus?: TransactionStatus;
     }) => Promise<unknown>;
     writeContract: (args: {
         account?: Account;

package/dist/types/index.d.ts

@@ -118,7 +118,7 @@ type GenLayerMethod = {
     params: [address: string, filter?: "all" | "from" | "to"];
 } | {
     method: "eth_getTransactionCount";
-    params: [address: string];
+    params: [address: string, block: string];
 };
 type GenLayerClient<TSimulatorChain extends SimulatorChain> = Omit<Client<Transport, TSimulatorChain>, "transport" | "getTransaction" | "readContract"> & Omit<PublicActions<Transport, TSimulatorChain>, "readContract" | "getTransaction" | "waitForTransactionReceipt"> & {
     request: Client<Transport, TSimulatorChain>["request"] & {
@@ -131,6 +131,7 @@ type GenLayerClient<TSimulatorChain extends SimulatorChain> = Omit<Client<Transp
         address: Address$1;
         functionName: string;
         args: CalldataEncodable[];
+        stateStatus?: TransactionStatus;
     }) => Promise<unknown>;
     writeContract: (args: {
         account?: Account;

package/dist/types/index.js

@@ -1,6 +1,6 @@
 import {
   TransactionStatus
-} from "../chunk-M7SA3INM.js";
+} from "../chunk-G7EQ6KPE.js";
 import "../chunk-MLKGABMK.js";
 export {
   TransactionStatus

package/package.json

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

package/src/accounts/actions.ts

@@ -13,16 +13,15 @@ export function accountActions(client: GenLayerClient<SimulatorChain>) {
         params: [address, amount],
       }) as Promise<TransactionHash>;
     },
-    getCurrentNonce: async ({address}: {address: string}): Promise<number> => {
+    getCurrentNonce: async ({address, block = 'latest'}: {address: string, block?: 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: [addressToUse],
+        params: [addressToUse, block],
       }) as Promise<number>;
     },
   };

package/src/client/client.ts

@@ -1,4 +1,4 @@
-import {Account, createClient as createViemClient, http, publicActions} from "viem";
+import {Account, createClient as createViemClient, publicActions, custom, Address} from "viem";
 import {simulator} from "../chains/simulator";
 import {accountActions} from "../accounts/actions";
 import {contractActions, overrideContractActions} from "../contracts/actions";
@@ -10,24 +10,62 @@ interface ClientConfig {
   chain?: {
     id: number;
     name: string;
-    rpcUrls: {default: {http: readonly string[]}};
-    nativeCurrency: {name: string; symbol: string; decimals: number};
-    blockExplorers?: {default: {name: string; url: string}};
+    rpcUrls: { default: { http: readonly string[] } };
+    nativeCurrency: { name: string; symbol: string; decimals: number };
+    blockExplorers?: { default: { name: string; url: string } };
   };
-  endpoint?: string; // Optional: Custom RPC endpoint override
-  account?: Account;
+  endpoint?: string; // Custom RPC endpoint
+  account?: Account | Address;
 }
 
-// Extend Viem client to work with GenLayer-specific chains (simulator, testnet, etc.)
-export const createClient = (config: ClientConfig = {chain: simulator}) => {
-  // Determine the RPC URL based on the provided configuration or default to the simulator's RPC UR
+export const createClient = (config: ClientConfig = { chain: simulator }) => {
   const chainConfig = config.chain || simulator;
   const rpcUrl = config.endpoint || chainConfig.rpcUrls.default.http[0];
+  const isAddress = typeof config.account !== "object";
+
+  const customTransport = {
+      async request({method, params}: {method: string; params: any[]}) {
+        if (method.startsWith('eth_') && isAddress) {
+          try {
+            return await window.ethereum?.request({method, params});
+          } catch (err) {
+            console.warn(`Error using window.ethereum for method ${method}:`, err);
+            throw err;
+          }
+        } else {
+          try {
+            const response = await fetch(rpcUrl, {
+              method: 'POST',
+              headers: {
+                'Content-Type': 'application/json',
+              },
+              body: JSON.stringify({
+                jsonrpc: '2.0',
+                id: Date.now(),
+                method,
+                params,
+              }),
+            });
+
+            const data = await response.json();
+
+            if (data.error) {
+              throw new Error(data.error.message);
+            }
+
+            return data.result;
+          } catch (err) {
+            console.error(`Error fetching ${method} from GenLayer RPC:`, err);
+            throw err;
+          }
+        }
+      },
+    }
+
 
-  // Create a Viem client connected to the GenLayer Simulator (or custom chain)
   const baseClient = createViemClient({
     chain: chainConfig,
-    transport: http(rpcUrl),
+    transport: custom(customTransport),
     ...(config.account ? {account: config.account} : {}),
   })
     .extend(publicActions)
@@ -35,7 +73,7 @@ export const createClient = (config: ClientConfig = {chain: simulator}) => {
     .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<SimulatorChain>);
+  return overrideContractActions(baseClient as unknown as GenLayerClient<SimulatorChain>);
 
-  return genLayerClient;
 };
+

package/src/contracts/actions.ts

@@ -1,6 +1,14 @@
 import {decode} from "@/abi/calldata/decoder";
-import {encode, serialize, encodeAndSerialize} from "@/abi/calldata/encoder";
-import {Account, ContractSchema, SimulatorChain, GenLayerClient, CalldataEncodable, Address} from "@/types";
+import {encode, serialize} from "@/abi/calldata/encoder";
+import {
+  Account,
+  ContractSchema,
+  SimulatorChain,
+  GenLayerClient,
+  CalldataEncodable,
+  Address,
+  TransactionStatus,
+} from "@/types";
 
 export const contractActions = (client: GenLayerClient<SimulatorChain>) => {
   return {
@@ -27,14 +35,18 @@ export const overrideContractActions = (client: GenLayerClient<SimulatorChain>)
     address: Address;
     functionName: string;
     args: CalldataEncodable[];
+    stateStatus?: TransactionStatus;
   }): Promise<unknown> => {
-    const {account, address, functionName, args: params} = args;
-    const encodedData = encodeAndSerialize({method: functionName, args: params});
+    const {account, address, functionName, args: params, stateStatus = TransactionStatus.ACCEPTED} = args;
+    const encodedData = [encode({method: functionName, args: params}), stateStatus];
+    const serializedData = serialize(encodedData);
+
+    const senderAddress = account?.address ?? client.account?.address;
 
     const requestParams = {
       to: address,
-      from: account?.address ?? client.account?.address,
-      data: encodedData,
+      from: senderAddress,
+      data: serializedData,
     };
     const result = await client.request({
       method: "eth_call",
@@ -60,8 +72,22 @@ export const overrideContractActions = (client: GenLayerClient<SimulatorChain>)
     const {account, address, functionName, args: params, value = 0n, leaderOnly = false} = args;
     const data = [encode({method: functionName, args: params}), leaderOnly];
     const serializedData = serialize(data);
-
     const senderAccount = account || client.account;
+
+    if (senderAccount?.type !== "local") {
+      const transaction = {
+        from: senderAccount?.address,
+        to: address,
+        data: serializedData,
+        value: `0x${value.toString(16)}`,
+      };
+
+      return await client.request({
+        method: "eth_sendTransaction",
+        params: [transaction as any],
+      });
+    }
+
     if (!senderAccount) {
       throw new Error(
         "No account set. Configure the client with an account or pass an account to this function.",
@@ -81,11 +107,11 @@ export const overrideContractActions = (client: GenLayerClient<SimulatorChain>)
       type: "legacy",
       nonce,
     });
-    const result = await client.request({
+
+    return await client.request({
       method: "eth_sendRawTransaction",
       params: [signedTransaction],
     });
-    return result;
   };
 
   client.deployContract = async (args: {
@@ -97,8 +123,22 @@ export const overrideContractActions = (client: GenLayerClient<SimulatorChain>)
     const {account, code, args: constructorArgs, leaderOnly = false} = args;
     const data = [code, encode({args: constructorArgs}), leaderOnly];
     const serializedData = serialize(data);
-
     const senderAccount = account || client.account;
+
+    if (senderAccount?.type !== "local") {
+      const transaction = {
+        from: senderAccount?.address,
+        to: null,
+        data: serializedData,
+        value: "0x0",
+      };
+
+      return await client.request({
+        method: "eth_sendTransaction",
+        params: [transaction as any],
+      });
+    }
+
     if (!senderAccount) {
       throw new Error(
         "No account set. Configure the client with an account or pass an account to this function.",
@@ -117,11 +157,10 @@ export const overrideContractActions = (client: GenLayerClient<SimulatorChain>)
       nonce,
     });
 
-    const result = await client.request({
+    return await client.request({
       method: "eth_sendRawTransaction",
       params: [signedTransaction],
     });
-    return result;
   };
 
   return client;

package/src/global.d.ts

@@ -0,0 +1,7 @@
+// global.d.ts
+interface Window {
+  ethereum?: {
+    isMetaMask?: boolean;
+    request: (args: { method: string; params?: unknown[] }) => Promise<unknown>;
+  };
+}

package/src/types/clients.ts

@@ -13,7 +13,7 @@ export type GenLayerMethod =
   | {method: "gen_getContractSchema"; params: [address: string]}
   | {method: "gen_getContractSchemaForCode"; params: [contractCode: string]}
   | {method: "sim_getTransactionsForAddress"; params: [address: string, filter?: "all" | "from" | "to"]}
-  | {method: "eth_getTransactionCount"; params: [address: string]};
+  | {method: "eth_getTransactionCount"; params: [address: string, block: string]};
 
 /*
   Take all the properties from PublicActions<Transport, TSimulatorChain>
@@ -39,6 +39,7 @@ export type GenLayerClient<TSimulatorChain extends SimulatorChain> = Omit<
       address: Address;
       functionName: string;
       args: CalldataEncodable[];
+      stateStatus?: TransactionStatus;
     }) => Promise<unknown>;
     writeContract: (args: {
       account?: Account;

package/tests/client.test.ts

@@ -4,6 +4,7 @@ import {simulator} from "../src/chains/simulator";
 import {Address} from "../src/types/accounts";
 import {createAccount, generatePrivateKey} from "../src/accounts/account";
 import {vi} from "vitest";
+import {TransactionStatus} from "../src/types/transactions";
 
 describe("Client Creation", () => {
   it("should create a client for the simulator", () => {
@@ -18,7 +19,7 @@ describe("Client Overrides", () => {
     const account = createAccount(generatePrivateKey());
     const client = createClient({
       chain: simulator,
-      account,
+      account: account,
     });
 
     // Mock the client.request method
@@ -29,6 +30,7 @@ describe("Client Overrides", () => {
       address: contractAddress as Address,
       functionName: "testFunction",
       args: ["arg1", "arg2"],
+      stateStatus: TransactionStatus.ACCEPTED,
     });
 
     expect(client.request).toHaveBeenCalledWith({
@@ -62,6 +64,7 @@ describe("Client Overrides", () => {
       address: contractAddress as Address,
       functionName: "testFunction",
       args: ["arg1", "arg2"],
+      stateStatus: TransactionStatus.ACCEPTED,
     });
 
     expect(client.request).toHaveBeenCalledWith({
@@ -76,4 +79,33 @@ describe("Client Overrides", () => {
       ],
     });
   });
+  it("should override client account if address is provided", async () => {
+    const account = "0x65e03a3e916CF1dC92d3C8E8186a89CfAB0D2bc2";
+    const client = createClient({
+      chain: simulator,
+      account,
+    });
+
+    // Mock the client.request method
+    vi.spyOn(client, "request").mockResolvedValue(undefined);
+
+    const contractAddress = "0x1234567890123456789012345678901234567890";
+    await client.readContract({
+      address: contractAddress as Address,
+      functionName: "testFunction",
+      args: ["arg1", "arg2"],
+    });
+
+    expect(client.request).toHaveBeenCalledWith({
+      method: "eth_call",
+      params: [
+        {
+          to: contractAddress,
+          from: account,
+          data: expect.any(String),
+        },
+        "latest",
+      ],
+    });
+  });
 });

package/tsconfig.json

@@ -115,5 +115,5 @@
     // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
     "skipLibCheck": true /* Skip type checking all .d.ts files. */
   },
-  "include": ["src/**/*", "tests/**/*"]
+  "include": ["src/**/*", "tests/**/*", "src/global.d.ts"]
 }