git.delta.rocks / unique-network / refs/commits / 82da1603dbfe

difftreelog

fix use CheckNonce from pallet-sponsoring

Yaroslav Bolyukin2023-11-21parent: #5f96768.patch.diff
in: master

3 files changed

modifiedCargo.lockdiffbeforeafterboth
before · Cargo.lock
1209 packageslockfile v3
modifiedpallets/evm-transaction-payment/src/lib.rsdiffbeforeafterboth
--- a/pallets/evm-transaction-payment/src/lib.rs
+++ b/pallets/evm-transaction-payment/src/lib.rs
@@ -171,13 +171,13 @@
 		origin: &T::CrossAccountId,
 	) -> Result<(), TransactionValidationError> {
 		let who = &v.who;
-		let max_fee_per_gas = Some(v.transaction_fee_input()?.0);
+		let max_fee_per_gas = v.transaction_fee_input()?.0;
 		let gas_limit = v.transaction.gas_limit.low_u64();
 		let reason = if let Some(to) = v.transaction.to {
 			WithdrawReason::Call {
 				target: to,
 				input: v.transaction.input.clone(),
-				max_fee_per_gas,
+				max_fee_per_gas: Some(max_fee_per_gas),
 				gas_limit,
 				is_transactional: v.config.is_transactional,
 				is_check: true,
@@ -187,7 +187,7 @@
 		};
 		let sponsor = get_sponsor::<T>(
 			*origin.as_eth(),
-			max_fee_per_gas,
+			Some(max_fee_per_gas),
 			gas_limit,
 			&reason,
 			v.config.is_transactional,
@@ -196,9 +196,7 @@
 		.as_ref()
 		.map(pallet_evm::Pallet::<T>::account_basic_by_id)
 		.map(|v| v.0);
-		let fee = max_fee_per_gas
-			.unwrap()
-			.saturating_mul(v.transaction.gas_limit);
+		let fee = max_fee_per_gas.saturating_mul(v.transaction.gas_limit);
 		if let Some(sponsor) = sponsor.as_ref() {
 			if who.balance < v.transaction.value || sponsor.balance < fee {
 				return Err(TransactionValidationError::BalanceTooLow);
modifiedruntime/common/mod.rsdiffbeforeafterboth
--- a/runtime/common/mod.rs
+++ b/runtime/common/mod.rs
@@ -81,18 +81,16 @@
 	}
 }
 
-pub type ChargeTransactionPayment = pallet_charge_transaction::ChargeTransactionPayment<Runtime>;
-
 pub type SignedExtra = (
 	frame_system::CheckSpecVersion<Runtime>,
 	frame_system::CheckTxVersion<Runtime>,
 	frame_system::CheckGenesis<Runtime>,
 	frame_system::CheckEra<Runtime>,
-	frame_system::CheckNonce<Runtime>,
+	pallet_charge_transaction::CheckNonce<Runtime>,
 	frame_system::CheckWeight<Runtime>,
 	maintenance::CheckMaintenance,
 	identity::DisableIdentityCalls,
-	ChargeTransactionPayment,
+	pallet_charge_transaction::ChargeTransactionPayment<Runtime>,
 	//pallet_contract_helpers::ContractHelpersExtension<Runtime>,
 	pallet_ethereum::FakeTransactionFinalizer<Runtime>,
 );