genlayer-js 0.17.1 → 0.18.1

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 
 
+## 0.18.1 (2025-09-11)
+
+
+### Bug Fixes
+
+* replace hardcoded gas 21000 ([#115](https://github.com/genlayerlabs/genlayer-js/issues/115)) ([8eacd5d](https://github.com/genlayerlabs/genlayer-js/commit/8eacd5dbba9ae85f0232ec525076582ea8b6b045))
+
+## 0.18.0 (2025-09-04)
+
+
+### Features
+
+* format in genlayer js to convert to an object ([#107](https://github.com/genlayerlabs/genlayer-js/issues/107)) ([3ca4076](https://github.com/genlayerlabs/genlayer-js/commit/3ca40765bc03e8d7174c8e337e6104ccea455e5a))
+
 ## 0.17.1 (2025-09-03)
 
 

package/dist/{index-BIyk5Fv7.d.ts → index-BJebZa37.d.ts}

@@ -313,6 +313,9 @@ type GenLayerMethod = {
 } | {
     method: "eth_getTransactionCount";
     params: [address: Address, block: string];
+} | {
+    method: "eth_estimateGas";
+    params: [transactionParams: any];
 } | {
     method: "gen_call";
     params: [requestParams: any];
@@ -332,6 +335,7 @@ type GenLayerClient<TGenLayerChain extends GenLayerChain> = Omit<Client<Transpor
             [key: string]: CalldataEncodable;
         };
         rawReturn?: RawReturn;
+        jsonSafeReturn?: boolean;
         transactionHashVariant?: TransactionHashVariant;
     }) => Promise<RawReturn extends true ? `0x${string}` : CalldataEncodable>;
     writeContract: (args: {
@@ -374,6 +378,12 @@ type GenLayerClient<TGenLayerChain extends GenLayerChain> = Omit<Client<Transpor
     getCurrentNonce: (args: {
         address: Address;
     }) => Promise<number>;
+    estimateTransactionGas: (transactionParams: {
+        from?: Address;
+        to: Address;
+        data?: `0x${string}`;
+        value?: bigint;
+    }) => Promise<bigint>;
     waitForTransactionReceipt: (args: {
         hash: TransactionHash;
         status?: TransactionStatus;

package/dist/{index-DrEvzYFA.d.cts → index-C_GfhvDJ.d.cts}

@@ -313,6 +313,9 @@ type GenLayerMethod = {
 } | {
     method: "eth_getTransactionCount";
     params: [address: Address, block: string];
+} | {
+    method: "eth_estimateGas";
+    params: [transactionParams: any];
 } | {
     method: "gen_call";
     params: [requestParams: any];
@@ -332,6 +335,7 @@ type GenLayerClient<TGenLayerChain extends GenLayerChain> = Omit<Client<Transpor
             [key: string]: CalldataEncodable;
         };
         rawReturn?: RawReturn;
+        jsonSafeReturn?: boolean;
         transactionHashVariant?: TransactionHashVariant;
     }) => Promise<RawReturn extends true ? `0x${string}` : CalldataEncodable>;
     writeContract: (args: {
@@ -374,6 +378,12 @@ type GenLayerClient<TGenLayerChain extends GenLayerChain> = Omit<Client<Transpor
     getCurrentNonce: (args: {
         address: Address;
     }) => Promise<number>;
+    estimateTransactionGas: (transactionParams: {
+        from?: Address;
+        to: Address;
+        data?: `0x${string}`;
+        value?: bigint;
+    }) => Promise<bigint>;
     waitForTransactionReceipt: (args: {
         hash: TransactionHash;
         status?: TransactionStatus;

package/dist/index.cjs

@@ -419,6 +419,7 @@ var calldata = calldata_exports;
 var transactions = transactions_exports;
 
 // src/utils/jsonifier.ts
+
 function b64ToArray(b64) {
   return Uint8Array.from(atob(b64), (c) => c.charCodeAt(0));
 }
@@ -457,6 +458,54 @@ function resultToUserFriendlyJson(cd64) {
     payload
   };
 }
+function toJsonSafeDeep(value) {
+  return _toJsonSafeDeep(value, /* @__PURE__ */ new WeakSet());
+}
+function _toJsonSafeDeep(value, seen) {
+  if (value === null || value === void 0) {
+    return null;
+  }
+  const primitiveType = typeof value;
+  if (primitiveType === "string" || primitiveType === "boolean" || primitiveType === "number") {
+    return value;
+  }
+  if (primitiveType === "bigint") {
+    const big = value;
+    const abs = big < 0n ? -big : big;
+    const maxSafe = 9007199254740991n;
+    return abs <= maxSafe ? Number(big) : big.toString();
+  }
+  if (typeof value === "object") {
+    if (seen.has(value)) {
+      return null;
+    }
+    seen.add(value);
+    if (value instanceof Uint8Array) {
+      return _viem.toHex.call(void 0, value);
+    }
+    if (value instanceof Array) {
+      return value.map((v) => _toJsonSafeDeep(v, seen));
+    }
+    if (value instanceof Map) {
+      const obj = {};
+      for (const [k, v] of value.entries()) {
+        obj[k] = _toJsonSafeDeep(v, seen);
+      }
+      return obj;
+    }
+    if (value instanceof _chunkH4ZYXVV2cjs.CalldataAddress) {
+      return _viem.toHex.call(void 0, value.bytes);
+    }
+    if (Object.getPrototypeOf(value) === Object.prototype) {
+      const obj = {};
+      for (const [k, v] of Object.entries(value)) {
+        obj[k] = _toJsonSafeDeep(v, seen);
+      }
+      return obj;
+    }
+  }
+  return value;
+}
 
 // src/contracts/actions.ts
 var contractActions = (client, publicClient) => {
@@ -499,6 +548,7 @@ var contractActions = (client, publicClient) => {
         functionName,
         args: callArgs,
         kwargs,
+        jsonSafeReturn = false,
         leaderOnly = false,
         transactionHashVariant = "latest-nonfinal" /* LATEST_NONFINAL */
       } = args;
@@ -521,7 +571,11 @@ var contractActions = (client, publicClient) => {
         return prefixedResult;
       }
       const resultBinary = _viem.fromHex.call(void 0, prefixedResult, "bytes");
-      return decode(resultBinary);
+      const decoded = decode(resultBinary);
+      if (!jsonSafeReturn) {
+        return decoded;
+      }
+      return toJsonSafeDeep(decoded);
     },
     simulateWriteContract: async (args) => {
       const {
@@ -676,16 +730,28 @@ var _sendTransaction = async ({
   }
   const validatedSenderAccount = validateAccount(senderAccount);
   const nonce = await client.getCurrentNonce({ address: validatedSenderAccount.address });
+  let estimatedGas;
+  try {
+    estimatedGas = await client.estimateTransactionGas({
+      from: validatedSenderAccount.address,
+      to: _optionalChain([client, 'access', _20 => _20.chain, 'access', _21 => _21.consensusMainContract, 'optionalAccess', _22 => _22.address]),
+      data: encodedData,
+      value
+    });
+  } catch (error) {
+    console.warn("Gas estimation failed, using fallback value:", error);
+    estimatedGas = 200000n;
+  }
   const transactionRequest = await client.prepareTransactionRequest({
     account: validatedSenderAccount,
-    to: _optionalChain([client, 'access', _20 => _20.chain, 'access', _21 => _21.consensusMainContract, 'optionalAccess', _22 => _22.address]),
+    to: _optionalChain([client, 'access', _23 => _23.chain, 'access', _24 => _24.consensusMainContract, 'optionalAccess', _25 => _25.address]),
     data: encodedData,
     type: "legacy",
     nonce: Number(nonce),
     value,
-    gas: 21000n
+    gas: estimatedGas
   });
-  if (_optionalChain([validatedSenderAccount, 'optionalAccess', _23 => _23.type]) !== "local") {
+  if (_optionalChain([validatedSenderAccount, 'optionalAccess', _26 => _26.type]) !== "local") {
     const formattedRequest = {
       from: transactionRequest.from,
       to: transactionRequest.to,
@@ -698,7 +764,7 @@ var _sendTransaction = async ({
       params: [formattedRequest]
     });
   }
-  if (!_optionalChain([validatedSenderAccount, 'optionalAccess', _24 => _24.signTransaction])) {
+  if (!_optionalChain([validatedSenderAccount, 'optionalAccess', _27 => _27.signTransaction])) {
     throw new Error("Account does not support signTransaction");
   }
   const serializedTransaction = await validatedSenderAccount.signTransaction(transactionRequest);
@@ -708,7 +774,7 @@ var _sendTransaction = async ({
     throw new Error("Transaction reverted");
   }
   const newTxEvents = _viem.parseEventLogs.call(void 0, {
-    abi: _optionalChain([client, 'access', _25 => _25.chain, 'access', _26 => _26.consensusMainContract, 'optionalAccess', _27 => _27.abi]),
+    abi: _optionalChain([client, 'access', _28 => _28.chain, 'access', _29 => _29.consensusMainContract, 'optionalAccess', _30 => _30.abi]),
     eventName: "NewTransaction",
     logs: receipt.logs
   });
@@ -921,7 +987,7 @@ var simplifyTransactionReceipt = (tx) => {
 var decodeLocalnetTransaction = (tx) => {
   if (!tx.data) return tx;
   try {
-    const leaderReceipt = _optionalChain([tx, 'access', _28 => _28.consensus_data, 'optionalAccess', _29 => _29.leader_receipt]);
+    const leaderReceipt = _optionalChain([tx, 'access', _31 => _31.consensus_data, 'optionalAccess', _32 => _32.leader_receipt]);
     if (leaderReceipt) {
       const receipts = Array.isArray(leaderReceipt) ? leaderReceipt : [leaderReceipt];
       receipts.forEach((receipt) => {
@@ -952,7 +1018,7 @@ var decodeLocalnetTransaction = (tx) => {
         }
       });
     }
-    if (_optionalChain([tx, 'access', _30 => _30.data, 'optionalAccess', _31 => _31.calldata]) && typeof tx.data.calldata === "string") {
+    if (_optionalChain([tx, 'access', _33 => _33.data, 'optionalAccess', _34 => _34.calldata]) && typeof tx.data.calldata === "string") {
       tx.data.calldata = {
         base64: tx.data.calldata,
         ...calldataToUserFriendlyJson(b64ToArray(tx.data.calldata))
@@ -1015,8 +1081,8 @@ var transactionActions = (client, publicClient) => ({
       return decodeLocalnetTransaction(transaction2);
     }
     const transaction = await publicClient.readContract({
-      address: _optionalChain([client, 'access', _32 => _32.chain, 'access', _33 => _33.consensusDataContract, 'optionalAccess', _34 => _34.address]),
-      abi: _optionalChain([client, 'access', _35 => _35.chain, 'access', _36 => _36.consensusDataContract, 'optionalAccess', _37 => _37.abi]),
+      address: _optionalChain([client, 'access', _35 => _35.chain, 'access', _36 => _36.consensusDataContract, 'optionalAccess', _37 => _37.address]),
+      abi: _optionalChain([client, 'access', _38 => _38.chain, 'access', _39 => _39.consensusDataContract, 'optionalAccess', _40 => _40.abi]),
       functionName: "getTransactionData",
       args: [
         hash,
@@ -1025,6 +1091,19 @@ var transactionActions = (client, publicClient) => ({
       ]
     });
     return decodeTransaction(transaction);
+  },
+  estimateTransactionGas: async (transactionParams) => {
+    const formattedParams = {
+      from: transactionParams.from || _optionalChain([client, 'access', _41 => _41.account, 'optionalAccess', _42 => _42.address]),
+      to: transactionParams.to,
+      data: transactionParams.data || "0x",
+      value: transactionParams.value ? `0x${transactionParams.value.toString(16)}` : "0x0"
+    };
+    const gasHex = await client.request({
+      method: "eth_estimateGas",
+      params: [formattedParams]
+    });
+    return BigInt(gasHex);
   }
 });
 
@@ -1057,7 +1136,7 @@ var connect = async (client, network = "studionet", snapSource = "npm") => {
     chainName: selectedNetwork.name,
     rpcUrls: selectedNetwork.rpcUrls.default.http,
     nativeCurrency: selectedNetwork.nativeCurrency,
-    blockExplorerUrls: [_optionalChain([selectedNetwork, 'access', _38 => _38.blockExplorers, 'optionalAccess', _39 => _39.default, 'access', _40 => _40.url])]
+    blockExplorerUrls: [_optionalChain([selectedNetwork, 'access', _43 => _43.blockExplorers, 'optionalAccess', _44 => _44.default, 'access', _45 => _45.url])]
   };
   const currentChainId = await window.ethereum.request({ method: "eth_chainId" });
   if (currentChainId !== chainIdHex) {
@@ -1091,10 +1170,10 @@ var metamaskClient = async (snapSource = "npm") => {
   }
   const isFlask = async () => {
     try {
-      const clientVersion = await _optionalChain([window, 'access', _41 => _41.ethereum, 'optionalAccess', _42 => _42.request, 'call', _43 => _43({
+      const clientVersion = await _optionalChain([window, 'access', _46 => _46.ethereum, 'optionalAccess', _47 => _47.request, 'call', _48 => _48({
         method: "web3_clientVersion"
       })]);
-      return _optionalChain([clientVersion, 'optionalAccess', _44 => _44.includes, 'call', _45 => _45("flask")]);
+      return _optionalChain([clientVersion, 'optionalAccess', _49 => _49.includes, 'call', _50 => _50("flask")]);
     } catch (error) {
       console.error("Error detecting Flask:", error);
       return false;
@@ -1102,7 +1181,7 @@ var metamaskClient = async (snapSource = "npm") => {
   };
   const installedSnaps = async () => {
     try {
-      return await _optionalChain([window, 'access', _46 => _46.ethereum, 'optionalAccess', _47 => _47.request, 'call', _48 => _48({
+      return await _optionalChain([window, 'access', _51 => _51.ethereum, 'optionalAccess', _52 => _52.request, 'call', _53 => _53({
         method: "wallet_getSnaps"
       })]);
     } catch (error) {
@@ -1137,10 +1216,10 @@ function walletActions(client) {
 function chainActions(client) {
   return {
     initializeConsensusSmartContract: async (forceReset = false) => {
-      if (_optionalChain([client, 'access', _49 => _49.chain, 'optionalAccess', _50 => _50.id]) === _chunkZKBMABRAcjs.testnetAsimov.id) {
+      if (_optionalChain([client, 'access', _54 => _54.chain, 'optionalAccess', _55 => _55.id]) === _chunkZKBMABRAcjs.testnetAsimov.id) {
         return;
       }
-      if (!forceReset && _optionalChain([client, 'access', _51 => _51.chain, 'access', _52 => _52.consensusMainContract, 'optionalAccess', _53 => _53.address]) && _optionalChain([client, 'access', _54 => _54.chain, 'access', _55 => _55.consensusMainContract, 'optionalAccess', _56 => _56.abi])) {
+      if (!forceReset && _optionalChain([client, 'access', _56 => _56.chain, 'access', _57 => _57.consensusMainContract, 'optionalAccess', _58 => _58.address]) && _optionalChain([client, 'access', _59 => _59.chain, 'access', _60 => _60.consensusMainContract, 'optionalAccess', _61 => _61.abi])) {
         return;
       }
       const contractsResponse = await fetch(client.chain.rpcUrls.default.http[0], {
@@ -1225,12 +1304,15 @@ var createClient = (config = { chain: _chunkZKBMABRAcjs.localnet }) => {
     ...config.account ? { account: config.account } : {}
   });
   const clientWithBasicActions = baseClient.extend(_viem.publicActions).extend(_viem.walletActions).extend((client) => accountActions(client));
-  const clientWithAllActions = {
+  const clientWithTransactionActions = {
     ...clientWithBasicActions,
-    ...contractActions(clientWithBasicActions, publicClient),
+    ...transactionActions(clientWithBasicActions, publicClient),
     ...chainActions(clientWithBasicActions),
-    ...walletActions(clientWithBasicActions),
-    ...transactionActions(clientWithBasicActions, publicClient)
+    ...walletActions(clientWithBasicActions)
+  };
+  const clientWithAllActions = {
+    ...clientWithTransactionActions,
+    ...contractActions(clientWithTransactionActions, publicClient)
   };
   const finalClient = {
     ...clientWithAllActions,

package/dist/index.d.cts

@@ -1,7 +1,7 @@
 import * as viem from 'viem';
 import { Account, Address, Hex } from 'viem';
 import { G as GenLayerChain } from './chains-BYSCF33g.cjs';
-import { G as GenLayerClient, D as DecodedDeployData, a as DecodedCallData, b as GenLayerRawTransaction, c as GenLayerTransaction, C as CalldataEncodable, T as TransactionDataElement } from './index-DrEvzYFA.cjs';
+import { G as GenLayerClient, D as DecodedDeployData, a as DecodedCallData, b as GenLayerRawTransaction, c as GenLayerTransaction, C as CalldataEncodable, T as TransactionDataElement } from './index-C_GfhvDJ.cjs';
 import * as abitype from 'abitype';
 import * as viem__types_types_authorization from 'viem/_types/types/authorization';
 import * as viem_accounts from 'viem/accounts';

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import * as viem from 'viem';
 import { Account, Address, Hex } from 'viem';
 import { G as GenLayerChain } from './chains-BYSCF33g.js';
-import { G as GenLayerClient, D as DecodedDeployData, a as DecodedCallData, b as GenLayerRawTransaction, c as GenLayerTransaction, C as CalldataEncodable, T as TransactionDataElement } from './index-BIyk5Fv7.js';
+import { G as GenLayerClient, D as DecodedDeployData, a as DecodedCallData, b as GenLayerRawTransaction, c as GenLayerTransaction, C as CalldataEncodable, T as TransactionDataElement } from './index-BJebZa37.js';
 import * as abitype from 'abitype';
 import * as viem__types_types_authorization from 'viem/_types/types/authorization';
 import * as viem_accounts from 'viem/accounts';

package/dist/index.js

@@ -407,7 +407,7 @@ function serialize(data) {
 }
 
 // src/contracts/actions.ts
-import { fromHex, toHex as toHex2, zeroAddress, encodeFunctionData, parseEventLogs } from "viem";
+import { fromHex, toHex as toHex3, zeroAddress, encodeFunctionData, parseEventLogs } from "viem";
 
 // src/abi/index.ts
 var abi_exports = {};
@@ -419,6 +419,7 @@ var calldata = calldata_exports;
 var transactions = transactions_exports;
 
 // src/utils/jsonifier.ts
+import { toHex as toHex2 } from "viem";
 function b64ToArray(b64) {
   return Uint8Array.from(atob(b64), (c) => c.charCodeAt(0));
 }
@@ -457,6 +458,54 @@ function resultToUserFriendlyJson(cd64) {
     payload
   };
 }
+function toJsonSafeDeep(value) {
+  return _toJsonSafeDeep(value, /* @__PURE__ */ new WeakSet());
+}
+function _toJsonSafeDeep(value, seen) {
+  if (value === null || value === void 0) {
+    return null;
+  }
+  const primitiveType = typeof value;
+  if (primitiveType === "string" || primitiveType === "boolean" || primitiveType === "number") {
+    return value;
+  }
+  if (primitiveType === "bigint") {
+    const big = value;
+    const abs = big < 0n ? -big : big;
+    const maxSafe = 9007199254740991n;
+    return abs <= maxSafe ? Number(big) : big.toString();
+  }
+  if (typeof value === "object") {
+    if (seen.has(value)) {
+      return null;
+    }
+    seen.add(value);
+    if (value instanceof Uint8Array) {
+      return toHex2(value);
+    }
+    if (value instanceof Array) {
+      return value.map((v) => _toJsonSafeDeep(v, seen));
+    }
+    if (value instanceof Map) {
+      const obj = {};
+      for (const [k, v] of value.entries()) {
+        obj[k] = _toJsonSafeDeep(v, seen);
+      }
+      return obj;
+    }
+    if (value instanceof CalldataAddress) {
+      return toHex2(value.bytes);
+    }
+    if (Object.getPrototypeOf(value) === Object.prototype) {
+      const obj = {};
+      for (const [k, v] of Object.entries(value)) {
+        obj[k] = _toJsonSafeDeep(v, seen);
+      }
+      return obj;
+    }
+  }
+  return value;
+}
 
 // src/contracts/actions.ts
 var contractActions = (client, publicClient) => {
@@ -488,7 +537,7 @@ var contractActions = (client, publicClient) => {
       }
       const schema = await client.request({
         method: "gen_getContractSchemaForCode",
-        params: [toHex2(contractCode)]
+        params: [toHex3(contractCode)]
       });
       return schema;
     },
@@ -499,6 +548,7 @@ var contractActions = (client, publicClient) => {
         functionName,
         args: callArgs,
         kwargs,
+        jsonSafeReturn = false,
         leaderOnly = false,
         transactionHashVariant = "latest-nonfinal" /* LATEST_NONFINAL */
       } = args;
@@ -521,7 +571,11 @@ var contractActions = (client, publicClient) => {
         return prefixedResult;
       }
       const resultBinary = fromHex(prefixedResult, "bytes");
-      return decode(resultBinary);
+      const decoded = decode(resultBinary);
+      if (!jsonSafeReturn) {
+        return decoded;
+      }
+      return toJsonSafeDeep(decoded);
     },
     simulateWriteContract: async (args) => {
       const {
@@ -676,6 +730,18 @@ var _sendTransaction = async ({
   }
   const validatedSenderAccount = validateAccount(senderAccount);
   const nonce = await client.getCurrentNonce({ address: validatedSenderAccount.address });
+  let estimatedGas;
+  try {
+    estimatedGas = await client.estimateTransactionGas({
+      from: validatedSenderAccount.address,
+      to: client.chain.consensusMainContract?.address,
+      data: encodedData,
+      value
+    });
+  } catch (error) {
+    console.warn("Gas estimation failed, using fallback value:", error);
+    estimatedGas = 200000n;
+  }
   const transactionRequest = await client.prepareTransactionRequest({
     account: validatedSenderAccount,
     to: client.chain.consensusMainContract?.address,
@@ -683,7 +749,7 @@ var _sendTransaction = async ({
     type: "legacy",
     nonce: Number(nonce),
     value,
-    gas: 21000n
+    gas: estimatedGas
   });
   if (validatedSenderAccount?.type !== "local") {
     const formattedRequest = {
@@ -1025,6 +1091,19 @@ var transactionActions = (client, publicClient) => ({
       ]
     });
     return decodeTransaction(transaction);
+  },
+  estimateTransactionGas: async (transactionParams) => {
+    const formattedParams = {
+      from: transactionParams.from || client.account?.address,
+      to: transactionParams.to,
+      data: transactionParams.data || "0x",
+      value: transactionParams.value ? `0x${transactionParams.value.toString(16)}` : "0x0"
+    };
+    const gasHex = await client.request({
+      method: "eth_estimateGas",
+      params: [formattedParams]
+    });
+    return BigInt(gasHex);
   }
 });
 
@@ -1225,12 +1304,15 @@ var createClient = (config = { chain: localnet }) => {
     ...config.account ? { account: config.account } : {}
   });
   const clientWithBasicActions = baseClient.extend(publicActions).extend(walletActions2).extend((client) => accountActions(client));
-  const clientWithAllActions = {
+  const clientWithTransactionActions = {
     ...clientWithBasicActions,
-    ...contractActions(clientWithBasicActions, publicClient),
+    ...transactionActions(clientWithBasicActions, publicClient),
     ...chainActions(clientWithBasicActions),
-    ...walletActions(clientWithBasicActions),
-    ...transactionActions(clientWithBasicActions, publicClient)
+    ...walletActions(clientWithBasicActions)
+  };
+  const clientWithAllActions = {
+    ...clientWithTransactionActions,
+    ...contractActions(clientWithTransactionActions, publicClient)
   };
   const finalClient = {
     ...clientWithAllActions,

package/dist/types/index.d.cts

@@ -1,3 +1,3 @@
 export { Account, Address } from 'viem';
-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-DrEvzYFA.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-C_GfhvDJ.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 { 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-BIyk5Fv7.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-BJebZa37.js';
 export { G as GenLayerChain } from '../chains-BYSCF33g.js';

package/package.json

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

package/src/client/client.ts

@@ -106,13 +106,18 @@ export const createClient = (config: ClientConfig = {chain: localnet}): GenLayer
     .extend(walletActions)
     .extend(client => accountActions(client as unknown as GenLayerClient<GenLayerChain>));
 
-  // Create a client with all actions except transaction actions
-  const clientWithAllActions = {
+  // First add transaction actions, then contract actions that depend on them
+  const clientWithTransactionActions = {
     ...clientWithBasicActions,
-    ...contractActions(clientWithBasicActions as unknown as GenLayerClient<GenLayerChain>, publicClient),
+    ...transactionActions(clientWithBasicActions as unknown as GenLayerClient<GenLayerChain>, publicClient),
     ...chainActions(clientWithBasicActions as unknown as GenLayerClient<GenLayerChain>),
     ...genlayerWalletActions(clientWithBasicActions as unknown as GenLayerClient<GenLayerChain>),
-    ...transactionActions(clientWithBasicActions as unknown as GenLayerClient<GenLayerChain>, publicClient),
+  } as unknown as GenLayerClient<GenLayerChain>;
+
+  // Then add contract actions that can now access transaction actions
+  const clientWithAllActions = {
+    ...clientWithTransactionActions,
+    ...contractActions(clientWithTransactionActions as unknown as GenLayerClient<GenLayerChain>, publicClient),
   } as unknown as GenLayerClient<GenLayerChain>;
 
   // Add transaction actions last, after all other actions are in place

package/src/contracts/actions.ts

@@ -11,7 +11,7 @@ import {
   TransactionHashVariant,
 } from "@/types";
 import {fromHex, toHex, zeroAddress, encodeFunctionData, PublicClient, parseEventLogs} from "viem";
-import {b64ToArray} from "@/utils/jsonifier";
+import {toJsonSafeDeep, b64ToArray} from "@/utils/jsonifier";
 
 export const contractActions = (client: GenLayerClient<GenLayerChain>, publicClient: PublicClient) => {
   return {
@@ -53,6 +53,7 @@ export const contractActions = (client: GenLayerClient<GenLayerChain>, publicCli
       args?: CalldataEncodable[];
       kwargs?: Map<string, CalldataEncodable> | {[key: string]: CalldataEncodable};
       rawReturn?: RawReturn;
+      jsonSafeReturn?: boolean;
       leaderOnly?: boolean;
       transactionHashVariant?: TransactionHashVariant;
     }): Promise<RawReturn extends true ? `0x${string}` : CalldataEncodable> => {
@@ -62,6 +63,7 @@ export const contractActions = (client: GenLayerClient<GenLayerChain>, publicCli
         functionName,
         args: callArgs,
         kwargs,
+        jsonSafeReturn = false,
         leaderOnly = false,
         transactionHashVariant = TransactionHashVariant.LATEST_NONFINAL,
       } = args;
@@ -88,7 +90,12 @@ export const contractActions = (client: GenLayerClient<GenLayerChain>, publicCli
         return prefixedResult;
       }
       const resultBinary = fromHex(prefixedResult, "bytes");
-      return calldata.decode(resultBinary) as any;
+      const decoded = calldata.decode(resultBinary) as any;
+      if (!jsonSafeReturn) {
+        return decoded;
+      }
+      // If jsonSafeReturn is requested, convert to JSON-safe recursively
+      return toJsonSafeDeep(decoded) as any;
     },
     simulateWriteContract: async <RawReturn extends boolean | undefined>(args: {
       account?: Account;
@@ -296,6 +303,18 @@ const _sendTransaction = async ({
   const validatedSenderAccount = validateAccount(senderAccount);
 
   const nonce = await client.getCurrentNonce({address: validatedSenderAccount.address});
+  let estimatedGas: bigint;
+  try {
+    estimatedGas = await client.estimateTransactionGas({
+      from: validatedSenderAccount.address,
+      to: client.chain.consensusMainContract?.address as Address,
+      data: encodedData,
+      value: value,
+    });
+  } catch (error) {
+    console.warn("Gas estimation failed, using fallback value:", error);
+    estimatedGas = 200_000n;
+  }
   const transactionRequest = await client.prepareTransactionRequest({
     account: validatedSenderAccount,
     to: client.chain.consensusMainContract?.address as Address,
@@ -303,7 +322,7 @@ const _sendTransaction = async ({
     type: "legacy",
     nonce: Number(nonce),
     value: value,
-    gas: 21000n,
+    gas: estimatedGas,
   });
 
   if (validatedSenderAccount?.type !== "local") {

package/src/transactions/actions.ts

@@ -90,6 +90,26 @@ export const transactionActions = (client: GenLayerClient<GenLayerChain>, public
     })) as unknown as GenLayerRawTransaction;
     return decodeTransaction(transaction);
   },
+  estimateTransactionGas: async (transactionParams: {
+    from?: Address;
+    to: Address;
+    data?: `0x${string}`;
+    value?: bigint;
+  }): Promise<bigint> => {
+    const formattedParams = {
+      from: transactionParams.from || client.account?.address,
+      to: transactionParams.to,
+      data: transactionParams.data || "0x",
+      value: transactionParams.value ? `0x${transactionParams.value.toString(16)}` as `0x${string}` : "0x0" as `0x${string}`,
+    };
+
+    const gasHex = await client.request({
+      method: "eth_estimateGas",
+      params: [formattedParams],
+    }) as string;
+
+    return BigInt(gasHex);
+  },
 });
 
 

package/src/transactions/decoders.ts

@@ -1,5 +1,4 @@
-import {GenLayerTransaction, GenLayerRawTransaction, DecodedCallData, DecodedDeployData} from "../types/transactions";
-import {transactionsStatusNumberToName, transactionResultNumberToName, voteTypeNumberToName, VoteType} from "../types/transactions";
+import {GenLayerTransaction, GenLayerRawTransaction, DecodedCallData, DecodedDeployData,transactionsStatusNumberToName, transactionResultNumberToName, voteTypeNumberToName, VoteType} from "../types/transactions";
 import {b64ToArray, calldataToUserFriendlyJson, resultToUserFriendlyJson} from "../utils/jsonifier";
 import {fromRlp, fromHex, Hex, Address} from "viem";
 import * as calldataAbi from "../abi/calldata";

package/src/types/clients.ts

@@ -18,6 +18,7 @@ export type GenLayerMethod =
   | {method: "gen_getContractCode"; params: [address: Address]}
   | {method: "sim_getTransactionsForAddress"; params: [address: Address, filter?: "all" | "from" | "to"]}
   | {method: "eth_getTransactionCount"; params: [address: Address, block: string]}
+  | {method: "eth_estimateGas"; params: [transactionParams: any]}
   | {method: "gen_call"; params: [requestParams: any]};
 
 /*
@@ -47,6 +48,7 @@ export type GenLayerClient<TGenLayerChain extends GenLayerChain> = Omit<
       args?: CalldataEncodable[];
       kwargs?: Map<string, CalldataEncodable> | {[key: string]: CalldataEncodable};
       rawReturn?: RawReturn;
+      jsonSafeReturn?: boolean;
       transactionHashVariant?: TransactionHashVariant;
     }) => Promise<RawReturn extends true ? `0x${string}` : CalldataEncodable>;
     writeContract: (args: {
@@ -79,6 +81,12 @@ export type GenLayerClient<TGenLayerChain extends GenLayerChain> = Omit<
     }) => Promise<`0x${string}`>;
     getTransaction: (args: {hash: TransactionHash}) => Promise<GenLayerTransaction>;
     getCurrentNonce: (args: {address: Address}) => Promise<number>;
+    estimateTransactionGas: (transactionParams: {
+      from?: Address;
+      to: Address;
+      data?: `0x${string}`;
+      value?: bigint;
+    }) => Promise<bigint>;
     waitForTransactionReceipt: (args: {
       hash: TransactionHash;
       status?: TransactionStatus;

package/src/utils/jsonifier.ts

@@ -1,4 +1,7 @@
 import {calldata} from "@/abi";
+import type {CalldataEncodable} from "@/types/calldata";
+import {CalldataAddress} from "@/types/calldata";
+import {toHex} from "viem";
 
 
 export function b64ToArray(b64: string): Uint8Array {
@@ -44,4 +47,73 @@ export function resultToUserFriendlyJson(cd64: string): any {
     status,
     payload,
   };
+}
+
+// Deeply converts CalldataEncodable values into JSON-serializable structures.
+// Rules:
+// - bigint: to number if safe, otherwise to decimal string
+// - Uint8Array: to 0x-prefixed hex string
+// - CalldataAddress: to 0x-prefixed hex string
+// - Map: to Array<[key, value]> preserving order
+// - Arrays and plain objects: converted recursively
+export function toJsonSafeDeep<T extends CalldataEncodable>(value: T): any {
+  return _toJsonSafeDeep(value, new WeakSet());
+}
+
+function _toJsonSafeDeep(value: CalldataEncodable, seen: WeakSet<object>): any {
+  if (value === null || value === undefined) {
+    return null;
+  }
+
+  const primitiveType = typeof value;
+  if (primitiveType === "string" || primitiveType === "boolean" || primitiveType === "number") {
+    return value;
+  }
+
+  if (primitiveType === "bigint") {
+    const big = value as bigint;
+    const abs = big < 0n ? -big : big;
+    const maxSafe = 9007199254740991n; // Number.MAX_SAFE_INTEGER
+    return abs <= maxSafe ? Number(big) : big.toString();
+  }
+
+  // Objects and structured values
+  if (typeof value === "object") {
+    if (seen.has(value as object)) {
+      // Prevent potential cycles; represent as null
+      return null;
+    }
+    seen.add(value as object);
+
+    if (value instanceof Uint8Array) {
+      return toHex(value);
+    }
+
+    if (value instanceof Array) {
+      return value.map((v) => _toJsonSafeDeep(v as CalldataEncodable, seen));
+    }
+
+    if (value instanceof Map) {
+      const obj: Record<string, any> = {};
+      for (const [k, v] of value.entries()) {
+        obj[k] = _toJsonSafeDeep(v as CalldataEncodable, seen);
+      }
+      return obj;
+    }
+
+    if (value instanceof CalldataAddress) {
+      return toHex(value.bytes);
+    }
+
+    if (Object.getPrototypeOf(value) === Object.prototype) {
+      const obj: Record<string, any> = {};
+      for (const [k, v] of Object.entries(value)) {
+        obj[k] = _toJsonSafeDeep(v as CalldataEncodable, seen);
+      }
+      return obj;
+    }
+  }
+
+  // Fallback: return as-is (shouldn't normally reach here)
+  return value as any;
 }