Skip to content

Commit

Permalink
Merge branch 'master' into verkle-checkpoint-db-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
scorbajio committed May 9, 2024
2 parents fd536b8 + 3dd3bec commit eed4486
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion packages/vm/src/buildBlock.ts
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,6 @@ export class BlockBuilder {
}
await this.processWithdrawals()

const stateRoot = await this.vm.stateManager.getStateRoot()
const transactionsTrie = await this.transactionsTrie()
const withdrawalsRoot = this.withdrawals
? await Block.genWithdrawalsTrieRoot(this.withdrawals, new Trie({ common: this.vm.common }))
Expand All @@ -328,6 +327,8 @@ export class BlockBuilder {
// Do other validations per request type
}

// get stateRoot after all the accumulateRequests etc have been done
const stateRoot = await this.vm.stateManager.getStateRoot()
const headerData = {
...this.headerData,
stateRoot,
Expand Down

0 comments on commit eed4486

Please sign in to comment.