From 2ca1d1bfb10a18a0c8d53df59e213584374fc799 Mon Sep 17 00:00:00 2001
From: Wei Tang <wei@that.world>
Date: Fri, 11 Dec 2020 15:38:22 +0100
Subject: [PATCH] Accept None chain ID

---
 frame/ethereum/src/lib.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/frame/ethereum/src/lib.rs b/frame/ethereum/src/lib.rs
index c365ce381f..e9fc8b674e 100644
--- a/frame/ethereum/src/lib.rs
+++ b/frame/ethereum/src/lib.rs
@@ -217,8 +217,10 @@ impl<T: Trait> frame_support::unsigned::ValidateUnsigned for Module<T> {
 
 	fn validate_unsigned(_source: TransactionSource, call: &Self::Call) -> TransactionValidity {
 		if let Call::transact(transaction) = call {
-			if transaction.signature.chain_id().unwrap_or_default() != T::ChainId::get() {
-				return InvalidTransaction::Custom(TransactionValidationError::InvalidChainId as u8).into();
+			if let Some(chain_id) = transaction.signature.chain_id() {
+				if chain_id != T::ChainId::get() {
+					return InvalidTransaction::Custom(TransactionValidationError::InvalidChainId as u8).into();
+				}
 			}
 
 			let origin = Self::recover_signer(&transaction)