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

refactor block builder #429

Merged
merged 1 commit into from
Oct 10, 2023
Merged

refactor block builder #429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
59 changes: 39 additions & 20 deletions packages/core/src/blockchain/block-builder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,13 @@ export const newHeader = async (head: Block, unsafeBlockHeight?: number) => {
return header
}

const initNewBlock = async (head: Block, header: Header, inherents: HexString[], storageLayer?: StorageLayer) => {
const initNewBlock = async (
head: Block,
header: Header,
inherents: HexString[],
storageLayer?: StorageLayer,
callback?: BuildBlockCallbacks,
) => {
const blockNumber = header.number.toNumber()
const hash: HexString = `0x${Math.round(Math.random() * 100000000)
.toString(16)
Expand All @@ -115,20 +121,22 @@ const initNewBlock = async (head: Block, header: Header, inherents: HexString[],

{
// initialize block
const { storageDiff } = await newBlock.call('Core_initialize_block', [header.toHex()])
newBlock.pushStorageLayer().setAll(storageDiff)
logger.trace(truncate(storageDiff), 'Initialize block')
const resp = await newBlock.call('Core_initialize_block', [header.toHex()])
newBlock.pushStorageLayer().setAll(resp.storageDiff)

callback?.onPhaseApplied?.('initialize', resp)
}

const layers: StorageLayer[] = []
// apply inherents
for (const extrinsic of inherents) {
try {
const { storageDiff } = await newBlock.call('BlockBuilder_apply_extrinsic', [extrinsic])
const resp = await newBlock.call('BlockBuilder_apply_extrinsic', [extrinsic])
const layer = newBlock.pushStorageLayer()
layer.setAll(storageDiff)
layer.setAll(resp.storageDiff)
layers.push(layer)
logger.trace(truncate(storageDiff), 'Applied inherent')

callback?.onPhaseApplied?.(layers.length - 1, resp)
} catch (e) {
logger.warn('Failed to apply inherents %o %s', e, e)
throw new Error('Failed to apply inherents')
Expand All @@ -141,12 +149,17 @@ const initNewBlock = async (head: Block, header: Header, inherents: HexString[],
}
}

export type BuildBlockCallbacks = {
onApplyExtrinsicError?: (extrinsic: HexString, error: TransactionValidityError) => void
onPhaseApplied?: (phase: 'initialize' | 'finalize' | number, resp: TaskCallResponse) => void
}

export const buildBlock = async (
head: Block,
inherents: HexString[],
extrinsics: HexString[],
ump: Record<number, HexString[]>,
onApplyExtrinsicError: (extrinsic: HexString, error: TransactionValidityError) => void,
callbacks?: BuildBlockCallbacks,
unsafeBlockHeight?: number,
): Promise<[Block, HexString[]]> => {
const registry = await head.registry
Expand Down Expand Up @@ -253,15 +266,16 @@ export const buildBlock = async (
// apply extrinsics
for (const extrinsic of extrinsics) {
try {
const { result, storageDiff } = await newBlock.call('BlockBuilder_apply_extrinsic', [extrinsic])
const outcome = registry.createType<ApplyExtrinsicResult>('ApplyExtrinsicResult', result)
const resp = await newBlock.call('BlockBuilder_apply_extrinsic', [extrinsic])
const outcome = registry.createType<ApplyExtrinsicResult>('ApplyExtrinsicResult', resp.result)
if (outcome.isErr) {
onApplyExtrinsicError(extrinsic, outcome.asErr)
callbacks?.onApplyExtrinsicError?.(extrinsic, outcome.asErr)
continue
}
newBlock.pushStorageLayer().setAll(storageDiff)
logger.trace(truncate(storageDiff), 'Applied extrinsic')
newBlock.pushStorageLayer().setAll(resp.storageDiff)
includedExtrinsic.push(extrinsic)

callbacks?.onPhaseApplied?.(includedExtrinsic.length - 1, resp)
} catch (e) {
logger.info('Failed to apply extrinsic %o %s', e, e)
pendingExtrinsics.push(extrinsic)
Expand All @@ -270,10 +284,11 @@ export const buildBlock = async (

{
// finalize block
const { storageDiff } = await newBlock.call('BlockBuilder_finalize_block', [])
const resp = await newBlock.call('BlockBuilder_finalize_block', [])

newBlock.pushStorageLayer().setAll(resp.storageDiff)

newBlock.pushStorageLayer().setAll(storageDiff)
logger.trace(truncate(storageDiff), 'Finalize block')
callbacks?.onPhaseApplied?.('finalize', resp)
}

const blockData = registry.createType('Block', {
Expand All @@ -282,10 +297,14 @@ export const buildBlock = async (
})

const storageDiff = await newBlock.storageDiff()
logger.trace(
Object.entries(storageDiff).map(([key, value]) => [key, truncate(value)]),
'Final block',
)

if (logger.isLevelEnabled('trace')) {
logger.trace(
Object.entries(storageDiff).map(([key, value]) => [key, truncate(value)]),
'Final block',
)
}

const finalBlock = new Block(head.chain, newBlock.number, blockData.hash.toHex(), head, {
header,
extrinsics: [...inherents, ...includedExtrinsic],
Expand Down
20 changes: 18 additions & 2 deletions packages/core/src/blockchain/txpool.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,8 +234,24 @@ export class TxPool {
inherents,
params.transactions,
params.upwardMessages,
(extrinsic, error) => {
this.event.emit(APPLY_EXTRINSIC_ERROR, [extrinsic, error])
{
onApplyExtrinsicError: (extrinsic, error) => {
this.event.emit(APPLY_EXTRINSIC_ERROR, [extrinsic, error])
},
onPhaseApplied: logger.isLevelEnabled('trace')
? (phase, resp) => {
switch (phase) {
case 'initialize':
logger.trace(truncate(resp.storageDiff), 'Initialize block')
break
case 'finalize':
logger.trace(truncate(resp.storageDiff), 'Finalize block')
break
default:
logger.trace(truncate(resp.storageDiff), `Apply extrinsic ${phase}`)
}
}
: undefined,
},
params.unsafeBlockHeight,
)
Expand Down