wasm_gasleft_activation_transition -> kip4_transition

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<ethjson::spec::Params> for CommonParams {
 				BlockNumber::max_value,
 				Into::into
 			),
-			wasm_gasleft_activation_transition: p.wasm_gasleft_activation_transition.map_or_else(
-				BlockNumber::max_value,
-				Into::into
-			),
 		}
 	}
 }

json/src/spec/params.rs

@@ -152,9 +152,6 @@ pub struct Params {
 	/// KIP4 activiation block height.
 	#[serde(rename="kip4Transition")]
 	pub kip4_transition: Option<Uint>,
-	/// Wasm `gasleft` extern (aka opcode) activation block height.
-	#[serde(rename="wasmGasleftActivationTransition")]
-	pub wasm_gasleft_activation_transition: Option<Uint>,
 }
 
 #[cfg(test)]