genlayer-js 0.9.1 → 0.9.2

package/src/chains/{testnet.ts → testnetAsimov.ts}

@@ -3,7 +3,7 @@ import {GenLayerChain} from "@/types";
 
 // chains/localnet.ts
 const TESTNET_JSON_RPC_URL = " http://34.32.169.58:9151";
-
+const EXPLORER_URL = "https://explorer-asimov.genlayer.com/";
 const CONSENSUS_MAIN_CONTRACT = {
   address: "0x174782d5819dD26F3d6967c995EE43db7DB824F8" as Address,
   abi: [
@@ -3988,9 +3988,9 @@ const CONSENSUS_DATA_CONTRACT = {
   bytecode: "",
 };
 
-export const testnet: GenLayerChain = defineChain({
+export const testnetAsimov: GenLayerChain = defineChain({
   id: 0x107d,
-  name: "Genlayer Testnet",
+  name: "Genlayer Asimov Testnet",
   rpcUrls: {
     default: {
       http: [TESTNET_JSON_RPC_URL],
@@ -4003,8 +4003,8 @@ export const testnet: GenLayerChain = defineChain({
   },
   blockExplorers: {
     default: {
-      name: "GenLayer Explorer",
-      url: "https://explorer-asimov.genlayer.com",
+      name: "GenLayer Asimov Explorer",
+      url: EXPLORER_URL,
     },
   },
   testnet: true,

package/src/contracts/actions.ts

@@ -1,7 +1,15 @@
 import * as calldata from "@/abi/calldata";
 import {serialize} from "@/abi/transactions";
 import {localnet} from "@/chains/localnet";
-import {Account, ContractSchema, GenLayerChain, GenLayerClient, CalldataEncodable, Address} from "@/types";
+import {
+  Account,
+  ContractSchema,
+  GenLayerChain,
+  GenLayerClient,
+  CalldataEncodable,
+  Address,
+  TransactionHashVariant,
+} from "@/types";
 import {fromHex, toHex, zeroAddress, encodeFunctionData, PublicClient, parseEventLogs} from "viem";
 
 function makeCalldataObject(
@@ -71,8 +79,17 @@ export const contractActions = (client: GenLayerClient<GenLayerChain>, publicCli
       kwargs?: Map<string, CalldataEncodable> | {[key: string]: CalldataEncodable};
       rawReturn?: RawReturn;
       leaderOnly?: boolean;
+      transactionHashVariant?: TransactionHashVariant;
     }): Promise<RawReturn extends true ? `0x${string}` : CalldataEncodable> => {
-      const {account, address, functionName, args: callArgs, kwargs, leaderOnly = false} = args;
+      const {
+        account,
+        address,
+        functionName,
+        args: callArgs,
+        kwargs,
+        leaderOnly = false,
+        transactionHashVariant = TransactionHashVariant.LATEST_FINAL,
+      } = args;
       const encodedData = [calldata.encode(makeCalldataObject(functionName, callArgs, kwargs)), leaderOnly];
       const serializedData = serialize(encodedData);
 
@@ -83,7 +100,7 @@ export const contractActions = (client: GenLayerClient<GenLayerChain>, publicCli
         to: address,
         from: senderAddress,
         data: serializedData,
-        transaction_hash_variant: "latest-final",
+        transaction_hash_variant: transactionHashVariant,
       };
       const result = await client.request({
         method: "gen_call",
@@ -233,6 +250,12 @@ const _sendTransaction = async ({
   const serializedTransaction = await senderAccount.signTransaction(transactionRequest);
 
   const txHash = await client.sendRawTransaction({serializedTransaction: serializedTransaction});
+
+  // TODO: remove this once DXP-298 is merged
+  if (client.chain.id === localnet.id) {
+    return txHash;
+  }
+
   const receipt = await publicClient.waitForTransactionReceipt({hash: txHash});
 
   if (receipt.status === "reverted") {

package/src/transactions/actions.ts

@@ -68,6 +68,16 @@ export const receiptActions = (client: GenLayerClient<GenLayerChain>, publicClie
 
 export const transactionActions = (client: GenLayerClient<GenLayerChain>, publicClient: PublicClient) => ({
   getTransaction: async ({hash}: {hash: TransactionHash}): Promise<GenLayerTransaction> => {
+    // TODO: remove this once DXP-298 is merged
+    if (client.chain.id === localnet.id) {
+      const transaction = await client.getTransaction({hash});
+      const localnetStatus =
+        (transaction.status as string) === "ACTIVATED" ? TransactionStatus.PENDING : transaction.status;
+
+      transaction.status = Number(transactionsStatusNameToNumber[localnetStatus as TransactionStatus]);
+      transaction.statusName = localnetStatus as TransactionStatus;
+      return _decodeLocalnetTransaction(transaction as unknown as GenLayerTransaction);
+    }
     const transaction = (await publicClient.readContract({
       address: client.chain.consensusDataContract?.address as Address,
       abi: client.chain.consensusDataContract?.abi as Abi,
@@ -175,13 +185,14 @@ const _decodeTransaction = (tx: GenLayerRawTransaction): GenLayerTransaction =>
 };
 
 const _decodeLocalnetTransaction = (tx: GenLayerTransaction): GenLayerTransaction => {
+  if (!tx.data) return tx;
   try {
     const leaderReceipt = tx.consensus_data?.leader_receipt;
     if (leaderReceipt) {
-      if (leaderReceipt.result) {
+      if (leaderReceipt.result && typeof leaderReceipt.result === "string") {
         leaderReceipt.result = resultToUserFriendlyJson(leaderReceipt.result);
       }
-      if (leaderReceipt.calldata) {
+      if (leaderReceipt.calldata && typeof leaderReceipt.calldata === "string") {
         leaderReceipt.calldata = {
           base64: leaderReceipt.calldata as string,
           ...calldataToUserFriendlyJson(b64ToArray(leaderReceipt.calldata as string)),
@@ -196,7 +207,7 @@ const _decodeLocalnetTransaction = (tx: GenLayerTransaction): GenLayerTransactio
         );
       }
     }
-    if (tx.data?.calldata) {
+    if (tx.data?.calldata && typeof tx.data.calldata === "string") {
       tx.data.calldata = {
         base64: tx.data.calldata as string,
         ...calldataToUserFriendlyJson(b64ToArray(tx.data.calldata as string)),

package/src/types/network.ts

@@ -1 +1 @@
-export type Network = 'localnet' | 'testnet' | 'mainnet';
+export type Network = "localnet" | "studionet" | "testnetAsimov" | "mainnet";

package/src/types/transactions.ts

@@ -119,6 +119,11 @@ export const voteTypeNameToNumber = {
 
 export type TransactionType = "deploy" | "call";
 
+export enum TransactionHashVariant {
+  LATEST_FINAL = "latest-final",
+  LATEST_NONFINAL = "latest-nonfinal",
+}
+
 export type DecodedDeployData = {
   code?: Hex;
   constructorArgs?: any; // Type this more strictly if possible

package/src/wallet/connect.ts

@@ -1,4 +1,6 @@
 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";
@@ -6,17 +8,19 @@ import {snapID} from "@/config/snapID";
 
 const networks = {
   localnet,
+  studionet,
+  testnetAsimov,
 };
 
 export const connect = async (
   client: GenLayerClient<GenLayerChain>,
-  network: Network = "localnet",
+  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.`);
   }
 

package/dist/index-BM9hOtGg.d.cts

@@ -1,13 +0,0 @@
-import { G as GenLayerChain } from './chains-BYSCF33g.cjs';
-
-declare const localnet: GenLayerChain;
-
-declare const testnet: GenLayerChain;
-
-declare const index_localnet: typeof localnet;
-declare const index_testnet: typeof testnet;
-declare namespace index {
-  export { index_localnet as localnet, index_testnet as testnet };
-}
-
-export { index as i, localnet as l, testnet as t };

package/dist/index-C7Colsnk.d.ts

@@ -1,13 +0,0 @@
-import { G as GenLayerChain } from './chains-BYSCF33g.js';
-
-declare const localnet: GenLayerChain;
-
-declare const testnet: GenLayerChain;
-
-declare const index_localnet: typeof localnet;
-declare const index_testnet: typeof testnet;
-declare namespace index {
-  export { index_localnet as localnet, index_testnet as testnet };
-}
-
-export { index as i, localnet as l, testnet as t };