Merge pull request #3462 from ethcore/stable-testing

[stable] EIP-170

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 description = "Ethcore client."
 name = "parity"
-version = "1.3.11"
+version = "1.3.12"
 license = "GPL-3.0"
 authors = ["Ethcore <[email protected]>"]
 build = "build.rs"

ethcore/res/ethereum/frontier.json

@@ -131,10 +131,11 @@
  "0x807640a13483f8ac783c557fcdf27be11ea4ac7a"
  ],
  "eip150Transition": "0x259518",
- "eip155Transition": "0x7fffffffffffffff",
- "eip160Transition": "0x7fffffffffffffff",
- "eip161abcTransition": "0x7fffffffffffffff",
- "eip161dTransition": "0x7fffffffffffffff"
+ "eip155Transition": "0x28d138",
+ "eip160Transition": "0x28d138",
+ "eip161abcTransition": "0x28d138",
+ "eip161dTransition": "0x28d138",
+ "maxCodeSize": 24576
  }
  }
  },

ethcore/res/ethereum/morden.json

@@ -11,10 +11,10 @@
  "registrar": "0x8e4e9b13d4b45cb0befc93c3061b1408f67316b2",
  "homesteadTransition": "0x789b0",
  "eip150Transition": "0x1b34d8",
- "eip155Transition": "0x7fffffffffffffff",
- "eip160Transition": "0x7fffffffffffffff",
- "eip161abcTransition": "0x7fffffffffffffff",
- "eip161dTransition": "0x7fffffffffffffff"
+ "eip155Transition": "0x1cc348",
+ "eip160Transition": "0x1cc348",
+ "eip161abcTransition": "0x1cc348",
+ "eip161dTransition": "0x1cc348"
  }
  }
  },

ethcore/src/engines/instant_seal.rs

@@ -55,7 +55,7 @@ impl Engine for InstantSeal {
  }
 
  fn schedule(&self, _env_info: &EnvInfo) -> Schedule {
- Schedule::new_homestead()
+ Schedule::new_post_eip150(usize::max_value(), false, false, false)
  }
 
  fn generate_seal(&self, _block: &ExecutedBlock, _accounts: Option<&AccountProvider>) -> Option<Vec<Bytes>> {

ethcore/src/ethereum/ethash.rs

@@ -62,6 +62,8 @@ pub struct EthashParams {
  pub eip161abc_transition: u64,
  /// Number of first block where EIP-161.d begins.
  pub eip161d_transition: u64,
+ /// Maximum amount of code that can be deploying into a contract.
+ pub max_code_size: u64,
 }
 
 impl From<ethjson::spec::EthashParams> for EthashParams {
@@ -74,17 +76,18 @@ impl From<ethjson::spec::EthashParams> for EthashParams {
  block_reward: p.block_reward.into(),
  registrar: p.registrar.map_or_else(Address::new, Into::into),
  homestead_transition: p.homestead_transition.map_or(0, Into::into),
- dao_hardfork_transition: p.dao_hardfork_transition.map_or(0x7fffffffffffffff, Into::into),
+ dao_hardfork_transition: p.dao_hardfork_transition.map_or(u64::max_value(), Into::into),
  dao_hardfork_beneficiary: p.dao_hardfork_beneficiary.map_or_else(Address::new, Into::into),
  dao_hardfork_accounts: p.dao_hardfork_accounts.unwrap_or_else(Vec::new).into_iter().map(Into::into).collect(),
- difficulty_hardfork_transition: p.difficulty_hardfork_transition.map_or(0x7fffffffffffffff, Into::into),
+ difficulty_hardfork_transition: p.difficulty_hardfork_transition.map_or(u64::max_value(), Into::into),
  difficulty_hardfork_bound_divisor: p.difficulty_hardfork_bound_divisor.map_or(p.difficulty_bound_divisor.into(), Into::into),
- bomb_defuse_transition: p.bomb_defuse_transition.map_or(0x7fffffffffffffff, Into::into),
+ bomb_defuse_transition: p.bomb_defuse_transition.map_or(u64::max_value(), Into::into),
  eip150_transition: p.eip150_transition.map_or(0, Into::into),
  eip155_transition: p.eip155_transition.map_or(0, Into::into),
  eip160_transition: p.eip160_transition.map_or(0, Into::into),
  eip161abc_transition: p.eip161abc_transition.map_or(0, Into::into),
- eip161d_transition: p.eip161d_transition.map_or(0x7fffffffffffffff, Into::into),
+ eip161d_transition: p.eip161d_transition.map_or(u64::max_value(), Into::into),
+ max_code_size: p.max_code_size.map_or(u64::max_value(), Into::into),
  }
  }
 }
