Upgrade mmr super-peak function to 0.5.4 and update reports test vect…

…ors.
eigerco · Feb 5, 2025 · f570219 · f570219
1 parent 83b396c
commit f570219
Show file tree

Hide file tree

Showing 38 changed files with 210 additions and 211 deletions.
diff --git a/internal/merkle/mountain_ranges/mmr.go b/internal/merkle/mountain_ranges/mmr.go
@@ -83,8 +83,7 @@ func (m *MMR) SuperPeak(peaks []*crypto.Hash, hashFunc func([]byte) crypto.Hash)
 
 	subPeak := m.SuperPeak(validPeaks[:len(validPeaks)-1], hashFunc)
 
-	combined := append([]byte("node"), subPeak[:]...) // Graypaper 0.5.3
-	//combined := append([]byte("peak"), subPeak[:]...)  // Graypaper 0.5.4  TODO: [Issue 219] Uncomment once test vectors are updated).
+	combined := append([]byte("peak"), subPeak[:]...) // Graypaper 0.5.4
 	combined = append(combined, lastHash[:]...)
 	result := hashFunc(combined)
 

diff --git a/tests/integration/vectors/reports/tiny/anchor_not_recent-1.json b/tests/integration/vectors/reports/tiny/anchor_not_recent-1.json
@@ -13,7 +13,7 @@
                     "context": {
                         "anchor": "0x6900f39559232990f5e2c1353ee2316b063604a07bdf14322dbc0188f76b4d3f",
                         "state_root": "0xd8c577816b629241676502d0461e4eae42a375461314d64484f35f4228da23d6",
-                        "beefy_root": "0x71c150347dc035847d5944c864a2d3ed0fa410341b2ffbfdeeaa1c9d6aa9cacd",
+                        "beefy_root": "0xf5df0c11416d43c55b43e096572d450b7780ed0fd7b540f26c8ded8e0d41e183",
                         "lookup_anchor": "0x16bda47e5a68daf53c39ddee8af4ecaced7e87f3f0ac9da5a6f4f9e41350d319",
                         "lookup_anchor_slot": 6,
                         "prerequisites": []
@@ -38,15 +38,15 @@
                 "signatures": [
                     {
                         "validator_index": 1,
-                        "signature": "0xf9b1872b769a246de4a05742ea7bb42c23447356059e6acb025b94c521092e423a4d591e1e85d181b367a93b05f89badb4ceadd54e92c6c55a07558638299207"
+                        "signature": "0x3a06bdb2756b63255c7aff3880367ccb4fd55eb40c4b95c40c3e1e172c31cad0613700ea934df1d98fe7465c7f8022dd711580478d8b532f8854ecd40aab2200"
                     },
                     {
                         "validator_index": 4,
-                        "signature": "0x4d0f0a11ef495e331ecc0c201ee22a04f11e8c082a0780f010b76554cb526fd420fa888d7815c1dd3345a2abb4599387318a9e5d933e6447a3c91fbb0dfe4e03"
+                        "signature": "0xd426313d5b724dbaa7cd02e165718893b38696249673ae4a847000e8d4afea90a7eb3077b3642b9cb02b79ccf1189e7f6066444671f13e370f8e7eaa1280f705"
                     },
                     {
                         "validator_index": 5,
-                        "signature": "0x5d02237d0392e1ce07554b6207c1c9f426e7f9349c92bb5201e5c3770bf895c2c941fa895c15c73794bb16ee4fe1bc7f8daa88ea406666c518b5c73893bf270d"
+                        "signature": "0xf1346c48474ec8cb68f1e058c2dc532187a7f20d3726ca88a480ebf3525f92faab1972962fd45729d6acd4f8517e8b59ca8fca86b0058b3310a7f99a5464c905"
                     }
                 ]
             }

