EIP-2929: only add params.address to access list

CHANGELOG.md

@@ -1,3 +1,7 @@
+## OpenEthereum v3.2.3
+
+* Hotfix for berlin consensus error.
+
 ## OpenEthereum v3.2.1
 
 Hot fix issue, related to initial sync:

Cargo.lock

@@ -3188,7 +3188,7 @@ dependencies = [
 
 [[package]]
 name = "parity-version"
-version = "3.2.1"
+version = "3.2.3"
 dependencies = [
  "parity-bytes",
  "rlp 0.3.0",

crates/ethcore/src/executive.rs

@@ -240,7 +240,6 @@ impl<'a> CallCreateExecutive<'a> {
         if schedule.eip2929 {
             let mut substate = Substate::from_access_list(&params.access_list);
             substate.access_list.insert_address(params.address);
-            substate.access_list.insert_address(params.sender);
             substate
         } else {
             Substate::default()
@@ -1145,8 +1144,11 @@ 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);
+            access_list.insert_address(sender);
+            for (address, builtin) in self.machine.builtins() {
+                if builtin.is_active(self.info.number) {
+                    access_list.insert_address(*address);
+                }
             }
             if schedule.eip2930 {
                 // optional access list
@@ -1232,6 +1234,7 @@ impl<'a, B: 'a + StateBackend> Executive<'a, B> {
                     &nonce,
                     &t.tx().data,
                 );
+                access_list.insert_address(new_address);
                 let params = ActionParams {
                     code_address: new_address.clone(),
                     code_hash: code_hash,
@@ -1255,6 +1258,7 @@ impl<'a, B: 'a + StateBackend> Executive<'a, B> {
                 (res, out)
             }
             Action::Call(ref address) => {
+                access_list.insert_address(address.clone());
                 let params = ActionParams {
                     code_address: address.clone(),
                     address: address.clone(),

crates/util/version/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "parity-version"
 # NOTE: this value is used for OpenEthereum version string (via env CARGO_PKG_VERSION)
-version = "3.2.1"
+version = "3.2.3"
 authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"