rm Deneb builder API remnant (#7111)

tersec · web-flow · commit 7f11fdaf8660 · 2025-04-27T05:06:33.000Z
diff --git a/beacon_chain/spec/keystore.nim b/beacon_chain/spec/keystore.nim
@@ -150,7 +150,6 @@ type
   ProvenProperty* = object
     path*: string
     description*: Option[string]
-    capellaIndex*: Option[GeneralizedIndex]
     denebIndex*: Option[GeneralizedIndex]
     electraIndex*: Option[GeneralizedIndex]
     fuluIndex*: Option[GeneralizedIndex]
@@ -730,14 +729,12 @@ func parseProvenBlockProperty*(propertyPath: string): Result[ProvenProperty, str
     debugFuluComment "We don't know yet if `GeneralizedIndex` will stay same in Fulu yet."
     ok ProvenProperty(
       path: propertyPath,
-      capellaIndex: some GeneralizedIndex(401),
       denebIndex: some GeneralizedIndex(801),
       electraIndex: some GeneralizedIndex(801),
       fuluIndex: some GeneralizedIndex(801))
   elif propertyPath == ".graffiti":
     ok ProvenProperty(
       path: propertyPath,
-      capellaIndex: some GeneralizedIndex(18),
       denebIndex: some GeneralizedIndex(18),
       electraIndex: some GeneralizedIndex(18),
       fuluIndex: some GeneralizedIndex(18))
@@ -847,12 +844,10 @@ proc readValue*(reader: var JsonReader, value: var RemoteKeystore)
       var provenProperties = reader.readValue(seq[ProvenProperty])
       for prop in provenProperties.mitems:
         if prop.path == ".execution_payload.fee_recipient":
-          prop.capellaIndex = some GeneralizedIndex(401)
           prop.denebIndex = some GeneralizedIndex(801)
           prop.electraIndex = some GeneralizedIndex(801)
           prop.fuluIndex = some GeneralizedIndex(801)
         elif prop.path == ".graffiti":
-          prop.capellaIndex = some GeneralizedIndex(18)
           prop.denebIndex = some GeneralizedIndex(18)
           prop.electraIndex = some GeneralizedIndex(18)
           prop.fuluIndex = some GeneralizedIndex(18)
diff --git a/beacon_chain/validators/validator_pool.nim b/beacon_chain/validators/validator_pool.nim
@@ -578,21 +578,8 @@ proc getBlockSignature*(v: AttachedValidator, fork: Fork,
     let web3signerRequest =
       when blck is ForkedBlindedBeaconBlock:
         case blck.kind
-        of ConsensusFork.Phase0 .. ConsensusFork.Capella:
+        of ConsensusFork.Phase0 .. ConsensusFork.Deneb:
           return SignatureResult.err("Invalid blinded beacon block fork")
-        of ConsensusFork.Deneb:
-          case v.data.remoteType
-          of RemoteSignerType.Web3Signer:
-            Web3SignerRequest.init(fork, genesis_validators_root,
-              Web3SignerForkedBeaconBlock(kind: ConsensusFork.Deneb,
-                data: blck.denebData.toBeaconBlockHeader))
-          of RemoteSignerType.VerifyingWeb3Signer:
-            let proofs = blockPropertiesProofs(
-              blck.denebData.body, denebIndex)
-            Web3SignerRequest.init(fork, genesis_validators_root,
-              Web3SignerForkedBeaconBlock(kind: ConsensusFork.Deneb,
-                data: blck.denebData.toBeaconBlockHeader),
-              proofs)
         of ConsensusFork.Electra:
           case v.data.remoteType
           of RemoteSignerType.Web3Signer:
@@ -647,26 +634,8 @@ proc getBlockSignature*(v: AttachedValidator, fork: Fork,
             proofs)
       elif blck is ForkedMaybeBlindedBeaconBlock:
         withForkyMaybeBlindedBlck(blck):
-          # TODO why isn't this a case statement
-          when consensusFork < ConsensusFork.Capella:
+          when consensusFork < ConsensusFork.Deneb:
             return SignatureResult.err("Invalid beacon block fork")
-          elif consensusFork == ConsensusFork.Capella:
-            when isBlinded:
-              return SignatureResult.err("Invalid blinded beacon block fork")
-            else:
-              case v.data.remoteType
-              of RemoteSignerType.Web3Signer:
-                Web3SignerRequest.init(fork, genesis_validators_root,
-                  Web3SignerForkedBeaconBlock(kind: ConsensusFork.Capella,
-                    data: forkyMaybeBlindedBlck.toBeaconBlockHeader))
-              of RemoteSignerType.VerifyingWeb3Signer:
-                let proofs =
-                  blockPropertiesProofs(forkyMaybeBlindedBlck.body,
-                                        capellaIndex)
-                Web3SignerRequest.init(fork, genesis_validators_root,
-                  Web3SignerForkedBeaconBlock(kind: ConsensusFork.Capella,
-                    data: forkyMaybeBlindedBlck.toBeaconBlockHeader),
-                      proofs)
           elif consensusFork == ConsensusFork.Deneb:
             when isBlinded:
               case v.data.remoteType
@@ -753,21 +722,8 @@ proc getBlockSignature*(v: AttachedValidator, fork: Fork,
                       proofs)
       else:
         case blck.kind
-        of ConsensusFork.Phase0 .. ConsensusFork.Bellatrix:
+        of ConsensusFork.Phase0 .. ConsensusFork.Capella:
           return SignatureResult.err("Invalid beacon block fork")
-        of ConsensusFork.Capella:
-          case v.data.remoteType
-          of RemoteSignerType.Web3Signer:
-            Web3SignerRequest.init(fork, genesis_validators_root,
-              Web3SignerForkedBeaconBlock(kind: ConsensusFork.Capella,
-                data: blck.capellaData.toBeaconBlockHeader))
-          of RemoteSignerType.VerifyingWeb3Signer:
-            let proofs = blockPropertiesProofs(
-              blck.capellaData.body, capellaIndex)
-            Web3SignerRequest.init(fork, genesis_validators_root,
-              Web3SignerForkedBeaconBlock(kind: ConsensusFork.Capella,
-                data: blck.capellaData.toBeaconBlockHeader),
-              proofs)
         of ConsensusFork.Deneb:
           case v.data.remoteType
           of RemoteSignerType.Web3Signer:
diff --git a/tests/test_remote_keystore.nim b/tests/test_remote_keystore.nim
@@ -1,5 +1,5 @@
 # beacon_chain
-# Copyright (c) 2022-2024 Status Research & Development GmbH
+# Copyright (c) 2022-2025 Status Research & Development GmbH
 # Licensed and distributed under either of
 #   * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
 #   * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
@@ -135,7 +135,6 @@ suite "Remove keystore testing suite":
       check keystore.remotes[0].id == 0
       check keystore.remotes[0].pubkey.toHex == "8b9c875fbe539c6429c4fc304675062579ce47fb6b2ac6b6a1ba1188ca123a80affbfe381dbbc8e7f2437709a4c3325c"
       check keystore.provenBlockProperties.len == 1
-      check keystore.provenBlockProperties[0].capellaIndex == some GeneralizedIndex(401)
       check keystore.provenBlockProperties[0].denebIndex == some GeneralizedIndex(801)
       check keystore.provenBlockProperties[0].electraIndex == some GeneralizedIndex(801)
       check keystore.provenBlockProperties[0].fuluIndex == some GeneralizedIndex(801)
@@ -185,7 +184,6 @@ suite "Remove keystore testing suite":
       check keystore.remotes[2].pubkey.toHex == "8f5f9e305e7fcbde94182747f5ecec573d1786e8320a920347a74c0ff5e70f12ca22607c98fdc8dbe71161db59e0ac9d"
       check keystore.threshold == 2
       check keystore.provenBlockProperties.len == 1
-      check keystore.provenBlockProperties[0].capellaIndex == some GeneralizedIndex(401)
       check keystore.provenBlockProperties[0].denebIndex == some GeneralizedIndex(801)
       check keystore.provenBlockProperties[0].electraIndex == some GeneralizedIndex(801)
       check keystore.provenBlockProperties[0].fuluIndex == some GeneralizedIndex(801)
diff --git a/tests/test_signing_node.nim b/tests/test_signing_node.nim
@@ -265,8 +265,7 @@ func getRemoteKeystoreData(data: string, basePort: int,
             path: ".execution_payload.fee_recipient",
             fuluIndex: some GeneralizedIndex(801),
             electraIndex: some GeneralizedIndex(801),
-            denebIndex: some GeneralizedIndex(801),
-            capellaIndex: some GeneralizedIndex(401)
+            denebIndex: some GeneralizedIndex(801)
           )
         ],
         version: uint64(4),
