genlayer-js 0.18.0 → 0.18.2

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 
 
+## 0.18.2 (2025-09-18)
+
+
+### Bug Fixes
+
+* **transactions:** handle all DECIDED states in waitForTransactionReceipt ([#116](https://github.com/genlayerlabs/genlayer-js/issues/116)) ([78433d7](https://github.com/genlayerlabs/genlayer-js/commit/78433d7224298ab418ca16a87de497149b66b5f7))
+
+## 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)
 
 

package/dist/{chunk-GACCNOPJ.js → chunk-47QDX7IX.js}

@@ -75,6 +75,19 @@ var transactionsStatusNameToNumber = {
   ["VALIDATORS_TIMEOUT" /* VALIDATORS_TIMEOUT */]: "12",
   ["LEADER_TIMEOUT" /* LEADER_TIMEOUT */]: "13"
 };
+var DECIDED_STATES = [
+  "ACCEPTED" /* ACCEPTED */,
+  "UNDETERMINED" /* UNDETERMINED */,
+  "LEADER_TIMEOUT" /* LEADER_TIMEOUT */,
+  "VALIDATORS_TIMEOUT" /* VALIDATORS_TIMEOUT */,
+  "CANCELED" /* CANCELED */,
+  "FINALIZED" /* FINALIZED */
+];
+function isDecidedState(status) {
+  return DECIDED_STATES.some(
+    (state) => transactionsStatusNameToNumber[state] === status
+  );
+}
 var transactionResultNumberToName = {
   "0": "IDLE" /* IDLE */,
   "1": "AGREE" /* AGREE */,
@@ -129,6 +142,8 @@ export {
   TransactionResult,
   transactionsStatusNumberToName,
   transactionsStatusNameToNumber,
+  DECIDED_STATES,
+  isDecidedState,
   transactionResultNumberToName,
   TransactionResultNameToNumber,
   VoteType,

package/dist/{chunk-H4ZYXVV2.cjs → chunk-FPZNF3JH.cjs}

@@ -75,6 +75,19 @@ var transactionsStatusNameToNumber = {
   ["VALIDATORS_TIMEOUT" /* VALIDATORS_TIMEOUT */]: "12",
   ["LEADER_TIMEOUT" /* LEADER_TIMEOUT */]: "13"
 };
+var DECIDED_STATES = [
+  "ACCEPTED" /* ACCEPTED */,
+  "UNDETERMINED" /* UNDETERMINED */,
+  "LEADER_TIMEOUT" /* LEADER_TIMEOUT */,
+  "VALIDATORS_TIMEOUT" /* VALIDATORS_TIMEOUT */,
+  "CANCELED" /* CANCELED */,
+  "FINALIZED" /* FINALIZED */
+];
+function isDecidedState(status) {
+  return DECIDED_STATES.some(
+    (state) => transactionsStatusNameToNumber[state] === status
+  );
+}
 var transactionResultNumberToName = {
   "0": "IDLE" /* IDLE */,
   "1": "AGREE" /* AGREE */,
@@ -135,4 +148,6 @@ var TransactionHashVariant = /* @__PURE__ */ ((TransactionHashVariant2) => {
 
 
 
-exports.CalldataAddress = CalldataAddress; exports.TransactionStatus = TransactionStatus; exports.TransactionResult = TransactionResult; exports.transactionsStatusNumberToName = transactionsStatusNumberToName; exports.transactionsStatusNameToNumber = transactionsStatusNameToNumber; exports.transactionResultNumberToName = transactionResultNumberToName; exports.TransactionResultNameToNumber = TransactionResultNameToNumber; exports.VoteType = VoteType; exports.voteTypeNumberToName = voteTypeNumberToName; exports.voteTypeNameToNumber = voteTypeNameToNumber; exports.TransactionHashVariant = TransactionHashVariant;
+
+
+exports.CalldataAddress = CalldataAddress; exports.TransactionStatus = TransactionStatus; exports.TransactionResult = TransactionResult; exports.transactionsStatusNumberToName = transactionsStatusNumberToName; exports.transactionsStatusNameToNumber = transactionsStatusNameToNumber; exports.DECIDED_STATES = DECIDED_STATES; exports.isDecidedState = isDecidedState; exports.transactionResultNumberToName = transactionResultNumberToName; exports.TransactionResultNameToNumber = TransactionResultNameToNumber; exports.VoteType = VoteType; exports.voteTypeNumberToName = voteTypeNumberToName; exports.voteTypeNameToNumber = voteTypeNameToNumber; exports.TransactionHashVariant = TransactionHashVariant;

package/dist/{index-BnFbqUhu.d.ts → index-Rls_T310.d.ts}

@@ -80,6 +80,8 @@ declare const transactionsStatusNameToNumber: {
     VALIDATORS_TIMEOUT: string;
     LEADER_TIMEOUT: string;
 };
+declare const DECIDED_STATES: TransactionStatus[];
+declare function isDecidedState(status: string): boolean;
 declare const transactionResultNumberToName: {
     "0": TransactionResult;
     "1": TransactionResult;
@@ -313,6 +315,9 @@ type GenLayerMethod = {
 } | {
     method: "eth_getTransactionCount";
     params: [address: Address, block: string];
+} | {
+    method: "eth_estimateGas";
+    params: [transactionParams: any];
 } | {
     method: "gen_call";
     params: [requestParams: any];
@@ -375,6 +380,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;
@@ -393,4 +404,4 @@ type GenLayerClient<TGenLayerChain extends GenLayerChain> = Omit<Client<Transpor
     }) => Promise<any>;
 };
 
-export { type CalldataEncodable as C, type DecodedDeployData as D, type GenLayerClient as G, type Hash as H, type MethodDescription as M, type Network as N, type SnapSource as S, type TransactionDataElement as T, VoteType as V, type DecodedCallData as a, type GenLayerRawTransaction as b, type GenLayerTransaction as c, CalldataAddress as d, type GenLayerMethod as e, type ContractParamsArraySchemaElement as f, type ContractParamsSchema as g, type ContractMethodBase as h, type ContractMethod as i, type ContractSchema as j, type TransactionHash as k, TransactionStatus as l, TransactionResult as m, transactionsStatusNameToNumber as n, transactionResultNumberToName as o, TransactionResultNameToNumber as p, voteTypeNameToNumber as q, type TransactionType as r, TransactionHashVariant as s, transactionsStatusNumberToName as t, voteTypeNumberToName as v };
+export { type CalldataEncodable as C, type DecodedDeployData as D, type GenLayerClient as G, type Hash as H, type MethodDescription as M, type Network as N, type SnapSource as S, type TransactionDataElement as T, VoteType as V, type DecodedCallData as a, type GenLayerRawTransaction as b, type GenLayerTransaction as c, CalldataAddress as d, type GenLayerMethod as e, type ContractParamsArraySchemaElement as f, type ContractParamsSchema as g, type ContractMethodBase as h, type ContractMethod as i, type ContractSchema as j, type TransactionHash as k, TransactionStatus as l, TransactionResult as m, transactionsStatusNameToNumber as n, DECIDED_STATES as o, isDecidedState as p, transactionResultNumberToName as q, TransactionResultNameToNumber as r, voteTypeNameToNumber as s, transactionsStatusNumberToName as t, type TransactionType as u, voteTypeNumberToName as v, TransactionHashVariant as w };

package/dist/{index-CxNl4CK5.d.cts → index-tixobC8m.d.cts}

@@ -80,6 +80,8 @@ declare const transactionsStatusNameToNumber: {
     VALIDATORS_TIMEOUT: string;
     LEADER_TIMEOUT: string;
 };
+declare const DECIDED_STATES: TransactionStatus[];
+declare function isDecidedState(status: string): boolean;
 declare const transactionResultNumberToName: {
     "0": TransactionResult;
     "1": TransactionResult;
@@ -313,6 +315,9 @@ type GenLayerMethod = {
 } | {
     method: "eth_getTransactionCount";
     params: [address: Address, block: string];
+} | {
+    method: "eth_estimateGas";
+    params: [transactionParams: any];
 } | {
     method: "gen_call";
     params: [requestParams: any];
@@ -375,6 +380,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;
@@ -393,4 +404,4 @@ type GenLayerClient<TGenLayerChain extends GenLayerChain> = Omit<Client<Transpor
     }) => Promise<any>;
 };
 
-export { type CalldataEncodable as C, type DecodedDeployData as D, type GenLayerClient as G, type Hash as H, type MethodDescription as M, type Network as N, type SnapSource as S, type TransactionDataElement as T, VoteType as V, type DecodedCallData as a, type GenLayerRawTransaction as b, type GenLayerTransaction as c, CalldataAddress as d, type GenLayerMethod as e, type ContractParamsArraySchemaElement as f, type ContractParamsSchema as g, type ContractMethodBase as h, type ContractMethod as i, type ContractSchema as j, type TransactionHash as k, TransactionStatus as l, TransactionResult as m, transactionsStatusNameToNumber as n, transactionResultNumberToName as o, TransactionResultNameToNumber as p, voteTypeNameToNumber as q, type TransactionType as r, TransactionHashVariant as s, transactionsStatusNumberToName as t, voteTypeNumberToName as v };
+export { type CalldataEncodable as C, type DecodedDeployData as D, type GenLayerClient as G, type Hash as H, type MethodDescription as M, type Network as N, type SnapSource as S, type TransactionDataElement as T, VoteType as V, type DecodedCallData as a, type GenLayerRawTransaction as b, type GenLayerTransaction as c, CalldataAddress as d, type GenLayerMethod as e, type ContractParamsArraySchemaElement as f, type ContractParamsSchema as g, type ContractMethodBase as h, type ContractMethod as i, type ContractSchema as j, type TransactionHash as k, TransactionStatus as l, TransactionResult as m, transactionsStatusNameToNumber as n, DECIDED_STATES as o, isDecidedState as p, transactionResultNumberToName as q, TransactionResultNameToNumber as r, voteTypeNameToNumber as s, transactionsStatusNumberToName as t, type TransactionType as u, voteTypeNumberToName as v, TransactionHashVariant as w };

package/dist/index.cjs

@@ -10,7 +10,8 @@ var _chunkZKBMABRAcjs = require('./chunk-ZKBMABRA.cjs');
 
 
 
-var _chunkH4ZYXVV2cjs = require('./chunk-H4ZYXVV2.cjs');
+
+var _chunkFPZNF3JHcjs = require('./chunk-FPZNF3JH.cjs');
 
 
 var _chunk75ZPJI57cjs = require('./chunk-75ZPJI57.cjs');
@@ -183,7 +184,7 @@ function encodeImpl(to, data) {
         }
       } else if (data instanceof Map) {
         encodeMap(to, data);
-      } else if (data instanceof _chunkH4ZYXVV2cjs.CalldataAddress) {
+      } else if (data instanceof _chunkFPZNF3JHcjs.CalldataAddress) {
         to.push(SPECIAL_ADDR);
         for (const c of data.bytes) {
           to.push(c);
@@ -258,7 +259,7 @@ function decodeImpl(data, index) {
     case BigInt(SPECIAL_ADDR): {
       const res = data.slice(index.i, index.i + 20);
       index.i += 20;
-      return new (0, _chunkH4ZYXVV2cjs.CalldataAddress)(res);
+      return new (0, _chunkFPZNF3JHcjs.CalldataAddress)(res);
     }
   }
   const type = Number(cur & 0xffn) & (1 << BITS_IN_TYPE) - 1;
@@ -370,7 +371,7 @@ function toStringImpl(data, to) {
         to.push("]");
       } else if (data instanceof Map) {
         toStringImplMap(data.entries(), to);
-      } else if (data instanceof _chunkH4ZYXVV2cjs.CalldataAddress) {
+      } else if (data instanceof _chunkFPZNF3JHcjs.CalldataAddress) {
         to.push("addr#");
         for (const c of data.bytes) {
           to.push(c.toString(16));
@@ -493,7 +494,7 @@ function _toJsonSafeDeep(value, seen) {
       }
       return obj;
     }
-    if (value instanceof _chunkH4ZYXVV2cjs.CalldataAddress) {
+    if (value instanceof _chunkFPZNF3JHcjs.CalldataAddress) {
       return _viem.toHex.call(void 0, value.bytes);
     }
     if (Object.getPrototypeOf(value) === Object.prototype) {
@@ -730,16 +731,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,
@@ -752,7 +765,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);
@@ -762,7 +775,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
   });
@@ -884,8 +897,8 @@ var decodeTransaction = (tx) => {
       processingBlock: tx.readStateBlockRange.processingBlock.toString(),
       proposalBlock: tx.readStateBlockRange.proposalBlock.toString()
     },
-    statusName: _chunkH4ZYXVV2cjs.transactionsStatusNumberToName[String(tx.status)],
-    resultName: _chunkH4ZYXVV2cjs.transactionResultNumberToName[String(tx.result)],
+    statusName: _chunkFPZNF3JHcjs.transactionsStatusNumberToName[String(tx.status)],
+    resultName: _chunkFPZNF3JHcjs.transactionResultNumberToName[String(tx.result)],
     lastRound: {
       ...tx.lastRound,
       round: tx.lastRound.round.toString(),
@@ -895,7 +908,7 @@ var decodeTransaction = (tx) => {
       appealBond: tx.lastRound.appealBond.toString(),
       rotationsLeft: tx.lastRound.rotationsLeft.toString(),
       validatorVotesName: tx.lastRound.validatorVotes.map(
-        (vote) => _chunkH4ZYXVV2cjs.voteTypeNumberToName[String(vote)]
+        (vote) => _chunkFPZNF3JHcjs.voteTypeNumberToName[String(vote)]
       )
     }
   };
@@ -975,7 +988,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) => {
@@ -1006,7 +1019,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))
@@ -1034,9 +1047,8 @@ var receiptActions = (client, publicClient) => ({
       throw new Error("Transaction not found");
     }
     const transactionStatusString = String(transaction.status);
-    const transactionStatusFinalized = _chunkH4ZYXVV2cjs.transactionsStatusNameToNumber["FINALIZED" /* FINALIZED */];
-    const requestedStatus = _chunkH4ZYXVV2cjs.transactionsStatusNameToNumber[status];
-    if (transactionStatusString === requestedStatus || status === "ACCEPTED" /* ACCEPTED */ && transactionStatusString === transactionStatusFinalized) {
+    const requestedStatus = _chunkFPZNF3JHcjs.transactionsStatusNameToNumber[status];
+    if (transactionStatusString === requestedStatus || status === "ACCEPTED" /* ACCEPTED */ && _chunkFPZNF3JHcjs.isDecidedState.call(void 0, transactionStatusString)) {
       let finalTransaction = transaction;
       if (client.chain.id === _chunkZKBMABRAcjs.localnet.id) {
         finalTransaction = decodeLocalnetTransaction(transaction);
@@ -1064,13 +1076,13 @@ var transactionActions = (client, publicClient) => ({
     if (client.chain.id === _chunkZKBMABRAcjs.localnet.id) {
       const transaction2 = await client.getTransaction({ hash });
       const localnetStatus = transaction2.status === "ACTIVATED" ? "PENDING" /* PENDING */ : transaction2.status;
-      transaction2.status = Number(_chunkH4ZYXVV2cjs.transactionsStatusNameToNumber[localnetStatus]);
+      transaction2.status = Number(_chunkFPZNF3JHcjs.transactionsStatusNameToNumber[localnetStatus]);
       transaction2.statusName = localnetStatus;
       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,
@@ -1079,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);
   }
 });
 
@@ -1111,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) {
@@ -1145,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;
@@ -1156,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) {
@@ -1191,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], {
@@ -1279,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-CxNl4CK5.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-tixobC8m.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-BnFbqUhu.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-Rls_T310.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

@@ -6,11 +6,12 @@ import {
 } from "./chunk-GEN4SJ6K.js";
 import {
   CalldataAddress,
+  isDecidedState,
   transactionResultNumberToName,
   transactionsStatusNameToNumber,
   transactionsStatusNumberToName,
   voteTypeNumberToName
-} from "./chunk-GACCNOPJ.js";
+} from "./chunk-47QDX7IX.js";
 import {
   __export
 } from "./chunk-MLKGABMK.js";
@@ -730,6 +731,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,
@@ -737,7 +750,7 @@ var _sendTransaction = async ({
     type: "legacy",
     nonce: Number(nonce),
     value,
-    gas: 21000n
+    gas: estimatedGas
   });
   if (validatedSenderAccount?.type !== "local") {
     const formattedRequest = {
@@ -1034,9 +1047,8 @@ var receiptActions = (client, publicClient) => ({
       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 (transactionStatusString === requestedStatus || status === "ACCEPTED" /* ACCEPTED */ && isDecidedState(transactionStatusString)) {
       let finalTransaction = transaction;
       if (client.chain.id === localnet.id) {
         finalTransaction = decodeLocalnetTransaction(transaction);
@@ -1079,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);
   }
 });
 
@@ -1279,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.cjs

@@ -10,7 +10,9 @@
 
 
 
-var _chunkH4ZYXVV2cjs = require('../chunk-H4ZYXVV2.cjs');
+
+
+var _chunkFPZNF3JHcjs = require('../chunk-FPZNF3JH.cjs');
 require('../chunk-75ZPJI57.cjs');
 
 
@@ -24,4 +26,6 @@ require('../chunk-75ZPJI57.cjs');
 
 
 
-exports.CalldataAddress = _chunkH4ZYXVV2cjs.CalldataAddress; exports.TransactionHashVariant = _chunkH4ZYXVV2cjs.TransactionHashVariant; exports.TransactionResult = _chunkH4ZYXVV2cjs.TransactionResult; exports.TransactionResultNameToNumber = _chunkH4ZYXVV2cjs.TransactionResultNameToNumber; exports.TransactionStatus = _chunkH4ZYXVV2cjs.TransactionStatus; exports.VoteType = _chunkH4ZYXVV2cjs.VoteType; exports.transactionResultNumberToName = _chunkH4ZYXVV2cjs.transactionResultNumberToName; exports.transactionsStatusNameToNumber = _chunkH4ZYXVV2cjs.transactionsStatusNameToNumber; exports.transactionsStatusNumberToName = _chunkH4ZYXVV2cjs.transactionsStatusNumberToName; exports.voteTypeNameToNumber = _chunkH4ZYXVV2cjs.voteTypeNameToNumber; exports.voteTypeNumberToName = _chunkH4ZYXVV2cjs.voteTypeNumberToName;
+
+
+exports.CalldataAddress = _chunkFPZNF3JHcjs.CalldataAddress; exports.DECIDED_STATES = _chunkFPZNF3JHcjs.DECIDED_STATES; exports.TransactionHashVariant = _chunkFPZNF3JHcjs.TransactionHashVariant; exports.TransactionResult = _chunkFPZNF3JHcjs.TransactionResult; exports.TransactionResultNameToNumber = _chunkFPZNF3JHcjs.TransactionResultNameToNumber; exports.TransactionStatus = _chunkFPZNF3JHcjs.TransactionStatus; exports.VoteType = _chunkFPZNF3JHcjs.VoteType; exports.isDecidedState = _chunkFPZNF3JHcjs.isDecidedState; exports.transactionResultNumberToName = _chunkFPZNF3JHcjs.transactionResultNumberToName; exports.transactionsStatusNameToNumber = _chunkFPZNF3JHcjs.transactionsStatusNameToNumber; exports.transactionsStatusNumberToName = _chunkFPZNF3JHcjs.transactionsStatusNumberToName; exports.voteTypeNameToNumber = _chunkFPZNF3JHcjs.voteTypeNameToNumber; exports.voteTypeNumberToName = _chunkFPZNF3JHcjs.voteTypeNumberToName;

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-CxNl4CK5.cjs';
+export { d as CalldataAddress, C as CalldataEncodable, i as ContractMethod, h as ContractMethodBase, f as ContractParamsArraySchemaElement, g as ContractParamsSchema, j as ContractSchema, o as DECIDED_STATES, 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, w as TransactionHashVariant, m as TransactionResult, r as TransactionResultNameToNumber, l as TransactionStatus, u as TransactionType, V as VoteType, p as isDecidedState, q as transactionResultNumberToName, n as transactionsStatusNameToNumber, t as transactionsStatusNumberToName, s as voteTypeNameToNumber, v as voteTypeNumberToName } from '../index-tixobC8m.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-BnFbqUhu.js';
+export { d as CalldataAddress, C as CalldataEncodable, i as ContractMethod, h as ContractMethodBase, f as ContractParamsArraySchemaElement, g as ContractParamsSchema, j as ContractSchema, o as DECIDED_STATES, 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, w as TransactionHashVariant, m as TransactionResult, r as TransactionResultNameToNumber, l as TransactionStatus, u as TransactionType, V as VoteType, p as isDecidedState, q as transactionResultNumberToName, n as transactionsStatusNameToNumber, t as transactionsStatusNumberToName, s as voteTypeNameToNumber, v as voteTypeNumberToName } from '../index-Rls_T310.js';
 export { G as GenLayerChain } from '../chains-BYSCF33g.js';

package/dist/types/index.js

@@ -1,24 +1,28 @@
 import {
   CalldataAddress,
+  DECIDED_STATES,
   TransactionHashVariant,
   TransactionResult,
   TransactionResultNameToNumber,
   TransactionStatus,
   VoteType,
+  isDecidedState,
   transactionResultNumberToName,
   transactionsStatusNameToNumber,
   transactionsStatusNumberToName,
   voteTypeNameToNumber,
   voteTypeNumberToName
-} from "../chunk-GACCNOPJ.js";
+} from "../chunk-47QDX7IX.js";
 import "../chunk-MLKGABMK.js";
 export {
   CalldataAddress,
+  DECIDED_STATES,
   TransactionHashVariant,
   TransactionResult,
   TransactionResultNameToNumber,
   TransactionStatus,
   VoteType,
+  isDecidedState,
   transactionResultNumberToName,
   transactionsStatusNameToNumber,
   transactionsStatusNumberToName,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "genlayer-js",
   "type": "module",
-  "version": "0.18.0",
+  "version": "0.18.2",
   "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

@@ -303,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,
@@ -310,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

@@ -5,6 +5,7 @@ import {
   GenLayerTransaction,
   GenLayerRawTransaction,
   transactionsStatusNameToNumber,
+  isDecidedState,
 } from "../types/transactions";
 import {transactionsConfig} from "../config/transactions";
 import {sleep} from "../utils/async";
@@ -37,11 +38,10 @@ export const receiptActions = (client: GenLayerClient<GenLayerChain>, publicClie
       throw new Error("Transaction not found");
     }
     const transactionStatusString = String(transaction.status);
-    const transactionStatusFinalized = transactionsStatusNameToNumber[TransactionStatus.FINALIZED];
     const requestedStatus = transactionsStatusNameToNumber[status];
     if (
       transactionStatusString === requestedStatus ||
-      (status === TransactionStatus.ACCEPTED && transactionStatusString === transactionStatusFinalized)
+      (status === TransactionStatus.ACCEPTED && isDecidedState(transactionStatusString))
     ) {
       let finalTransaction = transaction;
       if (client.chain.id === localnet.id) {
@@ -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]};
 
 /*
@@ -80,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/types/transactions.ts

@@ -71,6 +71,21 @@ export const transactionsStatusNameToNumber = {
   [TransactionStatus.LEADER_TIMEOUT]: "13",
 };
 
+export const DECIDED_STATES = [
+  TransactionStatus.ACCEPTED,
+  TransactionStatus.UNDETERMINED,
+  TransactionStatus.LEADER_TIMEOUT,
+  TransactionStatus.VALIDATORS_TIMEOUT,
+  TransactionStatus.CANCELED,
+  TransactionStatus.FINALIZED
+];
+
+export function isDecidedState(status: string): boolean {
+  return DECIDED_STATES.some(state => 
+    transactionsStatusNameToNumber[state] === status
+  );
+}
+
 export const transactionResultNumberToName = {
   "0": TransactionResult.IDLE,
   "1": TransactionResult.AGREE,

package/tests/transactions.test.ts

@@ -0,0 +1,142 @@
+import { describe, it, expect, vi, beforeEach } from "vitest";
+import { TransactionStatus, DECIDED_STATES, isDecidedState } from "../src/types/transactions";
+import { receiptActions } from "../src/transactions/actions";
+import { localnet } from "../src/chains/localnet";
+
+const mockFetch = vi.fn();
+vi.stubGlobal("fetch", mockFetch);
+
+describe("DECIDED_STATES constant", () => {
+  it("should contain all expected decided states", () => {
+    const expectedStates = [
+      TransactionStatus.ACCEPTED,
+      TransactionStatus.UNDETERMINED,
+      TransactionStatus.LEADER_TIMEOUT,
+      TransactionStatus.VALIDATORS_TIMEOUT,
+      TransactionStatus.CANCELED,
+      TransactionStatus.FINALIZED
+    ];
+    
+    expect(DECIDED_STATES).toEqual(expectedStates);
+  });
+});
+
+describe("isDecidedState utility function", () => {
+  it("should return true for all decided states", () => {
+    const decidedStatusNumbers = ["5", "6", "13", "12", "8", "7"]; // ACCEPTED, UNDETERMINED, LEADER_TIMEOUT, VALIDATORS_TIMEOUT, CANCELED, FINALIZED
+    
+    decidedStatusNumbers.forEach(statusNum => {
+      expect(isDecidedState(statusNum)).toBe(true);
+    });
+  });
+
+  it("should return false for non-decided states", () => {
+    const nonDecidedStatusNumbers = ["0", "1", "2", "3", "4", "9", "10", "11"]; // UNINITIALIZED, PENDING, PROPOSING, COMMITTING, REVEALING, APPEAL_REVEALING, APPEAL_COMMITTING, READY_TO_FINALIZE
+    
+    nonDecidedStatusNumbers.forEach(statusNum => {
+      expect(isDecidedState(statusNum)).toBe(false);
+    });
+  });
+
+  it("should return false for invalid statuses", () => {
+    const invalidStatuses = ["999", "invalid", ""];
+    
+    invalidStatuses.forEach(status => {
+      expect(isDecidedState(status)).toBe(false);
+    });
+  });
+});
+
+describe("waitForTransactionReceipt with DECIDED_STATES", () => {
+  beforeEach(() => {
+    mockFetch.mockReset();
+  });
+
+  it("should accept all decided states when waiting for ACCEPTED", async () => {
+    const decidedStatusNumbers = ["5", "6", "13", "12", "8", "7"]; // All decided states
+    
+    for (const statusNum of decidedStatusNumbers) {
+      const mockTransaction = {
+        hash: "0x4b8037744adab7ea8335b4f839979d20031d83a8ccdf706e0ae61312930335f6",
+        status: statusNum,
+        from_address: "0x123",
+        to_address: "0x456",
+        value: "0",
+        gaslimit: "1000000",
+        nonce: "1",
+        created_at: "2023-01-01T00:00:00Z",
+      };
+
+      const mockClient = {
+        chain: localnet,
+        getTransaction: vi.fn().mockResolvedValue(mockTransaction)
+      };
+
+      const mockPublicClient = {} as any;
+
+      const actions = receiptActions(mockClient as any, mockPublicClient);
+      const result = await actions.waitForTransactionReceipt({
+        hash: "0x4b8037744adab7ea8335b4f839979d20031d83a8ccdf706e0ae61312930335f6" as any,
+        status: TransactionStatus.ACCEPTED,
+      });
+
+      expect(result).toEqual(mockTransaction);
+    }
+  });
+
+  it("should not affect waiting for specific non-ACCEPTED statuses", async () => {
+    const mockTransaction = {
+      hash: "0x4b8037744adab7ea8335b4f839979d20031d83a8ccdf706e0ae61312930335f6",
+      status: "7", // FINALIZED
+      from_address: "0x123",
+      to_address: "0x456",
+      value: "0",
+      gaslimit: "1000000",
+      nonce: "1",
+      created_at: "2023-01-01T00:00:00Z",
+    };
+
+    const mockClient = {
+      chain: localnet,
+      getTransaction: vi.fn().mockResolvedValue(mockTransaction)
+    };
+
+    const mockPublicClient = {} as any;
+
+    const actions = receiptActions(mockClient as any, mockPublicClient);
+    const result = await actions.waitForTransactionReceipt({
+      hash: "0x4b8037744adab7ea8335b4f839979d20031d83a8ccdf706e0ae61312930335f6" as any,
+      status: TransactionStatus.FINALIZED,
+    });
+
+    expect(result).toEqual(mockTransaction);
+  });
+
+  it("should maintain backward compatibility", async () => {
+    const mockTransaction = {
+      hash: "0x4b8037744adab7ea8335b4f839979d20031d83a8ccdf706e0ae61312930335f6",
+      status: "5", // ACCEPTED
+      from_address: "0x123",
+      to_address: "0x456",
+      value: "0",
+      gaslimit: "1000000",
+      nonce: "1",
+      created_at: "2023-01-01T00:00:00Z",
+    };
+
+    const mockClient = {
+      chain: localnet,
+      getTransaction: vi.fn().mockResolvedValue(mockTransaction)
+    };
+
+    const mockPublicClient = {} as any;
+
+    const actions = receiptActions(mockClient as any, mockPublicClient);
+    const result = await actions.waitForTransactionReceipt({
+      hash: "0x4b8037744adab7ea8335b4f839979d20031d83a8ccdf706e0ae61312930335f6" as any,
+      status: TransactionStatus.ACCEPTED,
+    });
+
+    expect(result).toEqual(mockTransaction);
+  });
+});