Merge pull request #8064 from ethereum-optimism/aj/verify-more-than-block-hash

op-service: Ensure block body validation tests fail for the expected reason

op-service/sources/testdata/data/blocks/post-shanghai-bad-receipts-hash_metadata.json

+{"name":"post-shanghai-bad-receipts-hash","fail":true, "reason":"failed to verify block hash"}

op-service/sources/testdata/data/blocks/post-shanghai-bad-receipts_metadata.json

-{"name":"post-shanghai-bad-receipts","fail":true}

op-service/sources/testdata/data/blocks/post-shanghai-bad-transactions-hash_metadata.json

+{"name":"post-shanghai-bad-transactions-hash","fail":true, "reason":"failed to verify block hash"}

op-service/sources/testdata/data/blocks/post-shanghai-bad-transactions-nil_metadata.json

+{"name":"post-shanghai-bad-transactions-nil","fail":true, "reason": "block tx 0 is nil"}

op-service/sources/testdata/data/blocks/post-shanghai-bad-transactions_metadata.json

-{"name":"post-shanghai-bad-transactions","fail":true}
+{"name":"post-shanghai-bad-transactions","fail":true, "reason": "failed to verify transactions list"}

op-service/sources/testdata/data/blocks/post-shanghai-bad-withdrawals-hash_metadata.json

+{"name":"post-shanghai-bad-withdrawals-hash","fail":true, "reason":"failed to verify block hash"}

op-service/sources/testdata/data/blocks/post-shanghai-bad-withdrawals-nil_metadata.json

+{"name":"post-shanghai-bad-withdrawals-nil","fail":true, "reason": "block withdrawal 0 is null"}

op-service/sources/testdata/data/blocks/post-shanghai-bad-withdrawals_metadata.json

-{"name":"post-shanghai-bad-withdrawals","fail":true}
+{"name":"post-shanghai-bad-withdrawals","fail":true,"reason": "failed to verify withdrawals list"}

op-service/sources/testdata/data/blocks/pre-shanghai-bad-receipts-hash_metadata.json

+{"name":"pre-shanghai-bad-receipts-hash","fail":true, "reason":"failed to verify block hash"}

op-service/sources/testdata/data/blocks/pre-shanghai-bad-receipts_metadata.json

-{"name":"pre-shanghai-bad-receipts","fail":true}

op-service/sources/testdata/data/blocks/pre-shanghai-bad-transactions-hash_metadata.json

+{"name":"pre-shanghai-bad-transactions-hash","fail":true, "reason":"failed to verify block hash"}

op-service/sources/testdata/data/blocks/pre-shanghai-bad-transactions_metadata.json

-{"name":"pre-shanghai-bad-transactions","fail":true}
+{"name":"pre-shanghai-bad-transactions","fail":true,"reason": "failed to verify transactions list"}

op-service/sources/testdata/gen.sh

@@ -62,18 +62,8 @@ generate_test_vector() {
     $mutation_func "$data_file" $metadata_file
 }
 
-mkdir -p data/blocks
 mkdir -p data/headers
 
-# Blocks
-generate_test_vector "pre-shanghai-success" "0x9ef7cd2241202b919a0e51240818a8666c73f7ce4b908931e3ae6d26d30f7663" true success_case
-generate_test_vector "pre-shanghai-bad-transactions" "0x9ef7cd2241202b919a0e51240818a8666c73f7ce4b908931e3ae6d26d30f7663" true bad_transactions_root
-generate_test_vector "pre-shanghai-bad-receipts" "0x9ef7cd2241202b919a0e51240818a8666c73f7ce4b908931e3ae6d26d30f7663" true bad_receipts_root
-generate_test_vector "post-shanghai-success" "0xa16c6bcda4fdca88b5761965c4d724f7afc6a6900d9051a204e544870adb3452" true success_case
-generate_test_vector "post-shanghai-bad-withdrawals" "0xa16c6bcda4fdca88b5761965c4d724f7afc6a6900d9051a204e544870adb3452" true bad_withdrawals_root
-generate_test_vector "post-shanghai-bad-transactions" "0xa16c6bcda4fdca88b5761965c4d724f7afc6a6900d9051a204e544870adb3452" true  bad_transactions_root
-generate_test_vector "post-shanghai-bad-receipts" "0xa16c6bcda4fdca88b5761965c4d724f7afc6a6900d9051a204e544870adb3452" true bad_receipts_root
-
 # Headers
 generate_test_vector "pre-shanghai-success" "0x9ef7cd2241202b919a0e51240818a8666c73f7ce4b908931e3ae6d26d30f7663" false success_case
 generate_test_vector "pre-shanghai-bad-transactions" "0x9ef7cd2241202b919a0e51240818a8666c73f7ce4b908931e3ae6d26d30f7663" false bad_transactions_root

op-service/sources/types_test.go

@@ -13,8 +13,9 @@ import (
 var blocksTestdata embed.FS
 
 type testMetadata struct {
-	Name string `json:"name"`
-	Fail bool   `json:"fail,omitempty"`
+	Name   string `json:"name"`
+	Fail   bool   `json:"fail,omitempty"`
+	Reason string `json:"reason,omitempty"`
 }
 
 func readJsonTestdata(t *testing.T, name string, dest any) {
@@ -67,6 +68,7 @@ func TestBlockJSON(t *testing.T) {
 			err := block.verify()
 			if metadata.Fail {
 				require.NotNil(t, err, "expecting verification error")
+				require.ErrorContains(t, err, metadata.Reason, "validation failed for incorrect reason")
 			} else {
 				require.NoError(t, err, "verification should pass")
 			}