genlayer-js 0.19.2 → 0.19.4

package/dist/index.cjs

@@ -788,9 +788,13 @@ var _encodeSubmitAppealData = ({
   });
 };
 var isAddTransactionAbiMismatchError = (error) => {
-  const errorMessage = String(
-    _optionalChain([error, 'optionalAccess', _18 => _18.shortMessage]) || _optionalChain([error, 'optionalAccess', _19 => _19.details]) || _optionalChain([error, 'optionalAccess', _20 => _20.message]) || error || ""
-  ).toLowerCase();
+  const errorObject = error;
+  const errorMessage = [
+    _optionalChain([errorObject, 'optionalAccess', _18 => _18.shortMessage]),
+    _optionalChain([errorObject, 'optionalAccess', _19 => _19.details]),
+    _optionalChain([errorObject, 'optionalAccess', _20 => _20.message]),
+    String(_nullishCoalesce(error, () => ( "")))
+  ].filter(Boolean).join(" ").toLowerCase();
   return errorMessage.includes("invalid pointer in tuple") || errorMessage.includes("could not decode") || errorMessage.includes("invalid arrayify value") || errorMessage.includes("types/value length mismatch");
 };
 var _sendTransaction = async ({
@@ -823,10 +827,10 @@ var _sendTransaction = async ({
       if (!_optionalChain([validatedSenderAccount, 'optionalAccess', _28 => _28.signTransaction])) {
         throw new Error("Account does not support signTransaction");
       }
-      const gasPriceHex = await client.request({
+      const gasPriceHex2 = await client.request({
         method: "eth_gasPrice"
       });
-      const transactionRequest2 = {
+      const transactionRequest = {
         account: validatedSenderAccount,
         to: _optionalChain([client, 'access', _29 => _29.chain, 'access', _30 => _30.consensusMainContract, 'optionalAccess', _31 => _31.address]),
         data: encodedDataForSend,
@@ -834,10 +838,10 @@ var _sendTransaction = async ({
         nonce: Number(nonce),
         value,
         gas: estimatedGas,
-        gasPrice: BigInt(gasPriceHex),
+        gasPrice: BigInt(gasPriceHex2),
         chainId: client.chain.id
       };
-      const serializedTransaction = await validatedSenderAccount.signTransaction(transactionRequest2);
+      const serializedTransaction = await validatedSenderAccount.signTransaction(transactionRequest);
       const txHash = await client.sendRawTransaction({ serializedTransaction });
       const receipt = await publicClient.waitForTransactionReceipt({ hash: txHash });
       if (receipt.status === "reverted") {
@@ -853,21 +857,29 @@ var _sendTransaction = async ({
       }
       return newTxEvents[0].args["txId"];
     }
-    const transactionRequest = await client.prepareTransactionRequest({
-      account: validatedSenderAccount,
-      to: _optionalChain([client, 'access', _35 => _35.chain, 'access', _36 => _36.consensusMainContract, 'optionalAccess', _37 => _37.address]),
-      data: encodedDataForSend,
-      type: "legacy",
-      nonce: Number(nonce),
-      value,
-      gas: estimatedGas
-    });
+    let gasPriceHex;
+    try {
+      const gasPriceResult = await client.request({
+        method: "eth_gasPrice"
+      });
+      if (typeof gasPriceResult === "string") {
+        gasPriceHex = gasPriceResult;
+      }
+    } catch (error) {
+      console.warn("Failed to fetch gas price, delegating gas price selection to wallet:", error);
+    }
+    const nonceBigInt = typeof nonce === "bigint" ? nonce : typeof nonce === "string" ? BigInt(nonce) : BigInt(Number(nonce));
     const formattedRequest = {
-      from: transactionRequest.from,
-      to: transactionRequest.to,
+      from: validatedSenderAccount.address,
+      to: _optionalChain([client, 'access', _35 => _35.chain, 'access', _36 => _36.consensusMainContract, 'optionalAccess', _37 => _37.address]),
       data: encodedDataForSend,
-      value: transactionRequest.value ? `0x${transactionRequest.value.toString(16)}` : "0x0",
-      gas: transactionRequest.gas ? `0x${transactionRequest.gas.toString(16)}` : "0x5208"
+      value: `0x${value.toString(16)}`,
+      gas: `0x${estimatedGas.toString(16)}`,
+      nonce: `0x${nonceBigInt.toString(16)}`,
+      type: "0x0",
+      // legacy tx
+      chainId: `0x${client.chain.id.toString(16)}`,
+      ...gasPriceHex ? { gasPrice: gasPriceHex } : {}
     };
     return await client.request({
       method: "eth_sendTransaction",

package/dist/index.js

@@ -788,9 +788,13 @@ var _encodeSubmitAppealData = ({
   });
 };
 var isAddTransactionAbiMismatchError = (error) => {
-  const errorMessage = String(
-    error?.shortMessage || error?.details || error?.message || error || ""
-  ).toLowerCase();
+  const errorObject = error;
+  const errorMessage = [
+    errorObject?.shortMessage,
+    errorObject?.details,
+    errorObject?.message,
+    String(error ?? "")
+  ].filter(Boolean).join(" ").toLowerCase();
   return errorMessage.includes("invalid pointer in tuple") || errorMessage.includes("could not decode") || errorMessage.includes("invalid arrayify value") || errorMessage.includes("types/value length mismatch");
 };
 var _sendTransaction = async ({
@@ -823,10 +827,10 @@ var _sendTransaction = async ({
       if (!validatedSenderAccount?.signTransaction) {
         throw new Error("Account does not support signTransaction");
       }
-      const gasPriceHex = await client.request({
+      const gasPriceHex2 = await client.request({
         method: "eth_gasPrice"
       });
-      const transactionRequest2 = {
+      const transactionRequest = {
         account: validatedSenderAccount,
         to: client.chain.consensusMainContract?.address,
         data: encodedDataForSend,
@@ -834,10 +838,10 @@ var _sendTransaction = async ({
         nonce: Number(nonce),
         value,
         gas: estimatedGas,
-        gasPrice: BigInt(gasPriceHex),
+        gasPrice: BigInt(gasPriceHex2),
         chainId: client.chain.id
       };
-      const serializedTransaction = await validatedSenderAccount.signTransaction(transactionRequest2);
+      const serializedTransaction = await validatedSenderAccount.signTransaction(transactionRequest);
       const txHash = await client.sendRawTransaction({ serializedTransaction });
       const receipt = await publicClient.waitForTransactionReceipt({ hash: txHash });
       if (receipt.status === "reverted") {
@@ -853,21 +857,29 @@ var _sendTransaction = async ({
       }
       return newTxEvents[0].args["txId"];
     }
-    const transactionRequest = await client.prepareTransactionRequest({
-      account: validatedSenderAccount,
-      to: client.chain.consensusMainContract?.address,
-      data: encodedDataForSend,
-      type: "legacy",
-      nonce: Number(nonce),
-      value,
-      gas: estimatedGas
-    });
+    let gasPriceHex;
+    try {
+      const gasPriceResult = await client.request({
+        method: "eth_gasPrice"
+      });
+      if (typeof gasPriceResult === "string") {
+        gasPriceHex = gasPriceResult;
+      }
+    } catch (error) {
+      console.warn("Failed to fetch gas price, delegating gas price selection to wallet:", error);
+    }
+    const nonceBigInt = typeof nonce === "bigint" ? nonce : typeof nonce === "string" ? BigInt(nonce) : BigInt(Number(nonce));
     const formattedRequest = {
-      from: transactionRequest.from,
-      to: transactionRequest.to,
+      from: validatedSenderAccount.address,
+      to: client.chain.consensusMainContract?.address,
       data: encodedDataForSend,
-      value: transactionRequest.value ? `0x${transactionRequest.value.toString(16)}` : "0x0",
-      gas: transactionRequest.gas ? `0x${transactionRequest.gas.toString(16)}` : "0x5208"
+      value: `0x${value.toString(16)}`,
+      gas: `0x${estimatedGas.toString(16)}`,
+      nonce: `0x${nonceBigInt.toString(16)}`,
+      type: "0x0",
+      // legacy tx
+      chainId: `0x${client.chain.id.toString(16)}`,
+      ...gasPriceHex ? { gasPrice: gasPriceHex } : {}
     };
     return await client.request({
       method: "eth_sendTransaction",

package/package.json

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