diff --git a/tests/integration/vectors/reports/tiny/bad_code_hash-1.json b/tests/integration/vectors/reports/tiny/bad_code_hash-1.json
@@ -13,7 +13,7 @@
                     "context": {
                         "anchor": "0x39cb518983b02695034b3b92cb31a7334e1a2ec3ef7dbfa32c68e4e8444363f1",
                         "state_root": "0xd8c577816b629241676502d0461e4eae42a375461314d64484f35f4228da23d6",
-                        "beefy_root": "0x71c150347dc035847d5944c864a2d3ed0fa410341b2ffbfdeeaa1c9d6aa9cacd",
+                        "beefy_root": "0xf5df0c11416d43c55b43e096572d450b7780ed0fd7b540f26c8ded8e0d41e183",
                         "lookup_anchor": "0x16bda47e5a68daf53c39ddee8af4ecaced7e87f3f0ac9da5a6f4f9e41350d319",
                         "lookup_anchor_slot": 6,
                         "prerequisites": []
@@ -38,15 +38,15 @@
                 "signatures": [
                     {
                         "validator_index": 1,
-                        "signature": "0xc2e124aefbb7e9856548524e3909ac5e92ea9aed7be383eb28664f3f9fb4165d61ae37d2d811fc264093e41b4e5a107ebf2a3ce4060aacabe6b71acc18943609"
+                        "signature": "0xa0fee93175fa382902e3a7dd9f9d06dcfea06a45ee8a6c5b082e7ac31fc97958dc412f428a3690a15df35186f947162d93ce44a207e9e20b8c981c87bc610001"
                     },
                     {
                         "validator_index": 4,
-                        "signature": "0x19fa6d51b7065ab0297fcd05f5834a3ed29142296370bf608b1202fae854c3c3d174db94ec88fd21e8efb9764a3ed9c1cb6da684cde6db7f64dbcacc2520490f"
+                        "signature": "0x33cbb2af620dbc98fb1eef296744a19e797589e7bd1b2a7cbe6d77514a064a08393e560a495a8afabc80d6611a8d50c7eadaf472b8a49d0a5bd5c1704fee3a0d"
                     },
                     {
                         "validator_index": 5,
-                        "signature": "0xb300854578cd36da4056fa9ffc5b5a486350b1674b19481afec2d71102edc2cac093dc11f00a9d9ac6584fb9e928e00118f161d80eb327b8c997f14d67cfa702"
+                        "signature": "0x31fd59b6c937ef68b0333b78f3f832dcc2e2dbc1999ed1acf2ea4c0462021160c1bd1c336f26a663b2a29c389fbc12a70ad4d15bcb1c0569e74548d7c9976405"
                     }
                 ]
             }

