fix: add chainId when manually filling unsigned tx

Kr1ptal · Oct 16, 2024 · ab516a6 · ab516a6
1 parent d40edd2
commit ab516a6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/ethers-core/src/main/kotlin/io/ethers/core/types/CallRequest.kt b/ethers-core/src/main/kotlin/io/ethers/core/types/CallRequest.kt
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.JsonSerializer
 import com.fasterxml.jackson.databind.SerializerProvider
 import com.fasterxml.jackson.databind.annotation.JsonSerialize
 import io.ethers.core.FastHex
+import io.ethers.core.types.transaction.ChainId
 import io.ethers.core.types.transaction.TransactionUnsigned
 import io.ethers.core.types.transaction.TxAccessList
 import io.ethers.core.types.transaction.TxBlob
@@ -117,7 +118,7 @@ class CallRequest() : IntoCallRequest {
 
         when {
             gasFeeCap != null && gasTipCap != null && blobVersionedHashes != null -> {
-                if (to == null || blobFeeCap == null) {
+                if (to == null || blobFeeCap == null || !ChainId.isValid(chainId)) {
                     return null
                 }
 
@@ -137,6 +138,10 @@ class CallRequest() : IntoCallRequest {
             }
 
             gasFeeCap != null && gasTipCap != null && blobVersionedHashes == null -> {
+                if (!ChainId.isValid(chainId)) {
+                    return null
+                }
+
                 return TxDynamicFee(
                     to = to,
                     value = value ?: BigInteger.ZERO,
@@ -151,6 +156,10 @@ class CallRequest() : IntoCallRequest {
             }
 
             gasPrice != null && accessList.isNotEmpty() -> {
+                if (!ChainId.isValid(chainId)) {
+                    return null
+                }
+
                 return TxAccessList(
                     to = to,
                     value = value ?: BigInteger.ZERO,

diff --git a/ethers-providers/src/main/kotlin/io/ethers/providers/Provider.kt b/ethers-providers/src/main/kotlin/io/ethers/providers/Provider.kt
@@ -335,6 +335,9 @@ class Provider(override val client: JsonRpcClient, override val chainId: Long) :
 
     private fun manuallyFillTransaction(original: CallRequest): Result<TransactionUnsigned, RpcError> {
         val call = CallRequest(original)
+        if (call.chainId == -1L) {
+            call.chainId = provider.chainId
+        }
 
         var unsigned = call.toUnsignedTransactionOrNull()
         if (unsigned != null) {