From b8f705265d85b5a19f85fc9d6d481ca351624dd5 Mon Sep 17 00:00:00 2001
From: Alejo Acosta <alejoacos@gmail.com>
Date: Mon, 18 Nov 2024 18:28:57 -0300
Subject: [PATCH 1/2] update chainId if it is set with default value (0)

---
 src/signers/abstract-signer.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/signers/abstract-signer.ts b/src/signers/abstract-signer.ts
index 6383ad0d..e60902f2 100644
--- a/src/signers/abstract-signer.ts
+++ b/src/signers/abstract-signer.ts
@@ -128,7 +128,7 @@ export abstract class AbstractSigner<P extends null | Provider = null | Provider
         // Populate the chain ID
         const network = await (<Provider>this.provider).getNetwork();
 
-        if (pop.chainId != null) {
+        if (pop.chainId != null && pop.chainId !== 0n) {
             const chainId = getBigInt(pop.chainId);
             assertArgument(chainId === network.chainId, 'transaction chainId mismatch', 'tx.chainId', zone);
         } else {

From 9645f5c62d37b2346f71f754dd7a101a4687bd79 Mon Sep 17 00:00:00 2001
From: rileystephens28 <riley.stephens28@gmail.com>
Date: Tue, 19 Nov 2024 14:36:32 -0600
Subject: [PATCH 2/2] Handle a few additional default cases

---
 src/signers/abstract-signer.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/signers/abstract-signer.ts b/src/signers/abstract-signer.ts
index e60902f2..f5e627a5 100644
--- a/src/signers/abstract-signer.ts
+++ b/src/signers/abstract-signer.ts
@@ -107,14 +107,14 @@ export abstract class AbstractSigner<P extends null | Provider = null | Provider
         const pop = (await populate(this, tx)) as QuaiTransactionLike;
 
         if (pop.type == null) {
-            pop.type = await getTxType(pop.from ?? null, pop.to ?? null);
+            pop.type = getTxType(pop.from ?? null, pop.to ?? null);
         }
 
-        if (pop.nonce == null) {
+        if (pop.nonce == null || pop.nonce === 0) {
             pop.nonce = await this.getNonce('pending');
         }
 
-        if (pop.gasLimit == null) {
+        if (pop.gasLimit == null || pop.gasLimit === 0n) {
             if (pop.type == 0) pop.gasLimit = await this.estimateGas(pop);
             else {
                 //Special cases for type 2 tx to bypass address out of scope in the node
@@ -148,7 +148,7 @@ export abstract class AbstractSigner<P extends null | Provider = null | Provider
             if (tx.accessList) {
                 pop.accessList = tx.accessList;
             } else {
-                pop.accessList = await this.createAccessList(tx);
+                pop.accessList = await this.createAccessList(pop as QuaiTransactionRequest);
             }
         }
         //@TOOD: Don't await all over the place; save them up for