Merge pull request #1418 from ethcore/newblocknumber
Update SF blocknumber to 1800000.
This commit is contained in:
commit
3c63244c00
@ -288,7 +288,7 @@ impl<'x> OpenBlock<'x> {
|
|||||||
/// Get the environment info concerning this block.
|
/// Get the environment info concerning this block.
|
||||||
pub fn env_info(&self) -> EnvInfo {
|
pub fn env_info(&self) -> EnvInfo {
|
||||||
// TODO: memoise.
|
// TODO: memoise.
|
||||||
const SOFT_FORK_BLOCK: u64 = 1775000;
|
const SOFT_FORK_BLOCK: u64 = 1_800_000;
|
||||||
EnvInfo {
|
EnvInfo {
|
||||||
number: self.block.base.header.number,
|
number: self.block.base.header.number,
|
||||||
author: self.block.base.header.author.clone(),
|
author: self.block.base.header.author.clone(),
|
||||||
|
@ -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.
|
/// 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> {
|
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.
|
// shortcut if the canon chain is already known.
|
||||||
if self.chain_info().best_block_number > SOFT_FORK_BLOCK + 1000 {
|
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());
|
return self.block_header(BlockID::Number(SOFT_FORK_BLOCK)).map(|header| HeaderView::new(&header).gas_limit());
|
||||||
|
Loading…
Reference in New Issue
Block a user