Initial public version of the Verifying Web3Signer functionality

* Allow the list of proved properties for web3signer to be configured
* Document the Web3Signer setups (regular, distributed and verified)

AllTests-mainnet.md

@@ -356,6 +356,16 @@ OK: 4/4 Fail: 0/4 Skip: 0/4
 + Voluntary exit signatures                                                                  OK
 ```
 OK: 8/8 Fail: 0/8 Skip: 0/8
+## Nimbus remote signer/signing test (verifying-web3signer)
+```diff
++ Signing BeaconBlock (getBlockSignature(altair))                                            OK
++ Signing BeaconBlock (getBlockSignature(bellatrix))                                         OK
++ Signing BeaconBlock (getBlockSignature(capella))                                           OK
++ Signing BeaconBlock (getBlockSignature(deneb))                                             OK
++ Signing BeaconBlock (getBlockSignature(phase0))                                            OK
++ Waiting for signing node (/upcheck) test                                                   OK
+```
+OK: 6/6 Fail: 0/6 Skip: 0/6
 ## Nimbus remote signer/signing test (web3signer)
 ```diff
 + Connection timeout test                                                                    OK
@@ -382,16 +392,6 @@ OK: 8/8 Fail: 0/8 Skip: 0/8
 + Waiting for signing node (/upcheck) test                                                   OK
 ```
 OK: 22/22 Fail: 0/22 Skip: 0/22
-## Nimbus remote signer/signing test (web3signer-diva)
-```diff
-+ Signing BeaconBlock (getBlockSignature(altair))                                            OK
-+ Signing BeaconBlock (getBlockSignature(bellatrix))                                         OK
-+ Signing BeaconBlock (getBlockSignature(capella))                                           OK
-+ Signing BeaconBlock (getBlockSignature(deneb))                                             OK
-+ Signing BeaconBlock (getBlockSignature(phase0))                                            OK
-+ Waiting for signing node (/upcheck) test                                                   OK
-```
-OK: 6/6 Fail: 0/6 Skip: 0/6
 ## Old database versions [Preset: mainnet]
 ```diff
 + pre-1.1.0                                                                                  OK
@@ -420,11 +420,13 @@ OK: 12/12 Fail: 0/12 Skip: 0/12
 OK: 1/1 Fail: 0/1 Skip: 0/1
 ## Remove keystore testing suite
 ```diff
++ Many remotes                                                                               OK
++ Single remote                                                                              OK
++ Verifying Signer / Many remotes                                                            OK
++ Verifying Signer / Single remote                                                           OK
 + vesion 1                                                                                   OK
-+ vesion 2 many remotes                                                                      OK
-+ vesion 2 single remote                                                                     OK
 ```
