genlayer-js 0.9.0 → 0.9.2

package/src/wallet/connect.ts

@@ -1,22 +1,26 @@
-import { localnet } from "@/chains/localnet";
-import { GenLayerClient, SimulatorChain } from "@/types";
-import { Network } from "@/types/network";
-import { SnapSource } from "@/types/snapSource";
-import { snapID } from "@/config/snapID";
+import {localnet} from "@/chains/localnet";
+import {studionet} from "@/chains/studionet";
+import {testnetAsimov} from "@/chains/testnetAsimov";
+import {GenLayerClient, GenLayerChain} from "@/types";
+import {Network} from "@/types/network";
+import {SnapSource} from "@/types/snapSource";
+import {snapID} from "@/config/snapID";
 
 const networks = {
   localnet,
+  studionet,
+  testnetAsimov,
 };
 
 export const connect = async (
-  client: GenLayerClient<SimulatorChain>,
-  network: Network = "localnet",
-  snapSource: SnapSource = 'npm'
+  client: GenLayerClient<GenLayerChain>,
+  network: Network = "studionet",
+  snapSource: SnapSource = "npm",
 ): Promise<void> => {
   if (!window.ethereum) {
     throw new Error("MetaMask is not installed.");
   }
-  if (network === "testnet" || network === "mainnet") {
+  if (network === "mainnet") {
     throw new Error(`${network} is not available yet. Please use localnet.`);
   }
 
@@ -34,7 +38,7 @@ export const connect = async (
     blockExplorerUrls: [selectedNetwork.blockExplorers?.default.url],
   };
 
-  const currentChainId = await window.ethereum.request({ method: "eth_chainId" });
+  const currentChainId = await window.ethereum.request({method: "eth_chainId"});
   if (currentChainId !== chainIdHex) {
     await window.ethereum.request({
       method: "wallet_addEthereumChain",
@@ -42,15 +46,13 @@ export const connect = async (
     });
     await window.ethereum.request({
       method: "wallet_switchEthereumChain",
-      params: [{ chainId: chainIdHex }],
+      params: [{chainId: chainIdHex}],
     });
   }
 
-  const id = snapSource === 'local' ? snapID.local : snapID.npm;
-  const installedSnaps: any = await window.ethereum.request({ method: "wallet_getSnaps" });
-  const isGenLayerSnapInstalled = Object.values(installedSnaps).some(
-    (snap: any) => snap.id === id
-  );
+  const id = snapSource === "local" ? snapID.local : snapID.npm;
+  const installedSnaps: any = await window.ethereum.request({method: "wallet_getSnaps"});
+  const isGenLayerSnapInstalled = Object.values(installedSnaps).some((snap: any) => snap.id === id);
 
   if (!isGenLayerSnapInstalled) {
     await window.ethereum.request({

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 };