Merge pull request #4019 from ethcore/optional-spec

Make some spec fields optional

ethcore/src/spec/genesis.rs

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use util::{Address, H256, Uint, U256};
+use util::{Address, H256, Uint, U256, FixedHash};
 use util::sha3::SHA3_NULL_RLP;
 use ethjson;
 use super::seal::Seal;
@@ -50,9 +50,9 @@ impl From<ethjson::spec::Genesis> for Genesis {
 		Genesis {
 			seal: From::from(g.seal),
 			difficulty: g.difficulty.into(),
-			author: g.author.into(),
-			timestamp: g.timestamp.into(),
-			parent_hash: g.parent_hash.into(),
+			author: g.author.map_or_else(Address::zero, Into::into),
+			timestamp: g.timestamp.map_or(0, Into::into),
+			parent_hash: g.parent_hash.map_or_else(H256::zero, Into::into),
 			gas_limit: g.gas_limit.into(),
 			transactions_root: g.transactions_root.map_or_else(|| SHA3_NULL_RLP.clone(), Into::into),
 			receipts_root: g.receipts_root.map_or_else(|| SHA3_NULL_RLP.clone(), Into::into),

ethcore/src/spec/spec.rs

@@ -58,7 +58,7 @@ pub struct CommonParams {
 impl From<ethjson::spec::Params> for CommonParams {
 	fn from(p: ethjson::spec::Params) -> Self {
 		CommonParams {
-			account_start_nonce: p.account_start_nonce.into(),
+			account_start_nonce: p.account_start_nonce.map_or_else(U256::zero, Into::into),
 			maximum_extra_data_size: p.maximum_extra_data_size.into(),
 			network_id: p.network_id.into(),
 			chain_id: if let Some(n) = p.chain_id { n.into() } else { p.network_id.into() },

json/src/blockchain/blockchain.rs

@@ -59,9 +59,9 @@ impl BlockChain {
 				mix_hash: self.genesis_block.mix_hash.clone(),
 			}),
 			difficulty: self.genesis_block.difficulty,
-			author: self.genesis_block.author.clone(),
-			timestamp: self.genesis_block.timestamp,
-			parent_hash: self.genesis_block.parent_hash.clone(),
+			author: Some(self.genesis_block.author.clone()),
+			timestamp: Some(self.genesis_block.timestamp),
+			parent_hash: Some(self.genesis_block.parent_hash.clone()),
 			gas_limit: self.genesis_block.gas_limit,
 			transactions_root: Some(self.genesis_block.transactions_root.clone()),
 			receipts_root: Some(self.genesis_block.receipts_root.clone()),

json/src/spec/genesis.rs

@@ -28,13 +28,13 @@ pub struct Genesis {
 	pub seal: Seal,
 	/// Difficulty.
 	pub difficulty: Uint,
-	/// Block author.
-	pub author: Address,
-	/// Block timestamp.
-	pub timestamp: Uint,
-	/// Parent hash.
+	/// Block author, defaults to 0.
+	pub author: Option<Address>,
+	/// Block timestamp, defaults to 0.
+	pub timestamp: Option<Uint>,
+	/// Parent hash, defaults to 0.
 	#[serde(rename="parentHash")]
-	pub parent_hash: H256,
+	pub parent_hash: Option<H256>,
 	/// Gas limit.
 	#[serde(rename="gasLimit")]
 	pub gas_limit: Uint,

json/src/spec/params.rs

@@ -22,9 +22,9 @@ use hash::H256;
 /// Spec params.
 #[derive(Debug, PartialEq, Deserialize)]
 pub struct Params {
-	/// Account start nonce.
+	/// Account start nonce, defaults to 0.
 	#[serde(rename="accountStartNonce")]
-	pub account_start_nonce: Uint,
+	pub account_start_nonce: Option<Uint>,
 	/// Maximum size of extra data.
 	#[serde(rename="maximumExtraDataSize")]
 	pub maximum_extra_data_size: Uint,