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

Common: Execute on Breaking Release Notes #1685

Closed
wants to merge 13 commits into from
Closed

Common: Execute on Breaking Release Notes #1685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
429a15a
remove forCustomChain, remove BN from method names
ScottyPoi Feb 2, 2022
efd7b58
remove BN from method names
ScottyPoi Feb 2, 2022
adaf27f
internalize getInitializedChains into common/index
ScottyPoi Feb 2, 2022
1328b67
delete genesisStates.index
ScottyPoi Feb 2, 2022
3717132
change test cases to use Common.custom
ScottyPoi Feb 3, 2022
ad3a725
replace forCustomChain with common.custom
ScottyPoi Feb 3, 2022
03c218e
remove BN from method names
ScottyPoi Feb 3, 2022
88145ac
remove test for deleted genesisStates
ScottyPoi Feb 3, 2022
f682d14
remove BN from method names
ScottyPoi Feb 3, 2022
17ad418
fix tests: BN methods compares BN.toNumber()
ScottyPoi Feb 3, 2022
deb27ee
remove BN from method names
ScottyPoi Feb 3, 2022
c309aa7
remove BN from method names
ScottyPoi Feb 3, 2022
4b1f266
change forCustomChain to Common.custom
ScottyPoi Feb 3, 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
182 changes: 158 additions & 24 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions packages/block/src/header.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ export class BlockHeader {

if (this._common.isActivatedEIP(1559)) {
if (baseFeePerGas === undefined) {
const londonHfBlock = this._common.hardforkBlockBN(Hardfork.London)
const londonHfBlock = this._common.hardforkBlock(Hardfork.London)
const isInitialEIP1559Block = londonHfBlock && number.eq(londonHfBlock)
if (isInitialEIP1559Block) {
baseFeePerGas = new BN(this._common.param('gasConfig', 'initialBaseFee'))
Expand Down Expand Up @@ -384,7 +384,7 @@ export class BlockHeader {

if (nonce.length !== 8) {
// Hack to check for Kovan due to non-standard nonce length (65 bytes)
if (this._common.networkIdBN().eqn(42)) {
if (this._common.networkId().eqn(42)) {
if (nonce.length !== 65) {
const msg = this._errorMsg(
`nonce must be 65 bytes on kovan, received ${nonce.length} bytes`
Expand Down Expand Up @@ -566,7 +566,7 @@ export class BlockHeader {
let parentGasLimit = parentBlockHeader.gasLimit
// EIP-1559: assume double the parent gas limit on fork block
// to adopt to the new gas target centered logic
const londonHardforkBlock = this._common.hardforkBlockBN(Hardfork.London)
const londonHardforkBlock = this._common.hardforkBlock(Hardfork.London)
if (londonHardforkBlock && this.number.eq(londonHardforkBlock)) {
const elasticity = new BN(this._common.param('gasConfig', 'elasticityMultiplier'))
parentGasLimit = parentGasLimit.mul(elasticity)
Expand Down Expand Up @@ -716,7 +716,7 @@ export class BlockHeader {
const msg = this._errorMsg('EIP1559 block has no base fee field')
throw new Error(msg)
}
const londonHfBlock = this._common.hardforkBlockBN(Hardfork.London)
const londonHfBlock = this._common.hardforkBlock(Hardfork.London)
const isInitialEIP1559Block = londonHfBlock && this.number.eq(londonHfBlock)
if (isInitialEIP1559Block) {
const initialBaseFee = new BN(this._common.param('gasConfig', 'initialBaseFee'))
Expand Down Expand Up @@ -1012,7 +1012,7 @@ export class BlockHeader {
if (!this._common.hardforkIsActiveOnChain(Hardfork.Dao)) {
return
}
const DAOActivationBlock = this._common.hardforkBlockBN(Hardfork.Dao)
const DAOActivationBlock = this._common.hardforkBlock(Hardfork.Dao)
if (!DAOActivationBlock || DAOActivationBlock.isZero() || this.number.lt(DAOActivationBlock)) {
return
}
Expand Down
Loading