Accept None chain ID

polkadot-evm · Dec 11, 2020 · 2ca1d1b · 2ca1d1b · sorpaas · Dec 11, 2020
1 parent 8932a86
commit 2ca1d1b
Showing 1 changed file with 4 additions and 2 deletions.
diff --git 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)