From c95f9feec435313f866a942543bd2b1fcddf5666 Mon Sep 17 00:00:00 2001
From: Etan Kissling <etan@status.im>
Date: Fri, 3 Nov 2023 15:37:44 +0100
Subject: [PATCH] remove unused Deneb code (#5556)

The `process_blob_kzg_commitments` step was removed in `v1.4.0-alpha.1`,
but we haven't deleted the now unused functions. Do that now.
---
 beacon_chain/spec/datatypes/deneb.nim        |  3 --
 beacon_chain/spec/state_transition_block.nim | 54 --------------------
 2 files changed, 57 deletions(-)

diff --git a/beacon_chain/spec/datatypes/deneb.nim b/beacon_chain/spec/datatypes/deneb.nim
index 5b0c73542..250314df4 100644
--- a/beacon_chain/spec/datatypes/deneb.nim
+++ b/beacon_chain/spec/datatypes/deneb.nim
@@ -33,9 +33,6 @@ const
   # https://github.com/ethereum/consensus-specs/blob/v1.4.0-beta.2/specs/deneb/polynomial-commitments.md#constants
   BYTES_PER_FIELD_ELEMENT = 32
 
-  # https://github.com/ethereum/consensus-specs/blob/v1.4.0-beta.3/specs/deneb/beacon-chain.md#blob
-  BLOB_TX_TYPE* = 0x03'u8
-
   # https://github.com/ethereum/consensus-specs/blob/v1.3.0/specs/deneb/polynomial-commitments.md#constants
   BLS_MODULUS* = "52435875175126190479447740508185965837690552500527637822603658699938581184513".u256
 
diff --git a/beacon_chain/spec/state_transition_block.nim b/beacon_chain/spec/state_transition_block.nim
index 21b027e56..1d0270ee5 100644
--- a/beacon_chain/spec/state_transition_block.nim
+++ b/beacon_chain/spec/state_transition_block.nim
@@ -715,35 +715,6 @@ func process_withdrawals*(
 
   ok()
 
-# https://github.com/ethereum/consensus-specs/blob/v1.3.0/specs/deneb/beacon-chain.md#tx_peek_blob_versioned_hashes
-func tx_peek_blob_versioned_hashes(opaque_tx: Transaction):
-    Result[seq[VersionedHash], cstring] =
-  ## This function retrieves the hashes from the `SignedBlobTransaction` as
-  ## defined in Deneb, using SSZ offsets. Offsets are little-endian `uint32`
-  ## values, as defined in the SSZ specification. See the full details of
-  ## `blob_versioned_hashes` offset calculation.
-  if not (opaque_tx[0] == BLOB_TX_TYPE):
-    return err("tx_peek_blob_versioned_hashes: invalid opaque transaction type")
-  let message_offset = 1 + bytes_to_uint32(opaque_tx.asSeq.toOpenArray(1, 4))
-
-  if opaque_tx.lenu64 < (message_offset + 192).uint64:
-    return err("tx_peek_blob_versioned_hashes: opaque transaction too short")
-
-  # field offset: 32 + 8 + 32 + 32 + 8 + 4 + 32 + 4 + 4 + 32 = 188
-  let blob_versioned_hashes_offset = (
-    message_offset + bytes_to_uint32(
-      opaque_tx[(message_offset + 188) ..< (message_offset + 192)]))
-
-  if blob_versioned_hashes_offset.uint64 > high(int).uint64:
-    return err("tx_peek_blob_versioned_hashes: blob_versioned_hashes_offset too high")
-
-  var res: seq[VersionedHash]
-  for x in countup(blob_versioned_hashes_offset.int, len(opaque_tx) - 1, 32):
-    var versionedHash: VersionedHash
-    versionedHash[0 .. 31] = opaque_tx.asSeq.toOpenArray(x, x + 31)
-    res.add versionedHash
-  ok res
-
 # https://github.com/ethereum/consensus-specs/blob/v1.4.0-beta.1/specs/deneb/beacon-chain.md#kzg_commitment_to_versioned_hash
 func kzg_commitment_to_versioned_hash*(
     kzg_commitment: KzgCommitment): VersionedHash =
@@ -755,31 +726,6 @@ func kzg_commitment_to_versioned_hash*(
   res[1 .. 31] = eth2digest(kzg_commitment).data.toOpenArray(1, 31)
   res
 
-# https://github.com/ethereum/consensus-specs/blob/v1.3.0/specs/deneb/beacon-chain.md#verify_kzg_commitments_against_transactions
-func verify_kzg_commitments_against_transactions*(
-    transactions: seq[Transaction],
-    kzg_commitments: seq[KzgCommitment]): bool =
-  var all_versioned_hashes: seq[VersionedHash]
-  for tx in transactions:
-    if tx[0] == BLOB_TX_TYPE:
-      let maybe_versioned_hashed = tx_peek_blob_versioned_hashes(tx)
-      if maybe_versioned_hashed.isErr:
-        return false
-      all_versioned_hashes.add maybe_versioned_hashed.get
-      # TODO valueOr version fails to compile
-      #all_versioned_hashes.add tx_peek_blob_versioned_hashes(tx).valueOr:
-      #  return false
-
-  all_versioned_hashes == mapIt(
-    kzg_commitments, it.kzg_commitment_to_versioned_hash)
-
-func process_blob_kzg_commitments(
-    body: deneb.BeaconBlockBody | deneb.TrustedBeaconBlockBody |
-          deneb.SigVerifiedBeaconBlockBody): bool =
-  verify_kzg_commitments_against_transactions(
-    body.execution_payload.transactions.asSeq,
-    body.blob_kzg_commitments.asSeq)
-
 # https://github.com/ethereum/consensus-specs/blob/v1.3.0/specs/deneb/fork-choice.md#validate_blobs
 proc validate_blobs*(expected_kzg_commitments: seq[KzgCommitment],
                      blobs: seq[KzgBlob],