genlayer-js 0.13.0 → 0.14.1

package/dist/types/index.d.cts

@@ -1,3 +1,3 @@
 export { Account, Address } from 'viem';
-export { a as CalldataAddress, C as CalldataEncodable, f as ContractMethod, e as ContractMethodBase, c as ContractParamsArraySchemaElement, d as ContractParamsSchema, g as ContractSchema, q as DecodedCallData, D as DecodedDeployData, G as GenLayerClient, b as GenLayerMethod, s as GenLayerRawTransaction, r as GenLayerTransaction, H as Hash, M as MethodDescription, N as Network, S as SnapSource, h as TransactionHash, p as TransactionHashVariant, j as TransactionResult, m as TransactionResultNameToNumber, i as TransactionStatus, o as TransactionType, V as VoteType, l as transactionResultNumberToName, k as transactionsStatusNameToNumber, t as transactionsStatusNumberToName, n as voteTypeNameToNumber, v as voteTypeNumberToName } from '../index-icLJcrDm.cjs';
+export { d as CalldataAddress, C as CalldataEncodable, i as ContractMethod, h as ContractMethodBase, f as ContractParamsArraySchemaElement, g as ContractParamsSchema, j as ContractSchema, a as DecodedCallData, D as DecodedDeployData, G as GenLayerClient, e as GenLayerMethod, b as GenLayerRawTransaction, c as GenLayerTransaction, H as Hash, M as MethodDescription, N as Network, S as SnapSource, k as TransactionHash, s as TransactionHashVariant, m as TransactionResult, p as TransactionResultNameToNumber, l as TransactionStatus, r as TransactionType, V as VoteType, o as transactionResultNumberToName, n as transactionsStatusNameToNumber, t as transactionsStatusNumberToName, q as voteTypeNameToNumber, v as voteTypeNumberToName } from '../index-IViMPpkl.cjs';
 export { G as GenLayerChain } from '../chains-BYSCF33g.cjs';

package/dist/types/index.d.ts

@@ -1,3 +1,3 @@
 export { Account, Address } from 'viem';
-export { a as CalldataAddress, C as CalldataEncodable, f as ContractMethod, e as ContractMethodBase, c as ContractParamsArraySchemaElement, d as ContractParamsSchema, g as ContractSchema, q as DecodedCallData, D as DecodedDeployData, G as GenLayerClient, b as GenLayerMethod, s as GenLayerRawTransaction, r as GenLayerTransaction, H as Hash, M as MethodDescription, N as Network, S as SnapSource, h as TransactionHash, p as TransactionHashVariant, j as TransactionResult, m as TransactionResultNameToNumber, i as TransactionStatus, o as TransactionType, V as VoteType, l as transactionResultNumberToName, k as transactionsStatusNameToNumber, t as transactionsStatusNumberToName, n as voteTypeNameToNumber, v as voteTypeNumberToName } from '../index-TWCEN45Z.js';
+export { d as CalldataAddress, C as CalldataEncodable, i as ContractMethod, h as ContractMethodBase, f as ContractParamsArraySchemaElement, g as ContractParamsSchema, j as ContractSchema, a as DecodedCallData, D as DecodedDeployData, G as GenLayerClient, e as GenLayerMethod, b as GenLayerRawTransaction, c as GenLayerTransaction, H as Hash, M as MethodDescription, N as Network, S as SnapSource, k as TransactionHash, s as TransactionHashVariant, m as TransactionResult, p as TransactionResultNameToNumber, l as TransactionStatus, r as TransactionType, V as VoteType, o as transactionResultNumberToName, n as transactionsStatusNameToNumber, t as transactionsStatusNumberToName, q as voteTypeNameToNumber, v as voteTypeNumberToName } from '../index-CgHl4W-5.js';
 export { G as GenLayerChain } from '../chains-BYSCF33g.js';

package/package.json

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

package/src/abi/calldata/encoder.ts

@@ -140,3 +140,39 @@ export function encode(data: CalldataEncodable): Uint8Array {
   encodeImpl(arr, data);
   return new Uint8Array(arr);
 }
