Skip to content

Commit

Permalink
Merge branch 'master' into soloseng/ganache-upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
soloseng committed Jul 10, 2023
2 parents 1945d60 + 0f2dffb commit 3bde778
Showing 1 changed file with 21 additions and 0 deletions.
21 changes: 21 additions & 0 deletions packages/celotool/src/e2e-tests/slashing_tests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,38 @@ const TMP_PATH = '/tmp/e2e'
const safeMarginBlocks = 4

function headerArray(block: any) {
if (!block.nonce) {
// Before Gingerbread fork
return [
block.parentHash,
block.miner,
block.stateRoot,
block.transactionsRoot,
block.receiptsRoot,
block.logsBloom,
block.number,
block.gasUsed,
block.timestamp,
block.extraData,
]
}
return [
block.parentHash,
block.sha3Uncles,
block.miner,
block.stateRoot,
block.transactionsRoot,
block.receiptsRoot,
block.logsBloom,
new BigNumber(block.difficulty).toNumber(),
block.number,
block.gasLimit,
block.gasUsed,
block.timestamp,
block.extraData,
block.mixHash,
block.nonce,
block.baseFee,
]
}

Expand Down

0 comments on commit 3bde778

Please sign in to comment.