diff --git a/tests/integration/vectors/reports/tiny/bad_core_index-1.json b/tests/integration/vectors/reports/tiny/bad_core_index-1.json
@@ -13,7 +13,7 @@
                     "context": {
                         "anchor": "0x39cb518983b02695034b3b92cb31a7334e1a2ec3ef7dbfa32c68e4e8444363f1",
                         "state_root": "0xd8c577816b629241676502d0461e4eae42a375461314d64484f35f4228da23d6",
-                        "beefy_root": "0x71c150347dc035847d5944c864a2d3ed0fa410341b2ffbfdeeaa1c9d6aa9cacd",
+                        "beefy_root": "0xf5df0c11416d43c55b43e096572d450b7780ed0fd7b540f26c8ded8e0d41e183",
                         "lookup_anchor": "0x16bda47e5a68daf53c39ddee8af4ecaced7e87f3f0ac9da5a6f4f9e41350d319",
                         "lookup_anchor_slot": 6,
                         "prerequisites": []
@@ -38,15 +38,15 @@
                 "signatures": [
                     {
                         "validator_index": 0,
-                        "signature": "0x3a614d57217b826e3dd3a03bd546328dfa8cc85a5ee76d5379733a90e20fac3bf57e61fe968764b2c87d9b6a863fd79c43b822fba357970913f8fa74019a280a"
+                        "signature": "0x078d8bbabaa603658934fe8d73ff4bb739f2957923a906c57ab27e52f8e362f4a433920af035eca9ae4095f46983ad4a87354d6002c3490f20bd03cdcfbfff09"
                     },
                     {
                         "validator_index": 2,
-                        "signature": "0x579dabdb8e5ee6576964145b838ef6b61d7f6de77b907c01638bf5ab3e21b5a484b53af1658dfcb706507c12b4eb2367428a9bbbc66baadbce95b268021de90d"
+                        "signature": "0xcdf097dec51c10e5a76434377e353599e89fbef72204d95bd24fc53eecccca6de8060d30be94b3409045b067e74664de2b44e2f87ce344653a4938b1fab94a0f"
                     },
                     {
                         "validator_index": 3,
-                        "signature": "0x3b430602fcf6c52190dbc66a2782756c05f86ae3fb00c5f709084db523e5d9a9300198c598621254a328f8d42f01b2063aae2d0062b70ffbc8fe77bcec7be20c"
+                        "signature": "0x901d7d6fd49ae3330583aa1aa1c8f2f8d8b115ddd10ee2b2699aabe154239b0c8d831a7c9abf094aba4d3f72f926dd9f543f6c5bf59ae2cd11125555af36e309"
                     }
                 ]
             }

diff --git a/tests/integration/vectors/reports/tiny/bad_service_id-1.json b/tests/integration/vectors/reports/tiny/bad_service_id-1.json
@@ -13,7 +13,7 @@
                     "context": {
                         "anchor": "0x39cb518983b02695034b3b92cb31a7334e1a2ec3ef7dbfa32c68e4e8444363f1",
                         "state_root": "0xd8c577816b629241676502d0461e4eae42a375461314d64484f35f4228da23d6",
-                        "beefy_root": "0x71c150347dc035847d5944c864a2d3ed0fa410341b2ffbfdeeaa1c9d6aa9cacd",
+                        "beefy_root": "0xf5df0c11416d43c55b43e096572d450b7780ed0fd7b540f26c8ded8e0d41e183",
                         "lookup_anchor": "0x16bda47e5a68daf53c39ddee8af4ecaced7e87f3f0ac9da5a6f4f9e41350d319",
                         "lookup_anchor_slot": 6,
                         "prerequisites": []
@@ -38,15 +38,15 @@
                 "signatures": [
                     {
                         "validator_index": 1,
-                        "signature": "0x105c7f9efd3ce2d2d00e333a28167cc6866a3445845e6c35d93c21518093603921bbfeabfabc8dbfe0af330e137d0bf3c928e3ba0441409e279b025e6869750b"
+                        "signature": "0x827694d480ef5f18b3acbe6076c35363b80d399c9d43b01dc22d193140d1ed181b1e32344fa44c15673edb38263429abe731e4070be7a0d84ae3dcd03061590b"
                     },
                     {
                         "validator_index": 4,
-                        "signature": "0x1c8cd1ce2e26f1119c8328d7ecb86c17be7b0044691dec0595dc03a739e105cb6edb29ac0ec32b72cf3cbe93bd225a93fa59d4a3b7750020daca6df5097c4602"
+                        "signature": "0x2996cb3b53de732536be305aab744b5f97dd08dd28d721fcd5cc0e06fc6dfb885f653d6d15f5e9f642ccdc9e7bd21dd35fa8498919c2f7e4a67ae66bf6366400"
                     },
                     {
                         "validator_index": 5,
-                        "signature": "0xd49301fc1c8f5eb18abdeb71892ef62cd57a780cdef99b36146798f262cd23e52eb1b43584212cb6341785639784c1160b1e9a5cbd307486148c2f7608195508"
+                        "signature": "0xf2753c342421d03ed486359b9c84df9093cbb4089fc90aad609083e240a4d92cafbf9dfed34cd0b71213ff8e84267e374298d22b5bd841d912340ca018f53f0a"
                     }
                 ]
             }

