From 1379e05db1f00128371959e065c2e4eea1808fa6 Mon Sep 17 00:00:00 2001
From: Kim De Mey <kim.demey@gmail.com>
Date: Fri, 22 Mar 2024 13:05:06 +0100
Subject: [PATCH] Add bellatrix block proof test using new test vectors (#2099)

---
 .../mainnet/all_fluffy_portal_spec_tests.nim  |  1 +
 .../test_history_block_proof_bellatrix.nim    | 64 +++++++++++++++++++
 vendor/portal-spec-tests                      |  2 +-
 3 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 fluffy/tests/portal_spec_tests/mainnet/test_history_block_proof_bellatrix.nim

diff --git a/fluffy/tests/portal_spec_tests/mainnet/all_fluffy_portal_spec_tests.nim b/fluffy/tests/portal_spec_tests/mainnet/all_fluffy_portal_spec_tests.nim
index 8e019a571..1116a14ca 100644
--- a/fluffy/tests/portal_spec_tests/mainnet/all_fluffy_portal_spec_tests.nim
+++ b/fluffy/tests/portal_spec_tests/mainnet/all_fluffy_portal_spec_tests.nim
@@ -12,5 +12,6 @@ import
   ./test_history_content_keys,
   ./test_history_content,
   ./test_history_content_validation,
+  ./test_history_block_proof_bellatrix,
   ./test_header_content,
   ./test_accumulator_root
diff --git a/fluffy/tests/portal_spec_tests/mainnet/test_history_block_proof_bellatrix.nim b/fluffy/tests/portal_spec_tests/mainnet/test_history_block_proof_bellatrix.nim
new file mode 100644
index 000000000..7cecb2742
--- /dev/null
+++ b/fluffy/tests/portal_spec_tests/mainnet/test_history_block_proof_bellatrix.nim
@@ -0,0 +1,64 @@
+# Fluffy
+# Copyright (c) 2024 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).
+# at your option. This file may not be copied, modified, or distributed except according to those terms.
+
+{.used.}
+
+{.push raises: [].}
+
+import
+  std/os,
+  unittest2,
+  yaml,
+  beacon_chain/spec/datatypes/bellatrix,
+  ../../../common/common_types,
+  ../../../network_metadata,
+  ../../../network/history/experimental/beacon_chain_block_proof,
+  ../../test_yaml_utils
+
+type YamlTestProof = object
+  execution_block_header: string # Not part of the actual proof
+  beacon_block_body_proof: array[8, string]
+  beacon_block_body_root: string
+  beacon_block_header_proof: array[3, string]
+  beacon_block_header_root: string
+  historical_roots_proof: array[14, string]
+  slot: uint64
+
+proc fromHex[n](T: type array[n, Digest], a: array[n, string]): T =
+  var res: T
+  for i in 0 ..< a.len:
+    res[i] = Digest.fromHex(a[i])
+
+  res
+
+suite "History Block Proofs - Bellatrix":
+  test "BeaconChainBlockProof for Execution BlockHeader":
+    let
+      testsPath =
+        "./vendor/portal-spec-tests/tests/mainnet/history/headers_with_proof/block_proofs_bellatrix/"
+      historicalRoots = loadHistoricalRoots()
+
+    for kind, path in walkDir(testsPath):
+      if kind == pcFile and path.splitFile.ext == ".yaml":
+        let
+          testProof = YamlTestProof.loadFromYaml(path).valueOr:
+            raiseAssert "Cannot read test vector: " & error
+
+          blockHash = BlockHash.fromHex(testProof.execution_block_header)
+          blockProof = BeaconChainBlockProof(
+            beaconBlockBodyProof:
+              array[8, Digest].fromHex(testProof.beacon_block_body_proof),
+            beaconBlockBodyRoot: Digest.fromHex(testProof.beacon_block_body_root),
+            beaconBlockHeaderProof:
+              array[3, Digest].fromHex(testProof.beacon_block_header_proof),
+            beaconBlockHeaderRoot: Digest.fromHex(testProof.beacon_block_header_root),
+            historicalRootsProof:
+              array[14, Digest].fromHex(testProof.historical_roots_proof),
+            slot: Slot(testProof.slot),
+          )
+
+        check verifyProof(historicalRoots, blockProof, blockHash)
diff --git a/vendor/portal-spec-tests b/vendor/portal-spec-tests
index 954f7d0eb..4255e60a7 160000
--- a/vendor/portal-spec-tests
+++ b/vendor/portal-spec-tests
@@ -1 +1 @@
-Subproject commit 954f7d0eb2950a2131048404a1a4ce476bb64657
+Subproject commit 4255e60a710b0d0579ec0d7ed11a3f1b034a9cd9