+
+// Constructs a calldata object for contract calls, omitting empty args/kwargs for compactness.
+export function makeCalldataObject(
+  method: string | undefined,
+  args: CalldataEncodable[] | undefined,
+  kwargs: {[key: string]: CalldataEncodable} | Map<string, CalldataEncodable> | undefined,
+): CalldataEncodable {
+  let ret: {[key: string]: CalldataEncodable} = {};
+
+  if (method) {
+    ret["method"] = method;
+  }
+
+  if (args && args.length > 0) {
+    ret["args"] = args;
+  }
+
+  if (kwargs) {
+    if (kwargs instanceof Map) {
+      if (kwargs.size > 0) {
+        ret["kwargs"] = kwargs;
+      }
+    } else {
+      let hasVal = false;
+      for (const _k in kwargs) {
+        hasVal = true;
+        break;
+      }
+      if (hasVal) {
+        ret["kwargs"] = kwargs;
+      }
+    }
+  }
+
+  return ret;
+}

package/src/contracts/actions.ts

@@ -12,43 +12,6 @@ import {
 } from "@/types";
 import {fromHex, toHex, zeroAddress, encodeFunctionData, PublicClient, parseEventLogs} from "viem";
 
-function makeCalldataObject(
-  method: string | undefined,
-  args: CalldataEncodable[] | undefined,
-  kwargs: {[key: string]: CalldataEncodable} | Map<string, CalldataEncodable> | undefined,
-): CalldataEncodable {
-  // this method omits args or kwargs if they are empty
-  // it reduces transaction size
-  let ret: {[key: string]: CalldataEncodable} = {};
-
-  if (method) {
-    ret["method"] = method;
-  }
-
-  if (args && args.length > 0) {
-    ret["args"] = args;
-  }
-
-  if (kwargs) {
-    if (kwargs instanceof Map) {
-      if (kwargs.size > 0) {
-        ret["kwargs"] = kwargs;
-      }
-    } else {
-      let hasVal = false;
-      for (const _k in kwargs) {
-        hasVal = true;
-        break;
-      }
-      if (hasVal) {
-        ret["kwargs"] = kwargs;
-      }
-    }
-  }
-
-  return ret;
-}
-
 export const contractActions = (client: GenLayerClient<GenLayerChain>, publicClient: PublicClient) => {
   return {
     getContractSchema: async (address: Address): Promise<ContractSchema> => {
@@ -91,7 +54,7 @@ export const contractActions = (client: GenLayerClient<GenLayerChain>, publicCli
         transactionHashVariant = TransactionHashVariant.LATEST_NONFINAL,
       } = args;
 
-      const encodedData = [calldata.encode(makeCalldataObject(functionName, callArgs, kwargs)), leaderOnly];
+      const encodedData = [calldata.encode(calldata.makeCalldataObject(functionName, callArgs, kwargs)), leaderOnly];
       const serializedData = serialize(encodedData);
 
       const senderAddress = account?.address ?? client.account?.address;
@@ -135,7 +98,7 @@ export const contractActions = (client: GenLayerClient<GenLayerChain>, publicCli
         leaderOnly = false,
         consensusMaxRotations = client.chain.defaultConsensusMaxRotations,
       } = args;
-      const data = [calldata.encode(makeCalldataObject(functionName, callArgs, kwargs)), leaderOnly];
+      const data = [calldata.encode(calldata.makeCalldataObject(functionName, callArgs, kwargs)), leaderOnly];
       const serializedData = serialize(data);
       const senderAccount = account || client.account;
       const encodedData = _encodeAddTransactionData({
@@ -171,7 +134,7 @@ export const contractActions = (client: GenLayerClient<GenLayerChain>, publicCli
       } = args;
       const data = [
         code,
-        calldata.encode(makeCalldataObject(undefined, constructorArgs, kwargs)),
+        calldata.encode(calldata.makeCalldataObject(undefined, constructorArgs, kwargs)),
         leaderOnly,
       ];
       const serializedData = serialize(data);
@@ -284,6 +247,7 @@ const _sendTransaction = async ({
     type: "legacy",
     nonce: Number(nonce),
     value: value,
+    gas: 21000n,
   });
 
   if (validatedSenderAccount?.type !== "local") {

package/src/index.ts

@@ -1,5 +1,11 @@
 // src/index.ts
 export {createClient} from "./client/client";
 export {createAccount, generatePrivateKey} from "./accounts/account";
+export {
+  decodeInputData,
+  decodeTransaction,
+  simplifyTransactionReceipt,
+  decodeLocalnetTransaction
+} from "./transactions/decoders";
 export * as chains from "./chains";
 export * as abi from "./abi";

package/src/transactions/actions.ts

@@ -5,41 +5,15 @@ import {
   GenLayerTransaction,
   GenLayerRawTransaction,
   transactionsStatusNameToNumber,
-  transactionsStatusNumberToName,
-  transactionResultNumberToName,
-  VoteType,
-  voteTypeNumberToName,
-  DecodedCallData,
-  DecodedDeployData,
 } from "../types/transactions";
 import {transactionsConfig} from "../config/transactions";
 import {sleep} from "../utils/async";
 import {GenLayerChain} from "@/types";
-import {b64ToArray, calldataToUserFriendlyJson, resultToUserFriendlyJson} from "@/utils/jsonifier";
-import {Abi, PublicClient, fromRlp, fromHex, Hex, Address} from "viem";
-import * as calldataAbi from "@/abi/calldata";
+import {Abi, PublicClient, Address} from "viem";
 import {localnet} from "@/chains/localnet";
+import {decodeLocalnetTransaction, decodeTransaction, simplifyTransactionReceipt} from "./decoders";
 
-// Fields to remove from simplified transaction receipts
-const FIELDS_TO_REMOVE = [
-  "raw", "contract_state", "base64", "consensus_history", "tx_data",
-  "eq_blocks_outputs", "r", "s", "v", "created_timestamp",
-  "current_timestamp", "tx_execution_hash", "random_seed", "states",
-  "contract_code", "appeal_failed", "appeal_leader_timeout",
-  "appeal_processing_time", "appeal_undetermined", "appealed",
-  "timestamp_appeal", "config_rotation_rounds", "rotation_count",
-  "queue_position", "queue_type", "leader_timeout_validators",
-  "triggered_by", "num_of_initial_validators",
-  "timestamp_awaiting_finalization", "last_vote_timestamp",
-  "read_state_block_range", "tx_slot", "blockHash", "blockNumber",
-  "to", "transactionIndex"
-];
 
-// Field name mappings for cross-language compatibility with genlayer-py
-const FIELD_NAME_MAPPINGS: Record<string, string> = {
-  statusName: "status_name",
-  typeHex: "type"
-};
 
 export const receiptActions = (client: GenLayerClient<GenLayerChain>, publicClient: PublicClient) => ({
   waitForTransactionReceipt: async ({
@@ -71,10 +45,10 @@ export const receiptActions = (client: GenLayerClient<GenLayerChain>, publicClie
     ) {
       let finalTransaction = transaction;
       if (client.chain.id === localnet.id) {
-        finalTransaction = _decodeLocalnetTransaction(transaction as unknown as GenLayerTransaction);
+        finalTransaction = decodeLocalnetTransaction(transaction as unknown as GenLayerTransaction);
       }
       if (!fullTransaction) {
-        return _simplifyTransactionReceipt(finalTransaction as GenLayerTransaction);
+        return simplifyTransactionReceipt(finalTransaction as GenLayerTransaction);
       }
       return finalTransaction;
     }
@@ -103,7 +77,7 @@ export const transactionActions = (client: GenLayerClient<GenLayerChain>, public
 
       transaction.status = Number(transactionsStatusNameToNumber[localnetStatus as TransactionStatus]);
       transaction.statusName = localnetStatus as TransactionStatus;
-      return _decodeLocalnetTransaction(transaction as unknown as GenLayerTransaction);
+      return decodeLocalnetTransaction(transaction as unknown as GenLayerTransaction);
     }
     const transaction = (await publicClient.readContract({
       address: client.chain.consensusDataContract?.address as Address,
@@ -114,256 +88,8 @@ export const transactionActions = (client: GenLayerClient<GenLayerChain>, public
         Math.round(new Date().getTime() / 1000), // unix seconds
       ],
     })) as unknown as GenLayerRawTransaction;
-    return _decodeTransaction(transaction);
+    return decodeTransaction(transaction);
   },
 });
 
-const _decodeInputData = (
-  rlpEncodedAppData: Hex | undefined | null,
-  recipient: Address,
-): DecodedDeployData | DecodedCallData | null => {
-  if (!rlpEncodedAppData || rlpEncodedAppData === "0x" || rlpEncodedAppData.length <= 2) {
-    return null;
-  }
-  try {
-    const rlpDecodedArray = fromRlp(rlpEncodedAppData) as Hex[];
 
-    if (rlpDecodedArray.length === 3) {
-      return {
-        code: fromHex(rlpDecodedArray[0], "string") as `0x${string}`,
-        constructorArgs:
-          rlpDecodedArray[1] && rlpDecodedArray[1] !== "0x"
-            ? calldataAbi.decode(fromHex(rlpDecodedArray[1], "bytes"))
-            : null,
-        leaderOnly: rlpDecodedArray[2] === "0x01",
-        type: "deploy",
-        contractAddress: recipient,
-      };
-    } else if (rlpDecodedArray.length === 2) {
-      return {
-        callData:
-          rlpDecodedArray[0] && rlpDecodedArray[0] !== "0x"
-            ? calldataAbi.decode(fromHex(rlpDecodedArray[0], "bytes"))
-            : null,
-        leaderOnly: rlpDecodedArray[1] === "0x01",
-        type: "call",
-      };
-    } else {
-      console.warn(
-        "[decodeInputData] WRITE: Unexpected RLP array length:",
-        rlpDecodedArray.length,
-        rlpDecodedArray,
-      );
-      return null;
-    }
-  } catch (e) {
-    console.error(
-      "[decodeInputData] Error during comprehensive decoding:",
-      e,
-      "Raw RLP App Data:",
-      rlpEncodedAppData,
-    );
-    return null;
-  }
-};
-
-const _decodeTransaction = (tx: GenLayerRawTransaction): GenLayerTransaction => {
-  const txDataDecoded = _decodeInputData(tx.txData, tx.recipient);
-
-  const decodedTx = {
-    ...tx,
-    txData: tx.txData,
-    txDataDecoded: txDataDecoded,
-
-    currentTimestamp: tx.currentTimestamp.toString(),
-    numOfInitialValidators: tx.numOfInitialValidators.toString(),
-    txSlot: tx.txSlot.toString(),
-    createdTimestamp: tx.createdTimestamp.toString(),
-    lastVoteTimestamp: tx.lastVoteTimestamp.toString(),
-    queuePosition: tx.queuePosition.toString(),
-    numOfRounds: tx.numOfRounds.toString(),
-
-    readStateBlockRange: {
-      ...tx.readStateBlockRange,
-      activationBlock: tx.readStateBlockRange.activationBlock.toString(),
-      processingBlock: tx.readStateBlockRange.processingBlock.toString(),
-      proposalBlock: tx.readStateBlockRange.proposalBlock.toString(),
-    },
-
-    statusName:
-      transactionsStatusNumberToName[String(tx.status) as keyof typeof transactionsStatusNumberToName],
-    resultName:
-      transactionResultNumberToName[String(tx.result) as keyof typeof transactionResultNumberToName],
-
-    lastRound: {
-      ...tx.lastRound,
-      round: tx.lastRound.round.toString(),
-      leaderIndex: tx.lastRound.leaderIndex.toString(),
-      votesCommitted: tx.lastRound.votesCommitted.toString(),
-      votesRevealed: tx.lastRound.votesRevealed.toString(),
-      appealBond: tx.lastRound.appealBond.toString(),
-      rotationsLeft: tx.lastRound.rotationsLeft.toString(),
-      validatorVotesName: tx.lastRound.validatorVotes.map(
-        vote => voteTypeNumberToName[String(vote) as keyof typeof voteTypeNumberToName],
-      ) as VoteType[],
-    },
-  };
-  return decodedTx as GenLayerTransaction;
-};
-
-const _simplifyTransactionReceipt = (tx: GenLayerTransaction): GenLayerTransaction => {
-  /**
-   * Simplify transaction receipt by removing non-essential fields while preserving functionality.
-   *
-   * Removes: Binary data, internal timestamps, appeal fields, processing details, historical data
-   * Preserves: Transaction IDs, status, execution results, node configs, readable data
-   */
-  const simplifyObject = (obj: any, path = ""): any => {
-    if (obj === null || obj === undefined) return obj;
-    
-    if (Array.isArray(obj)) {
-      return obj.map(item => simplifyObject(item, path)).filter(item => item !== undefined);
-    }
-    
-    if (typeof obj === "object") {
-      const result: any = {};
-      
-      for (const [key, value] of Object.entries(obj)) {
-        const currentPath = path ? `${path}.${key}` : key;
-        
-        // Always remove these fields
-        if (FIELDS_TO_REMOVE.includes(key)) {
-          continue;
-        }
-        
-        // Remove node_config only from top level (keep it in consensus_data)
-        if (key === "node_config" && !path.includes("consensus_data")) {
-          continue;
-        }
-        
-        // Special handling for consensus_data - keep execution results and votes
-        if (key === "consensus_data" && typeof value === "object" && value !== null) {
-          const simplifiedConsensus: any = {};
-          
-          // Keep votes
-          if ("votes" in value) {
-            simplifiedConsensus.votes = value.votes;
-          }
-          
-          // Process leader_receipt to keep only essential fields
-          if ("leader_receipt" in value && Array.isArray(value.leader_receipt)) {
-            simplifiedConsensus.leader_receipt = value.leader_receipt.map((receipt: any) => {
-              const simplifiedReceipt: any = {};
-              
-              // Keep essential execution info
-              ["execution_result", "genvm_result", "mode", "vote", "node_config"].forEach(field => {
-                if (field in receipt) {
-                  simplifiedReceipt[field] = receipt[field];
-                }
-              });
-              
-              // Keep readable calldata
-              if (receipt.calldata && typeof receipt.calldata === "object" && "readable" in receipt.calldata) {
-                simplifiedReceipt.calldata = { readable: receipt.calldata.readable };
-              }
-              
-              // Keep readable outputs
-              if (receipt.eq_outputs) {
-                simplifiedReceipt.eq_outputs = simplifyObject(receipt.eq_outputs, currentPath);
-              }
-              if (receipt.result) {
-                simplifiedReceipt.result = simplifyObject(receipt.result, currentPath);
-              }
-              
-              return simplifiedReceipt;
-            });
-          }
-          
-          // Process validators to keep execution results
-          if ("validators" in value && Array.isArray(value.validators)) {
-            const simplifiedValidators = value.validators.map((validator: any) => {
-              const simplifiedValidator: any = {};
-              ["execution_result", "genvm_result", "mode", "vote", "node_config"].forEach(field => {
-                if (field in validator) {
-                  simplifiedValidator[field] = validator[field];
-                }
-              });
-              return simplifiedValidator;
-            }).filter((validator: any) => Object.keys(validator).length > 0);
-            
-            if (simplifiedValidators.length > 0) {
-              simplifiedConsensus.validators = simplifiedValidators;
-            }
-          }
-          
-          result[key] = simplifiedConsensus;
-          continue;
-        }
-        
-        const simplifiedValue = simplifyObject(value, currentPath);
-        // Include the value if it's not undefined and not an empty object
-        // Special case: include numeric 0 values (like value: 0)
-        const shouldInclude = simplifiedValue !== undefined && 
-          !(typeof simplifiedValue === "object" && simplifiedValue !== null && Object.keys(simplifiedValue).length === 0);
-        
-        if (shouldInclude || simplifiedValue === 0) {
-          // Map field names for cross-language compatibility
-          const mappedKey = FIELD_NAME_MAPPINGS[key] || key;
-          result[mappedKey] = simplifiedValue;
-        }
-      }
-      
-      return result;
-    }
-    
-    return obj;
-  };
-  
-  return simplifyObject({...tx});
-};
-
-const _decodeLocalnetTransaction = (tx: GenLayerTransaction): GenLayerTransaction => {
-  if (!tx.data) return tx;
-  try {
-    const leaderReceipt = tx.consensus_data?.leader_receipt;
-    if (leaderReceipt) {
-      const receipts = Array.isArray(leaderReceipt) ? leaderReceipt : [leaderReceipt];
-      receipts.forEach((receipt) => {
-        if (receipt.result && typeof receipt.result === "string") {
-          receipt.result = resultToUserFriendlyJson(receipt.result);
-        }
-        if (receipt.calldata && typeof receipt.calldata === "string") {
-          receipt.calldata = {
-            base64: receipt.calldata as string,
-            ...calldataToUserFriendlyJson(b64ToArray(receipt.calldata as string)),
-          };
-        }
-        if (receipt.eq_outputs) {
-          const decodedOutputs: any = {};
-          for (const [key, value] of Object.entries(receipt.eq_outputs)) {
-            if (typeof value === "object" && value !== null) {
-              decodedOutputs[key] = value;
-            } else {
-              try {
-                decodedOutputs[key] = resultToUserFriendlyJson(value as string);
-              } catch (e) {
-                console.warn(`Error decoding eq_output ${key}: ${e}`);
-                decodedOutputs[key] = value;
-              }
-            }
-          }
-          receipt.eq_outputs = decodedOutputs;
-        }
-      });
-    }
-    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)),
-      };
-    }
-  } catch (e) {
-    console.error("Error in _decodeLocalnetTransaction:", e);
-  }
-  return tx;
-};