From f56608d7c2583123d4bcff5576c104a373a6defe Mon Sep 17 00:00:00 2001 From: fro Date: Thu, 16 Aug 2018 15:19:35 +0300 Subject: [PATCH] wasm_gasleft_activation_transition -> kip4_transition --- ethcore/src/spec/spec.rs | 8 -------- json/src/spec/params.rs | 3 --- 2 files changed, 11 deletions(-) diff --git a/ethcore/src/spec/spec.rs b/ethcore/src/spec/spec.rs index cc95a3a9de1..0d8f59fa5bf 100644 --- a/ethcore/src/spec/spec.rs +++ b/ethcore/src/spec/spec.rs @@ -125,8 +125,6 @@ pub struct CommonParams { pub remove_dust_contracts: bool, /// Wasm activation blocknumber, if any disabled initially. pub wasm_activation_transition: BlockNumber, - /// Wasm activation blocknumber, if any disabled initially. - pub wasm_gasleft_activation_transition: BlockNumber, /// Number of first block where KIP-4 rules begin. Only has effect if Wasm is activated. pub kip4_transition: BlockNumber, /// Gas limit bound divisor (how much gas limit can change per block) @@ -196,8 +194,6 @@ impl CommonParams { let mut wasm = ::vm::WasmCosts::default(); if block_number >= self.kip4_transition { wasm.have_create2 = true; - } - if block_number >= self.wasm_gasleft_activation_transition { wasm.have_gasleft = true; } schedule.wasm = Some(wasm); @@ -313,10 +309,6 @@ impl From for CommonParams { BlockNumber::max_value, Into::into ), - wasm_gasleft_activation_transition: p.wasm_gasleft_activation_transition.map_or_else( - BlockNumber::max_value, - Into::into - ), } } } diff --git a/json/src/spec/params.rs b/json/src/spec/params.rs index be79758f8ab..cf57e9af456 100644 --- a/json/src/spec/params.rs +++ b/json/src/spec/params.rs @@ -152,9 +152,6 @@ pub struct Params { /// KIP4 activiation block height. #[serde(rename="kip4Transition")] pub kip4_transition: Option, - /// Wasm `gasleft` extern (aka opcode) activation block height. - #[serde(rename="wasmGasleftActivationTransition")] - pub wasm_gasleft_activation_transition: Option, } #[cfg(test)]