mirror of
https://github.com/sigp/lighthouse.git
synced 2026-05-30 12:47:05 +00:00
Merge remote-tracking branch, resolve conflicts preserving FOCIL/Heze logic
- test_utils: Heze branch uses DataColumnSidecarGloas (shared format), keeps heze_enabled() check ahead of gloas_enabled() so Heze blocks are handled first - genesis.rs: Keep both Gloas and Heze bid initialisation in genesis_block() Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -65,7 +65,6 @@ type_name_generic!(BlobSidecar);
|
||||
type_name_generic!(DataColumnSidecar);
|
||||
type_name_generic!(DataColumnSidecarFulu, "DataColumnSidecar");
|
||||
type_name_generic!(DataColumnSidecarGloas, "DataColumnSidecar");
|
||||
type_name_generic!(DataColumnSidecarHeze, "DataColumnSidecar");
|
||||
type_name!(Checkpoint);
|
||||
type_name!(ConsolidationRequest);
|
||||
type_name_generic!(ContributionAndProof);
|
||||
|
||||
@@ -738,9 +738,9 @@ mod ssz_static {
|
||||
.run();
|
||||
SszStaticHandler::<DataColumnSidecarGloas<MainnetEthSpec>, MainnetEthSpec>::gloas_only()
|
||||
.run();
|
||||
SszStaticHandler::<DataColumnSidecarHeze<MinimalEthSpec>, MinimalEthSpec>::heze_only()
|
||||
SszStaticHandler::<DataColumnSidecarGloas<MinimalEthSpec>, MinimalEthSpec>::heze_only()
|
||||
.run();
|
||||
SszStaticHandler::<DataColumnSidecarHeze<MainnetEthSpec>, MainnetEthSpec>::heze_only()
|
||||
SszStaticHandler::<DataColumnSidecarGloas<MainnetEthSpec>, MainnetEthSpec>::heze_only()
|
||||
.run();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user