-OK: 3/3 Fail: 0/3 Skip: 0/3
+OK: 5/5 Fail: 0/5 Skip: 0/5
 ## Serialization/deserialization [Beacon Node] [Preset: mainnet]
 ```diff
 + Deserialization test vectors                                                               OK
@@ -667,4 +669,4 @@ OK: 2/2 Fail: 0/2 Skip: 0/2
 OK: 9/9 Fail: 0/9 Skip: 0/9
 
 ---TOTAL---
-OK: 380/385 Fail: 0/385 Skip: 5/385
+OK: 382/387 Fail: 0/387 Skip: 5/387

beacon_chain/nimbus_signing_node.nim

@@ -256,7 +256,7 @@ proc installApiHandlers*(node: SigningNodeRef) =
         let feeRecipientRoot = hash_tree_root(distinctBase(
           node.config.expectedFeeRecipient.get()))
 
-        if not(is_valid_merkle_branch(feeRecipientRoot, proof.merkleProofs,
+        if not(is_valid_merkle_branch(feeRecipientRoot, proof.proof,
                                       log2trunc(proof.index),
                                       get_subtree_index(proof.index),
                                       blockHeader.body_root)):

beacon_chain/spec/eth2_apis/rest_types.nim

@@ -568,7 +568,7 @@ type
 
   Web3SignerMerkleProof* = object
     index*: GeneralizedIndex
-    merkleProofs* {.serializedFieldName: "merkle_proofs".}: seq[Eth2Digest]
+    proof*: seq[Eth2Digest]
 
   Web3SignerRequestKind* {.pure.} = enum
     AggregationSlot, AggregateAndProof, Attestation, Block, BlockV2,

beacon_chain/spec/keystore.nim

@@ -143,6 +143,18 @@ type
     ioHandle*: IoLockHandle
     opened*: bool
 
+  RemoteSignerType* {.pure.} = enum
+    Web3Signer, VerifyingWeb3Signer
+
+  ProvedProperty* = object
+    path*: string
+    description*: Option[string]
+    phase0Index*: Option[GeneralizedIndex]
+    altairIndex*: Option[GeneralizedIndex]
+    bellatrixIndex*: Option[GeneralizedIndex]
+    capellaIndex*: Option[GeneralizedIndex]
+    denebIndex*: Option[GeneralizedIndex]
+
   KeystoreData* = object
     version*: uint64
     pubkey*: ValidatorPubKey
@@ -157,7 +169,11 @@ type
       flags*: set[RemoteKeystoreFlag]
       remotes*: seq[RemoteSignerInfo]
       threshold*: uint32
-      remoteType*: RemoteSignerType
+      case remoteType*: RemoteSignerType
+      of RemoteSignerType.Web3Signer:
+        discard
+      of RemoteSignerType.VerifyingWeb3Signer:
+        provedBlockProperties*: seq[ProvedProperty]
 
   NetKeystore* = object
     crypto*: Crypto
@@ -166,13 +182,14 @@ type
     uuid*: string
     version*: int
 
-  RemoteSignerType* {.pure.} = enum
-    Web3Signer, Web3SignerDiva
-
   RemoteKeystore* = object
     version*: uint64
     description*: Option[string]
-    remoteType*: RemoteSignerType
+    case remoteType*: RemoteSignerType
+    of RemoteSignerType.Web3Signer:
+      discard
+    of RemoteSignerType.VerifyingWeb3Signer:
+      provedBlockProperties*: seq[ProvedProperty]
     pubkey*: ValidatorPubKey
     flags*: set[RemoteKeystoreFlag]
     remotes*: seq[RemoteSignerInfo]
@@ -599,8 +616,9 @@ proc writeValue*(writer: var JsonWriter, value: RemoteKeystore)
   case value.remoteType
   of RemoteSignerType.Web3Signer:
     writer.writeField("type", "web3signer")
-  of RemoteSignerType.Web3SignerDiva:
-    writer.writeField("type", "web3signer-diva")
+  of RemoteSignerType.VerifyingWeb3Signer:
+    writer.writeField("type", "verifying-web3signer")
+    writer.writeField("proved_block_properties", value.provedBlockProperties)
   if value.description.isSome():
     writer.writeField("description", value.description.get())
   if RemoteKeystoreFlag.IgnoreSSLVerification in value.flags:
@@ -618,7 +636,8 @@ proc readValue*(reader: var JsonReader, value: var RemoteKeystore)
     description: Option[string]
     remote: Option[HttpHostUri]
     remotes: Option[seq[RemoteSignerInfo]]
-    remoteType: Option[string]
+    remoteType: Option[RemoteSignerType]
+    provedBlockProperties: Option[seq[ProvedProperty]]
     ignoreSslVerification: Option[bool]
     pubkey: Option[ValidatorPubKey]
     threshold: Option[uint32]
@@ -630,58 +649,118 @@ proc readValue*(reader: var JsonReader, value: var RemoteKeystore)
   for fieldName in readObjectFields(reader):
     case fieldName:
     of "pubkey":
-      if pubkey.isSome():
+      if pubkey.isSome:
         reader.raiseUnexpectedField("Multiple `pubkey` fields found",
                                     "RemoteKeystore")
       pubkey = some(reader.readValue(ValidatorPubKey))
     of "remote":
+      if remote.isSome:
+        reader.raiseUnexpectedField("Multiple `remote` fields found",
+                                    "RemoteKeystore")
       if version.isSome and version.get > 1:
         reader.raiseUnexpectedField(
           "The `remote` field is valid only in version 1 of the remote keystore format",
           "RemoteKeystore")
-
-      if remote.isSome():
-        reader.raiseUnexpectedField("Multiple `remote` fields found",
-                                    "RemoteKeystore")
       remote = some(reader.readValue(HttpHostUri))
       implicitVersion1 = true
     of "remotes":
-      if remotes.isSome():
+      if remotes.isSome:
         reader.raiseUnexpectedField("Multiple `remote` fields found",
                                     "RemoteKeystore")
+      if version.isNone:
+        reader.raiseUnexpectedField(
+          "The `remotes` field should be specified after the `version` field of the keystore",
+          "RemoteKeystore")
+      if version.get < 2:
+        reader.raiseUnexpectedField(
+          "The `remotes` field is valid only past version 2 of the remote keystore format",
+          "RemoteKeystore")
       remotes = some(reader.readValue(seq[RemoteSignerInfo]))
     of "version":
-      if version.isSome():
+      if version.isSome:
         reader.raiseUnexpectedField("Multiple `version` fields found",
                                     "RemoteKeystore")
       version = some(reader.readValue(uint64))
       if implicitVersion1 and version.get > 1'u64:
         reader.raiseUnexpectedValue(
           "Remote keystore format doesn't match the specified version number")
-      if version.get > 2'u64:
+      if version.get > 3'u64:
         reader.raiseUnexpectedValue(
           "Remote keystore version " & $version.get &
           " requires a more recent version of Nimbus")
     of "description":
-      let res = reader.readValue(string)
-      if description.isSome():
-        description = some(description.get() & "\n" & res)
-      else:
-        description = some(res)
+      if description.isSome:
+        reader.raiseUnexpectedField("Multiple `description` fields found",
+                                    "RemoteKeystore")
+      description = some(reader.readValue(string))
     of "ignore_ssl_verification":
-      if ignoreSslVerification.isSome():
+      if ignoreSslVerification.isSome:
         reader.raiseUnexpectedField("Multiple conflicting options found",
                                     "RemoteKeystore")
       ignoreSslVerification = some(reader.readValue(bool))
     of "type":
-      if remoteType.isSome():
+      if remoteType.isSome:
         reader.raiseUnexpectedField("Multiple `type` fields found",
                                     "RemoteKeystore")
-      remoteType = some(reader.readValue(string))
+      if version.isNone:
+        reader.raiseUnexpectedField(
+          "The `type` field should be specified after the `version` field of the keystore",
+          "RemoteKeystore")
+      if version.get < 2:
+        reader.raiseUnexpectedField(
+          "The `type` field is valid only past version 2 of the remote keystore format",
+          "RemoteKeystore")
+      let remoteTypeValue = case reader.readValue(string).toLowerAscii()
+        of "web3signer":
+          RemoteSignerType.Web3Signer
+        of "verifying-web3signer":
+          RemoteSignerType.VerifyingWeb3Signer
+        else:
+          reader.raiseUnexpectedValue("Unsupported remote signer `type` value")
+      remoteType = some remoteTypeValue
+    of "proved_block_properties":
+      if provedBlockProperties.isSome:
+        reader.raiseUnexpectedField("Multiple `proved_block_properties` fields found",
+                                    "RemoteKeystore")
+      if version.isNone:
+        reader.raiseUnexpectedField(
+          "The `proved_block_properties` field should be specified after the `version` field of the keystore",
+          "RemoteKeystore")
+      if version.get < 3:
+        reader.raiseUnexpectedField(
+          "The `proved_block_properties` field is valid only past version 3 of the remote keystore format",
+          "RemoteKeystore")
+      if remoteType.isNone:
+        reader.raiseUnexpectedField(
+          "The `proved_block_properties` field should be specified after the `type` field of the keystore",
+          "RemoteKeystore")
+      if remoteType.get != RemoteSignerType.VerifyingWeb3Signer:
+        reader.raiseUnexpectedField(
+          "The `proved_block_properties` field can be specified only when the remote signer type is 'verifying-web3signer'",
+          "RemoteKeystore")
+      var provedProperties = reader.readValue(seq[ProvedProperty])
+      for prop in provedProperties.mitems:
+        if prop.path == ".execution_payload.fee_recipient":
+          prop.bellatrixIndex = some GeneralizedIndex(401)
+          prop.capellaIndex = some GeneralizedIndex(401)
+          prop.denebIndex = some GeneralizedIndex(401)
+        else:
+          reader.raiseUnexpectedValue("Keystores with proved properties different than " &
+                                      "`.execution_payload.fee_recipient` require a " &
+                                      "more recent version of Nimbus")
+      provedBlockProperties = some provedProperties
     of "threshold":
-      if threshold.isSome():
+      if threshold.isSome:
         reader.raiseUnexpectedField("Multiple `threshold` fields found",
                                     "RemoteKeystore")
+      if version.isNone:
+        reader.raiseUnexpectedField(
+          "The `threshold` field should be specified after the `version` field of the keystore",
+          "RemoteKeystore")
+      if version.get < 2:
+        reader.raiseUnexpectedField(
+          "The `threshold` field is valid only past version 2 of the remote keystore format",
+          "RemoteKeystore")
       threshold = some(reader.readValue(uint32))
     else:
       # Ignore unknown field names.
@@ -701,18 +780,15 @@ proc readValue*(reader: var JsonReader, value: var RemoteKeystore)
   if pubkey.isNone():
     reader.raiseUnexpectedValue("Field `pubkey` is missing")
 
-  let keystoreType =
-    if remoteType.isSome():
-      let res = remoteType.get()
-      case res.toLowerAscii()
-      of "web3signer":
-        RemoteSignerType.Web3Signer
-      of "web3signer-diva":
-        RemoteSignerType.Web3SignerDiva
-      else:
-        reader.raiseUnexpectedValue("Unsupported remote signer `type` value")
-    else:
-      RemoteSignerType.Web3Signer
+  if version.get >= 3:
+    if remoteType.isNone:
+      reader.raiseUnexpectedValue("The required `type` is missing")
+    case remoteType.get
+    of RemoteSignerType.Web3Signer:
+      discard
+    of RemoteSignerType.VerifyingWeb3Signer:
+      if provedBlockProperties.isNone:
+        reader.raiseUnexpectedValue("The required `proved_block_properties` is missing")
 
   let keystoreFlags =
     block:
@@ -721,14 +797,24 @@ proc readValue*(reader: var JsonReader, value: var RemoteKeystore)
         res.incl(RemoteKeystoreFlag.IgnoreSSLVerification)
       res
 
-  value = RemoteKeystore(
-    version: 2'u64,
-    pubkey: pubkey.get,
-    description: description,
-    remoteType: keystoreType,
-    remotes: remotes.get,
-    threshold: threshold.get(1),
-  )
+  value = case remoteType.get(RemoteSignerType.Web3Signer)
+  of RemoteSignerType.Web3Signer:
+    RemoteKeystore(
+      version: 2'u64,
+      pubkey: pubkey.get,
+      description: description,
+      remoteType: RemoteSignerType.Web3Signer,
+      remotes: remotes.get,
+      threshold: threshold.get(1))
+  of RemoteSignerType.VerifyingWeb3Signer:
+    RemoteKeystore(
+      version: 2'u64,
+      pubkey: pubkey.get,
+      description: description,
+      remoteType: RemoteSignerType.VerifyingWeb3Signer,
+      provedBlockProperties: provedBlockProperties.get,
+      remotes: remotes.get,
+      threshold: threshold.get(1))
 
 template writeValue*(w: var JsonWriter,
                      value: Pbkdf2Salt|SimpleHexEncodedTypes|Aes128CtrIv) =

beacon_chain/spec/mev/bellatrix_mev.nim

@@ -35,7 +35,7 @@ type
     signature*: ValidatorSig
 
   # https://github.com/ethereum/builder-specs/blob/v0.3.0/specs/bellatrix/builder.md#blindedbeaconblockbody
-  BlindedBeaconBlockBody = object
+  BlindedBeaconBlockBody* = object
     randao_reveal*: ValidatorSig
     eth1_data*: Eth1Data
     graffiti*: GraffitiBytes

beacon_chain/spec/mev/capella_mev.nim

@@ -25,7 +25,7 @@ type
     signature*: ValidatorSig
 
   # https://github.com/ethereum/builder-specs/blob/v0.3.0/specs/capella/builder.md#blindedbeaconblockbody
-  BlindedBeaconBlockBody = object
+  BlindedBeaconBlockBody* = object
     randao_reveal*: ValidatorSig
     eth1_data*: Eth1Data
     graffiti*: GraffitiBytes