EIP-2930: Access List Transactions (#1712)

https://eips.ethereum.org/EIPS/eip-2930

Signed-off-by: Ratan Rai Sur <[email protected]>

Author: RatanRSur

besu/src/test/java/org/hyperledger/besu/PrivacyReorgTest.java

@@ -80,7 +80,6 @@
 import org.junit.rules.TemporaryFolder;
 
 @SuppressWarnings("rawtypes")
-// todo request lucas look at this pr
 public class PrivacyReorgTest {
   @Rule public final TemporaryFolder folder = new TemporaryFolder();
 
@@ -93,9 +92,9 @@ public class PrivacyReorgTest {
       Bytes.fromBase64String("A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=");
 
   private static final String FIRST_BLOCK_WITH_NO_TRANSACTIONS_STATE_ROOT =
-      "0xc9dcaffbebc7edc20839c80e706430a8fa885e8f703bb89f6e95633cc2b05d4d";
+      "0xe368938a01d983e331eb0e4ea61224726d06075c1ad525569b369f664067ff26";
   private static final String FIRST_BLOCK_WITH_SINGLE_TRANSACTION_STATE_ROOT =
-      "0x66fbc6ad12ef1da78740093ea2b3362e773e510e27d8f88b68c27bfc1f4d58c8";
+      "0x9c88988f9602184efc538cf1c2f482a6b8757ff918d234602884dc8e3b983edd";
   private static final String BLOCK_WITH_SINGLE_TRANSACTION_RECEIPTS_ROOT =
       "0xc8267b3f9ed36df3ff8adb51a6d030716f23eeb50270e7fce8d9822ffa7f0461";
   private static final String STATE_ROOT_AFTER_TRANSACTION_APPENDED_TO_EMPTY_STATE =
@@ -338,7 +337,7 @@ public void reorgToLongerChain() {
         privateStateRootResolver, blockchain, STATE_ROOT_AFTER_TRANSACTION_APPENDED_TO_EMPTY_STATE);
 
     final String secondForkBlockStateRoot =
-        "0x57ccc80f4e50d2e669d82aefa7d3bbe763cf47df27665af14c90b2f8641953f5";
+        "0x2c37a360a700c614b10c980138f64be9ad66fc4a14cd5145199cd0d8ec43d51d";
     final Block secondForkBlock =
         gen.block(
             getBlockOptionsNoTransactionWithDifficulty(
@@ -368,8 +367,7 @@ public void reorgToLongerChain() {
     appendBlock(besuController, blockchain, protocolContext, thirdForkBlock);
 
     // Check that the private state did change after reorg
-    assertPrivateStateRoot(
-        privateStateRootResolver, blockchain, STATE_ROOT_AFTER_TRANSACTION_APPENDED_TO_EMPTY_STATE);
+    assertPrivateStateRoot(privateStateRootResolver, blockchain, EMPTY_ROOT_HASH);
   }
 
   @SuppressWarnings("unchecked")

besu/src/test/java/org/hyperledger/besu/services/BesuEventsImplTest.java

@@ -299,11 +299,22 @@ public void reorgedBlockEventFiresAfterSubscribe() {
     blockchain.appendBlock(block, gen.receipts(block));
     assertThat(result.get()).isNull();
 
-    final var reorgBlock =
+    final var forkBlock =
         gen.block(
             new BlockDataGenerator.BlockOptions()
                 .setParentHash(blockchain.getGenesisBlock().getHash())
-                .setBlockNumber(blockchain.getGenesisBlock().getHeader().getNumber() + 2));
+                .setDifficulty(block.getHeader().getDifficulty().subtract(1))
+                .setBlockNumber(blockchain.getGenesisBlock().getHeader().getNumber() + 1));
+    blockchain.appendBlock(forkBlock, gen.receipts(forkBlock));
+    assertThat(result.get()).isNull();
+
+    final var reorgBlock =
+        gen.block(
+            new BlockDataGenerator.BlockOptions()
+                .setParentHash(forkBlock.getHash())
+                .setDifficulty(Difficulty.of(10000000))
+                .setBlockNumber(forkBlock.getHeader().getNumber() + 1));
+
     List<TransactionReceipt> transactionReceipts = gen.receipts(reorgBlock);
     blockchain.appendBlock(reorgBlock, transactionReceipts);
     assertThat(result.get()).isNotNull();

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/query/BlockchainQueriesTest.java

@@ -400,7 +400,7 @@ public void getOmmerByBlockHashAndIndexShouldReturnEmptyWhenIndexIsOutOfRange()
 
   @Test
   public void getOmmerByBlockHashAndIndexShouldReturnExpectedOmmerHeader() {
-    final BlockchainWithData data = setupBlockchain(3);
+    final BlockchainWithData data = setupBlockchain(4);
     final BlockchainQueries queries = data.blockchainQueries;
     final Block targetBlock = data.blockData.get(data.blockData.size() - 1).block;
     final BlockHeader ommerBlockHeader = targetBlock.getBody().getOmmers().get(0);
@@ -448,7 +448,7 @@ public void getOmmerByBlockNumberAndIndexShouldReturnEmptyWhenIndexIsOutOfRange(
 
   @Test
   public void getOmmerByBlockNumberAndIndexShouldReturnExpectedOmmerHeader() {
-    final BlockchainWithData data = setupBlockchain(3);
+    final BlockchainWithData data = setupBlockchain(4);
     final BlockchainQueries queries = data.blockchainQueries;
     final Block targetBlock = data.blockData.get(data.blockData.size() - 1).block;
     final List<BlockHeader> ommers = targetBlock.getBody().getOmmers();
@@ -485,7 +485,7 @@ public void getLatestBlockOmmerByIndexShouldReturnEmptyWhenIndexIsOutOfRange() {
 
   @Test
   public void getLatestBlockOmmerByIndexShouldReturnExpectedOmmerHeader() {
-    final BlockchainWithData data = setupBlockchain(3);
+    final BlockchainWithData data = setupBlockchain(4);
     final BlockchainQueries queries = data.blockchainQueries;
     final Block targetBlock = data.blockData.get(data.blockData.size() - 1).block;
     final BlockHeader ommerBlockHeader = targetBlock.getBody().getOmmers().get(0);

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/AccessList.java

@@ -0,0 +1,35 @@
+/*
+ *
+ *  * Copyright ConsenSys AG.
+ *  *
+ *  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ *  * the License. You may obtain a copy of the License at
+ *  *
+ *  * http://www.apache.org/licenses/LICENSE-2.0
+ *  *
+ *  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ *  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ *  * specific language governing permissions and limitations under the License.
+ *  *
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.ethereum.core;
+
+import static java.util.Collections.emptyList;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.tuweni.bytes.Bytes32;
+
+public class AccessList extends ArrayList<Map.Entry<Address, List<Bytes32>>> {
+
+  public AccessList(final List<Map.Entry<Address, List<Bytes32>>> accessList) {
+    super(accessList);
+  }
+
+  public static final AccessList EMPTY = new AccessList(emptyList());
+}

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/GasAndAccessedState.java

@@ -0,0 +1,57 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.ethereum.core;
+
+import static java.util.Collections.emptySet;
+
+import java.util.Set;
+
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
+import org.apache.tuweni.bytes.Bytes32;
+
+public class GasAndAccessedState {
+  final Gas gas;
+  final Set<Address> accessListAddressSet;
+  final Multimap<Address, Bytes32> accessListStorageByAddress;
+
+  public GasAndAccessedState(
+      final Gas gas,
+      final Set<Address> accessListAddressSet,
+      final Multimap<Address, Bytes32> accessedStorage) {
+    this.gas = gas;
+    this.accessListAddressSet = accessListAddressSet;
+    this.accessListStorageByAddress = accessedStorage;
+  }
+
+  public GasAndAccessedState(final Gas gas) {
+    this.gas = gas;
+    this.accessListAddressSet = emptySet();
+    this.accessListStorageByAddress = HashMultimap.create();
+  }
+
+  public Gas getGas() {
+    return gas;
+  }
+
+  public Set<Address> getAccessListAddressSet() {
+    return accessListAddressSet;
+  }
+
+  public Multimap<Address, Bytes32> getAccessListStorageByAddress() {
+    return accessListStorageByAddress;
+  }
+}

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/LogsBloomFilter.java

@@ -59,6 +59,10 @@ public LogsBloomFilter(final Bytes data) {
         data.size());
   }
 
+  public LogsBloomFilter(final String logsBloomHexString) {
+    this(Bytes.fromHexString(logsBloomHexString));
+  }
+
   public static LogsBloomFilter fromHexString(final String hexString) {
     return new LogsBloomFilter(Bytes.fromHexString(hexString));
   }