Merge pull request openethereum#1418 from ethcore/newblocknumber

Update SF blocknumber to 1800000.
rphmeier · Jun 24, 2016 · 3c63244 · 3c63244
2 parents a9b757a + 60d259c
commit 3c63244
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ethcore/src/block.rs b/ethcore/src/block.rs
@@ -288,7 +288,7 @@ impl<'x> OpenBlock<'x> {
 	/// Get the environment info concerning this block.
 	pub fn env_info(&self) -> EnvInfo {
 		// TODO: memoise.
-		const SOFT_FORK_BLOCK: u64 = 1775000;
+		const SOFT_FORK_BLOCK: u64 = 1_800_000;
 		EnvInfo {
 			number: self.block.base.header.number,
 			author: self.block.base.header.author.clone(),

diff --git a/ethcore/src/client/mod.rs b/ethcore/src/client/mod.rs
@@ -227,7 +227,7 @@ pub trait BlockChainClient : Sync + Send {
 
 	/// Get `Some` gas limit of SOFT_FORK_BLOCK, or `None` if chain is not yet that long.
 	fn dao_rescue_block_gas_limit(&self, chain_hash: H256) -> Option<U256> {
-		const SOFT_FORK_BLOCK: u64 = 1775000;
+		const SOFT_FORK_BLOCK: u64 = 1800000;
 		// shortcut if the canon chain is already known.
 		if self.chain_info().best_block_number > SOFT_FORK_BLOCK + 1000 {
 			return self.block_header(BlockID::Number(SOFT_FORK_BLOCK)).map(|header| HeaderView::new(&header).gas_limit());