Skip to content
This repository was archived by the owner on Nov 6, 2020. It is now read-only.

Commit 29ebddc

Browse files
dvdplms3krit
dvdplm
authored and
s3krit
committed
V2.5.12 stable (#11336)
* Enable EIP-2384 for ice age hard fork (#11281) * ethcore/res: activate agharta on classic 9573000 (#11331) * Istanbul HF in xDai (2019-12-12) (#11299) * Istanbul HF in POA Core (2019-12-19) (#11298) * Istanbul HF in POA Sokol (2019-12-05) (#11282) * Activate ecip-1061 on kotti and mordor (#11338) * Enable basic verification of local transactions (#11332) * Disallow EIP-86 style null signatures for transactions outside tests (#11335)
1 parent fc129b4 commit 29ebddc

File tree

23 files changed

+382
-105
lines changed

23 files changed

+382
-105
lines changed

‎CHANGELOG.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
## Parity-Ethereum [v2.5.12](https://github.com/paritytech/parity-ethereum/releases/tag/v2.5.12)
2+
3+
Parity Ethereum v2.5.12-stable is a patch release that adds Istanbul hardfork
4+
block numbers for POA and xDai networks, implements ECIP-1056 and implements
5+
EIP-2384/2387 - Muir Glacier.
6+
7+
The full list of included changes:
8+
* Enable EIP-2384 for ice age hard fork (#11281)
9+
* ethcore/res: activate agharta on classic 9573000 (#11331)
10+
* Istanbul HF in xDai (2019-12-12) (#11299)
11+
* Istanbul HF in POA Core (2019-12-19) (#11298)
12+
* Istanbul HF in POA Sokol (2019-12-05) (#11282)
13+
* Activate ecip-1061 on kotti and mordor (#11338)
14+
* Enable basic verification of local transactions (#11332)
15+
* Disallow EIP-86 style null signatures for transactions outside tests (#11335)
16+
17+
118
## Parity-Ethereum [v2.5.11](https://github.com/paritytech/parity-ethereum/releases/tag/v2.5.11)
219

320
Parity Ethereum v2.5.11-stable is an emergency patch release that adds the missing

‎Cargo.lock‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
description = "Parity Ethereum client"
33
name = "parity-ethereum"
44
# NOTE Make sure to update util/version/Cargo.toml as well
5-
version = "2.5.11"
5+
version = "2.5.12"
66
license = "GPL-3.0"
77
authors = ["Parity Technologies <[email protected]>"]
88

‎ethcore/res/ethereum/classic.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,10 @@
3737
"eip140Transition": "0x85d9a0",
3838
"eip211Transition": "0x85d9a0",
3939
"eip214Transition": "0x85d9a0",
40-
"eip658Transition": "0x85d9a0"
40+
"eip658Transition": "0x85d9a0",
41+
"eip145Transition": "0x921288",
42+
"eip1014Transition": "0x921288",
43+
"eip1052Transition": "0x921288"
4144
},
4245
"genesis": {
4346
"seal": {

‎ethcore/res/ethereum/foundation.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,8 @@
136136
"eip100bTransition": "0x42ae50",
137137
"difficultyBombDelays": {
138138
"0x42ae50": "0x2dc6c0",
139-
"0x6f1580": "0x1e8480"
139+
"0x6f1580": "0x1e8480",
140+
"0x8c6180": "0x3d0900"
140141
}
141142
}
142143
}

‎ethcore/res/ethereum/kotti.json‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@
2424
"eip658Transition": "0xaef49",
2525
"eip1014Transition": "0x1a064d",
2626
"eip1052Transition": "0x1a064d",
27+
"eip1283Transition": "0x1f67cf",
28+
"eip1344Transition": "0x1f67cf",
29+
"eip1706Transition": "0x1f67cf",
30+
"eip2028Transition": "0x1f67cf",
2731
"gasLimitBoundDivisor": "0x400",
2832
"maxCodeSize": "0x6000",
2933
"maxCodeSizeTransition": "0xaef49",
@@ -123,7 +127,7 @@
123127
"0xaef49": {
124128
"price": { "alt_bn128_const_operations": { "price": 500 }}
125129
},
126-
"0x7fffffffffffff": {
130+
"0x1f67cf": {
127131
"info": "EIP 1108 transition",
128132
"price": { "alt_bn128_const_operations": { "price": 150 }}
129133
}
@@ -138,7 +142,7 @@
138142
"0xaef49": {
139143
"price": { "alt_bn128_const_operations": { "price": 40000 }}
140144
},
141-
"0x7fffffffffffff": {
145+
"0x1f67cf": {
142146
"info": "EIP 1108 transition",
143147
"price": { "alt_bn128_const_operations": { "price": 6000 }}
144148
}
@@ -153,15 +157,24 @@
153157
"0xaef49": {
154158
"price": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 }}
155159
},
156-
"0x7fffffffffffff": {
160+
"0x1f67cf": {
157161
"info": "EIP 1108 transition",
158162
"price": { "alt_bn128_pairing": { "base": 45000, "pair": 34000 }}
159163
}
160164
}
161165
}
162166
},
163167
"0x0000000000000000000000000000000000000009": {
164-
"balance": "0x1"
168+
"balance": "0x1",
169+
"builtin": {
170+
"name": "blake2_f",
171+
"activate_at": "0x1f67cf",
172+
"pricing": {
173+
"blake2_f": {
174+
"gas_per_round": 1
175+
}
176+
}
177+
}
165178
},
166179
"0x000000000000000000000000000000000000000a": {
167180
"balance": "0x1"

‎ethcore/res/ethereum/mordor.json‎

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,11 @@
3737
"eip658Transition":"0x0",
3838
"eip145Transition":"0x498bb",
3939
"eip1014Transition":"0x498bb",
40-
"eip1052Transition":"0x498bb"
40+
"eip1052Transition":"0x498bb",
41+
"eip1283Transition":"0xbe10b",
42+
"eip1344Transition":"0xbe10b",
43+
"eip1706Transition":"0xbe10b",
44+
"eip2028Transition":"0xbe10b"
4145
},
4246
"genesis":{
4347
"seal":{
@@ -59,7 +63,9 @@
5963
"enode://1813e90a0afdd7c1e4892c5376960e3577a9e6c5a4f86fa405a405c7421a4a1608248d77cc90333842f13d8954d82113dec480cfb76b4fef8cb475157cf4d5f2@10.28.224.3:30000",
6064
"enode://2b69a3926f36a7748c9021c34050be5e0b64346225e477fe7377070f6289bd363b2be73a06010fd516e6ea3ee90778dd0399bc007bb1281923a79374f842675a@51.15.116.226:30303",
6165
"enode://621e28e529146fd501709194885f50540c494f1a2985d1fb4ec8769226b5cb0b0d1a11545926077821474c2767cdd87888ead8a2509a2c9069dd5584e4b1c3b8@10.28.223.8:30000",
62-
"enode://a59e33ccd2b3e52d578f1fbd70c6f9babda2650f0760d6ff3b37742fdcdfdb3defba5d56d315b40c46b70198c7621e63ffa3f987389c7118634b0fefbbdfa7fd@51.15.116.226:30303"
66+
"enode://a59e33ccd2b3e52d578f1fbd70c6f9babda2650f0760d6ff3b37742fdcdfdb3defba5d56d315b40c46b70198c7621e63ffa3f987389c7118634b0fefbbdfa7fd@51.15.116.226:30303",
67+
"enode://f840b007500f50c98ea6f9c9e56dabf4690bbbbb7036d43682c531204341aff8315013547e5bee54117eb22bd3603585ae6bf713d9fa710659533fcab65d5b84@35.238.101.58:30000",
68+
"enode://19eda672030ad5debb98c9069b3e99d12438b96506325d9f3f82d76c5f8ce4942d345f41700a5223900e75ad48e76713b74c1b694d67a10c2112540035922256@35.238.101.58:30000"
6369
],
6470
"accounts":{
6571
"0x0000000000000000000000000000000000000001":{
@@ -128,7 +134,7 @@
128134
}
129135
}
130136
},
131-
"0x7fffffffffffff":{
137+
"0xbe10b":{
132138
"info":"EIP 1108 transition",
133139
"price":{
134140
"alt_bn128_const_operations":{
@@ -150,7 +156,7 @@
150156
}
151157
}
152158
},
153-
"0x7fffffffffffff":{
159+
"0xbe10b":{
154160
"info":"EIP 1108 transition",
155161
"price":{
156162
"alt_bn128_const_operations":{
@@ -173,7 +179,7 @@
173179
}
174180
}
175181
},
176-
"0x7fffffffffffff":{
182+
"0xbe10b":{
177183
"info":"EIP 1108 transition",
178184
"price":{
179185
"alt_bn128_pairing":{
@@ -184,6 +190,17 @@
184190
}
185191
}
186192
}
193+
},
194+
"0x0000000000000000000000000000000000000009": {
195+
"builtin": {
196+
"name": "blake2_f",
197+
"activate_at": "0xbe10b",
198+
"pricing": {
199+
"blake2_f": {
200+
"gas_per_round": 1
201+
}
202+
}
203+
}
187204
}
188205
}
189206
}

‎ethcore/res/ethereum/poacore.json‎

Lines changed: 69 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,12 @@
3737
"eip658Transition": "0x0",
3838
"eip145Transition": 8582254,
3939
"eip1014Transition": 8582254,
40-
"eip1052Transition": 8582254
40+
"eip1052Transition": 8582254,
41+
"eip1283Transition": 12598600,
42+
"eip1344Transition": 12598600,
43+
"eip1706Transition": 12598600,
44+
"eip1884Transition": 12598600,
45+
"eip2028Transition": 12598600
4146
},
4247
"genesis": {
4348
"seal": {
@@ -58,57 +63,89 @@
5863
"enode://96678da10ac83769ab3f63114a41b57b700476c5ac02719b878fa89909a936551bb7609aa09b068bf89903206fa03f23e1b5b9117ca278de304c2570b87dcb27@35.175.15.164:30303"
5964
],
6065
"accounts": {
61-
"0000000000000000000000000000000000000005": { "builtin": { "name": "modexp", "activate_at": "0x0", "pricing": { "modexp": { "divisor": 20 } } } },
62-
"0000000000000000000000000000000000000006": {
66+
"0x0000000000000000000000000000000000000005": {
67+
"builtin": {
68+
"name": "modexp",
69+
"pricing": {
70+
"0": {
71+
"price": {
72+
"modexp": {
73+
"divisor": 20
74+
}
75+
}
76+
}
77+
}
78+
}
79+
},
80+
"0x0000000000000000000000000000000000000006": {
6381
"builtin": {
6482
"name": "alt_bn128_add",
6583
"pricing": {
6684
"0": {
6785
"price": { "alt_bn128_const_operations": { "price": 500 }}
6886
},
69-
"0x7fffffffffffff": {
87+
"12598600": {
7088
"info": "EIP 1108 transition",
7189
"price": { "alt_bn128_const_operations": { "price": 150 }}
7290
}
7391
}
7492
}
7593
},
76-
"0000000000000000000000000000000000000007": {
94+
"0x0000000000000000000000000000000000000007": {
7795
"builtin": {
7896
"name": "alt_bn128_mul",
7997
"pricing": {
8098
"0": {
8199
"price": { "alt_bn128_const_operations": { "price": 40000 }}
82100
},
83-
"0x7fffffffffffff": {
101+
"12598600": {
84102
"info": "EIP 1108 transition",
85103
"price": { "alt_bn128_const_operations": { "price": 6000 }}
86104
}
87105
}
88106
}
89107
},
90-
"0000000000000000000000000000000000000008": {
108+
"0x0000000000000000000000000000000000000008": {
91109
"builtin": {
92110
"name": "alt_bn128_pairing",
93111
"pricing": {
94112
"0": {
95113
"price": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 }}
96114
},
97-
"0x7fffffffffffff": {
115+
"12598600": {
98116
"info": "EIP 1108 transition",
99117
"price": { "alt_bn128_pairing": { "base": 45000, "pair": 34000 }}
100118
}
101119
}
102120
}
103121
},
122+
"0x0000000000000000000000000000000000000009": {
123+
"builtin": {
124+
"name": "blake2_f",
125+
"pricing": {
126+
"12598600": {
127+
"info": "EIP 1108 transition",
128+
"price": {
129+
"blake2_f": {
130+
"gas_per_round": 1
131+
}
132+
}
133+
}
134+
}
135+
}
136+
},
104137
"0x0000000000000000000000000000000000000001": {
105138
"balance": "1",
106139
"builtin": {
107140
"name": "ecrecover",
108141
"pricing": {
109-
"linear": {
110-
"base": 3000,
111-
"word": 0
142+
"0": {
143+
"price": {
144+
"linear": {
145+
"base": 3000,
146+
"word": 0
147+
}
148+
}
112149
}
113150
}
114151
}
@@ -118,9 +155,13 @@
118155
"builtin": {
119156
"name": "sha256",
120157
"pricing": {
121-
"linear": {
122-
"base": 60,
123-
"word": 12
158+
"0": {
159+
"price": {
160+
"linear": {
161+
"base": 60,
162+
"word": 12
163+
}
164+
}
124165
}
125166
}
126167
}
@@ -130,9 +171,13 @@
130171
"builtin": {
131172
"name": "ripemd160",
132173
"pricing": {
133-
"linear": {
134-
"base": 600,
135-
"word": 120
174+
"0": {
175+
"price": {
176+
"linear": {
177+
"base": 600,
178+
"word": 120
179+
}
180+
}
136181
}
137182
}
138183
}
@@ -142,9 +187,13 @@
142187
"builtin": {
143188
"name": "identity",
144189
"pricing": {
145-
"linear": {
146-
"base": 15,
147-
"word": 3
190+
"0": {
191+
"price": {
192+
"linear": {
193+
"base": 15,
194+
"word": 3
195+
}
196+
}
148197
}
149198
}
150199
}

0 commit comments

Comments
 (0)