diff --git a/tests/integration/vectors/reports/tiny/bad_signature-1.json b/tests/integration/vectors/reports/tiny/bad_signature-1.json
@@ -13,7 +13,7 @@
                     "context": {
                         "anchor": "0x39cb518983b02695034b3b92cb31a7334e1a2ec3ef7dbfa32c68e4e8444363f1",
                         "state_root": "0xd8c577816b629241676502d0461e4eae42a375461314d64484f35f4228da23d6",
-                        "beefy_root": "0x71c150347dc035847d5944c864a2d3ed0fa410341b2ffbfdeeaa1c9d6aa9cacd",
+                        "beefy_root": "0xf5df0c11416d43c55b43e096572d450b7780ed0fd7b540f26c8ded8e0d41e183",
                         "lookup_anchor": "0x16bda47e5a68daf53c39ddee8af4ecaced7e87f3f0ac9da5a6f4f9e41350d319",
                         "lookup_anchor_slot": 6,
                         "prerequisites": []
@@ -38,15 +38,15 @@
                 "signatures": [
                     {
                         "validator_index": 1,
-                        "signature": "0x68e84d7253380e8beb1fb71a54a8a0a805c06ea756da74d79bcbf5b811306cea560f27abaca175f6908ab54e4acc7bb919ab87ac616e7df106d3b043b71bac04"
+                        "signature": "0x79fbac1ba518144be566ac2a71f43e7846f699786affc78574fffe6260108efef5ea810846c59b709cb77198dcb52b0fcd1d9858d8e3af6195537bf3cefa8600"
                     },
                     {
                         "validator_index": 4,
-                        "signature": "0xeef064e3973b71fa4b0ce0c69c6799cc9b0e1887a894a93559a4c3a3848f039df82de95c70218588134ac51c2a329936ec54bc320b4c97c5f29f46acd1f4860e"
+                        "signature": "0xfb17b608ee2887bdc911a2db418a5c29484f5c5f4ae5f6437ca171675364191c3a63d220af70a140b8e1d0831829ba8c3f34d7447015b34cdc3ef012129d6300"
                     },
                     {
                         "validator_index": 5,
-                        "signature": "0x2c369533280dcd2fbdc2efeaf9dd0e042363ad14a4dee64a0f539def799f488912c85743132c5966bf5f9e65ec4d13cda5281fbbbe0c705a22e00424c858bf0b"
+                        "signature": "0xa4dec614068e2582d3f6608d079ad34a15ecb97942d724b8dfaf317134ff76858d82c7c70bd2e54faedde975df20ea79d795e169e1456e848781c7112fa0a708"
                     }
                 ]
             }

