From c9c22f4dfa6f2c0969c6f94f2c126d53b447c11b Mon Sep 17 00:00:00 2001
From: Robin Molen-Grigull <39391306+grigull@users.noreply.github.com>
Date: Fri, 9 Sep 2022 16:20:25 -0700
Subject: [PATCH] fix: geth trace types (#1682)

* fix: geth trace types

* update: changelog entry added
---
 CHANGELOG.md                        | 1 +
 ethers-core/src/types/trace/geth.rs | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c6b00ec..939c4189 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Unreleased
 
+- Fix geth trace types for debug_traceTransaction rpc
 - Fix RLP decoding of legacy `Transaction`
 - Fix RLP encoding of `TransactionReceipt` [#1661](https://github.com/gakonst/ethers-rs/pull/1661)
 - Add `Unit8` helper type [#1639](https://github.com/gakonst/ethers-rs/pull/1639)
diff --git a/ethers-core/src/types/trace/geth.rs b/ethers-core/src/types/trace/geth.rs
index 36284898..47ecf4dd 100644
--- a/ethers-core/src/types/trace/geth.rs
+++ b/ethers-core/src/types/trace/geth.rs
@@ -23,15 +23,15 @@ pub struct StructLog {
     #[serde(rename = "gasCost")]
     pub gas_cost: u64,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub memory: Option<Vec<u8>>,
+    pub memory: Option<Vec<H256>>,
     pub op: String,
-    pub pc: U256,
+    pub pc: u64,
     #[serde(rename = "refund", skip_serializing_if = "Option::is_none")]
     pub refund_counter: Option<u64>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub stack: Option<Vec<U256>>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub storage: Option<BTreeMap<H160, BTreeMap<H256, H256>>>,
+    pub storage: Option<BTreeMap<H256, H256>>,
 }
 
 /// Bindings for additional `debug_traceTransaction` options