ETCM-944 Pass getBlockHashByNumber field directly to InMemoryWorldStateProxy

Author: Leonor Boga

src/it/scala/io/iohk/ethereum/ledger/BlockImporterItSpec.scala

@@ -62,7 +62,7 @@ class BlockImporterItSpec
   val emptyWorld = InMemoryWorldStateProxy(
     storagesInstance.storages.evmCodeStorage,
     blockchain.getBackingStorage(-1),
-    blockchain,
+    (number: BigInt) => blockchain.getBlockHeaderByNumber(number).map(_.hash),
     blockchainConfig.accountStartNonce,
     ByteString(MerklePatriciaTrie.EmptyRootHash),
     noEmptyAccounts = false,

src/it/scala/io/iohk/ethereum/sync/util/CommonFakePeer.scala

@@ -244,7 +244,7 @@ abstract class CommonFakePeer(peerName: String, fakePeerCustomConfig: FakePeerCu
     InMemoryWorldStateProxy(
       storagesInstance.storages.evmCodeStorage,
       bl.getBackingStorage(block.number),
-      bl,
+      (number: BigInt) => bl.getBlockHeaderByNumber(number).map(_.hash),
       blockchainConfig.accountStartNonce,
       block.header.stateRoot,
       noEmptyAccounts = EvmConfig.forBlock(block.number, blockchainConfig).noEmptyAccounts,

src/it/scala/io/iohk/ethereum/sync/util/RegularSyncItSpecUtils.scala

@@ -215,7 +215,7 @@ object RegularSyncItSpecUtils {
       InMemoryWorldStateProxy(
         storagesInstance.storages.evmCodeStorage,
         bl.getBackingStorage(block.number),
-        bl,
+        (number: BigInt) => bl.getBlockHeaderByNumber(number).map(_.hash),
         UInt256.Zero,
         ByteString(MerklePatriciaTrie.EmptyRootHash),
         noEmptyAccounts = false,

src/main/resources/conf/base.conf

@@ -386,7 +386,7 @@ mantis {
     nodes-per-request = 384
 
     # Minimum number of peers required to start fast-sync (by determining the pivot block)
-    min-peers-to-choose-pivot-block = 3
+    min-peers-to-choose-pivot-block = 1
 
     # Number of additional peers used to determine pivot block during fast-sync
     # Number of peers used to reach consensus = min-peers-to-choose-pivot-block + peers-to-choose-pivot-block-margin

src/main/scala/io/iohk/ethereum/jsonrpc/EthUserService.scala

@@ -35,7 +35,7 @@ class EthUserService(
         val world = InMemoryWorldStateProxy(
           evmCodeStorage,
           blockchain.getBackingStorage(block.header.number),
-          blockchain,
+          (number: BigInt) => blockchain.getBlockHeaderByNumber(number).map(_.hash),
           blockchainConfig.accountStartNonce,
           block.header.stateRoot,
           noEmptyAccounts = false,

src/main/scala/io/iohk/ethereum/ledger/BlockExecution.scala

@@ -65,7 +65,7 @@ class BlockExecution(
       initialWorld = InMemoryWorldStateProxy(
         evmCodeStorage = evmCodeStorage,
         blockchain.getBackingStorage(block.header.number),
-        blockchain,
+        (number: BigInt) => blockchain.getBlockHeaderByNumber(number).map(_.hash),
         accountStartNonce = blockchainConfig.accountStartNonce,
         stateRootHash = parentHeader.stateRoot,
         noEmptyAccounts = EvmConfig.forBlock(parentHeader.number, blockchainConfig).noEmptyAccounts,

src/main/scala/io/iohk/ethereum/ledger/BlockPreparator.scala

@@ -382,7 +382,7 @@ class BlockPreparator(
         InMemoryWorldStateProxy(
           evmCodeStorage = evmCodeStorage,
           mptStorage = blockchain.getReadOnlyStorage(),
-          blockchain = blockchain,
+          getBlockHashByNumber = (number: BigInt) => blockchain.getBlockHeaderByNumber(number).map(_.hash),
           accountStartNonce = blockchainConfig.accountStartNonce,
           stateRootHash = parent.stateRoot,
           noEmptyAccounts = EvmConfig.forBlock(block.header.number, blockchainConfig).noEmptyAccounts,

src/main/scala/io/iohk/ethereum/ledger/InMemoryWorldStateProxy.scala

@@ -16,7 +16,7 @@ object InMemoryWorldStateProxy {
   def apply(
       evmCodeStorage: EvmCodeStorage,
       mptStorage: MptStorage,
-      blockchain: Blockchain,
+      getBlockHashByNumber: BigInt => Option[ByteString],
       accountStartNonce: UInt256,
       stateRootHash: ByteString,
       noEmptyAccounts: Boolean,
@@ -25,7 +25,7 @@ object InMemoryWorldStateProxy {
     evmCodeStorage,
     mptStorage,
     accountStartNonce,
-    (number: BigInt) => blockchain.getBlockHeaderByNumber(number).map(_.hash),
+    getBlockHashByNumber,
     stateRootHash,
     noEmptyAccounts,
     ethCompatibleStorage

src/main/scala/io/iohk/ethereum/ledger/StxLedger.scala

@@ -24,7 +24,7 @@ class StxLedger(
       InMemoryWorldStateProxy(
         evmCodeStorage = evmCodeStorage,
         mptStorage = blockchain.getReadOnlyStorage(),
-        blockchain = blockchain,
+        getBlockHashByNumber = (number: BigInt) => blockchain.getBlockHeaderByNumber(number).map(_.hash),
         accountStartNonce = blockchainConfig.accountStartNonce,
         stateRootHash = blockHeader.stateRoot,
         noEmptyAccounts = EvmConfig.forBlock(blockHeader.number, blockchainConfig).noEmptyAccounts,

src/test/scala/io/iohk/ethereum/blockchain/sync/StateSyncUtils.scala

@@ -35,7 +35,7 @@ object StateSyncUtils extends EphemBlockchainTestSetup {
       val init = InMemoryWorldStateProxy(
         evmCodeStorage,
         blockchain.getBackingStorage(1),
-        blockchain,
+        (number: BigInt) => blockchain.getBlockHeaderByNumber(number).map(_.hash),
         blockchainConfig.accountStartNonce,
         existingTree.getOrElse(ByteString(MerklePatriciaTrie.EmptyRootHash)),
         noEmptyAccounts = true,