diff --git a/tests/integration/vectors/reports/tiny/bad_state_root-1.json b/tests/integration/vectors/reports/tiny/bad_state_root-1.json
@@ -13,7 +13,7 @@
                     "context": {
                         "anchor": "0x39cb518983b02695034b3b92cb31a7334e1a2ec3ef7dbfa32c68e4e8444363f1",
                         "state_root": "0x1248fd314e6ca467f0305f3494a66c75c37aa084512c6066ee211d49bb1f39bc",
-                        "beefy_root": "0x71c150347dc035847d5944c864a2d3ed0fa410341b2ffbfdeeaa1c9d6aa9cacd",
+                        "beefy_root": "0xf5df0c11416d43c55b43e096572d450b7780ed0fd7b540f26c8ded8e0d41e183",
                         "lookup_anchor": "0x16bda47e5a68daf53c39ddee8af4ecaced7e87f3f0ac9da5a6f4f9e41350d319",
                         "lookup_anchor_slot": 6,
                         "prerequisites": []
@@ -38,15 +38,15 @@
                 "signatures": [
                     {
                         "validator_index": 1,
-                        "signature": "0x47d92d28ea66e13615f73b5675f41b20cb99af3378b6329bcf0e0b4e5d6b7abe25f01f2324308918c2b72dca29da64a41f1a852b6fef018a1ced0ccc42b2d60c"
+                        "signature": "0x243d2acd27786a5846b840a2d1da27b3dfab43f404c4304cc9426fce80110979a3ee761880a24e650c27f7389b5a820e98b8731073bf6cf04903049076e24d0a"
                     },
                     {
                         "validator_index": 4,
-                        "signature": "0x159efb04b739b822ee38fdab2bad34df1d030b679abd0b9464a5f21fdb56ad7f22afd282945b51af3d9d0f8bdb2a1d0794a8ad2129f215e2a2303848b59c730c"
+                        "signature": "0x2626a29c5cc344120ed1a2b30994f1e0dc17f9610b61dc0653d092ef72a20bae287c74222769f968e3e08e7cec39c73995179a3421d242ac6fe869c6341c2304"
                     },
                     {
                         "validator_index": 5,
-                        "signature": "0x4a8a2159e0e8599e05ae44a6286a1441b6c87d4d74545cc65604cc10c1fca4a19c2c16a5c0e31b2963a5b9f21002ce8a80d58b2d916f6c07dbbc9b67581ca307"
+                        "signature": "0x735b546fe1606ec4686d96875ecb57ab3101f12a613c3c2c299497a131e73db0d1aba3bdbca588ac5783a4c99f6d3b9f463ac0947a6de95163b240c0f4d2f109"
                     }
                 ]
             }

diff --git a/tests/integration/vectors/reports/tiny/bad_validator_index-1.json b/tests/integration/vectors/reports/tiny/bad_validator_index-1.json
@@ -13,7 +13,7 @@
                     "context": {
                         "anchor": "0x39cb518983b02695034b3b92cb31a7334e1a2ec3ef7dbfa32c68e4e8444363f1",
                         "state_root": "0xd8c577816b629241676502d0461e4eae42a375461314d64484f35f4228da23d6",
-                        "beefy_root": "0x71c150347dc035847d5944c864a2d3ed0fa410341b2ffbfdeeaa1c9d6aa9cacd",
+                        "beefy_root": "0xf5df0c11416d43c55b43e096572d450b7780ed0fd7b540f26c8ded8e0d41e183",
                         "lookup_anchor": "0x16bda47e5a68daf53c39ddee8af4ecaced7e87f3f0ac9da5a6f4f9e41350d319",
                         "lookup_anchor_slot": 6,
                         "prerequisites": []
@@ -38,15 +38,15 @@
                 "signatures": [
                     {
                         "validator_index": 1,
-                        "signature": "0xeef064e3973b71fa4b0ce0c69c6799cc9b0e1887a894a93559a4c3a3848f039df82de95c70218588134ac51c2a329936ec54bc320b4c97c5f29f46acd1f4860e"
+                        "signature": "0xfb17b608ee2887bdc911a2db418a5c29484f5c5f4ae5f6437ca171675364191c3a63d220af70a140b8e1d0831829ba8c3f34d7447015b34cdc3ef012129d6300"
                     },
                     {
                         "validator_index": 4,
-                        "signature": "0x68e84d7253380e8beb1fb71a54a8a0a805c06ea756da74d79bcbf5b811306cea560f27abaca175f6908ab54e4acc7bb919ab87ac616e7df106d3b043b71bac04"
+                        "signature": "0x79fbac1ba518144be566ac2a71f43e7846f699786affc78574fffe6260108efef5ea810846c59b709cb77198dcb52b0fcd1d9858d8e3af6195537bf3cefa8600"
                     },
                     {
                         "validator_index": 6,
-                        "signature": "0x2c369533280dcd2fbdc2efeaf9dd0e042363ad14a4dee64a0f539def799f488912c85743132c5966bf5f9e65ec4d13cda5281fbbbe0c705a22e00424c858bf0b"
+                        "signature": "0xa4dec614068e2582d3f6608d079ad34a15ecb97942d724b8dfaf317134ff76858d82c7c70bd2e54faedde975df20ea79d795e169e1456e848781c7112fa0a708"
                     }
                 ]
             }