@@ -137,6 +140,7 @@ impl Engine for Ethash {
  Schedule::new_homestead()
  } else {
  Schedule::new_post_eip150(
+ self.ethash_params.max_code_size as usize,
  env_info.number >= self.ethash_params.eip160_transition,
  env_info.number >= self.ethash_params.eip161abc_transition,
  env_info.number >= self.ethash_params.eip161d_transition

ethcore/src/evm/schedule.rs

@@ -70,6 +70,8 @@ pub struct Schedule {
  pub quad_coeff_div: usize,
  /// Cost for contract length when executing `CREATE`
  pub create_data_gas: usize,
+ /// Maximum code size when creating a contract.
+ pub create_data_limit: usize,
  /// Transaction cost
  pub tx_gas: usize,
  /// `CREATE` transaction cost
@@ -111,7 +113,7 @@ impl Schedule {
  }
 
  /// Schedule for the post-EIP-150-era of the Ethereum main net.
- pub fn new_post_eip150(fix_exp: bool, no_empty: bool, kill_empty: bool) -> Schedule {
+ pub fn new_post_eip150(max_code_size: usize, fix_exp: bool, no_empty: bool, kill_empty: bool) -> Schedule {
  Schedule {
  exceptional_failed_code_deposit: true,
  have_delegate_call: true,
@@ -139,6 +141,7 @@ impl Schedule {
  memory_gas: 3,
  quad_coeff_div: 512,
  create_data_gas: 200,
+ create_data_limit: max_code_size,
  tx_gas: 21000,
  tx_create_gas: 53000,
  tx_data_zero_gas: 4,
@@ -183,6 +186,7 @@ impl Schedule {
  memory_gas: 3,
  quad_coeff_div: 512,
  create_data_gas: 200,
+ create_data_limit: usize::max_value(),
  tx_gas: 21000,
  tx_create_gas: tcg,
  tx_data_zero_gas: 4,

ethcore/src/externalities.rs

@@ -241,7 +241,7 @@ impl<'a, T, V> Ext for Externalities<'a, T, V> where T: 'a + Tracer, V: 'a + VMT
  },
  OutputPolicy::InitContract(ref mut copy) => {
  let return_cost = U256::from(data.len()) * U256::from(self.schedule.create_data_gas);
- if return_cost > *gas {
+ if return_cost > *gas || data.len() > self.schedule.create_data_limit {
  return match self.schedule.exceptional_failed_code_deposit {
  true => Err(evm::Error::OutOfGas),
  false => Ok(*gas)

json/src/spec/ethash.rs

@@ -78,6 +78,10 @@ pub struct EthashParams {
  /// See main EthashParams docs.
  #[serde(rename="eip161dTransition")]
  pub eip161d_transition: Option<Uint>,
+
+ /// See main EthashParams docs.
+ #[serde(rename="maxCodeSize")]
+ pub max_code_size: Option<Uint>,
 }
 
 /// Ethash engine deserialization.

nsis/installer.nsi

@@ -4,7 +4,7 @@
 !define DESCRIPTION "Fast, light, robust Ethereum implementation"
 !define VERSIONMAJOR 1
 !define VERSIONMINOR 3
-!define VERSIONBUILD 11
+!define VERSIONBUILD 12
 
 !addplugindir .\
 

util/Cargo.toml

@@ -3,7 +3,7 @@ description = "Ethcore utility library"
 homepage = "http://ethcore.io"
 license = "GPL-3.0"
 name = "ethcore-util"
-version = "1.3.11"
+version = "1.3.12"
 authors = ["Ethcore <[email protected]>"]
 build = "build.rs"