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

Commit 2a7dc64

Browse files
5chdn5chdn
authored
Stable Backports 2.2.8 (#10224)
* version: bump stable to 2.2.8 * Update for Android cross-compilation. (#10180) * build-unix update * .gitlab-ci update * Update build-unix.sh add android postprocessing * path to android lib libparity.so * fix path to libparity * add android lib to artifacts * Cancel Constantinople HF on POA Core (#10198) * Add EIP-1283 disable transition (#10214) * Enable St-Peters-Fork ("Constantinople Fix") (#10223) * ethcore: disable eip-1283 on kovan block 10255201 * ethcore: disable eip-1283 on ropsten block 4939394 * ethcore: enable st-peters-fork on mainnet block 7280000 * ethcore: fix kovan chain spec * version: update fork blocks * ethcore: disable eip-1283 on sokol block 7026400
1 parent b00a21f commit 2a7dc64

File tree

12 files changed

+63
-49
lines changed

12 files changed

+63
-49
lines changed

‎.gitlab-ci.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,9 @@ build-android:
146146
script:
147147
- scripts/gitlab/build-unix.sh
148148
tags:
149-
- rust-arm
149+
- linux-docker
150150
allow_failure: true
151+
<<: *collect_artifacts
151152

152153
test-beta:
153154
stage: optional

‎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.2.7"
5+
version = "2.2.8"
66
license = "GPL-3.0"
77
authors = ["Parity Technologies <admin@parity.io>"]
88

‎ethcore/res/ethereum/foundation.json‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
"durationLimit": "0xd",
1010
"blockReward": {
1111
"0x0": "0x4563918244f40000",
12-
"0x42ae50": "0x29a2241af62c0000"
12+
"0x42ae50": "0x29a2241af62c0000",
13+
"0x6f1580": "0x1bc16d674ec80000"
1314
},
1415
"homesteadTransition": "0x118c30",
1516
"daoHardforkTransition": "0x1d4c00",
@@ -134,7 +135,8 @@
134135
],
135136
"eip100bTransition": "0x42ae50",
136137
"difficultyBombDelays": {
137-
"0x42ae50": "0x2dc6c0"
138+
"0x42ae50": "0x2dc6c0",
139+
"0x6f1580": "0x1e8480"
138140
}
139141
}
140142
}
@@ -159,7 +161,10 @@
159161
"eip140Transition": "0x42ae50",
160162
"eip211Transition": "0x42ae50",
161163
"eip214Transition": "0x42ae50",
162-
"eip658Transition": "0x42ae50"
164+
"eip658Transition": "0x42ae50",
165+
"eip145Transition": "0x6f1580",
166+
"eip1014Transition": "0x6f1580",
167+
"eip1052Transition": "0x6f1580"
163168
},
164169
"genesis": {
165170
"seal": {

‎ethcore/res/ethereum/kovan.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
"eip1014Transition": "0x8c6180",
5050
"eip1052Transition": "0x8c6180",
5151
"eip1283Transition": "0x8c6180",
52+
"eip1283DisableTransition": "0x9c7b61",
5253
"kip4Transition": "0x8c6180",
5354
"kip6Transition": "0x8c6180"
5455
},

‎ethcore/res/ethereum/poacore.json‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,7 @@
3434
"eip140Transition": "0x0",
3535
"eip211Transition": "0x0",
3636
"eip214Transition": "0x0",
37-
"eip658Transition": "0x0",
38-
"eip145Transition": 6843780,
39-
"eip1014Transition": 6843780,
40-
"eip1052Transition": 6843780,
41-
"eip1283Transition": 6843780
37+
"eip658Transition": "0x0"
4238
},
4339
"genesis": {
4440
"seal": {

‎ethcore/res/ethereum/poasokol.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@
4141
"eip145Transition": 6464300,
4242
"eip1014Transition": 6464300,
4343
"eip1052Transition": 6464300,
44-
"eip1283Transition": 6464300
44+
"eip1283Transition": 6464300,
45+
"eip1283DisableTransition": 7026400
4546
},
4647
"genesis": {
4748
"seal": {

‎ethcore/res/ethereum/ropsten.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@
4545
"eip145Transition": "0x408b70",
4646
"eip1014Transition": "0x408b70",
4747
"eip1052Transition": "0x408b70",
48-
"eip1283Transition": "0x408b70"
48+
"eip1283Transition": "0x408b70",
49+
"eip1283DisableTransition": "0x4b5e82"
4950
},
5051
"genesis": {
5152
"seal": {

‎ethcore/src/spec/spec.rs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,8 @@ pub struct CommonParams {
120120
pub eip1052_transition: BlockNumber,
121121
/// Number of first block where EIP-1283 rules begin.
122122
pub eip1283_transition: BlockNumber,
123+
/// Number of first block where EIP-1283 rules end.
124+
pub eip1283_disable_transition: BlockNumber,
123125
/// Number of first block where EIP-1014 rules begin.
124126
pub eip1014_transition: BlockNumber,
125127
/// Number of first block where dust cleanup rules (EIP-168 and EIP169) begin.
@@ -188,7 +190,7 @@ impl CommonParams {
188190
schedule.have_return_data = block_number >= self.eip211_transition;
189191
schedule.have_bitwise_shifting = block_number >= self.eip145_transition;
190192
schedule.have_extcodehash = block_number >= self.eip1052_transition;
191-
schedule.eip1283 = block_number >= self.eip1283_transition;
193+
schedule.eip1283 = block_number >= self.eip1283_transition && !(block_number >= self.eip1283_disable_transition);
192194
if block_number >= self.eip210_transition {
193195
schedule.blockhash_gas = 800;
194196
}
@@ -296,6 +298,10 @@ impl From<ethjson::spec::Params> for CommonParams {
296298
BlockNumber::max_value,
297299
Into::into,
298300
),
301+
eip1283_disable_transition: p.eip1283_disable_transition.map_or_else(
302+
BlockNumber::max_value,
303+
Into::into,
304+
),
299305
eip1014_transition: p.eip1014_transition.map_or_else(
300306
BlockNumber::max_value,
301307
Into::into,

‎json/src/spec/params.rs‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
// Copyright 2015-2018 Parity Technologies (UK) Ltd.
2-
// This file is part of Parity.
1+
// Copyright 2015-2019 Parity Technologies (UK) Ltd.
2+
// This file is part of Parity Ethereum.
33

4-
// Parity is free software: you can redistribute it and/or modify
4+
// Parity Ethereum is free software: you can redistribute it and/or modify
55
// it under the terms of the GNU General Public License as published by
66
// the Free Software Foundation, either version 3 of the License, or
77
// (at your option) any later version.
88

9-
// Parity is distributed in the hope that it will be useful,
9+
// Parity Ethereum is distributed in the hope that it will be useful,
1010
// but WITHOUT ANY WARRANTY; without even the implied warranty of
1111
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1212
// GNU General Public License for more details.
1313

1414
// You should have received a copy of the GNU General Public License
15-
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
15+
// along with Parity Ethereum. If not, see <http://www.gnu.org/licenses/>.
1616

1717
//! Spec params deserialization.
1818
@@ -112,6 +112,10 @@ pub struct Params {
112112
/// See `CommonParams` docs.
113113
#[serde(rename="eip1283Transition")]
114114
pub eip1283_transition: Option<Uint>,
115+
/// See `CommonParams` docs.
116+
#[serde(rename="eip1283DisableTransition")]
117+
pub eip1283_disable_transition: Option<Uint>,
118+
/// See `CommonParams` docs.
115119
#[serde(rename="eip1014Transition")]
116120
pub eip1014_transition: Option<Uint>,
117121
/// See `CommonParams` docs.
@@ -210,3 +214,4 @@ mod tests {
210214
let _deserialized: Params = serde_json::from_str(s).unwrap();
211215
}
212216
}
217+

0 commit comments

Comments
 (0)