Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add merge transition/finalization banners #3963

Merged
merged 2 commits into from
May 12, 2022
Merged

Add merge transition/finalization banners #3963

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16d4fae
Add merge transition/finalization banners
g11tech May 2, 2022
794483a
fix signatures
g11tech May 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions packages/lodestar/src/chain/blocks/utils/pandaMergeTransitionBanner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/* eslint-disable no-useless-escape */
export const POS_PANDA_MERGE_TRANSITION_BANNER = `
_,..._,m, |, _,..._,m, |,
,/' '""; | |, /' '""; | |,
/ ". ".
,'mmmMMMMmm. \ -|-_" 'mmmMMMMmm. \ -|-_"
_/-"^^^^^"""%#%mm, ; | _ o /-"^^^^^"""%#%mm, ; | _ o
,m,_,' "###) ;, m,_,' "###) ;,
(###% \#/ ;##mm. (###% \#/ ;##mm.
^#/__ ___ ; (######) #/__ ___ ; (######)
; //.\\ //.\\ ; \####/ //.\\ //.\\ ; \####/
_; (#\"// \\"/#) ; ,/ _; (#\"// \\"/#) ; ,/
@##\ \##/ = "=" ,;mm/ @##\ \##/ = "=" ,;mm/
\##>.____,...,____,<####@ \##>.____,...,____,<####@
""' ""'
_______ ______ ______ ______ __ __
/ \ / \ / \ / \ / | / |
$$$$$$$ | ______ ______ ______ /$$$$$$ | ______ /$$$$$$ | /$$$$$$ |_$$ |_ ______ $$ | __ ______
$$ |__$$ |/ \ / \ / \ $$ |_ $$/ / \ $$ |_ $$/ $$ \__$$// $$ | / \ $$ | / | / \
$$ $$//$$$$$$ |/$$$$$$ |/$$$$$$ |$$ | /$$$$$$ |$$ | $$ \$$$$$$/ $$$$$$ |$$ |_/$$/ /$$$$$$ |
$$$$$$$/ $$ | $$/ $$ | $$ |$$ | $$ |$$$$/ $$ | $$ |$$$$/ $$$$$$ | $$ | __ / $$ |$$ $$< $$ $$ |
$$ | $$ | $$ \__$$ |$$ \__$$ |$$ | $$ \__$$ |$$ | / \__$$ | $$ |/ |/$$$$$$$ |$$$$$$ \ $$$$$$$$/
$$ | $$ | $$ $$/ $$ $$/ $$ | $$ $$/ $$ | $$ $$/ $$ $$/ $$ $$ |$$ | $$ |$$ |
$$/ $$/ $$$$$$/ $$$$$$/ $$/ $$$$$$/ $$/ $$$$$$/ $$$$/ $$$$$$$/ $$/ $$/ $$$$$$$/



______ __ __ __ __
/ \ / | / | / | / |
/$$$$$$ | _______ _$$ |_ $$/ __ __ ______ _$$ |_ ______ ____$$ |
$$ |__$$ | / |/ $$ | / |/ \ / |/ \ / $$ | / \ / $$ |
$$ $$ |/$$$$$$$/ $$$$$$/ $$ |$$ \ /$$/ $$$$$$ |$$$$$$/ /$$$$$$ |/$$$$$$$ |
$$$$$$$$ |$$ | $$ | __ $$ | $$ /$$/ / $$ | $$ | __ $$ $$ |$$ | $$ |
$$ | $$ |$$ \_____ $$ |/ |$$ | $$ $$/ /$$$$$$$ | $$ |/ |$$$$$$$$/ $$ \__$$ |
$$ | $$ |$$ | $$ $$/ $$ | $$$/ $$ $$ | $$ $$/ $$ |$$ $$ |
$$/ $$/ $$$$$$$/ $$$$/ $$/ $/ $$$$$$$/ $$$$/ $$$$$$$/ $$$$$$$/ `;
26 changes: 22 additions & 4 deletions packages/lodestar/src/chain/blocks/verifyBlock.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {FullyVerifiedBlock, PartiallyVerifiedBlock} from "./types";
import {ExecutePayloadStatus} from "../../executionEngine/interface";
import {byteArrayEquals} from "../../util/bytes";
import {IEth1ForBlockProduction} from "../../eth1";
import {POS_PANDA_MERGE_TRANSITION_BANNER} from "./utils/pandaMergeTransitionBanner";

export type VerifyBlockModules = {
bls: IBlsVerifier;
Expand All @@ -43,14 +44,13 @@ export async function verifyBlock(
): Promise<FullyVerifiedBlock> {
const parentBlock = verifyBlockSanityChecks(chain, partiallyVerifiedBlock);

const {postState, executionStatus} = await verifyBlockStateTransition(chain, partiallyVerifiedBlock, opts);
const processedBlockData = await verifyBlockStateTransition(chain, partiallyVerifiedBlock, opts);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this change? Being explicit and not doing the spread feels more readable in my opinion


return {
block: partiallyVerifiedBlock.block,
postState,
parentBlock,
skipImportingAttestations: partiallyVerifiedBlock.skipImportingAttestations,
executionStatus,
...processedBlockData,
};
}

Expand Down Expand Up @@ -151,7 +151,6 @@ export async function verifyBlockStateTransition(
chain.metrics
);

// TODO: Review mergeBlock conditions
/** Not null if execution is enabled */
const executionPayloadEnabled =
bellatrix.isBellatrixStateType(postState) &&
Expand Down Expand Up @@ -317,5 +316,24 @@ export async function verifyBlockStateTransition(
});
}

// All checks have passed, if this is a merge transition block we can log
if (isMergeTransitionBlock) {
logOnPowBlock(chain, block);
}

return {postState, executionStatus};
}

function logOnPowBlock(chain: VerifyBlockModules, block: allForks.SignedBeaconBlock): void {
Copy link
Contributor

@dapplion dapplion May 12, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be safer to have

function logOnPowBlock(chain: VerifyBlockModules, block: bellatrix.BeaconBlock): void

and do the casting right below isMergeTransitionBlock where it's clear that the casting is safe

const mergeBlock = block.message as bellatrix.BeaconBlock;
const mergeBlockHash = toHexString(chain.config.getForkTypes(mergeBlock.slot).BeaconBlock.hashTreeRoot(mergeBlock));
const mergeExecutionHash = toHexString(mergeBlock.body.executionPayload.blockHash);
const mergePowHash = toHexString(mergeBlock.body.executionPayload.parentHash);
chain.logger.info(POS_PANDA_MERGE_TRANSITION_BANNER);
chain.logger.info("Execution transitioning from PoW to PoS!!!");
chain.logger.info("Importing block referencing terminal PoW block", {
blockHash: mergeBlockHash,
executionHash: mergeExecutionHash,
powHash: mergePowHash,
});
}