From 5709dbc3e044d8032a9a495aae133d753bf6963f Mon Sep 17 00:00:00 2001
From: Wei Tang <wei@that.world>
Date: Thu, 15 Apr 2021 16:30:48 +0200
Subject: [PATCH] EIP2929: only add builtin to warm address if they are active

---
 crates/ethcore/src/executive.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/crates/ethcore/src/executive.rs b/crates/ethcore/src/executive.rs
index 485bb4275..e2b0478ad 100644
--- a/crates/ethcore/src/executive.rs
+++ b/crates/ethcore/src/executive.rs
@@ -1145,8 +1145,10 @@ impl<'a, B: 'a + StateBackend> Executive<'a, B> {
         let mut access_list = AccessList::new(schedule.eip2929);
 
         if schedule.eip2929 {
-            for (address, _) in self.machine.builtins() {
-                access_list.insert_address(*address);
+            for (address, builtin) in self.machine.builtins() {
+                if builtin.is_active() {
+                    access_list.insert_address(*address);
+                }
             }
             if schedule.eip2930 {
                 // optional access list