genlayer 0.28.0 → 0.28.1

package/CHANGELOG.md

@@ -1,5 +1,7 @@
 # Changelog
 
+## 0.28.1 (2025-09-03)
+
 ## 0.28.0 (2025-09-03)
 
 ### Features

package/dist/index.js

@@ -17856,7 +17856,7 @@ var require_semver2 = __commonJS({
 import { program } from "commander";
 
 // package.json
-var version = "0.28.0";
+var version = "0.28.1";
 var package_default = {
   name: "genlayer",
   version,
@@ -17923,7 +17923,7 @@ var package_default = {
     dotenv: "^17.0.0",
     ethers: "^6.13.4",
     "fs-extra": "^11.3.0",
-    "genlayer-js": "^0.11.0",
+    "genlayer-js": "0.15.1",
     inquirer: "^12.0.0",
     keytar: "^7.9.0",
     "node-fetch": "^3.0.0",
@@ -40019,6 +40019,7 @@ var calldata_exports = {};
 __export2(calldata_exports, {
   decode: () => decode2,
   encode: () => encode4,
+  makeCalldataObject: () => makeCalldataObject,
   toString: () => toString
 });
 var BITS_IN_TYPE = 3;
@@ -40161,6 +40162,32 @@ function encode4(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;
+}
 function readULeb128(data, index2) {
   let res = 0n;
   let accum = 0n;
@@ -40329,32 +40356,6 @@ function serializeOne(data) {
 function serialize(data) {
   return toRlp(data.map(serializeOne));
 }
-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) => {
@@ -40385,8 +40386,8 @@ var contractActions = (client, publicClient) => {
         args: callArgs,
         kwargs,
         leaderOnly = false,
-        transactionHashVariant = "latest-final"
-        /* LATEST_FINAL */
+        transactionHashVariant = "latest-nonfinal"
+        /* LATEST_NONFINAL */
       } = args;
       const encodedData = [encode4(makeCalldataObject(functionName, callArgs, kwargs)), leaderOnly];
       const serializedData = serialize(encodedData);
@@ -40537,14 +40538,16 @@ var _sendTransaction = async ({
     data: encodedData,
     type: "legacy",
     nonce: Number(nonce),
-    value
+    value,
+    gas: 21000n
   });
   if (validatedSenderAccount?.type !== "local") {
     const formattedRequest = {
       from: transactionRequest.from,
       to: transactionRequest.to,
       data: encodedData,
-      value: transactionRequest.value ? `0x${transactionRequest.value.toString(16)}` : "0x0"
+      value: transactionRequest.value ? `0x${transactionRequest.value.toString(16)}` : "0x0",
+      gas: transactionRequest.gas ? `0x${transactionRequest.gas.toString(16)}` : "0x5208"
     };
     return await client.request({
       method: "eth_sendTransaction",
@@ -40622,66 +40625,49 @@ function resultToUserFriendlyJson(cd64) {
     payload
   };
 }
-var receiptActions = (client, publicClient) => ({
-  waitForTransactionReceipt: async ({
-    hash: hash2,
-    status = "ACCEPTED",
-    interval = transactionsConfig.waitInterval,
-    retries = transactionsConfig.retries
-  }) => {
-    const transaction = await client.getTransaction({
-      hash: hash2
-    });
-    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" && 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: hash2,
-      status,
-      interval,
-      retries: retries - 1
-    });
-  }
-});
-var transactionActions = (client, publicClient) => ({
-  getTransaction: async ({ hash: hash2 }) => {
-    if (client.chain.id === localnet.id) {
-      const transaction2 = await client.getTransaction({ hash: hash2 });
-      const localnetStatus = transaction2.status === "ACTIVATED" ? "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: [
-        hash2,
-        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;
   }
@@ -40719,8 +40705,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,
@@ -40755,7 +40741,78 @@ var _decodeTransaction = (tx) => {
   };
   return decodedTx;
 };
-var _decodeLocalnetTransaction = (tx) => {
+var simplifyTransactionReceipt = (tx) => {
+  const simplifyObject = (obj, path6 = "") => {
+    if (obj === null || obj === void 0) return obj;
+    if (Array.isArray(obj)) {
+      return obj.map((item) => simplifyObject(item, path6)).filter((item) => item !== void 0);
+    }
+    if (typeof obj === "object") {
+      const result = {};
+      for (const [key, value] of Object.entries(obj)) {
+        const currentPath = path6 ? `${path6}.${key}` : key;
+        if (FIELDS_TO_REMOVE.includes(key)) {
+          continue;
+        }
+        if (key === "node_config" && !path6.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;
@@ -40772,11 +40829,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 (e2) {
+                console.warn(`Error decoding eq_output ${key}: ${e2}`);
+                decodedOutputs[key] = value;
+              }
+            }
+          }
+          receipt.eq_outputs = decodedOutputs;
         }
       });
     }
@@ -40787,10 +40853,75 @@ var _decodeLocalnetTransaction = (tx) => {
       };
     }
   } catch (e2) {
-    console.error("Error in _decodeLocalnetTransaction:", e2);
+    console.error("Error in decodeLocalnetTransaction:", e2);
   }
   return tx;
 };
+var receiptActions = (client, publicClient) => ({
+  waitForTransactionReceipt: async ({
+    hash: hash2,
+    status = "ACCEPTED",
+    interval = transactionsConfig.waitInterval,
+    retries = transactionsConfig.retries,
+    fullTransaction = false
+  }) => {
+    const transaction = await client.getTransaction({
+      hash: hash2
+    });
+    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" && 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: hash2,
+      status,
+      interval,
+      retries: retries - 1,
+      fullTransaction
+    });
+  }
+});
+var transactionActions = (client, publicClient) => ({
+  getTransaction: async ({ hash: hash2 }) => {
+    if (client.chain.id === localnet.id) {
+      const transaction2 = await client.getTransaction({ hash: hash2 });
+      const localnetStatus = transaction2.status === "ACTIVATED" ? "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: [
+        hash2,
+        Math.round((/* @__PURE__ */ new Date()).getTime() / 1e3)
+        // unix seconds
+      ]
+    });
+    return decodeTransaction(transaction);
+  }
+});
 var snapID = {
   local: "local:http://localhost:8081",
   npm: "npm:genlayer-wallet-plugin"
@@ -40923,9 +41054,13 @@ var getCustomTransportConfig = (config) => {
     async request({ method, params = [] }) {
       if (method.startsWith("eth_") && isAddress2) {
         try {
-          return await window.ethereum?.request({ method, params });
+          const provider = config.provider || window.ethereum;
+          if (!provider) {
+            throw new Error("No wallet provider available");
+          }
+          return await provider.request({ method, params });
         } catch (err) {
-          console.warn(`Error using window.ethereum for method ${method}:`, err);
+          console.warn(`Error using provider for method ${method}:`, err);
           throw err;
         }
       } else {
@@ -40963,7 +41098,7 @@ var createClient2 = (config = { chain: localnet }) => {
   if (config.endpoint) {
     chainConfig.rpcUrls.default.http = [config.endpoint];
   }
-  const customTransport = custom(getCustomTransportConfig(config));
+  const customTransport = custom(getCustomTransportConfig(config), { retryCount: 0, retryDelay: 0 });
   const publicClient = createPublicClient2(chainConfig, customTransport).extend(
     publicActions
   );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "genlayer",
-  "version": "0.28.0",
+  "version": "0.28.1",
   "description": "GenLayer Command Line Tool",
   "main": "src/index.ts",
   "type": "module",
@@ -64,7 +64,7 @@
     "dotenv": "^17.0.0",
     "ethers": "^6.13.4",
     "fs-extra": "^11.3.0",
-    "genlayer-js": "^0.11.0",
+    "genlayer-js": "0.15.1",
     "inquirer": "^12.0.0",
     "keytar": "^7.9.0",
     "node-fetch": "^3.0.0",