genlayer-js 0.12.1 → 0.14.0

package/dist/index.js

@@ -57,6 +57,7 @@ var calldata_exports = {};
 __export(calldata_exports, {
   decode: () => decode,
   encode: () => encode,
+  makeCalldataObject: () => makeCalldataObject,
   toString: () => toString
 });
 
@@ -203,6 +204,32 @@ function encode(data) {
   encodeImpl(arr, data);
   return new Uint8Array(arr);
 }
+function makeCalldataObject(method, args, kwargs) {
+  let ret = {};
+  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;
+}
 
 // src/abi/calldata/decoder.ts
 function readULeb128(data, index) {
@@ -381,32 +408,6 @@ function serialize(data) {
 
 // src/contracts/actions.ts
 import { fromHex, toHex as toHex2, zeroAddress, encodeFunctionData, parseEventLogs } from "viem";
-function makeCalldataObject(method, args, kwargs) {
-  let ret = {};
-  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;
-}
 var contractActions = (client, publicClient) => {
   return {
     getContractSchema: async (address) => {
@@ -682,65 +683,51 @@ function resultToUserFriendlyJson(cd64) {
   };
 }
 
-// src/transactions/actions.ts
+// src/transactions/decoders.ts
 import { fromRlp, fromHex as fromHex2 } from "viem";
-var receiptActions = (client, publicClient) => ({
-  waitForTransactionReceipt: async ({
-    hash,
-    status = "ACCEPTED" /* ACCEPTED */,
-    interval = transactionsConfig.waitInterval,
-    retries = transactionsConfig.retries
-  }) => {
-    const transaction = await client.getTransaction({
-      hash
-    });
-    if (!transaction) {
-      throw new Error("Transaction not found");
-    }
-    const transactionStatusString = String(transaction.status);
-    const transactionStatusFinalized = transactionsStatusNameToNumber["FINALIZED" /* FINALIZED */];
-    const requestedStatus = transactionsStatusNameToNumber[status];
-    if (transactionStatusString === requestedStatus || status === "ACCEPTED" /* ACCEPTED */ && transactionStatusString === transactionStatusFinalized) {
-      if (client.chain.id === localnet.id) {
-        return _decodeLocalnetTransaction(transaction);
-      }
-      return transaction;
-    }
-    if (retries === 0) {
-      throw new Error("Transaction status is not " + status);
-    }
-    await sleep(interval);
-    return receiptActions(client, publicClient).waitForTransactionReceipt({
-      hash,
-      status,
-      interval,
-      retries: retries - 1
-    });
-  }
-});
-var transactionActions = (client, publicClient) => ({
-  getTransaction: async ({ hash }) => {
-    if (client.chain.id === localnet.id) {
-      const transaction2 = await client.getTransaction({ hash });
-      const localnetStatus = transaction2.status === "ACTIVATED" ? "PENDING" /* PENDING */ : transaction2.status;
-      transaction2.status = Number(transactionsStatusNameToNumber[localnetStatus]);
-      transaction2.statusName = localnetStatus;
-      return _decodeLocalnetTransaction(transaction2);
-    }
-    const transaction = await publicClient.readContract({
-      address: client.chain.consensusDataContract?.address,
-      abi: client.chain.consensusDataContract?.abi,
-      functionName: "getTransactionData",
-      args: [
-        hash,
-        Math.round((/* @__PURE__ */ new Date()).getTime() / 1e3)
-        // unix seconds
-      ]
-    });
-    return _decodeTransaction(transaction);
-  }
-});
-var _decodeInputData = (rlpEncodedAppData, recipient) => {
+var 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"
+];
+var FIELD_NAME_MAPPINGS = {
+  statusName: "status_name",
+  typeHex: "type"
+};
+var decodeInputData = (rlpEncodedAppData, recipient) => {
   if (!rlpEncodedAppData || rlpEncodedAppData === "0x" || rlpEncodedAppData.length <= 2) {
     return null;
   }
@@ -778,8 +765,8 @@ var _decodeInputData = (rlpEncodedAppData, recipient) => {
     return null;
   }
 };
-var _decodeTransaction = (tx) => {
-  const txDataDecoded = _decodeInputData(tx.txData, tx.recipient);
+var decodeTransaction = (tx) => {
+  const txDataDecoded = decodeInputData(tx.txData, tx.recipient);
   const decodedTx = {
     ...tx,
     txData: tx.txData,
@@ -814,7 +801,78 @@ var _decodeTransaction = (tx) => {
   };
   return decodedTx;
 };
-var _decodeLocalnetTransaction = (tx) => {
+var simplifyTransactionReceipt = (tx) => {
+  const simplifyObject = (obj, path = "") => {
+    if (obj === null || obj === void 0) return obj;
+    if (Array.isArray(obj)) {
+      return obj.map((item) => simplifyObject(item, path)).filter((item) => item !== void 0);
+    }
+    if (typeof obj === "object") {
+      const result = {};
+      for (const [key, value] of Object.entries(obj)) {
+        const currentPath = path ? `${path}.${key}` : key;
+        if (FIELDS_TO_REMOVE.includes(key)) {
+          continue;
+        }
+        if (key === "node_config" && !path.includes("consensus_data")) {
+          continue;
+        }
+        if (key === "consensus_data" && typeof value === "object" && value !== null) {
+          const simplifiedConsensus = {};
+          if ("votes" in value) {
+            simplifiedConsensus.votes = value.votes;
+          }
+          if ("leader_receipt" in value && Array.isArray(value.leader_receipt)) {
+            simplifiedConsensus.leader_receipt = value.leader_receipt.map((receipt) => {
+              const simplifiedReceipt = {};
+              ["execution_result", "genvm_result", "mode", "vote", "node_config"].forEach((field) => {
+                if (field in receipt) {
+                  simplifiedReceipt[field] = receipt[field];
+                }
+              });
+              if (receipt.calldata && typeof receipt.calldata === "object" && "readable" in receipt.calldata) {
+                simplifiedReceipt.calldata = { readable: receipt.calldata.readable };
+              }
+              if (receipt.eq_outputs) {
+                simplifiedReceipt.eq_outputs = simplifyObject(receipt.eq_outputs, currentPath);
+              }
+              if (receipt.result) {
+                simplifiedReceipt.result = simplifyObject(receipt.result, currentPath);
+              }
+              return simplifiedReceipt;
+            });
+          }
+          if ("validators" in value && Array.isArray(value.validators)) {
+            const simplifiedValidators = value.validators.map((validator) => {
+              const simplifiedValidator = {};
+              ["execution_result", "genvm_result", "mode", "vote", "node_config"].forEach((field) => {
+                if (field in validator) {
+                  simplifiedValidator[field] = validator[field];
+                }
+              });
+              return simplifiedValidator;
+            }).filter((validator) => Object.keys(validator).length > 0);
+            if (simplifiedValidators.length > 0) {
+              simplifiedConsensus.validators = simplifiedValidators;
+            }
+          }
+          result[key] = simplifiedConsensus;
+          continue;
+        }
+        const simplifiedValue = simplifyObject(value, currentPath);
+        const shouldInclude = simplifiedValue !== void 0 && !(typeof simplifiedValue === "object" && simplifiedValue !== null && Object.keys(simplifiedValue).length === 0);
+        if (shouldInclude || simplifiedValue === 0) {
+          const mappedKey = FIELD_NAME_MAPPINGS[key] || key;
+          result[mappedKey] = simplifiedValue;
+        }
+      }
+      return result;
+    }
+    return obj;
+  };
+  return simplifyObject({ ...tx });
+};
+var decodeLocalnetTransaction = (tx) => {
   if (!tx.data) return tx;
   try {
     const leaderReceipt = tx.consensus_data?.leader_receipt;
@@ -831,11 +889,20 @@ var _decodeLocalnetTransaction = (tx) => {
           };
         }
         if (receipt.eq_outputs) {
-          receipt.eq_outputs = Object.fromEntries(
-            Object.entries(receipt.eq_outputs).map(([key, value]) => {
-              return [key, resultToUserFriendlyJson(String(value))];
-            })
-          );
+          const decodedOutputs = {};
+          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);
+              } catch (e) {
+                console.warn(`Error decoding eq_output ${key}: ${e}`);
+                decodedOutputs[key] = value;
+              }
+            }
+          }
+          receipt.eq_outputs = decodedOutputs;
         }
       });
     }
@@ -846,11 +913,75 @@ var _decodeLocalnetTransaction = (tx) => {
       };
     }
   } catch (e) {
-    console.error("Error in _decodeLocalnetTransaction:", e);
+    console.error("Error in decodeLocalnetTransaction:", e);
   }
   return tx;
 };
 
