Merge branch 'unstable' into fulu

Author: agnxsh

beacon_chain/beacon_node.nim

@@ -70,7 +70,7 @@ type
     config*: BeaconNodeConf
     attachedValidators*: ref ValidatorPool
     optimisticProcessor*: OptimisticProcessor
-    optimisticFcuFut*: Future[(PayloadExecutionStatus, Opt[BlockHash])]
+    optimisticFcuFut*: Future[(PayloadExecutionStatus, Opt[Hash32])]
       .Raising([CancelledError])
     lightClient*: LightClient
     dag*: ChainDAGRef

beacon_chain/el/el_manager.nim

@@ -45,7 +45,6 @@ type
   SignatureBytes = DynamicBytes[96, 96]
   Int64LeBytes = DynamicBytes[8, 8]
   WithoutTimeout* = distinct int
-  Address = web3.Address
 
   DeadlineObject* = object
     # TODO (cheatfate): This object declaration could be removed when
@@ -130,7 +129,7 @@ type
 
     depositContractAddress*: Eth1Address
     depositContractBlockNumber: uint64
-    depositContractBlockHash: BlockHash
+    depositContractBlockHash: Hash32
 
     blocksPerLogsRequest: uint64
       ## This value is used to dynamically adjust the number of
@@ -199,7 +198,7 @@ type
 
   FullBlockId* = object
     number: Eth1BlockNumber
-    hash: BlockHash
+    hash: Hash32
 
   DataProviderFailure* = object of CatchableError
   CorruptDataProvider* = object of DataProviderFailure
