Skip to content

Commit 03d00fd

Browse files
committed
common: removed EIP-2315 from the Berlin HF
1 parent d761e59 commit 03d00fd

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

packages/common/src/hardforks/berlin.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
"comment": "HF targeted for July 2020 following the Muir Glacier HF",
44
"url": "https://eips.ethereum.org/EIPS/eip-2070",
55
"status": "Draft",
6-
"eips": [ 2315, 2565, 2929, 2718, 2930 ]
6+
"eips": [ 2565, 2929, 2718, 2930 ]
77
}

packages/common/tests/eips.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ tape('[Common]: Initialization / Chain params', function (t: tape.Test) {
5252
c = new Common({ chain: 'rinkeby', hardfork: 'istanbul', eips: [2315] })
5353
st.equal(c.isActivatedEIP(2315), true, 'istanbul, eips: [2315] -> true (EIP-2315)')
5454
c = new Common({ chain: 'rinkeby', hardfork: 'berlin' })
55-
st.equal(c.isActivatedEIP(2315), true, 'berlin, eips: [] -> true (EIP-2315)')
55+
st.equal(c.isActivatedEIP(2929), true, 'berlin, eips: [] -> true (EIP-2929)')
56+
st.equal(c.isActivatedEIP(2315), false, 'berlin, eips: [] -> true (EIP-2315)')
5657
st.equal(c.isActivatedEIP(2537), false, 'berlin, eips: [] -> false (EIP-2537)')
5758

5859
st.end()

packages/common/tests/params.spec.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ tape('[Common]: Parameter access for param(), paramByHardfork()', function (t: t
1414
st.equal(c.param('gasPrices', 'ecAdd'), 150, msg)
1515
c.setHardfork('muirGlacier')
1616
st.equal(c.param('gasPrices', 'ecAdd'), 150, msg)
17-
c.setHardfork('berlin')
18-
st.equal(c.param('gasPrices', 'beginsub'), 2, msg)
1917

2018
msg = 'Should return null for non-existing value'
2119
st.equal(c.param('gasPrices', 'notexistingvalue'), null, msg)

0 commit comments

Comments
 (0)