fix squash merge to maybe_force_create_address

Author: TarekkMA

frame/ethereum/src/lib.rs

@@ -865,30 +865,60 @@ impl<T: Config> Pallet<T> {
 				Ok((Some(target), None, CallOrCreateInfo::Call(res)))
 			}
 			ethereum::TransactionAction::Create => {
-				let res = match T::Runner::create(
-					from,
-					input,
-					value,
-					gas_limit.unique_saturated_into(),
-					max_fee_per_gas,
-					max_priority_fee_per_gas,
-					nonce,
-					access_list,
-					is_transactional,
-					validate,
-					weight_limit,
-					proof_size_base_cost,
-					config.as_ref().unwrap_or_else(|| T::config()),
-				) {
-					Ok(res) => res,
-					Err(e) => {
-						return Err(DispatchErrorWithPostInfo {
-							post_info: PostDispatchInfo {
-								actual_weight: Some(e.weight),
-								pays_fee: Pays::Yes,
-							},
-							error: e.error.into(),
-						})
+				let res = if let Some(force_address) = maybe_force_create_address {
+					match T::Runner::create_force_address(
+						from,
+						input,
+						value,
+						gas_limit.unique_saturated_into(),
+						max_fee_per_gas,
+						max_priority_fee_per_gas,
+						nonce,
+						access_list,
+						is_transactional,
+						validate,
+						weight_limit,
+						proof_size_base_cost,
+						config.as_ref().unwrap_or_else(|| T::config()),
+						force_address,
+					) {
+						Ok(res) => res,
+						Err(e) => {
+							return Err(DispatchErrorWithPostInfo {
+								post_info: PostDispatchInfo {
+									actual_weight: Some(e.weight),
+									pays_fee: Pays::Yes,
+								},
+								error: e.error.into(),
+							})
+						}
+					}
+				} else {
+					match T::Runner::create(
+						from,
+						input,
+						value,
+						gas_limit.unique_saturated_into(),
+						max_fee_per_gas,
+						max_priority_fee_per_gas,
+						nonce,
+						access_list,
+						is_transactional,
+						validate,
+						weight_limit,
+						proof_size_base_cost,
+						config.as_ref().unwrap_or_else(|| T::config()),
+					) {
+						Ok(res) => res,
+						Err(e) => {
+							return Err(DispatchErrorWithPostInfo {
+								post_info: PostDispatchInfo {
+									actual_weight: Some(e.weight),
+									pays_fee: Pays::Yes,
+								},
+								error: e.error.into(),
+							})
+						}
 					}
 				};