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.

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: Add new isActivatedEIP() method #1125

Merged
merged 1 commit into from
Feb 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion packages/common/src/eips/2315.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"comment": "Simple subroutines for the EVM",
"url": "https://eips.ethereum.org/EIPS/eip-2315",
"status": "Draft",
"minimumHardfork": "berlin",
"minimumHardfork": "istanbul",
Copy link
Member Author

Choose a reason for hiding this comment

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

This is a fix, EIP can technically be applied earlier than berlin, this would otherwise not allow to instantiate the VM with istanbul and just activate this single EIP.

"gasConfig": {},
"gasPrices": {
"beginsub": {
Expand Down
24 changes: 24 additions & 0 deletions packages/common/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,30 @@ export default class Common extends EventEmitter {
return this.paramByHardfork(topic, name, hardfork)
}

/**
* Checks if an EIP is activated by either being included in the EIPs
* manually passed in with the `eips` constructor option or in a
* hardfork currently being active
*
* Note: this method only works for EIPs being supported
* by the `eips` constructor option
* @param eip
*/
isActivatedEIP(eip: number): boolean {
if (this.eips().includes(eip)) {
return true
}
for (const hfChanges of HARDFORK_CHANGES) {
const hf = hfChanges[1]
Copy link
Member

Choose a reason for hiding this comment

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

Had to do a double take here, this is a bit hard to read (but is due to how these hardforks are exposed). But yeah, this looks fine.

if (this.gteHardfork(hf['name']) && 'eips' in hf) {
if (hf['eips'].includes(eip)) {
return true
}
}
}
return false
}

/**
* Checks if set or provided hardfork is active on block number
* @param hardfork Hardfork name or null (for HF set)
Expand Down
12 changes: 12 additions & 0 deletions packages/common/tests/eips.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,16 @@ tape('[Common]: Initialization / Chain params', function (t: tape.Test) {

st.end()
})

t.test('isActivatedEIP()', function (st) {
let c = new Common({ chain: 'rinkeby', hardfork: 'istanbul' })
st.equal(c.isActivatedEIP(2315), false, 'istanbul, eips: [] -> false (EIP-2315)')
c = new Common({ chain: 'rinkeby', hardfork: 'istanbul', eips: [2315] })
st.equal(c.isActivatedEIP(2315), true, 'istanbul, eips: [2315] -> true (EIP-2315)')
c = new Common({ chain: 'rinkeby', hardfork: 'berlin' })
st.equal(c.isActivatedEIP(2315), true, 'berlin, eips: [] -> true (EIP-2315)')
st.equal(c.isActivatedEIP(2537), false, 'berlin, eips: [] -> false (EIP-2537)')

st.end()
})
})