backports for stable 2.2.7

Cargo.toml

@@ -2,7 +2,7 @@
 description = "Parity Ethereum client"
 name = "parity-ethereum"
 # NOTE Make sure to update util/version/Cargo.toml as well
-version = "2.2.6"
+version = "2.2.7"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 

ethcore/res/ethereum/foundation.json

@@ -9,8 +9,7 @@
  "durationLimit": "0xd",
  "blockReward": {
  "0x0": "0x4563918244f40000",
- "0x42ae50": "0x29a2241af62c0000",
- "0x6c0840": "0x1bc16d674ec80000"
+ "0x42ae50": "0x29a2241af62c0000"
  },
  "homesteadTransition": "0x118c30",
  "daoHardforkTransition": "0x1d4c00",
@@ -135,8 +134,7 @@
  ],
  "eip100bTransition": "0x42ae50",
  "difficultyBombDelays": {
- "0x42ae50": "0x2dc6c0",
- "0x6c0840": "0x1e8480"
+ "0x42ae50": "0x2dc6c0"
  }
  }
  }
@@ -161,11 +159,7 @@
  "eip140Transition": "0x42ae50",
  "eip211Transition": "0x42ae50",
  "eip214Transition": "0x42ae50",
- "eip658Transition": "0x42ae50",
- "eip145Transition": "0x6c0840",
- "eip1014Transition": "0x6c0840",
- "eip1052Transition": "0x6c0840",
- "eip1283Transition": "0x6c0840"
+ "eip658Transition": "0x42ae50"
  },
  "genesis": {
  "seal": {

ethcore/res/ethereum/tests-issues/currents.json

@@ -1,42 +1,4 @@
-{ "block":
- [
- {
- "reference": "None",
- "comment": "This failing test is deemed skippable. Could not happen on a mainnet.",
- "failing": "GeneralStateTest_stCreate2",
- "subtests": ["RevertInCreateInInitCreate2_d0g0v0_Constantinople"]
- },
- {
- "reference": "None",
- "comment": "This failing test is deemed skippable. Could not happen on a mainnet.",
- "failing": "GeneralStateTest_stRevertTest",
- "subtests": ["RevertInCreateInInit_d0g0v0_Constantinople"]
- }
- ],
- "state":
- [
- {
- "reference": "None",
- "comment": "This failing test is deemed skippable. Could not happen on a mainnet.",
- "failing": "stCreate2Test",
- "subtests": {
- "RevertInCreateInInitCreate2": {
- "subnumbers": ["1"],
- "chain": "Constantinople (test)"
- }
- }
- },
- {
- "reference": "None",
- "comment": "This failing test is deemed skippable. Could not happen on a mainnet.",
- "failing": "stRevertTest",
- "subtests": {
- "RevertInCreateInInit": {
- "subnumbers": ["1"],
- "chain": "Constantinople (test)"
- }
- }
- }
-
- ]
+{
+ "block": [],
+ "state": []
 }

ethcore/src/externalities.rs

@@ -116,7 +116,12 @@ impl<'a, T: 'a, V: 'a, B: 'a> Ext for Externalities<'a, T, V, B>
  where T: Tracer, V: VMTracer, B: StateBackend
 {
  fn initial_storage_at(&self, key: &H256) -> vm::Result<H256> {
- self.state.checkpoint_storage_at(0, &self.origin_info.address, key).map(|v| v.unwrap_or(H256::zero())).map_err(Into::into)
+ if self.state.is_base_storage_root_unchanged(&self.origin_info.address)? {
+ self.state.checkpoint_storage_at(0, &self.origin_info.address, key).map(|v| v.unwrap_or(H256::zero())).map_err(Into::into)
+ } else {
+ warn!(target: "externalities", "Detected existing account {:#x} where a forced contract creation happened.", self.origin_info.address);
+ Ok(H256::zero())
+ }
  }
 
  fn storage_at(&self, key: &H256) -> vm::Result<H256> {

ethcore/src/state/account.rs

@@ -447,6 +447,11 @@ impl Account {
  }
  }
 
+ /// Whether the base storage root of this account is unchanged.
+ pub fn is_base_storage_root_unchanged(&self) -> bool {
+ self.original_storage_cache.is_none()
+ }
+
  /// Storage root where the account changes are based upon.
  pub fn base_storage_root(&self) -> H256 {
  self.storage_root

ethcore/src/state/mod.rs

@@ -539,6 +539,13 @@ impl<B: Backend> State<B> {
  |a| a.as_ref().map_or(self.account_start_nonce, |account| *account.nonce()))
  }
 
+ /// Whether the base storage root of an account remains unchanged.
+ pub fn is_base_storage_root_unchanged(&self, a: &Address) -> TrieResult<bool> {
+ Ok(self.ensure_cached(a, RequireCache::None, true,
+ |a| a.as_ref().map(|account| account.is_base_storage_root_unchanged()))?
+ .unwrap_or(true))
+ }
+
  /// Get the storage root of account `a`.
  pub fn storage_root(&self, a: &Address) -> TrieResult<Option<H256>> {
  self.ensure_cached(a, RequireCache::None, true,

scripts/gitlab/publish-snap.sh

@@ -3,13 +3,17 @@
 set -e # fail on any error
 set -u # treat unset variables as error
 
-TRACK=`awk -F '=' '/^track/ {print $2}' ./util/version/Cargo.toml`
+# some necromancy:
+# gsub(/"/, "", $2) deletes "qoutes" 
+# gsub(/ /, "", $2) deletes whitespaces
+TRACK=`awk -F '=' '/^track/ {gsub(/"/, "", $2); gsub(/ /, "", $2); print $2}' ./util/version/Cargo.toml`
+echo Track is: $TRACK
 
 case ${TRACK} in
  nightly) export GRADE="devel" CHANNEL="edge";;
  beta) export GRADE="stable" CHANNEL="beta";;
  stable) export GRADE="stable" CHANNEL="stable";;
- *) echo "No release" exit 0;;
+ *) echo "No release" && exit 0;;
 esac
 
 SNAP_PACKAGE="parity_"$VERSION"_"$BUILD_ARCH".snap"