diff --git a/tests/integration/vectors/reports/tiny/big_work_report_output-1.json b/tests/integration/vectors/reports/tiny/big_work_report_output-1.json
@@ -13,7 +13,7 @@
                     "context": {
                         "anchor": "0x39cb518983b02695034b3b92cb31a7334e1a2ec3ef7dbfa32c68e4e8444363f1",
                         "state_root": "0xd8c577816b629241676502d0461e4eae42a375461314d64484f35f4228da23d6",
-                        "beefy_root": "0x71c150347dc035847d5944c864a2d3ed0fa410341b2ffbfdeeaa1c9d6aa9cacd",
+                        "beefy_root": "0xf5df0c11416d43c55b43e096572d450b7780ed0fd7b540f26c8ded8e0d41e183",
                         "lookup_anchor": "0x16bda47e5a68daf53c39ddee8af4ecaced7e87f3f0ac9da5a6f4f9e41350d319",
                         "lookup_anchor_slot": 6,
                         "prerequisites": []
@@ -47,15 +47,15 @@
                 "signatures": [
                     {
                         "validator_index": 1,
-                        "signature": "0x86256f6a19036d3f020a21a23b78fc99a85c6bcaf2dea5758f2e04af324e215c00dbe73e9fb7557f4a28c011a1a62503d46b9e74df8030bfb23c6805b62df009"
+                        "signature": "0xda35279cb43b54351f15239779c5350798390eb6e6d1ff05c8e3f9fb6d757fbee24600df01c79b8860fa1d51a3d4e98b96a55b37aba1b46fd4fbbbcd7f5ce405"
                     },
                     {
                         "validator_index": 4,
-                        "signature": "0x8ff3948c005f5451fa1ce73d4260f26ca53863996a7472c3e2168359718c6c0f71ce464f5183b18b00918ba088a2d5d8d651c169156cf907435617970f5ba308"
+                        "signature": "0x21d71fd4625205be2dbdd4d63b77e0775d9c5ca50d8ada951548b67d49ded432b0dbfeb55a347402b200dd0c05c7ab70c0152ff1e53a5234eb01e48d02f6f205"
                     },
                     {
                         "validator_index": 5,
-                        "signature": "0x7fb3c7db027aadfc9b6df5d582b9c72468d3645caad3c7026d34ae8223beb4110a4e5967fa4477ee255f657ed097b60ae9f5eeb8f312b5574e6f0a6a13134201"
+                        "signature": "0xb09762bfe4803307e8f842cb533869ba7c6b29037c389d17917c42eab5548b00145ee1f66009167cbb8eb9126cda9436a01f436ed35bec85639907cab49aba0f"
                     }
                 ]
             }
@@ -305,7 +305,7 @@
                     "context": {
                         "anchor": "0x39cb518983b02695034b3b92cb31a7334e1a2ec3ef7dbfa32c68e4e8444363f1",
                         "state_root": "0xd8c577816b629241676502d0461e4eae42a375461314d64484f35f4228da23d6",
-                        "beefy_root": "0x71c150347dc035847d5944c864a2d3ed0fa410341b2ffbfdeeaa1c9d6aa9cacd",
+                        "beefy_root": "0xf5df0c11416d43c55b43e096572d450b7780ed0fd7b540f26c8ded8e0d41e183",
                         "lookup_anchor": "0x16bda47e5a68daf53c39ddee8af4ecaced7e87f3f0ac9da5a6f4f9e41350d319",
                         "lookup_anchor_slot": 6,
                         "prerequisites": []