genlayer-js 0.9.0 → 0.9.1

package/tests/client.test.ts

@@ -6,6 +6,13 @@ import {createAccount, generatePrivateKey} from "../src/accounts/account";
 import {vi} from "vitest";
 import {TransactionStatus} from "../src/types/transactions";
 
+// Setup fetch mock
+const mockFetch = vi.fn();
+vi.stubGlobal("fetch", mockFetch);
+
+// Store for gen_call parameters received by mockFetch
+let lastGenCallParams: any = null;
+
 describe("Client Creation", () => {
   it("should create a client for the localnet", () => {
     const client = createClient({chain: localnet});
@@ -15,6 +22,65 @@ describe("Client Creation", () => {
 });
 
 describe("Client Overrides", () => {
+  beforeEach(() => {
+    mockFetch.mockReset();
+    lastGenCallParams = null; // Reset for each test
+
+    mockFetch.mockImplementation(async (url, options) => {
+      let body = {};
+      const bodyString = typeof options?.body === "string" ? options.body : null;
+
+      if (bodyString) {
+        try {
+          body = JSON.parse(bodyString);
+        } catch (e) {
+          console.error("[TESTS] mockFetch: Failed to parse bodyString:", bodyString, "Error:", e);
+          // Return a generic error if body parsing fails
+          return {
+            ok: false,
+            status: 500,
+            json: async () => ({error: {message: "mockFetch body parse error"}}),
+          };
+        }
+      }
+
+      const method = (body as any).method;
+      // console.log(`[TESTS] mockFetch called: URL=${url}, Method=${method}, Body=`, body); // Optional: keep for debugging
+
+      if (method === "sim_getConsensusContract") {
+        // console.log("[TESTS] mockFetch: Handling sim_getConsensusContract");
+        return {
+          ok: true,
+          json: async () => ({
+            result: {
+              address: "0x0000000000000000000000000000000000000001",
+              abi: [],
+            },
+          }),
+        };
+      } else if (method === "gen_call") {
+        // console.log("[TESTS] mockFetch: Handling gen_call");
+        lastGenCallParams = (body as any).params; // Store the params for gen_call
+        return {
+          ok: true,
+          json: async () => ({result: "0"}),
+        };
+      }
+
+      console.warn(`[TESTS] mockFetch: Unhandled method - URL=${url}, Method=${method}, Body=`, body);
+      return {
+        ok: false,
+        status: 404, // Not Found for unhandled methods
+        json: async () => ({error: {message: `Unexpected fetch mock call to method: ${method}`}}),
+      };
+    });
+  });
+
+  afterEach(() => {
+    // Restore any spies if they weren't restored in tests
+    vi.restoreAllMocks();
+  });
+
   it("should default to client account if no account is provided", async () => {
     const account = createAccount(generatePrivateKey());
     const client = createClient({
@@ -22,41 +88,37 @@ describe("Client Overrides", () => {
       account: account,
     });
 
-    // Mock the client.request method
-    vi.spyOn(client, "request").mockResolvedValue("0x00");
+    // const requestSpy = vi.spyOn(client, "request"); // Removed spy
 
     const contractAddress = "0x1234567890123456789012345678901234567890";
     await client.readContract({
       address: contractAddress as Address,
       functionName: "testFunction",
       args: ["arg1", "arg2"],
-      stateStatus: TransactionStatus.ACCEPTED,
+      stateStatus: TransactionStatus.ACCEPTED, // Kept as is, matches type, ignored by current gen_call impl.
     });
 
-    expect(client.request).toHaveBeenCalledWith({
-      method: "eth_call",
-      params: [
-        {
-          to: contractAddress,
-          from: account.address,
-          data: expect.any(String),
-        },
-        "latest",
-      ],
-    });
+    expect(lastGenCallParams).toEqual([
+      {
+        type: "read",
+        to: contractAddress,
+        from: account.address,
+        data: expect.any(String), // The data is complex, checking type is often sufficient
+        transaction_hash_variant: "latest-final",
+      },
+    ]);
   });
 
   it("should override client account if account is provided", async () => {
-    const account = createAccount(generatePrivateKey());
+    const clientInternalAccount = createAccount(generatePrivateKey()); // Renamed for clarity
     const client = createClient({
       chain: localnet,
-      account,
+      account: clientInternalAccount,
     });
 
     const overrideAccount = createAccount(generatePrivateKey());
 
-    // Mock the client.request method
-    vi.spyOn(client, "request").mockResolvedValue("0x00");
+    // const requestSpy = vi.spyOn(client, "request"); // Removed spy
 
     const contractAddress = "0x1234567890123456789012345678901234567890";
     await client.readContract({
@@ -67,45 +129,43 @@ describe("Client Overrides", () => {
       stateStatus: TransactionStatus.ACCEPTED,
     });
 
-    expect(client.request).toHaveBeenCalledWith({
-      method: "eth_call",
-      params: [
-        {
-          to: contractAddress,
-          from: overrideAccount.address,
-          data: expect.any(String),
-        },
-        "latest",
-      ],
-    });
+    expect(lastGenCallParams).toEqual([
+      {
+        type: "read",
+        to: contractAddress,
+        from: overrideAccount.address,
+        data: expect.any(String),
+        transaction_hash_variant: "latest-final",
+      },
+    ]);
   });
-  it("should override client account if address is provided", async () => {
-    const account = "0x65e03a3e916CF1dC92d3C8E8186a89CfAB0D2bc2";
+
+  it("should use client account if account is an address string and no override", async () => {
+    // Clarified title
+    const accountAddressString = "0x65e03a3e916CF1dC92d3C8E8186a89CfAB0D2bc2";
     const client = createClient({
       chain: localnet,
-      account,
+      account: accountAddressString, // Client's account is an address string
     });
 
-    // Mock the client.request method
-    vi.spyOn(client, "request").mockResolvedValue("0x00");
+    // const requestSpy = vi.spyOn(client, "request"); // Removed spy
 
     const contractAddress = "0x1234567890123456789012345678901234567890";
     await client.readContract({
       address: contractAddress as Address,
       functionName: "testFunction",
       args: ["arg1", "arg2"],
+      // No stateStatus, no account override in this specific call to readContract
     });
 
-    expect(client.request).toHaveBeenCalledWith({
-      method: "eth_call",
-      params: [
-        {
-          to: contractAddress,
-          from: account,
-          data: expect.any(String),
-        },
-        "latest",
-      ],
-    });
+    expect(lastGenCallParams).toEqual([
+      {
+        type: "read",
+        to: contractAddress,
+        from: accountAddressString, // Expecting the address string directly
+        data: expect.any(String),
+        transaction_hash_variant: "latest-final",
+      },
+    ]);
   });
 });

package/dist/chains-C5PI_Nr_.d.cts

@@ -1,13 +0,0 @@
-import { Chain } from 'viem';
-
-type SimulatorChain = Chain & {
-    consensusMainContract: {
-        address: string;
-        abi: any[];
-        bytecode: string;
-    } | null;
-    defaultNumberOfInitialValidators: number;
-    defaultConsensusMaxRotations: number;
-};
-
-export type { SimulatorChain as S };

package/dist/chains-C5PI_Nr_.d.ts

@@ -1,13 +0,0 @@
-import { Chain } from 'viem';
-
-type SimulatorChain = Chain & {
-    consensusMainContract: {
-        address: string;
-        abi: any[];
-        bytecode: string;
-    } | null;
-    defaultNumberOfInitialValidators: number;
-    defaultConsensusMaxRotations: number;
-};
-
-export type { SimulatorChain as S };

package/dist/chunk-I6HC44KD.cjs

@@ -1,72 +0,0 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});
-
-var _chunk75ZPJI57cjs = require('./chunk-75ZPJI57.cjs');
-
-// src/chains/index.ts
-var chains_exports = {};
-_chunk75ZPJI57cjs.__export.call(void 0, chains_exports, {
-  localnet: () => localnet,
-  simulator: () => simulator
-});
-
-// src/chains/localnet.ts
-var _viem = require('viem');
-var SIMULATOR_JSON_RPC_URL = "http://127.0.0.1:4000/api";
-var localnet = _viem.defineChain.call(void 0, {
-  id: 61999,
-  name: "Genlayer Localnet",
-  rpcUrls: {
-    default: {
-      http: [SIMULATOR_JSON_RPC_URL]
-    }
-  },
-  nativeCurrency: {
-    name: "GEN Token",
-    symbol: "GEN",
-    decimals: 18
-  },
-  blockExplorers: {
-    default: {
-      name: "GenLayer Explorer",
-      url: SIMULATOR_JSON_RPC_URL
-    }
-  },
-  testnet: true,
-  consensusMainContract: null,
-  defaultNumberOfInitialValidators: 5,
-  defaultConsensusMaxRotations: 3
-});
-
-// src/chains/simulator.ts
-
-var SIMULATOR_JSON_RPC_URL2 = "http://127.0.0.1:4000/api";
-var simulator = _viem.defineChain.call(void 0, {
-  id: 61999,
-  name: "GenLayer Simulator",
-  rpcUrls: {
-    default: {
-      http: [SIMULATOR_JSON_RPC_URL2]
-    }
-  },
-  nativeCurrency: {
-    name: "GEN Token",
-    symbol: "GEN",
-    decimals: 18
-  },
-  blockExplorers: {
-    default: {
-      name: "GenLayer Explorer",
-      url: SIMULATOR_JSON_RPC_URL2
-    }
-  },
-  testnet: true,
-  consensusMainContract: null,
-  defaultNumberOfInitialValidators: 5,
-  defaultConsensusMaxRotations: 3
-});
-
-
-
-
-
-exports.localnet = localnet; exports.simulator = simulator; exports.chains_exports = chains_exports;

package/dist/chunk-K72OSU5N.js

@@ -1,28 +0,0 @@
-// src/types/calldata.ts
-var CalldataAddress = class {
-  bytes;
-  constructor(addr) {
-    if (addr.length != 20) {
-      throw new Error(`invalid address length ${addr}`);
-    }
-    this.bytes = addr;
-  }
-};
-
-// src/types/transactions.ts
-var TransactionStatus = /* @__PURE__ */ ((TransactionStatus2) => {
-  TransactionStatus2["PENDING"] = "PENDING";
-  TransactionStatus2["CANCELED"] = "CANCELED";
-  TransactionStatus2["PROPOSING"] = "PROPOSING";
-  TransactionStatus2["COMMITTING"] = "COMMITTING";
-  TransactionStatus2["REVEALING"] = "REVEALING";
-  TransactionStatus2["ACCEPTED"] = "ACCEPTED";
-  TransactionStatus2["FINALIZED"] = "FINALIZED";
-  TransactionStatus2["UNDETERMINED"] = "UNDETERMINED";
-  return TransactionStatus2;
-})(TransactionStatus || {});
-
-export {
-  CalldataAddress,
-  TransactionStatus
-};

package/dist/chunk-WEXFFND6.js

@@ -1,72 +0,0 @@
-import {
-  __export
-} from "./chunk-MLKGABMK.js";
-
-// src/chains/index.ts
-var chains_exports = {};
-__export(chains_exports, {
-  localnet: () => localnet,
-  simulator: () => simulator
-});
-
-// src/chains/localnet.ts
-import { defineChain } from "viem";
-var SIMULATOR_JSON_RPC_URL = "http://127.0.0.1:4000/api";
-var localnet = defineChain({
-  id: 61999,
-  name: "Genlayer Localnet",
-  rpcUrls: {
-    default: {
-      http: [SIMULATOR_JSON_RPC_URL]
-    }
-  },
-  nativeCurrency: {
-    name: "GEN Token",
-    symbol: "GEN",
-    decimals: 18
-  },
-  blockExplorers: {
-    default: {
-      name: "GenLayer Explorer",
-      url: SIMULATOR_JSON_RPC_URL
-    }
-  },
-  testnet: true,
-  consensusMainContract: null,
-  defaultNumberOfInitialValidators: 5,
-  defaultConsensusMaxRotations: 3
-});
-
-// src/chains/simulator.ts
-import { defineChain as defineChain2 } from "viem";
-var SIMULATOR_JSON_RPC_URL2 = "http://127.0.0.1:4000/api";
-var simulator = defineChain2({
-  id: 61999,
-  name: "GenLayer Simulator",
-  rpcUrls: {
-    default: {
-      http: [SIMULATOR_JSON_RPC_URL2]
-    }
-  },
-  nativeCurrency: {
-    name: "GEN Token",
-    symbol: "GEN",
-    decimals: 18
-  },
-  blockExplorers: {
-    default: {
-      name: "GenLayer Explorer",
-      url: SIMULATOR_JSON_RPC_URL2
-    }
-  },
-  testnet: true,
-  consensusMainContract: null,
-  defaultNumberOfInitialValidators: 5,
-  defaultConsensusMaxRotations: 3
-});
-
-export {
-  localnet,
-  simulator,
-  chains_exports
-};

package/dist/chunk-YDFRDDP5.cjs

@@ -1,28 +0,0 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});// src/types/calldata.ts
-var CalldataAddress = class {
-  
-  constructor(addr) {
-    if (addr.length != 20) {
-      throw new Error(`invalid address length ${addr}`);
-    }
-    this.bytes = addr;
-  }
-};
-
-// src/types/transactions.ts
-var TransactionStatus = /* @__PURE__ */ ((TransactionStatus2) => {
-  TransactionStatus2["PENDING"] = "PENDING";
-  TransactionStatus2["CANCELED"] = "CANCELED";
-  TransactionStatus2["PROPOSING"] = "PROPOSING";
-  TransactionStatus2["COMMITTING"] = "COMMITTING";
-  TransactionStatus2["REVEALING"] = "REVEALING";
-  TransactionStatus2["ACCEPTED"] = "ACCEPTED";
-  TransactionStatus2["FINALIZED"] = "FINALIZED";
-  TransactionStatus2["UNDETERMINED"] = "UNDETERMINED";
-  return TransactionStatus2;
-})(TransactionStatus || {});
-
-
-
-
-exports.CalldataAddress = CalldataAddress; exports.TransactionStatus = TransactionStatus;

package/dist/index-B8E0qiOq.d.cts

@@ -1,13 +0,0 @@
-import { S as SimulatorChain } from './chains-C5PI_Nr_.cjs';
-
-declare const localnet: SimulatorChain;
-
-declare const simulator: SimulatorChain;
-
-declare const index_localnet: typeof localnet;
-declare const index_simulator: typeof simulator;
-declare namespace index {
-  export { index_localnet as localnet, index_simulator as simulator };
-}
-
-export { index as i, localnet as l, simulator as s };

package/dist/index-BCbofn6t.d.cts

@@ -1,188 +0,0 @@
-import { S as SimulatorChain } from './chains-C5PI_Nr_.cjs';
-import { Client, Transport, WalletActions, PublicActions, Account } from 'viem';
-
-type Address = `0x${string}` & {
-    length: 42;
-};
-
-declare class CalldataAddress {
-    bytes: Uint8Array;
-    constructor(addr: Uint8Array);
-}
-type CalldataEncodable = null | boolean | CalldataAddress | number | bigint | string | Uint8Array | Array<CalldataEncodable> | Map<string, CalldataEncodable> | {
-    [key: string]: CalldataEncodable;
-};
-type MethodDescription = {
-    method: string;
-    args: Array<CalldataEncodable>;
-};
-type TransactionDataElement$1 = string | number | bigint | boolean | Uint8Array;
-
-type TransactionHash = `0x${string}` & {
-    length: 66;
-};
-declare enum TransactionStatus {
-    PENDING = "PENDING",
-    CANCELED = "CANCELED",
-    PROPOSING = "PROPOSING",
-    COMMITTING = "COMMITTING",
-    REVEALING = "REVEALING",
-    ACCEPTED = "ACCEPTED",
-    FINALIZED = "FINALIZED",
-    UNDETERMINED = "UNDETERMINED"
-}
-type GenLayerTransaction = {
-    hash: TransactionHash;
-    status: TransactionStatus;
-    from_address?: string;
-    to_address?: string;
-    data?: Record<string, unknown>;
-    consensus_data?: {
-        final: boolean;
-        leader_receipt?: {
-            calldata: string;
-            class_name: string;
-            contract_state: string;
-            eq_outputs: Record<string, unknown>;
-            error: string | null;
-            execution_result: string;
-            gas_used: number;
-            mode: string;
-            node_config: Record<string, unknown>;
-            pending_transactions: unknown[];
-            vote: string;
-            result: string;
-        };
-        validators?: Record<string, unknown>[];
-        votes?: Record<string, string>;
-    };
-    nonce?: number;
-    value?: number;
-    type?: number;
-    gaslimit?: bigint;
-    created_at?: Date;
-    r?: number;
-    s?: number;
-    v?: number;
-};
-type TransactionDataElement = string | number | bigint | boolean | Uint8Array;
-
-type ContractParamsArraySchemaElement = ContractParamsSchema | {
-    $rep: ContractParamsSchema;
-};
-type ContractParamsSchema = "null" | "bool" | "int" | "address" | "string" | "bytes" | "any" | "array" | "dict" | {
-    $or: ContractParamsSchema[];
-} | {
-    $dict: ContractParamsSchema;
-} | {
-    [key: string]: ContractParamsSchema;
-} | ContractParamsArraySchemaElement[];
-interface ContractMethodBase {
-    params: [string, ContractParamsSchema][];
-    kwparams: {
-        [key: string]: ContractParamsSchema;
-    };
-}
-interface ContractMethod extends ContractMethodBase {
-    ret: ContractParamsSchema;
-    readonly: boolean;
-}
-type ContractSchema = {
-    ctor: ContractMethodBase;
-    methods: ContractMethod[];
-};
-
-type Network = 'localnet' | 'testnet' | 'mainnet';
-
-type SnapSource = 'npm' | 'local';
-
-type MetaMaskClientResult = {
-    isFlask: boolean;
-    installedSnaps: Record<string, any>;
-    isGenLayerSnapInstalled: boolean;
-};
-
-type GenLayerMethod = {
-    method: "sim_fundAccount";
-    params: [address: string, amount: number];
-} | {
-    method: "eth_getTransactionByHash";
-    params: [hash: TransactionHash];
-} | {
-    method: "eth_call";
-    params: [requestParams: any, blockNumberOrHash: string];
-} | {
-    method: "eth_sendRawTransaction";
-    params: [signedTransaction: string];
-} | {
-    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, block: string];
-};
-type GenLayerClient<TSimulatorChain extends SimulatorChain> = Omit<Client<Transport, TSimulatorChain>, "transport" | "getTransaction" | "readContract"> & Omit<WalletActions<TSimulatorChain>, "deployContract" | "writeContract"> & Omit<PublicActions<Transport, TSimulatorChain>, "readContract" | "getTransaction" | "waitForTransactionReceipt"> & {
-    request: Client<Transport, TSimulatorChain>["request"] & {
-        <TMethod extends GenLayerMethod>(args: Extract<GenLayerMethod, {
-            method: TMethod["method"];
-        }>): Promise<unknown>;
-    };
-    readContract: <RawReturn extends boolean | undefined>(args: {
-        account?: Account;
-        address: Address;
-        functionName: string;
-        stateStatus?: TransactionStatus;
-        args?: CalldataEncodable[];
-        kwargs?: Map<string, CalldataEncodable> | {
-            [key: string]: CalldataEncodable;
-        };
-        rawReturn?: RawReturn;
-    }) => Promise<RawReturn extends true ? `0x${string}` : CalldataEncodable>;
-    writeContract: (args: {
-        account?: Account;
-        address: Address;
-        functionName: string;
-        args?: CalldataEncodable[];
-        kwargs?: Map<string, CalldataEncodable> | {
-            [key: string]: CalldataEncodable;
-        };
-        value: bigint;
-        leaderOnly?: boolean;
-        consensusMaxRotations?: number;
-    }) => Promise<any>;
-    deployContract: (args: {
-        account?: Account;
-        code: string | Uint8Array;
-        args?: CalldataEncodable[];
-        kwargs?: Map<string, CalldataEncodable> | {
-            [key: string]: CalldataEncodable;
-        };
-        leaderOnly?: boolean;
-        consensusMaxRotations?: number;
-    }) => Promise<`0x${string}`>;
-    getTransaction: (args: {
-        hash: TransactionHash;
-    }) => Promise<GenLayerTransaction>;
-    getCurrentNonce: (args: {
-        address: string;
-    }) => Promise<number>;
-    waitForTransactionReceipt: (args: {
-        hash: TransactionHash;
-        status?: TransactionStatus;
-        interval?: number;
-        retries?: number;
-    }) => Promise<GenLayerTransaction>;
-    getContractSchema: (address: string) => Promise<ContractSchema>;
-    getContractSchemaForCode: (contractCode: string | Uint8Array) => Promise<ContractSchema>;
-    initializeConsensusSmartContract: (forceReset?: boolean) => Promise<void>;
-    connect: (network?: Network, snapSource?: SnapSource) => Promise<void>;
-    metamaskClient: (snapSource?: SnapSource) => Promise<MetaMaskClientResult>;
-};
-
-export { type Address as A, type CalldataEncodable as C, type GenLayerClient as G, type MethodDescription as M, type Network as N, type SnapSource as S, type TransactionDataElement$1 as T, CalldataAddress as a, type GenLayerMethod as b, type ContractParamsArraySchemaElement as c, type ContractParamsSchema as d, type ContractMethodBase as e, type ContractMethod as f, type ContractSchema as g, type TransactionHash as h, TransactionStatus as i, type GenLayerTransaction as j, type TransactionDataElement as k };