ethcore: add clique engine

ethcore/src/block.rs

@@ -320,9 +320,7 @@ impl<'x> OpenBlock<'x> {
 	}
 
 	/// Get the environment info concerning this block.
-	pub fn env_info(&self) -> EnvInfo {
-		self.block.env_info()
-	}
+	pub fn env_info(&self) -> EnvInfo { self.block.env_info() }
 
 	/// Push a transaction into the block.
 	///
@@ -374,22 +372,6 @@ impl<'x> OpenBlock<'x> {
 		Ok(())
 	}
 
-	/// Populate self from a header.
-	fn populate_from(&mut self, header: &Header) {
-		self.block.header.set_difficulty(*header.difficulty());
-		self.block.header.set_gas_limit(*header.gas_limit());
-		self.block.header.set_timestamp(header.timestamp());
-		self.block.header.set_author(*header.author());
-		self.block.header.set_uncles_hash(*header.uncles_hash());
-		self.block.header.set_transactions_root(*header.transactions_root());
-		// TODO: that's horrible. set only for backwards compatibility
-		if header.extra_data().len() > self.engine.maximum_extra_data_size() {
-			warn!("Couldn't set extradata. Ignoring.");
-		} else {
-			self.block.header.set_extra_data(header.extra_data().clone());
-		}
-	}
-
 	/// Turn this into a `ClosedBlock`.
 	pub fn close(self) -> Result<ClosedBlock, Error> {
 		let unclosed_state = self.block.state.clone();
@@ -419,6 +401,10 @@ impl<'x> OpenBlock<'x> {
 		}));
 		s.block.header.set_gas_used(s.block.receipts.last().map_or_else(U256::zero, |r| r.gas_used));
 
+		if let Some(extra_data) = s.engine.close_block_extra_data(&s.block.header) {
+			s.block.header.set_extra_data(extra_data);
+		}
+
 		Ok(LockedBlock {
 			block: s.block,
 		})
@@ -496,6 +482,7 @@ impl LockedBlock {
 				Mismatch { expected: expected_seal_fields, found: seal.len() }));
 		}
 		s.block.header.set_seal(seal);
+
 		s.block.header.compute_hash();
 		Ok(SealedBlock {
 			block: s.block
@@ -563,39 +550,45 @@ fn enact(
 	is_epoch_begin: bool,
 	ancestry: &mut Iterator<Item=ExtendedHeader>,
 ) -> Result<LockedBlock, Error> {
-	{
-		if ::log::max_level() >= ::log::Level::Trace {
-			let s = State::from_existing(db.boxed_clone(), parent.state_root().clone(), engine.account_start_nonce(parent.number() + 1), factories.clone())?;
-			trace!(target: "enact", "num={}, root={}, author={}, author_balance={}\n",
-				header.number(), s.root(), header.author(), s.balance(&header.author())?);
-		}
-	}
-
 	let mut b = OpenBlock::new(
 		engine,
 		factories,
 		tracing,
 		db,
 		parent,
 		last_hashes,
-		Address::new(),
-		(3141562.into(), 31415620.into()),
-		vec![],
+		engine.executive_author(&header), // Engine such as Clique will calculate author from extra_data.  this is only important for executing contracts as the 'executive_author'
+		(*header.gas_limit(), *header.gas_limit()),
+		header.extra_data().clone(),
 		is_epoch_begin,
 		ancestry,
 	)?;
 
-	b.populate_from(&header);
+	// We must set timestamp here
+	b.block.header.set_timestamp(header.timestamp());
+	b.block.header.set_difficulty(*header.difficulty());
+//	{
+//		if ::log::max_level() >= ::log::Level::Trace {
+//			let env = b.env_info();
+//			let s = State::from_existing(db.boxed_clone(), parent.state_root().clone(), engine.account_start_nonce(parent.number() + 1), factories.clone())?;
+//			trace!(target: "enact", "num={}, root={}, author={}, author_balance={}\n",
+//				   b.block.header.number(), s.root(), env.author, s.balance(&env.author)?);
+//		}
+//	}
+
 	b.push_transactions(transactions)?;
 
+	// reset the author to what it was originally specified as now that transactions are applied
+	b.block.header.set_author(*header.author());
+
 	for u in uncles {
 		b.push_uncle(u)?;
 	}
 
 	b.close_and_lock()
 }
 
-/// Enact the block given by `block_bytes` using `engine` on the database `db` with given `parent` block header
+/// Enact the PreverifiedBlock given using `engine` on the database `db` with given `parent` block header
 pub fn enact_verified(
 	block: PreverifiedBlock,
 	engine: &EthEngine,
@@ -659,36 +652,19 @@ mod tests {
 			.collect();
 		let transactions = transactions?;
 
-		{
-			if ::log::max_level() >= ::log::Level::Trace {
-				let s = State::from_existing(db.boxed_clone(), parent.state_root().clone(), engine.account_start_nonce(parent.number() + 1), factories.clone())?;
-				trace!(target: "enact", "num={}, root={}, author={}, author_balance={}\n",
-					header.number(), s.root(), header.author(), s.balance(&header.author())?);
-			}
-		}
-
-		let mut b = OpenBlock::new(
+		enact(
+			header,
+			transactions,
+			block.uncles,
 			engine,
-			factories,
 			tracing,
 			db,
 			parent,
 			last_hashes,
-			Address::new(),
-			(3141562.into(), 31415620.into()),
-			vec![],
+			factories,
 			false,
 			&mut Vec::new().into_iter(),
-		)?;
-
-		b.populate_from(&header);
-		b.push_transactions(transactions)?;
-
-		for u in block.uncles {
-			b.push_uncle(u)?;
-		}
-
-		b.close_and_lock()
+		)
 	}
 
 	/// Enact the block given by `block_bytes` using `engine` on the database `db` with given `parent` block header. Seal the block aferwards
@@ -703,7 +679,7 @@ mod tests {
 	) -> Result<SealedBlock, Error> {
 		let header = Unverified::from_rlp(block_bytes.clone())?.header;
 		Ok(enact_bytes(block_bytes, engine, tracing, db, parent, last_hashes, factories)?
-		   .seal(engine, header.seal().to_vec())?)
+			.seal(engine, header.seal().to_vec())?)
 	}
 
 	#[test]