From 75ba015a1efebb24228f158bab9102f17fbc9886 Mon Sep 17 00:00:00 2001
From: Dan Cline <6798349+Rjected@users.noreply.github.com>
Date: Wed, 9 Nov 2022 20:36:55 -0500
Subject: [PATCH 1/3] fix(core): stop decoding gas twice for 2930 txs

 * adds two tests from #1848
---
 ethers-core/src/types/transaction/response.rs | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/ethers-core/src/types/transaction/response.rs b/ethers-core/src/types/transaction/response.rs
index 5ee768b45..ed12d1dcc 100644
--- a/ethers-core/src/types/transaction/response.rs
+++ b/ethers-core/src/types/transaction/response.rs
@@ -275,12 +275,11 @@ impl Transaction {
         *offset += 1;
         self.gas = rlp.val_at(*offset)?;
         *offset += 1;
+        println!("got past gas");
 
         #[cfg(feature = "celo")]
         self.decode_celo_metadata(rlp, offset)?;
 
-        self.gas = rlp.val_at(*offset)?;
-        *offset += 1;
         self.to = Some(rlp.val_at(*offset)?);
         *offset += 1;
         self.value = rlp.val_at(*offset)?;
@@ -368,6 +367,7 @@ impl Decodable for Transaction {
 
             let bytes = data.get(1..).ok_or(DecoderError::Custom("no tx body"))?;
             let rest = rlp::Rlp::new(bytes);
+            println!("got to the first byte stuff!");
             match first {
                 0x01 => {
                     txn.decode_base_eip2930(&rest, &mut offset)?;
@@ -1071,4 +1071,24 @@ mod tests {
         decoded_tx.hash = decoded_tx.hash();
         dbg!(&decoded_tx);
     }
+
+    #[test]
+    fn test_rlp_decoding_issue_1848_first() {
+        // slot 5097934, tx index 40, hash
+        // 0xf98c9f1a2f30ee316ea1db18c132ccab6383b8e4933ccf6259ca9d1f27d4a364
+        let s = "01f9012e01826c6f850737be7600830493ef940c3de458b51a11da7d4616f42f66c861e3859d3e80b8c4f5b22c2a000000000000000000000000e67b950f4b84c5b06ee36ded6727a17443fe749300000000000000000000000000000000000000000000005f344f4a335cc50000000000000000000000000000000000000000000005c2f00b834b7f0000000000000000000000000000000000000000000000000005aa64a95b4a40400000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000c3de458b51a11da7d4616f42f66c861e3859d3ec080a0c4023f0b8f7daecd7e143ef7aaa9b67bd059e643a6f2ae509a0e8483a3966e28a065a20662274cb5f7fe60a2af7dbd466244154440e73243f00b6a69bd08eacda4";
+        let b = hex::decode(s).unwrap();
+        let r = rlp::Rlp::new(b.as_slice());
+        Transaction::decode(&r).unwrap();
+    }
+
+    #[test]
+    fn test_rlp_decoding_issue_1848_second() {
+        // slot 5097936, tx index 0, hash
+        // 6d38fc8aee934858815ed41273cece3b676c368e9c6e39f172313a0685e1f175
+        let s = "01f8ee0182034c853d9f1b88158307a120940087bb802d9c0e343f00510000729031ce00bf2780b8841e1326a300000000000000000000000088e6a0c2ddd26feeb64f039a2c41296fcb3f56400000000000000000000000000000000000000000000000000000001d3b3e730000000000000000000000000000000000000000000000000596b93e53696740000000000000000000000000000000000000000000000000000000000000000001c001a0bbfd754ed51b34d0a8577f69b4c42ce6b47fee6ecf49114bb135e7e8eadbb336a0433692134eb7e7686e9aefafa9f69c601aa977c00cc85c827782f5fb1f1cff0f";
+        let b = hex::decode(s).unwrap();
+        let r = rlp::Rlp::new(b.as_slice());
+        Transaction::decode(&r).unwrap();
+    }
 }

From e6a50a51e423ad59ef8daeaeb85b6296bdb8428f Mon Sep 17 00:00:00 2001
From: Dan Cline <6798349+Rjected@users.noreply.github.com>
Date: Wed, 9 Nov 2022 20:41:12 -0500
Subject: [PATCH 2/3] remove debugging printlns

---
 ethers-core/src/types/transaction/response.rs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ethers-core/src/types/transaction/response.rs b/ethers-core/src/types/transaction/response.rs
index ed12d1dcc..793c3a8ce 100644
--- a/ethers-core/src/types/transaction/response.rs
+++ b/ethers-core/src/types/transaction/response.rs
@@ -275,7 +275,6 @@ impl Transaction {
         *offset += 1;
         self.gas = rlp.val_at(*offset)?;
         *offset += 1;
-        println!("got past gas");
 
         #[cfg(feature = "celo")]
         self.decode_celo_metadata(rlp, offset)?;
@@ -367,7 +366,6 @@ impl Decodable for Transaction {
 
             let bytes = data.get(1..).ok_or(DecoderError::Custom("no tx body"))?;
             let rest = rlp::Rlp::new(bytes);
-            println!("got to the first byte stuff!");
             match first {
                 0x01 => {
                     txn.decode_base_eip2930(&rest, &mut offset)?;

From 666b2822fe1adb3edc9d747aa787ab6a4cbf1726 Mon Sep 17 00:00:00 2001
From: Dan Cline <6798349+Rjected@users.noreply.github.com>
Date: Thu, 10 Nov 2022 11:43:19 -0500
Subject: [PATCH 3/3] replace call to dbg! with txhash assert

---
 ethers-core/src/types/transaction/response.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ethers-core/src/types/transaction/response.rs b/ethers-core/src/types/transaction/response.rs
index 793c3a8ce..314caf0b6 100644
--- a/ethers-core/src/types/transaction/response.rs
+++ b/ethers-core/src/types/transaction/response.rs
@@ -1067,7 +1067,11 @@ mod tests {
         .expect("unable to decode raw tx");
         decoded_tx.recover_from_mut().unwrap();
         decoded_tx.hash = decoded_tx.hash();
-        dbg!(&decoded_tx);
+        assert_eq!(
+            H256::from_str("0xeae304417079580c334ccc07e3933a906699461802a17b722034a8191c4a38ea")
+                .unwrap(),
+            decoded_tx.hash
+        );
     }
 
     #[test]