fix block parent hash (#135)

frame/ethereum/src/lib.rs

@@ -241,7 +241,7 @@ impl<T: Trait> Module<T> {
 
 		let ommers = Vec::<ethereum::Header>::new();
 		let header = ethereum::Header {
-			parent_hash: frame_system::Module::<T>::parent_hash(),
+			parent_hash: Self::current_block_hash().unwrap_or_default(),
 			ommers_hash: H256::from_slice(
 				Keccak256::digest(&rlp::encode_list(&ommers)[..]).as_slice(),
 			), // TODO: check ommers hash.
@@ -269,7 +269,7 @@ impl<T: Trait> Module<T> {
 			mix_hash: H256::default(),
 			nonce: H64::default(),
 		};
-		let hash = H256::from_slice(Keccak256::digest(&rlp::encode(&header)).as_slice());
+		let hash = Self::ethereum_block_hash(&header);
 
 		let block = ethereum::Block {
 			header,
@@ -313,11 +313,16 @@ impl<T: Trait> Module<T> {
 		CurrentTransactionStatuses::get()
 	}
 
-	/// Get block by number.
+	/// Get current block.
 	pub fn current_block() -> Option<ethereum::Block> {
 		CurrentBlock::get()
 	}
 
+	/// Get current block hash
+	pub fn current_block_hash() -> Option<H256> {
+		Self::current_block().map(|block| Self::ethereum_block_hash(&block.header))
+	}
+
 	/// Get receipts by number.
 	pub fn current_receipts() -> Option<Vec<ethereum::Receipt>> {
 		CurrentReceipts::get()
@@ -430,4 +435,8 @@ impl<T: Trait> Module<T> {
 			ExitError::Other(_s) => return Error::<T>::ExitErrorOther,
 		}
 	}
+
+	fn ethereum_block_hash(header: &ethereum::Header) -> H256 {
+		H256::from_slice(Keccak256::digest(&rlp::encode(header)).as_slice())
+	}
 }

ts-tests/tests/test-block.ts

@@ -117,7 +117,7 @@ describeWithFrontier("Frontier RPC (Block)", `simple-specs.json`, (context) => {
 		expect(block).not.null;
 	});
 
-	it.skip("should include previous block hash as parent", async function () {
+	it("should include previous block hash as parent", async function () {
 		this.timeout(15000);
 		await createAndFinalizeBlock(context.web3);
 		const block = await context.web3.eth.getBlock("latest");