v2.5.10 stable (#11239)

* ropsten #6631425 foundation #8798209 (#11201) * [stable] builtin, istanbul and mordor testnet backports (#11234) * ethcore-builtin (#10850) * [builtin]: support `multiple prices and activations` in chain spec (#11039) * [chain specs]: activate `Istanbul` on mainnet (#11228) * ethcore/res: add mordor testnet configuration (#11200) * Update list of bootnodes for xDai chain (#11236) * ethcore: remove `test-helper feat` from build (#11047) * Secret store: fix Instant::now() related race in net_keep_alive (#11155) (#11159) * [stable]: backport #10691 and #10683 (#11143) * Fix compiler warning (that will become an error) (#10683) * Refactor Clique stepping (#10691) * Add Constantinople eips to the dev (instant_seal) config (#10809) * Add cargo-remote dir to .gitignore (?) * Insert explicit warning into the panic hook (#11225) * Fix docker centos build (#11226) * Update MIX bootnodes. (#11203) * Use provided usd-per-eth value if an endpoint is specified (#11209) * Add new line after writing block to hex file. (#10984) * Type annotation for next_key() matching of json filter options (#11192) (but no `FilterOption` in 2.5 so…) * Upgrade jsonrpc to latest (#11206) * [CI] check evmbin build (#11096) * Correct EIP-712 encoding (#11092) * [client]: Fix for incorrectly dropped consensus messages (#11086) * Fix block detail updating (#11015) * Switching sccache from local to Redis (#10971) * Made ecrecover implementation trait public (#11188) * [dependencies]: jsonrpc `14.0.1` (#11183) * [receipt]: add `sender` & `receiver` to `RichReceipts` (#11179) * [ethcore/builtin]: do not panic in blake2pricer on short input (#11180) * util Host: fix a double Read Lock bug in fn Host::session_readable() (#11175) * ethcore client: fix a double Read Lock bug in fn Client::logs() (#11172) * Change how RPCs eth_call and eth_estimateGas handle "Pending" (#11127) * Cleanup stratum a bit (#11161) * Upgrade to jsonrpc v14 (#11151) * SecretStore: expose restore_key_public in HTTP API (#10241)
2019-11-11 21:57:38 +01:00
parent 5ee54b7298
commit f3cdd7bf21
159 changed files with 12295 additions and 3918 deletions
--- a/json/src/lib.rs
+++ b/json/src/lib.rs
@@ -20,6 +20,9 @@ extern crate serde_json;
 extern crate ethereum_types;
 #[macro_use] extern crate serde_derive;

+#[cfg(test)]
+extern crate macros;
+
 pub mod hash;
 pub mod uint;
 pub mod bytes;
--- a/json/src/spec/account.rs
+++ b/json/src/spec/account.rs
@@ -17,16 +17,18 @@
 //! Spec account deserialization.

 use std::collections::BTreeMap;
+
 use uint::Uint;
 use bytes::Bytes;
-use spec::builtin::Builtin;
+use spec::builtin::BuiltinCompat;

 /// Spec account.
 #[derive(Debug, PartialEq, Deserialize)]
 #[serde(deny_unknown_fields)]
+#[serde(rename_all = "camelCase")]
 pub struct Account {
 	/// Builtin contract.
-	pub builtin: Option<Builtin>,
+	pub builtin: Option<BuiltinCompat>,
 	/// Balance.
 	pub balance: Option<Uint>,
 	/// Nonce.
@@ -102,7 +104,15 @@ mod tests {
 	#[test]
 	fn account_empty() {
 		let s = r#"{
-			"builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } }
+			"builtin": {
+				"name": "ecrecover",
+				"pricing": {
+					"linear": {
+						"base": 3000,
+						"word": 0
+					}
+				}
+			}
 		}"#;
 		let deserialized: Account = serde_json::from_str(s).unwrap();
 		assert!(deserialized.is_empty());
@@ -113,8 +123,16 @@ mod tests {
 		let s = r#"{
 			"balance": "1",
 			"nonce": "0",
-			"builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } },
-			"code": "1234"
+			"code": "1234",
+			"builtin": {
+				"name": "ecrecover",
+				"pricing": {
+					"linear": {
+						"base": 3000,
+						"word": 0
+					}
+				}
+			}
 		}"#;
 		let deserialized: Account = serde_json::from_str(s).unwrap();
 		assert!(!deserialized.is_empty());
--- a/json/src/spec/builtin.rs
+++ b/json/src/spec/builtin.rs
@@ -17,16 +17,16 @@
 //! Spec builtin deserialization.

 use uint::Uint;
-
+use std::collections::BTreeMap;

 /// Linear pricing.
 #[derive(Debug, PartialEq, Deserialize, Clone)]
 #[serde(deny_unknown_fields)]
 pub struct Linear {
 	/// Base price.
-	pub base: usize,
+	pub base: u64,
 	/// Price for word.
-	pub word: usize,
+	pub word: u64,
 }

 /// Pricing for modular exponentiation.
@@ -34,7 +34,7 @@ pub struct Linear {
 #[serde(deny_unknown_fields)]
 pub struct Modexp {
 	/// Price divisor.
-	pub divisor: usize,
+	pub divisor: u64,
 }

 /// Pricing for constant alt_bn128 operations (ECADD and ECMUL)
@@ -42,9 +42,7 @@ pub struct Modexp {
 #[serde(deny_unknown_fields)]
 pub struct AltBn128ConstOperations {
 	/// price
-	pub price: usize,
-	/// EIP 1108 transition price
-	pub eip1108_transition_price: usize,
+	pub price: u64,
 }

 /// Pricing for alt_bn128_pairing.
@@ -52,13 +50,9 @@ pub struct AltBn128ConstOperations {
 #[serde(deny_unknown_fields)]
 pub struct AltBn128Pairing {
 	/// Base price.
-	pub base: usize,
+	pub base: u64,
 	/// Price per point pair.
-	pub pair: usize,
-	/// EIP 1108 transition base price
-	pub eip1108_transition_base: usize,
-	/// EIP 1108 transition price per point pair
-	pub eip1108_transition_pair: usize,
+	pub pair: u64,
 }

 /// Pricing variants.
@@ -81,25 +75,72 @@ pub enum Pricing {
 	AltBn128ConstOperations(AltBn128ConstOperations),
 }

-/// Spec builtin.
+/// Builtin compability layer
 #[derive(Debug, PartialEq, Deserialize, Clone)]
 #[serde(deny_unknown_fields)]
+pub struct BuiltinCompat {
+	/// Builtin name.
+	name: String,
+	/// Builtin pricing.
+	pricing: PricingCompat,
+	/// Activation block.
+	activate_at: Option<Uint>,
+}
+
+/// Spec builtin.
+#[derive(Debug, PartialEq, Clone)]
 pub struct Builtin {
 	/// Builtin name.
 	pub name: String,
 	/// Builtin pricing.
-	pub pricing: Pricing,
-	/// Activation block.
-	pub activate_at: Option<Uint>,
-	/// EIP 1108
-	pub eip1108_transition: Option<Uint>,
+	pub pricing: BTreeMap<u64, PricingAt>,
+}
+
+impl From<BuiltinCompat> for Builtin {
+	fn from(legacy: BuiltinCompat) -> Self {
+		let pricing = match legacy.pricing {
+			PricingCompat::Single(pricing) => {
+				let mut map = BTreeMap::new();
+				let activate_at: u64 = legacy.activate_at.map_or(0, Into::into);
+				map.insert(activate_at, PricingAt { info: None, price: pricing });
+				map
+			}
+			PricingCompat::Multi(pricings) => {
+				pricings.into_iter().map(|(a, p)| (a.into(), p)).collect()
+			}
+		};
+		Self { name: legacy.name, pricing }
+	}
+}
+
+/// Compability layer for different pricings
+#[derive(Debug, PartialEq, Deserialize, Clone)]
+#[serde(rename_all = "snake_case")]
+#[serde(deny_unknown_fields)]
+#[serde(untagged)]
+enum PricingCompat {
+	/// Single builtin
+	Single(Pricing),
+	/// Multiple builtins
+	Multi(BTreeMap<Uint, PricingAt>),
+}
+
+/// Price for a builtin, with the block number to activate it on
+#[derive(Debug, PartialEq, Deserialize, Clone)]
+#[serde(deny_unknown_fields)]
+pub struct PricingAt {
+	/// Description of the activation, e.g. "PunyPony HF, March 12, 2025".
+	pub info: Option<String>,
+	/// Builtin pricing.
+	pub price: Pricing,
 }

 #[cfg(test)]
 mod tests {
 	use serde_json;
-	use spec::builtin::{Builtin, Pricing, Linear, Modexp};
 	use uint::Uint;
+	use super::{Builtin, BuiltinCompat, BTreeMap, Pricing, PricingAt, Linear, Modexp, AltBn128ConstOperations};
+	use macros::map;

 	#[test]
 	fn builtin_deserialization() {
@@ -107,10 +148,42 @@ mod tests {
 			"name": "ecrecover",
 			"pricing": { "linear": { "base": 3000, "word": 0 } }
 		}"#;
-		let deserialized: Builtin = serde_json::from_str(s).unwrap();
-		assert_eq!(deserialized.name, "ecrecover");
-		assert_eq!(deserialized.pricing, Pricing::Linear(Linear { base: 3000, word: 0 }));
-		assert!(deserialized.activate_at.is_none());
+		let builtin: Builtin = serde_json::from_str::<BuiltinCompat>(s).unwrap().into();
+		assert_eq!(builtin.name, "ecrecover");
+		assert_eq!(builtin.pricing, map![
+			0 => PricingAt {
+				info: None,
+				price: Pricing::Linear(Linear { base: 3000, word: 0 })
+			}
+		]);
+	}
+
+	#[test]
+	fn deserialize_multiple_pricings() {
+		let s = r#"{
+			"name": "ecrecover",
+			"pricing": {
+				"0": {
+					"price": {"linear": { "base": 3000, "word": 0 }}
+				},
+				"500": {
+					"info": "enable fake EIP at block 500",
+					"price": {"linear": { "base": 10, "word": 0 }}
+				}
+			}
+		}"#;
+		let builtin: Builtin = serde_json::from_str::<BuiltinCompat>(s).unwrap().into();
+		assert_eq!(builtin.name, "ecrecover");
+		assert_eq!(builtin.pricing, map![
+			0 => PricingAt {
+				info: None,
+				price: Pricing::Linear(Linear { base: 3000, word: 0 })
+			},
+			500 => PricingAt {
+				info: Some(String::from("enable fake EIP at block 500")),
+				price: Pricing::Linear(Linear { base: 10, word: 0 })
+			}
+		]);
 	}

 	#[test]
@@ -120,10 +193,14 @@ mod tests {
 			"activate_at": "0xffffff",
 			"pricing": { "blake2_f": { "gas_per_round": 123 } }
 		}"#;
-		let deserialized: Builtin = serde_json::from_str(s).unwrap();
-		assert_eq!(deserialized.name, "blake2_f");
-		assert_eq!(deserialized.pricing, Pricing::Blake2F { gas_per_round: 123 });
-		assert!(deserialized.activate_at.is_some());
+		let builtin: Builtin = serde_json::from_str::<BuiltinCompat>(s).unwrap().into();
+		assert_eq!(builtin.name, "blake2_f");
+		assert_eq!(builtin.pricing, map![
+			0xffffff => PricingAt {
+				info: None,
+				price: Pricing::Blake2F { gas_per_round: 123 }
+			}
+		]);
 	}

 	#[test]
@@ -134,9 +211,13 @@ mod tests {
 			"pricing": { "modexp": { "divisor": 5 } }
 		}"#;

-		let deserialized: Builtin = serde_json::from_str(s).unwrap();
-		assert_eq!(deserialized.name, "late_start");
-		assert_eq!(deserialized.pricing, Pricing::Modexp(Modexp { divisor: 5 }));
-		assert_eq!(deserialized.activate_at, Some(Uint(100000.into())));
+		let builtin: Builtin = serde_json::from_str::<BuiltinCompat>(s).unwrap().into();
+		assert_eq!(builtin.name, "late_start");
+		assert_eq!(builtin.pricing, map![
+			100_000 => PricingAt {
+				info: None,
+				price: Pricing::Modexp(Modexp { divisor: 5 })
+			}
+		]);
 	}
 }
--- a/json/src/spec/null_engine.rs
+++ b/json/src/spec/null_engine.rs
@@ -25,6 +25,8 @@ use uint::Uint;
 pub struct NullEngineParams {
 	/// Block reward.
 	pub block_reward: Option<Uint>,
+	/// Immediate finalization.
+	pub immediate_finalization: Option<bool>
 }

 /// Null engine descriptor
--- a/json/src/spec/spec.rs
+++ b/json/src/spec/spec.rs
@@ -76,63 +76,63 @@ mod tests {
 	#[test]
 	fn should_error_on_unknown_fields() {
 		let s = r#"{
-	"name": "Morden",
-	"dataDir": "morden",
-	"engine": {
-		"Ethash": {
-			"params": {
-				"minimumDifficulty": "0x020000",
-				"difficultyBoundDivisor": "0x0800",
-				"durationLimit": "0x0d",
-				"homesteadTransition" : "0x",
-				"daoHardforkTransition": "0xffffffffffffffff",
-				"daoHardforkBeneficiary": "0x0000000000000000000000000000000000000000",
-				"daoHardforkAccounts": []
-			}
-		}
-	},
-	"params": {
-		"accountStartNonce": "0x0100000",
-		"maximumExtraDataSize": "0x20",
-		"minGasLimit": "0x1388",
-		"networkID" : "0x2",
-		"forkBlock": "0xffffffffffffffff",
-		"forkCanonHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-		"gasLimitBoundDivisor": "0x20",
-		"unknownField": "0x0"
-	},
-	"genesis": {
-		"seal": {
-			"ethereum": {
-				"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-				"nonce": "0x00006d6f7264656e"
+		"name": "Morden",
+		"dataDir": "morden",
+		"engine": {
+			"Ethash": {
+				"params": {
+					"minimumDifficulty": "0x020000",
+					"difficultyBoundDivisor": "0x0800",
+					"durationLimit": "0x0d",
+					"homesteadTransition" : "0x",
+					"daoHardforkTransition": "0xffffffffffffffff",
+					"daoHardforkBeneficiary": "0x0000000000000000000000000000000000000000",
+					"daoHardforkAccounts": []
+				}
 			}
 		},
-		"difficulty": "0x20000",
-		"author": "0x0000000000000000000000000000000000000000",
-		"timestamp": "0x00",
-		"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-		"extraData": "0x",
-		"gasLimit": "0x2fefd8"
-	},
-	"nodes": [
-		"enode://b1217cbaa440e35ed471157123fe468e19e8b5ad5bedb4b1fdbcbdab6fb2f5ed3e95dd9c24a22a79fdb2352204cea207df27d92bfd21bfd41545e8b16f637499@104.44.138.37:30303"
-	],
-	"accounts": {
-		"0000000000000000000000000000000000000001": { "balance": "1", "nonce": "1048576", "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
-		"0000000000000000000000000000000000000002": { "balance": "1", "nonce": "1048576", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
-		"0000000000000000000000000000000000000003": { "balance": "1", "nonce": "1048576", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
-		"0000000000000000000000000000000000000004": { "balance": "1", "nonce": "1048576", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
-		"102e61f5d8f9bc71d0ad4a084df4e65e05ce0e1c": { "balance": "1606938044258990275541962092341162602522202993782792835301376", "nonce": "1048576" }
-	},
-	"hardcodedSync": {
-		"header": "f901f9a0d405da4e66f1445d455195229624e133f5baafe72b5cf7b3c36c12c8146e98b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a05fb2b4bfdef7b314451cb138a534d225c922fc0e5fbe25e451142732c3e25c25a088d2ec6b9860aae1a2c3b299f72b6a5d70d7f7ba4722c78f2c49ba96273c2158a007c6fdfa8eea7e86b81f5b0fc0f78f90cc19f4aa60d323151e0cac660199e9a1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302008003832fefba82524d84568e932a80a0a0349d8c3df71f1a48a9df7d03fd5f14aeee7d91332c009ecaff0a71ead405bd88ab4e252a7e8c2a23",
-		"totalDifficulty": "0x400000000",
-		"CHTs": [
+		"params": {
+			"accountStartNonce": "0x0100000",
+			"maximumExtraDataSize": "0x20",
+			"minGasLimit": "0x1388",
+			"networkID" : "0x2",
+			"forkBlock": "0xffffffffffffffff",
+			"forkCanonHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+			"gasLimitBoundDivisor": "0x20",
+			"unknownField": "0x0"
+		},
+		"genesis": {
+			"seal": {
+				"ethereum": {
+					"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+					"nonce": "0x00006d6f7264656e"
+				}
+			},
+			"difficulty": "0x20000",
+			"author": "0x0000000000000000000000000000000000000000",
+			"timestamp": "0x00",
+			"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+			"extraData": "0x",
+			"gasLimit": "0x2fefd8"
+		},
+		"nodes": [
+			"enode://b1217cbaa440e35ed471157123fe468e19e8b5ad5bedb4b1fdbcbdab6fb2f5ed3e95dd9c24a22a79fdb2352204cea207df27d92bfd21bfd41545e8b16f637499@104.44.138.37:30303"
+		],
+		"accounts": {
+			"0000000000000000000000000000000000000001": { "balance": "1", "nonce": "1048576", "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
+			"0000000000000000000000000000000000000002": { "balance": "1", "nonce": "1048576", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
+			"0000000000000000000000000000000000000003": { "balance": "1", "nonce": "1048576", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
+			"0000000000000000000000000000000000000004": { "balance": "1", "nonce": "1048576", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
+			"102e61f5d8f9bc71d0ad4a084df4e65e05ce0e1c": { "balance": "1606938044258990275541962092341162602522202993782792835301376", "nonce": "1048576" }
+		},
+		"hardcodedSync": {
+			"header": "f901f9a0d405da4e66f1445d455195229624e133f5baafe72b5cf7b3c36c12c8146e98b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a05fb2b4bfdef7b314451cb138a534d225c922fc0e5fbe25e451142732c3e25c25a088d2ec6b9860aae1a2c3b299f72b6a5d70d7f7ba4722c78f2c49ba96273c2158a007c6fdfa8eea7e86b81f5b0fc0f78f90cc19f4aa60d323151e0cac660199e9a1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302008003832fefba82524d84568e932a80a0a0349d8c3df71f1a48a9df7d03fd5f14aeee7d91332c009ecaff0a71ead405bd88ab4e252a7e8c2a23",
+			"totalDifficulty": "0x400000000",
+			"CHTs": [
 			"0x11bbe8db4e347b4e8c937c1c8370e4b5ed33adb3db69cbdb7a38e1e50b1b82fa",
 			"0xd7f8974fb5ac78d9ac099b9ad5018bedc2ce0a72dad1827a1709da30580f0544"
-		]
-	}
+			]
+		}
 		}"#;
 		let result: Result<Spec, _> = serde_json::from_str(s);
 		assert!(result.is_err());
@@ -141,62 +141,110 @@ mod tests {
 	#[test]
 	fn spec_deserialization() {
 		let s = r#"{
-	"name": "Morden",
-	"dataDir": "morden",
-	"engine": {
-		"Ethash": {
-			"params": {
-				"minimumDifficulty": "0x020000",
-				"difficultyBoundDivisor": "0x0800",
-				"durationLimit": "0x0d",
-				"homesteadTransition" : "0x",
-				"daoHardforkTransition": "0xffffffffffffffff",
-				"daoHardforkBeneficiary": "0x0000000000000000000000000000000000000000",
-				"daoHardforkAccounts": []
-			}
-		}
-	},
-	"params": {
-		"accountStartNonce": "0x0100000",
-		"maximumExtraDataSize": "0x20",
-		"minGasLimit": "0x1388",
-		"networkID" : "0x2",
-		"forkBlock": "0xffffffffffffffff",
-		"forkCanonHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-		"gasLimitBoundDivisor": "0x20"
-	},
-	"genesis": {
-		"seal": {
-			"ethereum": {
-				"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-				"nonce": "0x00006d6f7264656e"
+		"name": "Morden",
+		"dataDir": "morden",
+		"engine": {
+			"Ethash": {
+				"params": {
+					"minimumDifficulty": "0x020000",
+					"difficultyBoundDivisor": "0x0800",
+					"durationLimit": "0x0d",
+					"homesteadTransition" : "0x",
+					"daoHardforkTransition": "0xffffffffffffffff",
+					"daoHardforkBeneficiary": "0x0000000000000000000000000000000000000000",
+					"daoHardforkAccounts": []
+				}
 			}
 		},
-		"difficulty": "0x20000",
-		"author": "0x0000000000000000000000000000000000000000",
-		"timestamp": "0x00",
-		"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-		"extraData": "0x",
-		"gasLimit": "0x2fefd8"
-	},
-	"nodes": [
-		"enode://b1217cbaa440e35ed471157123fe468e19e8b5ad5bedb4b1fdbcbdab6fb2f5ed3e95dd9c24a22a79fdb2352204cea207df27d92bfd21bfd41545e8b16f637499@104.44.138.37:30303"
-	],
-	"accounts": {
-		"0000000000000000000000000000000000000001": { "balance": "1", "nonce": "1048576", "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
-		"0000000000000000000000000000000000000002": { "balance": "1", "nonce": "1048576", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
-		"0000000000000000000000000000000000000003": { "balance": "1", "nonce": "1048576", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
-		"0000000000000000000000000000000000000004": { "balance": "1", "nonce": "1048576", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
-		"102e61f5d8f9bc71d0ad4a084df4e65e05ce0e1c": { "balance": "1606938044258990275541962092341162602522202993782792835301376", "nonce": "1048576" }
-	},
-	"hardcodedSync": {
-		"header": "f901f9a0d405da4e66f1445d455195229624e133f5baafe72b5cf7b3c36c12c8146e98b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a05fb2b4bfdef7b314451cb138a534d225c922fc0e5fbe25e451142732c3e25c25a088d2ec6b9860aae1a2c3b299f72b6a5d70d7f7ba4722c78f2c49ba96273c2158a007c6fdfa8eea7e86b81f5b0fc0f78f90cc19f4aa60d323151e0cac660199e9a1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302008003832fefba82524d84568e932a80a0a0349d8c3df71f1a48a9df7d03fd5f14aeee7d91332c009ecaff0a71ead405bd88ab4e252a7e8c2a23",
-		"totalDifficulty": "0x400000000",
-		"CHTs": [
-			"0x11bbe8db4e347b4e8c937c1c8370e4b5ed33adb3db69cbdb7a38e1e50b1b82fa",
-			"0xd7f8974fb5ac78d9ac099b9ad5018bedc2ce0a72dad1827a1709da30580f0544"
-		]
-	}
+		"params": {
+			"accountStartNonce": "0x0100000",
+			"maximumExtraDataSize": "0x20",
+			"minGasLimit": "0x1388",
+			"networkID" : "0x2",
+			"forkBlock": "0xffffffffffffffff",
+			"forkCanonHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+			"gasLimitBoundDivisor": "0x20"
+		},
+		"genesis": {
+			"seal": {
+				"ethereum": {
+					"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+					"nonce": "0x00006d6f7264656e"
+				}
+			},
+			"difficulty": "0x20000",
+			"author": "0x0000000000000000000000000000000000000000",
+			"timestamp": "0x00",
+			"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+			"extraData": "0x",
+			"gasLimit": "0x2fefd8"
+		},
+		"nodes": [
+			"enode://b1217cbaa440e35ed471157123fe468e19e8b5ad5bedb4b1fdbcbdab6fb2f5ed3e95dd9c24a22a79fdb2352204cea207df27d92bfd21bfd41545e8b16f637499@104.44.138.37:30303"
+		],
+		"accounts": {
+			"0000000000000000000000000000000000000001": {
+				"balance": "1",
+				"nonce": "1048576",
+				"builtin": {
+					"name": "ecrecover",
+					"pricing": {
+						"linear": {
+							"base": 3000,
+							"word": 0
+						}
+					}
+				}
+			},
+			"0000000000000000000000000000000000000002": {
+				"balance": "1",
+				"nonce": "1048576",
+				"builtin": {
+					"name": "sha256",
+					"pricing": {
+						"linear": {
+							"base": 60,
+							"word": 12
+						}
+					}
+				}
+			},
+			"0000000000000000000000000000000000000003": {
+				"balance": "1",
+				"nonce": "1048576",
+				"builtin": {
+					"name": "ripemd160",
+					"pricing": {
+						"linear": {
+							"base": 600,
+							"word": 120
+						}
+					}
+				}
+			},
+			"0000000000000000000000000000000000000004": {
+				"balance": "1",
+				"nonce": "1048576",
+				"builtin": {
+					"name": "identity",
+					"pricing": {
+						"linear": {
+							"base": 15,
+							"word": 3
+						}
+					}
+				}
+			},
+			"102e61f5d8f9bc71d0ad4a084df4e65e05ce0e1c": { "balance": "1606938044258990275541962092341162602522202993782792835301376", "nonce": "1048576" }
+		},
+		"hardcodedSync": {
+			"header": "f901f9a0d405da4e66f1445d455195229624e133f5baafe72b5cf7b3c36c12c8146e98b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a05fb2b4bfdef7b314451cb138a534d225c922fc0e5fbe25e451142732c3e25c25a088d2ec6b9860aae1a2c3b299f72b6a5d70d7f7ba4722c78f2c49ba96273c2158a007c6fdfa8eea7e86b81f5b0fc0f78f90cc19f4aa60d323151e0cac660199e9a1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302008003832fefba82524d84568e932a80a0a0349d8c3df71f1a48a9df7d03fd5f14aeee7d91332c009ecaff0a71ead405bd88ab4e252a7e8c2a23",
+			"totalDifficulty": "0x400000000",
+			"CHTs": [
+				"0x11bbe8db4e347b4e8c937c1c8370e4b5ed33adb3db69cbdb7a38e1e50b1b82fa",
+				"0xd7f8974fb5ac78d9ac099b9ad5018bedc2ce0a72dad1827a1709da30580f0544"
+			]
+		}
 		}"#;
 		let _deserialized: Spec = serde_json::from_str(s).unwrap();
 		// TODO: validate all fields
--- a/json/src/spec/state.rs
+++ b/json/src/spec/state.rs
@@ -31,7 +31,7 @@ impl State {
 	pub fn builtins(&self) -> BTreeMap<Address, Builtin> {
 		self.0
 			.iter()
-			.filter_map(|(add, ref acc)| acc.builtin.clone().map(|b| (add.clone(), b)))
+			.filter_map(|(add, ref acc)| acc.builtin.clone().map(|b| (add.clone(), b.into())))
 			.collect()
 	}