+// src/transactions/actions.ts
+var receiptActions = (client, publicClient) => ({
+  waitForTransactionReceipt: async ({
+    hash,
+    status = "ACCEPTED" /* ACCEPTED */,
+    interval = transactionsConfig.waitInterval,
+    retries = transactionsConfig.retries,
+    fullTransaction = false
+  }) => {
+    const transaction = await client.getTransaction({
+      hash
+    });
+    if (!transaction) {
+      throw new Error("Transaction not found");
+    }
+    const transactionStatusString = String(transaction.status);
+    const transactionStatusFinalized = transactionsStatusNameToNumber["FINALIZED" /* FINALIZED */];
+    const requestedStatus = transactionsStatusNameToNumber[status];
+    if (transactionStatusString === requestedStatus || status === "ACCEPTED" /* ACCEPTED */ && transactionStatusString === transactionStatusFinalized) {
+      let finalTransaction = transaction;
+      if (client.chain.id === localnet.id) {
+        finalTransaction = decodeLocalnetTransaction(transaction);
+      }
+      if (!fullTransaction) {
+        return simplifyTransactionReceipt(finalTransaction);
+      }
+      return finalTransaction;
+    }
+    if (retries === 0) {
+      throw new Error("Transaction status is not " + status);
+    }
+    await sleep(interval);
+    return receiptActions(client, publicClient).waitForTransactionReceipt({
+      hash,
+      status,
+      interval,
+      retries: retries - 1,
+      fullTransaction
+    });
+  }
+});
+var transactionActions = (client, publicClient) => ({
+  getTransaction: async ({ hash }) => {
+    if (client.chain.id === localnet.id) {
+      const transaction2 = await client.getTransaction({ hash });
+      const localnetStatus = transaction2.status === "ACTIVATED" ? "PENDING" /* PENDING */ : transaction2.status;
+      transaction2.status = Number(transactionsStatusNameToNumber[localnetStatus]);
+      transaction2.statusName = localnetStatus;
+      return decodeLocalnetTransaction(transaction2);
+    }
+    const transaction = await publicClient.readContract({
+      address: client.chain.consensusDataContract?.address,
+      abi: client.chain.consensusDataContract?.abi,
+      functionName: "getTransactionData",
+      args: [
+        hash,
+        Math.round((/* @__PURE__ */ new Date()).getTime() / 1e3)
+        // unix seconds
+      ]
+    });
+    return decodeTransaction(transaction);
+  }
+});
+
 // src/config/snapID.ts
 var snapID = {
   local: "local:http://localhost:8081",
@@ -1077,5 +1208,9 @@ export {
   chains_exports as chains,
   createAccount,
   createClient,
-  generatePrivateKey
+  decodeInputData,
+  decodeLocalnetTransaction,
+  decodeTransaction,
+  generatePrivateKey,
+  simplifyTransactionReceipt
 };

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.12.1",
+  "version": "0.14.0",
   "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);

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