@@ -458,7 +457,7 @@ proc connectedRpcClient(connection: ELConnection): Future[RpcClient] {.
 
 proc getBlockByHash(
     rpcClient: RpcClient,
-    hash: BlockHash
+    hash: Hash32
 ): Future[BlockObject] {.async: (raises: [CatchableError]).} =
   await rpcClient.eth_getBlockByHash(hash, false)
 
@@ -737,7 +736,7 @@ proc getPayload*(
 
 proc waitELToSyncDeposits(
     connection: ELConnection,
-    minimalRequiredBlock: BlockHash
+    minimalRequiredBlock: Hash32
 ) {.async: (raises: [CancelledError]).} =
   var rpcClient: RpcClient = nil
 
@@ -783,7 +782,7 @@ proc waitELToSyncDeposits(
 func networkHasDepositContract(m: ELManager): bool =
   not m.cfg.DEPOSIT_CONTRACT_ADDRESS.isDefaultValue
 
-func mostRecentKnownBlock(m: ELManager): BlockHash =
+func mostRecentKnownBlock(m: ELManager): Hash32 =
   if m.eth1Chain.finalizedDepositsMerkleizer.getChunkCount() > 0:
     m.eth1Chain.finalizedBlockHash.asBlockHash
   else:
@@ -1118,7 +1117,7 @@ proc forkchoiceUpdated*(
                        Opt[PayloadAttributesV3],
     deadlineObj: DeadlineObject,
     maxRetriesCount: int
-): Future[(PayloadExecutionStatus, Opt[BlockHash])] {.
+): Future[(PayloadExecutionStatus, Opt[Hash32])] {.
    async: (raises: [CancelledError]).} =
 
   doAssert not headBlockHash.isZero
@@ -1136,7 +1135,7 @@ proc forkchoiceUpdated*(
   # payload (`Hash32()` if none yet finalized)"
 
   if m.elConnections.len == 0:
-    return (PayloadExecutionStatus.syncing, Opt.none BlockHash)
+    return (PayloadExecutionStatus.syncing, Opt.none Hash32)
 
   when payloadAttributes is Opt[PayloadAttributesV3]:
     template payloadAttributesV3(): auto =
@@ -1245,7 +1244,7 @@ proc forkchoiceUpdated*(
             pendingRequests.filterIt(not(it.finished())).
               mapIt(it.cancelAndWait())
           await noCancel allFutures(pending)
-          return (PayloadExecutionStatus.invalid, Opt.none BlockHash)
+          return (PayloadExecutionStatus.invalid, Opt.none Hash32)
         elif responseProcessor.selectedResponse.isSome:
           # We spawn task which will wait for all other responses which are
           # still pending, after 30.seconds all pending requests will be
@@ -1260,14 +1259,14 @@ proc forkchoiceUpdated*(
             pendingRequests.filterIt(not(it.finished())).
               mapIt(it.cancelAndWait())
           await noCancel allFutures(pending)
-          return (PayloadExecutionStatus.syncing, Opt.none BlockHash)
+          return (PayloadExecutionStatus.syncing, Opt.none Hash32)
 
         if len(pendingRequests) == 0:
           # All requests failed, we will continue our attempts until deadline
           # is not finished.
           inc(retriesCount)
           if retriesCount == maxRetriesCount:
-            return (PayloadExecutionStatus.syncing, Opt.none BlockHash)
+            return (PayloadExecutionStatus.syncing, Opt.none Hash32)
 
           # To avoid continous spam of requests when EL node is offline we
           # going to sleep until next attempt.
@@ -1280,7 +1279,7 @@ proc forkchoiceUpdated*(
     payloadAttributes: Opt[PayloadAttributesV1] |
                        Opt[PayloadAttributesV2] |
                        Opt[PayloadAttributesV3]
-): Future[(PayloadExecutionStatus, Opt[BlockHash])] {.
+): Future[(PayloadExecutionStatus, Opt[Hash32])] {.
     async: (raises: [CancelledError], raw: true).} =
   forkchoiceUpdated(
     m, headBlockHash, safeBlockHash, finalizedBlockHash,
@@ -1396,7 +1395,7 @@ func depositEventsToBlocks(
     let
       logEvent = JrpcConv.decode(logEventData.string, LogObject)
       blockNumber = Eth1BlockNumber readJsonField(logEvent, blockNumber, Quantity)
-      blockHash = readJsonField(logEvent, blockHash, BlockHash)
+      blockHash = readJsonField(logEvent, blockHash, Hash32)
 
     if lastEth1Block == nil or lastEth1Block.number != blockNumber:
       lastEth1Block = Eth1Block(

beacon_chain/el/engine_api_conversions.nim

@@ -19,11 +19,11 @@ type
     executionPayload*: ExecutionPayloadV1
     blockValue*: UInt256
 
-func asEth2Digest*(x: BlockHash|Bytes32): Eth2Digest =
+func asEth2Digest*(x: Hash32|Bytes32): Eth2Digest =
   Eth2Digest(data: array[32, byte](x))
 
-template asBlockHash*(x: Eth2Digest): BlockHash =
-  BlockHash(x.data)
+template asBlockHash*(x: Eth2Digest): Hash32 =
+  Hash32(x.data)
 
 func asConsensusWithdrawal*(w: WithdrawalV1): capella.Withdrawal =
   capella.Withdrawal(

beacon_chain/el/eth1_chain.nim

@@ -32,7 +32,7 @@ declarePublicGauge eth1_finalized_deposits,
 declareGauge eth1_chain_len,
   "The length of the in-memory chain of Eth1 blocks"
 
-template toGaugeValue*(x: Quantity | BlockNumber): int64 =
+template toGaugeValue*(x: Quantity): int64 =
   toGaugeValue(distinctBase x)
 
 type
@@ -69,7 +69,7 @@ type
       ## A non-forkable chain of blocks ending at the block with
       ## ETH1_FOLLOW_DISTANCE offset from the head.
 
-    blocksByHash: Table[BlockHash, Eth1Block]
+    blocksByHash: Table[Hash32, Eth1Block]
 
     headMerkleizer: DepositsMerkleizer
       ## Merkleizer state after applying all `blocks`

beacon_chain/networking/eth2_network.nim

@@ -24,7 +24,7 @@ import
       pubsub, gossipsub, rpc/message, rpc/messages, peertable, pubsubpeer],
   libp2p/stream/connection,
   libp2p/services/wildcardresolverservice,
-  eth/[keys, async_utils],
+  eth/[common/keys, async_utils],
   eth/net/nat, eth/p2p/discoveryv5/[enr, node, random2],
   ".."/[version, conf, beacon_clock, conf_light_client],
   ../spec/[eth2_ssz_serialization, network, helpers, forks],

beacon_chain/spec/presets.nim

@@ -464,7 +464,7 @@ elif const_preset == "minimal":
     TERMINAL_TOTAL_DIFFICULTY:
       u256"115792089237316195423570985008687907853269984665640564039457584007913129638912",
     # By default, don't use these params
-    TERMINAL_BLOCK_HASH: BlockHash.fromHex(
+    TERMINAL_BLOCK_HASH: Hash32.fromHex(
       "0x0000000000000000000000000000000000000000000000000000000000000000"),
 
 

ncli/ncli_testnet.nim

@@ -10,7 +10,7 @@
 import
   std/[json, options, times],
   chronos, bearssl/rand, chronicles, confutils, stint, json_serialization,
-  web3, eth/keys, eth/p2p/discoveryv5/random2,
+  web3, eth/common/keys, eth/p2p/discoveryv5/random2,
   stew/[io2, byteutils], json_rpc/jsonmarshal,
   ../beacon_chain/conf,
   ../beacon_chain/el/el_manager,
@@ -21,7 +21,6 @@ import
   ../beacon_chain/validators/keystore_management
 
 from std/os import changeFileExt, fileExists
-from std/times import toUnix
 from ../beacon_chain/el/engine_api_conversions import asEth2Digest
 from ../beacon_chain/spec/beaconstate import initialize_beacon_state_from_eth1
 from ../tests/mocking/mock_genesis import mockEth1BlockHash
@@ -244,7 +243,7 @@ contract(DepositContract):
 template `as`(address: Eth1Address, T: type bellatrix.ExecutionAddress): T =
   T(data: distinctBase(address))
 
-template `as`(address: BlockHash, T: type Eth2Digest): T =
+template `as`(address: Hash32, T: type Eth2Digest): T =
   asEth2Digest(address)
 
 func getOrDefault[T](x: Opt[T]): T =

tests/test_discovery.nim

@@ -10,7 +10,7 @@
 
 import
   testutils/unittests,
-  chronos, eth/keys, eth/p2p/discoveryv5/enr,
+  chronos, eth/p2p/discoveryv5/enr,
   ../beacon_chain/spec/[forks, network],
   ../beacon_chain/networking/[eth2_network, eth2_discovery],
   ./testutil