git.delta.rocks / unique-network / refs/commits / 940b0a339ab0

difftreelog

fix clippy warnings

Grigoriy Simonov2023-06-05parent: #e7cba9a.patch.diff
in: master

36 files changed

modifiednode/cli/src/chain_spec.rsdiffbeforeafterboth
--- a/node/cli/src/chain_spec.rs
+++ b/node/cli/src/chain_spec.rs
@@ -110,7 +110,7 @@
 
 /// Helper function to generate a crypto pair from seed
 pub fn get_from_seed<TPublic: Public>(seed: &str) -> <TPublic::Pair as Pair>::Public {
-	TPublic::Pair::from_string(&format!("//{}", seed), None)
+	TPublic::Pair::from_string(&format!("//{seed}"), None)
 		.expect("static values are valid; qed")
 		.public()
 }
modifiednode/cli/src/command.rsdiffbeforeafterboth
--- a/node/cli/src/command.rs
+++ b/node/cli/src/command.rs
@@ -83,7 +83,7 @@
 		"" | "local" => Box::new(chain_spec::local_testnet_config()),
 		path => {
 			let path = std::path::PathBuf::from(path);
-			let chain_spec = Box::new(chain_spec::OpalChainSpec::from_json_file(path.clone())?)
+			let chain_spec = Box::new(chain_spec::OpalChainSpec::from_json_file(path)?)
 				as Box<dyn sc_service::ChainSpec>;
 
 			match chain_spec.runtime_id() {
@@ -352,7 +352,7 @@
 					&polkadot_cli,
 					config.tokio_handle.clone(),
 				)
-				.map_err(|err| format!("Relay chain argument error: {}", err))?;
+				.map_err(|err| format!("Relay chain argument error: {err}"))?;
 
 				cmd.run(config, polkadot_config)
 			})
@@ -464,7 +464,7 @@
 			runner.run_node_until_exit(|config| async move {
 				let hwbench = if !cli.no_hardware_benchmarks {
 					config.database.path().map(|database_path| {
-						let _ = std::fs::create_dir_all(&database_path);
+						let _ = std::fs::create_dir_all(database_path);
 						sc_sysinfo::gather_hwbench(Some(database_path))
 					})
 				} else {
@@ -513,7 +513,7 @@
 				let state_version =
 					RelayChainCli::native_runtime_version(&config.chain_spec).state_version();
 				let block: Block = generate_genesis_block(&*config.chain_spec, state_version)
-					.map_err(|e| format!("{:?}", e))?;
+					.map_err(|e| format!("{e:?}"))?;
 				let genesis_state = format!("0x{:?}", HexDisplay::from(&block.header().encode()));
 				let genesis_hash = format!("0x{:?}", HexDisplay::from(&block.header().hash().0));
 
@@ -522,7 +522,7 @@
 					&polkadot_cli,
 					config.tokio_handle.clone(),
 				)
-				.map_err(|err| format!("Relay chain argument error: {}", err))?;
+				.map_err(|err| format!("Relay chain argument error: {err}"))?;
 
 				info!("Parachain id: {:?}", para_id);
 				info!("Parachain Account: {}", parachain_account);
modifiednode/cli/src/service.rsdiffbeforeafterboth
--- a/node/cli/src/service.rs
+++ b/node/cli/src/service.rs
@@ -698,7 +698,7 @@
 {
 	let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?;
 
-	let block_import = ParachainBlockImport::new(client.clone(), backend.clone());
+	let block_import = ParachainBlockImport::new(client.clone(), backend);
 
 	cumulus_client_consensus_aura::import_queue::<
 		sp_consensus_aura::sr25519::AuthorityPair,
@@ -709,7 +709,7 @@
 		_,
 	>(cumulus_client_consensus_aura::ImportQueueParams {
 		block_import,
-		client: client.clone(),
+		client,
 		create_inherent_data_providers: move |_, _| async move {
 			let time = sp_timestamp::InherentDataProvider::from_system_time();
 
@@ -787,7 +787,7 @@
 				telemetry.clone(),
 			);
 
-			let block_import = ParachainBlockImport::new(client.clone(), backend.clone());
+			let block_import = ParachainBlockImport::new(client.clone(), backend);
 
 			Ok(AuraConsensus::build::<
 				sp_consensus_aura::sr25519::AuthorityPair,
@@ -864,7 +864,7 @@
 	ExecutorDispatch: NativeExecutionDispatch + 'static,
 {
 	Ok(sc_consensus_manual_seal::import_queue(
-		Box::new(client.clone()),
+		Box::new(client),
 		&task_manager.spawn_essential_handle(),
 		config.prometheus_registry(),
 	))
@@ -956,7 +956,7 @@
 
 	let collator = config.role.is_authority();
 
-	let select_chain = maybe_select_chain.clone();
+	let select_chain = maybe_select_chain;
 
 	if collator {
 		let block_import =
modifiednode/rpc/src/lib.rsdiffbeforeafterboth
--- a/node/rpc/src/lib.rs
+++ b/node/rpc/src/lib.rs
@@ -289,7 +289,7 @@
 	io.merge(
 		Net::new(
 			client.clone(),
-			network.clone(),
+			network,
 			// Whether to format the `peer_count` response as Hex (default) or not.
 			true,
 		)
modifiedpallets/app-promotion/src/lib.rsdiffbeforeafterboth
--- a/pallets/app-promotion/src/lib.rs
+++ b/pallets/app-promotion/src/lib.rs
@@ -296,7 +296,7 @@
 
 			if !block_pending.is_empty() {
 				block_pending.into_iter().for_each(|(staker, amount)| {
-					Self::get_frozen_balance(&staker).map(|b| {
+					if let Some(b) = Self::get_frozen_balance(&staker) {
 						let new_state = b.checked_sub(&amount).unwrap_or_default();
 
 						// In this case, setting a new state for the frozen funds cannot fail
@@ -305,7 +305,7 @@
 						// that we cannot (in the current implementation) unfreeze more funds
 						// than were originally frozen by the pallet. Either way, `on_initialize()` cannot fail.
 						Self::set_freeze_unchecked(&staker, new_state);
-					});
+					};
 				});
 			}
 
@@ -598,8 +598,8 @@
 			// this value is set for the stakers to whom the recalculation will be performed
 			let next_recalc_block = current_recalc_block + config.recalculation_interval;
 
-			let mut storage_iterator = Self::get_next_calculated_key()
-				.map_or(Staked::<T>::iter(), |key| Staked::<T>::iter_from(key));
+			let storage_iterator =
+				Self::get_next_calculated_key().map_or(Staked::<T>::iter(), Staked::<T>::iter_from);
 
 			PreviousCalculatedRecord::<T>::set(None);
 
@@ -658,10 +658,8 @@
 				// stakers_number - keeps the remaining number of iterations (staker addresses to handle)
 				// next_recalc_block_for_stake - is taken from the state and stores the starting relay block from which reward should be paid out
 				// income_acc - stores the reward amount to pay to the staker address (accumulates over all address stake records)
-				while let Some((
-					(current_id, staked_block),
-					(amount, next_recalc_block_for_stake),
-				)) = storage_iterator.next()
+				for ((current_id, staked_block), (amount, next_recalc_block_for_stake)) in
+					storage_iterator
 				{
 					// last_id is not equal current_id when we switch to handling a new staker address
 					// or just start handling the very first address. In the latter case last_id will be None and
@@ -859,11 +857,11 @@
 				if acc_amount < balance_per_block {
 					let res = (block, balance_per_block - acc_amount);
 					acc_amount = <BalanceOf<T>>::default();
-					return Some(res);
+					Some(res)
 				} else {
 					acc_amount -= balance_per_block;
 					will_deleted_stakes_count += 1;
-					return Some((block, <BalanceOf<T>>::default()));
+					Some((block, <BalanceOf<T>>::default()))
 				}
 			})
 			.collect::<Vec<_>>();
@@ -926,7 +924,7 @@
 		if amount.is_zero() {
 			<<T as Config>::Currency as MutateFreeze<T::AccountId>>::thaw(
 				&T::FreezeIdentifier::get(),
-				&staker,
+				staker,
 			)
 		} else {
 			<<T as Config>::Currency as MutateFreeze<T::AccountId>>::set_freeze(
@@ -1026,10 +1024,10 @@
 	) {
 		let income = Self::calculate_income(base, iters);
 
-		base.checked_add(&income).map(|res| {
+		if let Some(res) = base.checked_add(&income) {
 			<Staked<T>>::insert((staker, staked_block), (res, next_recalc_block));
 			*income_acc += income;
-		});
+		};
 	}
 
 	fn calculate_income<I>(base: I, iters: u32) -> I
modifiedpallets/app-promotion/src/types.rsdiffbeforeafterboth
--- a/pallets/app-promotion/src/types.rs
+++ b/pallets/app-promotion/src/types.rs
@@ -149,16 +149,16 @@
 		Self {
 			recalculation_interval: config
 				.recalculation_interval
-				.unwrap_or_else(|| T::RecalculationInterval::get()),
+				.unwrap_or_else(T::RecalculationInterval::get),
 			pending_interval: config
 				.pending_interval
-				.unwrap_or_else(|| T::PendingInterval::get()),
+				.unwrap_or_else(T::PendingInterval::get),
 			interval_income: config
 				.interval_income
-				.unwrap_or_else(|| T::IntervalIncome::get()),
+				.unwrap_or_else(T::IntervalIncome::get),
 			max_stakers_per_calculation: config
 				.max_stakers_per_calculation
-				.unwrap_or_else(|| MAX_NUMBER_PAYOUTS),
+				.unwrap_or(MAX_NUMBER_PAYOUTS),
 		}
 	}
 }
modifiedpallets/balances-adapter/src/lib.rsdiffbeforeafterboth
--- a/pallets/balances-adapter/src/lib.rs
+++ b/pallets/balances-adapter/src/lib.rs
@@ -31,6 +31,12 @@
 	}
 }
 
+impl<T: Config> Default for NativeFungibleHandle<T> {
+	fn default() -> Self {
+		Self::new()
+	}
+}
+
 impl<T: Config> WithRecorder<T> for NativeFungibleHandle<T> {
 	fn recorder(&self) -> &pallet_evm_coder_substrate::SubstrateRecorder<T> {
 		&self.0
modifiedpallets/common/src/eth.rsdiffbeforeafterboth
--- a/pallets/common/src/eth.rs
+++ b/pallets/common/src/eth.rs
@@ -136,7 +136,7 @@
 
 	fn try_from(from: up_data_structs::Property) -> Result<Self, Self::Error> {
 		let key = evm_coder::types::String::from_utf8(from.key.into())
-			.map_err(|e| Self::Error::Revert(format!("utf8 conversion error: {}", e)))?;
+			.map_err(|e| Self::Error::Revert(format!("utf8 conversion error: {e}")))?;
 		let value = evm_coder::types::Bytes(from.value.to_vec());
 		Ok(Property { key, value })
 	}
@@ -201,10 +201,7 @@
 	pub fn new(field: CollectionLimitField, value: Option<u32>) -> Self {
 		Self {
 			field,
-			value: match value {
-				Some(value) => Some(value.into()),
-				None => None,
-			},
+			value: value.map(|value| value.into()),
 		}
 	}
 	/// Whether the field contains a value.
@@ -222,8 +219,7 @@
 			.ok_or::<Self::Error>("can't convert `None` value to boolean".into())?;
 		let value = Some(value.try_into().map_err(|error| {
 			Self::Error::Revert(format!(
-				"can't convert value to u32 \"{}\" because: \"{error}\"",
-				value
+				"can't convert value to u32 \"{value}\" because: \"{error}\""
 			))
 		})?);
 
@@ -249,10 +245,8 @@
 				limits.sponsored_data_size = value;
 			}
 			CollectionLimitField::SponsoredDataRateLimit => {
-				limits.sponsored_data_rate_limit = match value {
-					Some(value) => Some(up_data_structs::SponsoringRateLimit::Blocks(value)),
-					None => None,
-				};
+				limits.sponsored_data_rate_limit =
+					value.map(up_data_structs::SponsoringRateLimit::Blocks);
 			}
 			CollectionLimitField::TokenLimit => {
 				limits.token_limit = value;
@@ -454,9 +448,9 @@
 	}
 }
 
-impl Into<up_data_structs::AccessMode> for AccessMode {
-	fn into(self) -> up_data_structs::AccessMode {
-		match self {
+impl From<AccessMode> for up_data_structs::AccessMode {
+	fn from(value: AccessMode) -> Self {
+		match value {
 			AccessMode::Normal => up_data_structs::AccessMode::Normal,
 			AccessMode::AllowList => up_data_structs::AccessMode::AllowList,
 		}
modifiedpallets/evm-coder-substrate/src/lib.rsdiffbeforeafterboth
--- a/pallets/evm-coder-substrate/src/lib.rs
+++ b/pallets/evm-coder-substrate/src/lib.rs
@@ -260,9 +260,9 @@
 			message: Some(msg), ..
 		}) => ExError::Revert(msg.into()),
 		DispatchError::Module(ModuleError { index, error, .. }) => {
-			ExError::Revert(format!("error {:?} in pallet {}", error, index))
+			ExError::Revert(format!("error {error:?} in pallet {index}"))
 		}
-		e => ExError::Revert(format!("substrate error: {:?}", e)),
+		e => ExError::Revert(format!("substrate error: {e:?}")),
 	}
 }
 
modifiedpallets/evm-contract-helpers/src/eth.rsdiffbeforeafterboth
--- a/pallets/evm-contract-helpers/src/eth.rs
+++ b/pallets/evm-contract-helpers/src/eth.rs
@@ -184,10 +184,9 @@
 	/// @param contractAddress The contract for which a sponsor is requested.
 	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
 	fn sponsor(&self, contract_address: Address) -> Result<Option<eth::CrossAddress>> {
-		Ok(match Pallet::<T>::get_sponsor(contract_address) {
-			Some(ref value) => Some(eth::CrossAddress::from_sub_cross_account::<T>(value)),
-			None => None,
-		})
+		Ok(Pallet::<T>::get_sponsor(contract_address)
+			.as_ref()
+			.map(eth::CrossAddress::from_sub_cross_account::<T>))
 	}
 
 	/// Check tat contract has confirmed sponsor.
@@ -275,7 +274,7 @@
 		self.recorder().consume_sstore()?;
 
 		<Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;
-		<Pallet<T>>::set_sponsoring_fee_limit(contract_address, fee_limit.into())
+		<Pallet<T>>::set_sponsoring_fee_limit(contract_address, fee_limit)
 			.map_err(dispatch_to_evm::<T>)?;
 		Ok(())
 	}
modifiedpallets/evm-contract-helpers/src/lib.rsdiffbeforeafterboth
--- a/pallets/evm-contract-helpers/src/lib.rs
+++ b/pallets/evm-contract-helpers/src/lib.rs
@@ -376,7 +376,7 @@
 			<SponsoringMode<T>>::get(contract)
 				.or_else(|| {
 					#[allow(deprecated)]
-					<SelfSponsoring<T>>::get(contract).then(|| SponsoringModeT::Allowlisted)
+					<SelfSponsoring<T>>::get(contract).then_some(SponsoringModeT::Allowlisted)
 				})
 				.unwrap_or_default()
 		}
@@ -410,7 +410,7 @@
 
 		/// Is user added to allowlist, or he is owner of specified contract
 		pub fn allowed(contract: H160, user: H160) -> bool {
-			<Allowlist<T>>::get(&contract, &user) || <Owner<T>>::get(&contract) == user
+			<Allowlist<T>>::get(contract, user) || <Owner<T>>::get(contract) == user
 		}
 
 		/// Toggle contract allowlist access
@@ -425,7 +425,7 @@
 
 		/// Throw error if user is not allowed to reconfigure target contract
 		pub fn ensure_owner(contract: H160, user: H160) -> DispatchResult {
-			ensure!(<Owner<T>>::get(&contract) == user, Error::<T>::NoPermission);
+			ensure!(<Owner<T>>::get(contract) == user, Error::<T>::NoPermission);
 			Ok(())
 		}
 	}
modifiedpallets/evm-migration/src/lib.rsdiffbeforeafterboth
--- a/pallets/evm-migration/src/lib.rs
+++ b/pallets/evm-migration/src/lib.rs
@@ -78,7 +78,7 @@
 		pub fn begin(origin: OriginFor<T>, address: H160) -> DispatchResult {
 			ensure_root(origin)?;
 			ensure!(
-				<PalletEvm<T>>::is_account_empty(&address) && !<MigrationPending<T>>::get(&address),
+				<PalletEvm<T>>::is_account_empty(&address) && !<MigrationPending<T>>::get(address),
 				<Error<T>>::AccountNotEmpty,
 			);
 
@@ -97,12 +97,12 @@
 		) -> DispatchResult {
 			ensure_root(origin)?;
 			ensure!(
-				<MigrationPending<T>>::get(&address),
+				<MigrationPending<T>>::get(address),
 				<Error<T>>::AccountIsNotMigrating,
 			);
 
 			for (k, v) in data {
-				<pallet_evm::AccountStorages<T>>::insert(&address, k, v);
+				<pallet_evm::AccountStorages<T>>::insert(address, k, v);
 			}
 			Ok(())
 		}
@@ -115,11 +115,11 @@
 		pub fn finish(origin: OriginFor<T>, address: H160, code: Vec<u8>) -> DispatchResult {
 			ensure_root(origin)?;
 			ensure!(
-				<MigrationPending<T>>::get(&address),
+				<MigrationPending<T>>::get(address),
 				<Error<T>>::AccountIsNotMigrating,
 			);
 
-			<pallet_evm::AccountCodes<T>>::insert(&address, code);
+			<pallet_evm::AccountCodes<T>>::insert(address, code);
 			<MigrationPending<T>>::remove(address);
 			Ok(())
 		}
@@ -166,7 +166,7 @@
 	pub struct OnMethodCall<T>(PhantomData<T>);
 	impl<T: Config> pallet_evm::OnMethodCall<T> for OnMethodCall<T> {
 		fn is_reserved(contract: &H160) -> bool {
-			<MigrationPending<T>>::get(&contract)
+			<MigrationPending<T>>::get(contract)
 		}
 
 		fn is_used(_contract: &H160) -> bool {
modifiedpallets/foreign-assets/src/impl_fungibles.rsdiffbeforeafterboth
--- a/pallets/foreign-assets/src/impl_fungibles.rs
+++ b/pallets/foreign-assets/src/impl_fungibles.rs
@@ -333,7 +333,7 @@
 					&Value::new(0),
 				)?;
 
-				Ok(amount.into())
+				Ok(amount)
 			}
 		}
 	}
modifiedpallets/foreign-assets/src/lib.rsdiffbeforeafterboth
--- a/pallets/foreign-assets/src/lib.rs
+++ b/pallets/foreign-assets/src/lib.rs
@@ -161,7 +161,7 @@
 
 	fn get_currency_id(multi_location: MultiLocation) -> Option<CurrencyId> {
 		log::trace!(target: "fassets::get_currency_id", "call");
-		Pallet::<T>::location_to_currency_ids(multi_location).map(|id| AssetIds::ForeignAssetId(id))
+		Pallet::<T>::location_to_currency_ids(multi_location).map(AssetIds::ForeignAssetId)
 	}
 }
 
@@ -378,7 +378,7 @@
 				foreign_asset_id,
 				|maybe_location| -> DispatchResult {
 					ensure!(maybe_location.is_none(), Error::<T>::MultiLocationExisted);
-					*maybe_location = Some(location.clone());
+					*maybe_location = Some(*location);
 
 					AssetMetadatas::<T>::try_mutate(
 						AssetIds::ForeignAssetId(foreign_asset_id),
@@ -422,7 +422,7 @@
 
 						// modify location
 						if location != old_multi_locations {
-							LocationToCurrencyIds::<T>::remove(old_multi_locations.clone());
+							LocationToCurrencyIds::<T>::remove(*old_multi_locations);
 							LocationToCurrencyIds::<T>::try_mutate(
 								location,
 								|maybe_currency_ids| -> DispatchResult {
@@ -437,7 +437,7 @@
 							)?;
 						}
 						*maybe_asset_metadatas = Some(metadata.clone());
-						*old_multi_locations = location.clone();
+						*old_multi_locations = *location;
 						Ok(())
 					},
 				)
modifiedpallets/identity/src/types.rsdiffbeforeafterboth
--- a/pallets/identity/src/types.rs
+++ b/pallets/identity/src/types.rs
@@ -104,7 +104,7 @@
 			Data::Raw(ref x) => {
 				let l = x.len().min(32);
 				let mut r = vec![l as u8 + 1; l + 1];
-				r[1..].copy_from_slice(&x[..l as usize]);
+				r[1..].copy_from_slice(&x[..l]);
 				r
 			}
 			Data::BlakeTwo256(ref h) => once(34u8).chain(h.iter().cloned()).collect(),
@@ -287,7 +287,7 @@
 	fn decode<I: codec::Input>(input: &mut I) -> sp_std::result::Result<Self, codec::Error> {
 		let field = u64::decode(input)?;
 		Ok(Self(
-			<BitFlags<IdentityField>>::from_bits(field as u64).map_err(|_| "invalid value")?,
+			<BitFlags<IdentityField>>::from_bits(field).map_err(|_| "invalid value")?,
 		))
 	}
 }
modifiedpallets/nonfungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -20,6 +20,8 @@
 //! Method implementations are mostly doing parameter conversion and calling Nonfungible Pallet methods.
 
 extern crate alloc;
+
+use alloc::string::ToString;
 use core::{
 	char::{REPLACEMENT_CHARACTER, decode_utf16},
 	convert::TryInto,
@@ -356,8 +358,7 @@
 				.transpose()
 				.map_err(|e| {
 					Error::Revert(alloc::format!(
-						"Can not convert value \"baseURI\" to string with error \"{}\"",
-						e
+						"Can not convert value \"baseURI\" to string with error \"{e}\""
 					))
 				})?;
 
@@ -675,7 +676,7 @@
 					.try_into()
 					.map_err(|_| "token uri is too long")?,
 			})
-			.map_err(|e| Error::Revert(alloc::format!("Can't add property: {:?}", e)))?;
+			.map_err(|e| Error::Revert(alloc::format!("Can't add property: {e:?}")))?;
 
 		<Pallet<T>>::create_item(
 			self,
@@ -717,7 +718,7 @@
 		.map(Clone::clone)
 		.ok_or_else(|| {
 			let key = String::from_utf8(key.clone().into_inner()).unwrap_or_default();
-			Error::Revert(alloc::format!("No permission for key {}", key))
+			Error::Revert(alloc::format!("No permission for key {key}"))
 		})?;
 	Ok(a)
 }
@@ -752,14 +753,14 @@
 	/// @param tokenId Id for the token.
 	#[solidity(hide)]
 	fn cross_owner_of(&self, token_id: U256) -> Result<eth::CrossAddress> {
-		Self::owner_of_cross(&self, token_id)
+		Self::owner_of_cross(self, token_id)
 	}
 
 	/// Returns the owner (in cross format) of the token.
 	///
 	/// @param tokenId Id for the token.
 	fn owner_of_cross(&self, token_id: U256) -> Result<eth::CrossAddress> {
-		Self::token_owner(&self, token_id.try_into()?)
+		Self::token_owner(self, token_id.try_into()?)
 			.map(|o| eth::CrossAddress::from_sub_cross_account::<T>(&o))
 			.map_err(|_| Error::Revert("token not found".into()))
 	}
@@ -789,7 +790,7 @@
 			.collect::<Result<Vec<_>>>()?;
 
 		<Self as CommonCollectionOperations<T>>::token_properties(
-			&self,
+			self,
 			token_id.try_into()?,
 			if keys.is_empty() { None } else { Some(keys) },
 		)
@@ -1021,7 +1022,7 @@
 						.try_into()
 						.map_err(|_| "token uri is too long")?,
 				})
-				.map_err(|e| Error::Revert(alloc::format!("Can't add property: {:?}", e)))?;
+				.map_err(|e| Error::Revert(alloc::format!("Can't add property: {e:?}")))?;
 
 			data.push(CreateItemData::<T> {
 				properties,
@@ -1056,7 +1057,7 @@
 			.map(eth::Property::try_into)
 			.collect::<Result<Vec<_>>>()?
 			.try_into()
-			.map_err(|_| Error::Revert(alloc::format!("too many properties")))?;
+			.map_err(|_| Error::Revert("too many properties".to_string()))?;
 
 		let caller = T::CrossAccountId::from_eth(caller);
 
modifiedpallets/nonfungible/src/lib.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -166,10 +166,7 @@
 
 	#[pallet::config]
 	pub trait Config:
-		frame_system::Config
-		+ pallet_common::Config
-		+ pallet_structure::Config
-		+ pallet_evm::Config
+		frame_system::Config + pallet_common::Config + pallet_structure::Config + pallet_evm::Config
 	{
 		type WeightInfo: WeightInfo;
 	}
@@ -860,13 +857,7 @@
 
 		<PalletStructure<T>>::unnest_if_nested(&token_data.owner, collection.id, token);
 
-		<TokenData<T>>::insert(
-			(collection.id, token),
-			ItemData {
-				owner: to.clone(),
-				..token_data
-			},
-		);
+		<TokenData<T>>::insert((collection.id, token), ItemData { owner: to.clone() });
 
 		if let Some(balance_to) = balance_to {
 			// from != to
modifiedpallets/refungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -21,6 +21,7 @@
 
 extern crate alloc;
 
+use alloc::string::ToString;
 use core::{
 	char::{REPLACEMENT_CHARACTER, decode_utf16},
 	convert::TryInto,
@@ -353,8 +354,7 @@
 				.transpose()
 				.map_err(|e| {
 					Error::Revert(alloc::format!(
-						"Can not convert value \"baseURI\" to string with error \"{}\"",
-						e
+						"Can not convert value \"baseURI\" to string with error \"{e}\""
 					))
 				})?;
 
@@ -482,8 +482,8 @@
 			.recorder
 			.weight_calls_budget(<StructureWeight<T>>::find_parent());
 
-		let balance = balance(&self, token, &from)?;
-		ensure_single_owner(&self, token, balance)?;
+		let balance = balance(self, token, &from)?;
+		ensure_single_owner(self, token, balance)?;
 
 		<Pallet<T>>::transfer_from(self, &caller, &from, &to, token, balance, &budget)
 			.map_err(dispatch_to_evm::<T>)?;
@@ -575,8 +575,8 @@
 		let caller = T::CrossAccountId::from_eth(caller);
 		let token = token_id.try_into()?;
 
-		let balance = balance(&self, token, &caller)?;
-		ensure_single_owner(&self, token, balance)?;
+		let balance = balance(self, token, &caller)?;
+		ensure_single_owner(self, token, balance)?;
 
 		<Pallet<T>>::burn(self, &caller, token, balance).map_err(dispatch_to_evm::<T>)?;
 		Ok(())
@@ -622,7 +622,7 @@
 			return Err("item id should be next".into());
 		}
 
-		let users = [(to.clone(), 1)]
+		let users = [(to, 1)]
 			.into_iter()
 			.collect::<BTreeMap<_, _>>()
 			.try_into()
@@ -706,9 +706,9 @@
 					.try_into()
 					.map_err(|_| "token uri is too long")?,
 			})
-			.map_err(|e| Error::Revert(alloc::format!("Can't add property: {:?}", e)))?;
+			.map_err(|e| Error::Revert(alloc::format!("Can't add property: {e:?}")))?;
 
-		let users = [(to.clone(), 1)]
+		let users = [(to, 1)]
 			.into_iter()
 			.collect::<BTreeMap<_, _>>()
 			.try_into()
@@ -750,7 +750,7 @@
 		.map(Clone::clone)
 		.ok_or_else(|| {
 			let key = String::from_utf8(key.clone().into_inner()).unwrap_or_default();
-			Error::Revert(alloc::format!("No permission for key {}", key))
+			Error::Revert(alloc::format!("No permission for key {key}"))
 		})?;
 	Ok(a)
 }
@@ -785,14 +785,14 @@
 	/// @param tokenId Id for the token.
 	#[solidity(hide)]
 	fn cross_owner_of(&self, token_id: U256) -> Result<eth::CrossAddress> {
-		Self::owner_of_cross(&self, token_id)
+		Self::owner_of_cross(self, token_id)
 	}
 
 	/// Returns the owner (in cross format) of the token.
 	///
 	/// @param tokenId Id for the token.
 	fn owner_of_cross(&self, token_id: U256) -> Result<eth::CrossAddress> {
-		Self::token_owner(&self, token_id.try_into()?)
+		Self::token_owner(self, token_id.try_into()?)
 			.map(|o| eth::CrossAddress::from_sub_cross_account::<T>(&o))
 			.or_else(|err| match err {
 				TokenOwnerError::NotFound => Err(Error::Revert("token not found".into())),
@@ -827,7 +827,7 @@
 			.collect::<Result<Vec<_>>>()?;
 
 		<Self as CommonCollectionOperations<T>>::token_properties(
-			&self,
+			self,
 			token_id.try_into()?,
 			if keys.is_empty() { None } else { Some(keys) },
 		)
@@ -1004,7 +1004,7 @@
 			}
 			expected_index = expected_index.checked_add(1).ok_or("item id overflow")?;
 		}
-		let users = [(to.clone(), 1)]
+		let users = [(to, 1)]
 			.into_iter()
 			.collect::<BTreeMap<_, _>>()
 			.try_into()
@@ -1046,7 +1046,7 @@
 			.weight_calls_budget(<StructureWeight<T>>::find_parent());
 
 		let mut data = Vec::with_capacity(tokens.len());
-		let users: BoundedBTreeMap<_, _, _> = [(to.clone(), 1)]
+		let users: BoundedBTreeMap<_, _, _> = [(to, 1)]
 			.into_iter()
 			.collect::<BTreeMap<_, _>>()
 			.try_into()
@@ -1067,7 +1067,7 @@
 						.try_into()
 						.map_err(|_| "token uri is too long")?,
 				})
-				.map_err(|e| Error::Revert(alloc::format!("Can't add property: {:?}", e)))?;
+				.map_err(|e| Error::Revert(alloc::format!("Can't add property: {e:?}")))?;
 
 			let create_item_data = CreateItemData::<T> {
 				users: users.clone(),
@@ -1103,7 +1103,7 @@
 			.map(eth::Property::try_into)
 			.collect::<Result<Vec<_>>>()?
 			.try_into()
-			.map_err(|_| Error::Revert(alloc::format!("too many properties")))?;
+			.map_err(|_| Error::Revert("too many properties".to_string()))?;
 
 		let caller = T::CrossAccountId::from_eth(caller);
 
modifiedpallets/refungible/src/lib.rsdiffbeforeafterboth
--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -1124,7 +1124,7 @@
 
 		if collection.ignores_token_restrictions(spender) {
 			return Ok(Self::compute_allowance_decrease(
-				collection, token, from, &spender, amount,
+				collection, token, from, spender, amount,
 			));
 		}
 
@@ -1143,7 +1143,7 @@
 			return Ok(None);
 		}
 
-		let allowance = Self::compute_allowance_decrease(collection, token, from, &spender, amount);
+		let allowance = Self::compute_allowance_decrease(collection, token, from, spender, amount);
 		if allowance.is_some() {
 			return Ok(allowance);
 		}
modifiedpallets/scheduler-v2/src/lib.rsdiffbeforeafterboth
--- a/pallets/scheduler-v2/src/lib.rs
+++ b/pallets/scheduler-v2/src/lib.rs
@@ -969,7 +969,7 @@
 		call: ScheduledCall<T>,
 	) -> Result<TaskAddress<T::BlockNumber>, DispatchError> {
 		// ensure id it is unique
-		if Lookup::<T>::contains_key(&id) {
+		if Lookup::<T>::contains_key(id) {
 			return Err(Error::<T>::FailedToSchedule.into());
 		}
 
modifiedpallets/structure/src/lib.rsdiffbeforeafterboth
--- a/pallets/structure/src/lib.rs
+++ b/pallets/structure/src/lib.rs
@@ -280,7 +280,7 @@
 	) -> DispatchResultWithPostInfo {
 		let dispatch = T::CollectionDispatch::dispatch(collection)?;
 		let dispatch = dispatch.as_dyn();
-		dispatch.burn_item_recursively(from.clone(), token, self_budget, breadth_budget)
+		dispatch.burn_item_recursively(from, token, self_budget, breadth_budget)
 	}
 
 	/// Check if `token` indirectly owned by `user`
@@ -396,7 +396,7 @@
 		account: &T::CrossAccountId,
 		action: impl FnOnce(&dyn CommonCollectionOperations<T>, TokenId) -> DispatchResult,
 	) -> DispatchResult {
-		if is_collection(&account.as_eth()) {
+		if is_collection(account.as_eth()) {
 			fail!(<Error<T>>::CantNestTokenUnderCollection);
 		}
 		let Some((collection, token)) = T::CrossTokenAddressMapping::address_to_token(account) else {
modifiedpallets/unique/src/eth/mod.rsdiffbeforeafterboth
--- a/pallets/unique/src/eth/mod.rs
+++ b/pallets/unique/src/eth/mod.rs
@@ -113,13 +113,9 @@
 	let collection_helpers_address =
 		T::CrossAccountId::from_eth(<T as pallet_common::Config>::ContractAddress::get());
 
-	let collection_id = T::CollectionDispatch::create(
-		caller.clone(),
-		collection_helpers_address,
-		data,
-		Default::default(),
-	)
-	.map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;
+	let collection_id =
+		T::CollectionDispatch::create(caller, collection_helpers_address, data, Default::default())
+			.map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;
 	let address = pallet_common::eth::collection_id_to_address(collection_id);
 	Ok(address)
 }
@@ -132,8 +128,7 @@
 		.expect("Collection creation price should be convertible to u128");
 	if value != creation_price {
 		return Err(format!(
-			"Sent amount not equals to collection creation price ({0})",
-			creation_price
+			"Sent amount not equals to collection creation price ({creation_price})",
 		)
 		.into());
 	}
@@ -383,8 +378,7 @@
 		map_eth_to_id(&collection_address)
 			.map(|id| id.0)
 			.ok_or(Error::Revert(format!(
-				"failed to convert address {} into collectionId.",
-				collection_address
+				"failed to convert address {collection_address} into collectionId."
 			)))
 	}
 }
@@ -422,5 +416,5 @@
 generate_stubgen!(collection_helper_iface, CollectionHelpersCall<()>, false);
 
 fn error_field_too_long(feild: &str, bound: usize) -> Error {
-	Error::Revert(format!("{} is too long. Max length is {}.", feild, bound))
+	Error::Revert(format!("{feild} is too long. Max length is {bound}."))
 }
modifiedpallets/unique/src/lib.rsdiffbeforeafterboth
--- a/pallets/unique/src/lib.rs
+++ b/pallets/unique/src/lib.rs
@@ -507,7 +507,7 @@
 			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
 			let new_owner = T::CrossAccountId::from_sub(new_owner);
 			let mut target_collection = <CollectionHandle<T>>::try_get(collection_id)?;
-			target_collection.change_owner(sender, new_owner.clone())
+			target_collection.change_owner(sender, new_owner)
 		}
 
 		/// Add an admin to a collection.
@@ -667,7 +667,7 @@
 		/// * `owner`: Address of the initial owner of the item.
 		/// * `data`: Token data describing the item to store on chain.
 		#[pallet::call_index(11)]
-		#[pallet::weight(T::CommonWeightInfo::create_item(&data))]
+		#[pallet::weight(T::CommonWeightInfo::create_item(data))]
 		pub fn create_item(
 			origin: OriginFor<T>,
 			collection_id: CollectionId,
@@ -701,7 +701,7 @@
 		/// * `owner`: Address of the initial owner of the tokens.
 		/// * `items_data`: Vector of data describing each item to be created.
 		#[pallet::call_index(12)]
-		#[pallet::weight(T::CommonWeightInfo::create_multiple_items(&items_data))]
+		#[pallet::weight(T::CommonWeightInfo::create_multiple_items(items_data))]
 		pub fn create_multiple_items(
 			origin: OriginFor<T>,
 			collection_id: CollectionId,
@@ -889,7 +889,7 @@
 		/// * `collection_id`: ID of the collection to which the tokens would belong.
 		/// * `data`: Explicit item creation data.
 		#[pallet::call_index(18)]
-		#[pallet::weight(T::CommonWeightInfo::create_multiple_items_ex(&data))]
+		#[pallet::weight(T::CommonWeightInfo::create_multiple_items_ex(data))]
 		pub fn create_multiple_items_ex(
 			origin: OriginFor<T>,
 			collection_id: CollectionId,
@@ -1313,7 +1313,7 @@
 			collection_id: CollectionId,
 		) -> DispatchResult {
 			let mut target_collection = <CollectionHandle<T>>::try_get(collection_id)?;
-			target_collection.force_set_sponsor(sponsor.clone())
+			target_collection.force_set_sponsor(sponsor)
 		}
 
 		/// Force remove `sponsor` for `collection`.
modifiedprimitives/data-structs/src/bounded.rsdiffbeforeafterboth
--- a/primitives/data-structs/src/bounded.rs
+++ b/primitives/data-structs/src/bounded.rs
@@ -63,7 +63,7 @@
 	V: fmt::Debug,
 {
 	use core::fmt::Debug;
-	(&v as &Vec<V>).fmt(f)
+	(v as &Vec<V>).fmt(f)
 }
 
 #[cfg(feature = "serde1")]
@@ -114,7 +114,7 @@
 	V: fmt::Debug,
 {
 	use core::fmt::Debug;
-	(&v as &BTreeMap<K, V>).fmt(f)
+	(v as &BTreeMap<K, V>).fmt(f)
 }
 
 #[cfg(feature = "serde1")]
@@ -157,5 +157,5 @@
 	K: fmt::Debug + Ord,
 {
 	use core::fmt::Debug;
-	(&v as &BTreeSet<K>).fmt(f)
+	(v as &BTreeSet<K>).fmt(f)
 }
modifiedprimitives/data-structs/src/lib.rsdiffbeforeafterboth
--- a/primitives/data-structs/src/lib.rs
+++ b/primitives/data-structs/src/lib.rs
@@ -536,7 +536,7 @@
 	type Target = Vec<u8>;
 
 	fn deref(&self) -> &Self::Target {
-		return &self.0;
+		&self.0
 	}
 }
 
@@ -816,6 +816,11 @@
 		Self(Default::default())
 	}
 }
+impl Default for OwnerRestrictedSet {
+	fn default() -> Self {
+		Self::new()
+	}
+}
 impl core::ops::Deref for OwnerRestrictedSet {
 	type Target = OwnerRestrictedSetInner;
 	fn deref(&self) -> &Self::Target {
@@ -1098,9 +1103,9 @@
 	pub value: PropertyValue,
 }
 
-impl Into<(PropertyKey, PropertyValue)> for Property {
-	fn into(self) -> (PropertyKey, PropertyValue) {
-		(self.key, self.value)
+impl From<Property> for (PropertyKey, PropertyValue) {
+	fn from(value: Property) -> Self {
+		(value.key, value.value)
 	}
 }
 
@@ -1116,9 +1121,9 @@
 	pub permission: PropertyPermission,
 }
 
-impl Into<(PropertyKey, PropertyPermission)> for PropertyKeyPermission {
-	fn into(self) -> (PropertyKey, PropertyPermission) {
-		(self.key, self.permission)
+impl From<PropertyKeyPermission> for (PropertyKey, PropertyPermission) {
+	fn from(value: PropertyKeyPermission) -> Self {
+		(value.key, value.permission)
 	}
 }
 
@@ -1415,7 +1420,7 @@
 		value: Self::Value,
 	) -> Result<Option<Self::Value>, PropertiesError> {
 		let key_size = scoped_slice_size(scope, &key);
-		let value_size = slice_size(&value) as u32;
+		let value_size = slice_size(&value);
 
 		if self.consumed_space + value_size + key_size > S && !cfg!(feature = "runtime-benchmarks")
 		{
@@ -1425,7 +1430,7 @@
 		let old_value = self.map.try_scoped_set(scope, key, value)?;
 
 		if let Some(old_value) = old_value.as_ref() {
-			let old_value_size = slice_size(&old_value);
+			let old_value_size = slice_size(old_value);
 			self.consumed_space = self.consumed_space.saturating_sub(old_value_size) + value_size;
 		} else {
 			self.consumed_space += key_size + value_size;
modifiedruntime/common/config/xcm/foreignassets.rsdiffbeforeafterboth
--- a/runtime/common/config/xcm/foreignassets.rs
+++ b/runtime/common/config/xcm/foreignassets.rs
@@ -65,7 +65,7 @@
 			return ConvertAssetId::convert_ref(AssetIds::NativeAssetId(NativeCurrency::Here));
 		}
 
-		match XcmForeignAssetIdMapping::<Runtime>::get_currency_id(id.clone()) {
+		match XcmForeignAssetIdMapping::<Runtime>::get_currency_id(*id) {
 			Some(AssetIds::ForeignAssetId(foreign_asset_id)) => {
 				ConvertAssetId::convert_ref(AssetIds::ForeignAssetId(foreign_asset_id))
 			}
@@ -206,9 +206,7 @@
 			return Some(AssetIds::NativeAssetId(NativeCurrency::Parent));
 		}
 
-		if let Some(currency_id) =
-			XcmForeignAssetIdMapping::<Runtime>::get_currency_id(location.clone())
-		{
+		if let Some(currency_id) = XcmForeignAssetIdMapping::<Runtime>::get_currency_id(location) {
 			return Some(currency_id);
 		}
 
modifiedruntime/common/ethereum/precompiles/mod.rsdiffbeforeafterboth
--- a/runtime/common/ethereum/precompiles/mod.rs
+++ b/runtime/common/ethereum/precompiles/mod.rs
@@ -37,6 +37,16 @@
 		[hash(1), hash(20482)]
 	}
 }
+
+impl<R> Default for UniquePrecompiles<R>
+where
+	R: pallet_evm::Config,
+{
+	fn default() -> Self {
+		Self::new()
+	}
+}
+
 impl<R> PrecompileSet for UniquePrecompiles<R>
 where
 	R: pallet_evm::Config,
modifiedruntime/common/ethereum/precompiles/sr25519.rsdiffbeforeafterboth
--- a/runtime/common/ethereum/precompiles/sr25519.rs
+++ b/runtime/common/ethereum/precompiles/sr25519.rs
@@ -64,7 +64,7 @@
 
 		// Parse arguments
 		let public: sr25519::Public =
-			sr25519::Public::unchecked_from(input.read::<H256>(gasometer)?).into();
+			sr25519::Public::unchecked_from(input.read::<H256>(gasometer)?);
 		let signature_bytes: Vec<u8> = input.read::<Bytes>(gasometer)?.into();
 		let message: Vec<u8> = input.read::<Bytes>(gasometer)?.into();
 
modifiedruntime/common/ethereum/precompiles/utils/data.rsdiffbeforeafterboth
before · runtime/common/ethereum/precompiles/utils/data.rs
1// Copyright 2019-2022 PureStake Inc.2// Copyright 2022      Stake Technologies3// This file is part of Utils package, originally developed by Purestake Inc.4// Utils package used in Astar Network in terms of GPLv3.5//6// Utils is free software: you can redistribute it and/or modify7// it under the terms of the GNU General Public License as published by8// the Free Software Foundation, either version 3 of the License, or9// (at your option) any later version.1011// Utils is distributed in the hope that it will be useful,12// but WITHOUT ANY WARRANTY; without even the implied warranty of13// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the14// GNU General Public License for more details.1516// You should have received a copy of the GNU General Public License17// along with Utils.  If not, see <http://www.gnu.org/licenses/>.1819use super::{EvmResult, Gasometer};2021use sp_std::borrow::ToOwned;22use core::{any::type_name, ops::Range};23use sp_core::{H160, H256, U256};24use sp_std::{convert::TryInto, vec, vec::Vec};2526/// The `address` type of Solidity.27/// H160 could represent 2 types of data (bytes20 and address) that are not encoded the same way.28/// To avoid issues writing H160 is thus not supported.29#[derive(Clone, Copy, Debug, Eq, PartialEq)]30pub struct Address(pub H160);3132impl From<H160> for Address {33	fn from(a: H160) -> Address {34		Address(a)35	}36}3738impl From<Address> for H160 {39	fn from(a: Address) -> H160 {40		a.041	}42}4344/// The `bytes`/`string` type of Solidity.45/// It is different from `Vec<u8>` which will be serialized with padding for each `u8` element46/// of the array, while `Bytes` is tightly packed.47#[derive(Clone, Debug, Eq, PartialEq)]48pub struct Bytes(pub Vec<u8>);4950impl From<&[u8]> for Bytes {51	fn from(a: &[u8]) -> Self {52		Self(a.to_owned())53	}54}5556impl From<&str> for Bytes {57	fn from(a: &str) -> Self {58		a.as_bytes().into()59	}60}6162impl Into<Vec<u8>> for Bytes {63	fn into(self: Self) -> Vec<u8> {64		self.065	}66}6768/// Wrapper around an EVM input slice, helping to parse it.69/// Provide functions to parse common types.70#[derive(Clone, Copy, Debug)]71pub struct EvmDataReader<'a> {72	input: &'a [u8],73	cursor: usize,74}7576impl<'a> EvmDataReader<'a> {77	/// Create a new input parser.78	pub fn new(input: &'a [u8]) -> Self {79		Self { input, cursor: 0 }80	}8182	/// Create a new input parser from a selector-initial input.83	pub fn new_with_selector<T>(gasometer: &Gasometer, input: &'a [u8]) -> EvmResult<(Self, T)>84	where85		T: num_enum::TryFromPrimitive<Primitive = u32>,86	{87		if input.len() < 4 {88			return Err(gasometer.revert("tried to parse selector out of bounds"));89		}9091		let mut buffer = [0u8; 4];92		buffer.copy_from_slice(&input[0..4]);93		let selector = T::try_from_primitive(u32::from_be_bytes(buffer)).map_err(|_| {94			log::trace!(95				target: "precompile-utils",96				"Failed to match function selector for {}",97				type_name::<T>()98			);99			gasometer.revert("unknown selector")100		})?;101102		Ok((Self::new(&input[4..]), selector))103	}104105	/// Check the input has at least the correct amount of arguments before the end (32 bytes values).106	pub fn expect_arguments(&self, gasometer: &Gasometer, args: usize) -> EvmResult {107		if self.input.len() >= self.cursor + args * 32 {108			Ok(())109		} else {110			Err(gasometer.revert("input doesn't match expected length"))111		}112	}113114	/// Read data from the input.115	/// Must be provided a gasometer to generate correct Revert errors.116	/// TODO : Benchmark and add cost of parsing to gasometer ?117	pub fn read<T: EvmData>(&mut self, gasometer: &Gasometer) -> EvmResult<T> {118		T::read(self, gasometer)119	}120121	/// Reads a pointer, returning a reader targetting the pointed location.122	pub fn read_pointer(&mut self, gasometer: &Gasometer) -> EvmResult<Self> {123		let offset: usize = self124			.read::<U256>(gasometer)125			.map_err(|_| gasometer.revert("tried to parse array offset out of bounds"))?126			.try_into()127			.map_err(|_| gasometer.revert("array offset is too large"))?;128129		if offset >= self.input.len() {130			return Err(gasometer.revert("pointer points out of bounds"));131		}132133		Ok(Self {134			input: &self.input[offset..],135			cursor: 0,136		})137	}138139	/// Move the reading cursor with provided length, and return a range from the previous cursor140	/// location to the new one.141	/// Checks cursor overflows.142	fn move_cursor(&mut self, gasometer: &Gasometer, len: usize) -> EvmResult<Range<usize>> {143		let start = self.cursor;144		let end = self145			.cursor146			.checked_add(len)147			.ok_or_else(|| gasometer.revert("data reading cursor overflow"))?;148149		self.cursor = end;150151		Ok(start..end)152	}153}154155/// Help build an EVM input/output data.156///157/// Functions takes `self` to allow chaining all calls like158/// `EvmDataWriter::new().write(...).write(...).build()`.159/// While it could be more ergonomic to take &mut self, this would160/// prevent to have a `build` function that don't clone the output.161#[derive(Clone, Debug)]162pub struct EvmDataWriter {163	pub(crate) data: Vec<u8>,164	offset_data: Vec<OffsetDatum>,165	selector: Option<u32>,166}167168#[derive(Clone, Debug)]169struct OffsetDatum {170	// Offset location in the container data.171	offset_position: usize,172	// Data pointed by the offset that must be inserted at the end of container data.173	data: Vec<u8>,174	// Inside of arrays, the offset is not from the start of array data (length), but from the start175	// of the item. This shift allow to correct this.176	offset_shift: usize,177}178179impl EvmDataWriter {180	/// Creates a new empty output builder (without selector).181	pub fn new() -> Self {182		Self {183			data: vec![],184			offset_data: vec![],185			selector: None,186		}187	}188189	/// Return the built data.190	pub fn build(mut self) -> Vec<u8> {191		Self::bake_offsets(&mut self.data, self.offset_data);192193		if let Some(selector) = self.selector {194			let mut output = selector.to_be_bytes().to_vec();195			output.append(&mut self.data);196			output197		} else {198			self.data199		}200	}201202	/// Add offseted data at the end of this writer's data, updating the offsets.203	fn bake_offsets(output: &mut Vec<u8>, offsets: Vec<OffsetDatum>) {204		for mut offset_datum in offsets {205			let offset_position = offset_datum.offset_position;206			let offset_position_end = offset_position + 32;207208			// The offset is the distance between the start of the data and the209			// start of the pointed data (start of a struct, length of an array).210			// Offsets in inner data are relative to the start of their respective "container".211			// However in arrays the "container" is actually the item itself instead of the whole212			// array, which is corrected by `offset_shift`.213			let free_space_offset = output.len() - offset_datum.offset_shift;214215			// Override dummy offset to the offset it will be in the final output.216			U256::from(free_space_offset)217				.to_big_endian(&mut output[offset_position..offset_position_end]);218219			// Append this data at the end of the current output.220			output.append(&mut offset_datum.data);221		}222	}223224	/// Write arbitrary bytes.225	/// Doesn't handle any alignement checks, prefer using `write` instead if possible.226	fn write_raw_bytes(mut self, value: &[u8]) -> Self {227		self.data.extend_from_slice(value);228		self229	}230231	/// Write data of requested type.232	pub fn write<T: EvmData>(mut self, value: T) -> Self {233		T::write(&mut self, value);234		self235	}236237	/// Writes a pointer to given data.238	/// The data will be appended when calling `build`.239	/// Initially write a dummy value as offset in this writer's data, which will be replaced by240	/// the correct offset once the pointed data is appended.241	///242	/// Takes `&mut self` since its goal is to be used inside `EvmData` impl and not in chains.243	pub fn write_pointer(&mut self, data: Vec<u8>) {244		let offset_position = self.data.len();245		H256::write(self, H256::repeat_byte(0xff));246247		self.offset_data.push(OffsetDatum {248			offset_position,249			data,250			offset_shift: 0,251		});252	}253}254255impl Default for EvmDataWriter {256	fn default() -> Self {257		Self::new()258	}259}260261/// Data that can be converted from and to EVM data types.262pub trait EvmData: Sized {263	fn read(reader: &mut EvmDataReader, gasometer: &Gasometer) -> EvmResult<Self>;264	fn write(writer: &mut EvmDataWriter, value: Self);265}266267impl EvmData for H256 {268	fn read(reader: &mut EvmDataReader, gasometer: &Gasometer) -> EvmResult<Self> {269		let range = reader.move_cursor(gasometer, 32)?;270271		let data = reader272			.input273			.get(range)274			.ok_or_else(|| gasometer.revert("tried to parse H256 out of bounds"))?;275276		Ok(H256::from_slice(data))277	}278279	fn write(writer: &mut EvmDataWriter, value: Self) {280		writer.data.extend_from_slice(value.as_bytes());281	}282}283284impl EvmData for Address {285	fn read(reader: &mut EvmDataReader, gasometer: &Gasometer) -> EvmResult<Self> {286		let range = reader.move_cursor(gasometer, 32)?;287288		let data = reader289			.input290			.get(range)291			.ok_or_else(|| gasometer.revert("tried to parse H160 out of bounds"))?;292293		Ok(H160::from_slice(&data[12..32]).into())294	}295296	fn write(writer: &mut EvmDataWriter, value: Self) {297		H256::write(writer, value.0.into());298	}299}300301impl EvmData for U256 {302	fn read(reader: &mut EvmDataReader, gasometer: &Gasometer) -> EvmResult<Self> {303		let range = reader.move_cursor(gasometer, 32)?;304305		let data = reader306			.input307			.get(range)308			.ok_or_else(|| gasometer.revert("tried to parse U256 out of bounds"))?;309310		Ok(U256::from_big_endian(data))311	}312313	fn write(writer: &mut EvmDataWriter, value: Self) {314		let mut buffer = [0u8; 32];315		value.to_big_endian(&mut buffer);316		writer.data.extend_from_slice(&buffer);317	}318}319320macro_rules! impl_evmdata_for_uints {321	($($uint:ty, )*) => {322		$(323			impl EvmData for $uint {324				fn read(reader: &mut EvmDataReader, gasometer: &Gasometer) -> EvmResult<Self> {325					let range = reader.move_cursor(gasometer, 32)?;326327					let data = reader328						.input329						.get(range)330						.ok_or_else(|| gasometer.revert(alloc::format!(331							"tried to parse {} out of bounds", core::any::type_name::<Self>()332						)))?;333334					let mut buffer = [0u8; core::mem::size_of::<Self>()];335					buffer.copy_from_slice(&data[32 - core::mem::size_of::<Self>()..]);336					Ok(Self::from_be_bytes(buffer))337				}338339				fn write(writer: &mut EvmDataWriter, value: Self) {340					let mut buffer = [0u8; 32];341					buffer[32 - core::mem::size_of::<Self>()..].copy_from_slice(&value.to_be_bytes());342					writer.data.extend_from_slice(&buffer);343				}344			}345		)*346	};347}348349impl_evmdata_for_uints!(u16, u32, u64, u128,);350351// The implementation for u8 is specific, for performance reasons.352impl EvmData for u8 {353	fn read(reader: &mut EvmDataReader, gasometer: &Gasometer) -> EvmResult<Self> {354		let range = reader.move_cursor(gasometer, 32)?;355356		let data = reader357			.input358			.get(range)359			.ok_or_else(|| gasometer.revert("tried to parse u64 out of bounds"))?;360361		Ok(data[31])362	}363364	fn write(writer: &mut EvmDataWriter, value: Self) {365		let mut buffer = [0u8; 32];366		buffer[31] = value;367368		writer.data.extend_from_slice(&buffer);369	}370}371372impl EvmData for bool {373	fn read(reader: &mut EvmDataReader, gasometer: &Gasometer) -> EvmResult<Self> {374		let h256 = H256::read(reader, gasometer)375			.map_err(|_| gasometer.revert("tried to parse bool out of bounds"))?;376377		Ok(!h256.is_zero())378	}379380	fn write(writer: &mut EvmDataWriter, value: Self) {381		let mut buffer = [0u8; 32];382		if value {383			buffer[31] = 1;384		}385386		writer.data.extend_from_slice(&buffer);387	}388}389390impl<T: EvmData> EvmData for Vec<T> {391	fn read(reader: &mut EvmDataReader, gasometer: &Gasometer) -> EvmResult<Self> {392		let mut inner_reader = reader.read_pointer(gasometer)?;393394		let array_size: usize = inner_reader395			.read::<U256>(gasometer)396			.map_err(|_| gasometer.revert("tried to parse array length out of bounds"))?397			.try_into()398			.map_err(|_| gasometer.revert("array length is too large"))?;399400		let mut array = vec![];401402		let mut item_reader = EvmDataReader {403			input: inner_reader404				.input405				.get(32..)406				.ok_or_else(|| gasometer.revert("try to read array items out of bound"))?,407			cursor: 0,408		};409410		for _ in 0..array_size {411			array.push(item_reader.read(gasometer)?);412		}413414		Ok(array)415	}416417	fn write(writer: &mut EvmDataWriter, value: Self) {418		let mut inner_writer = EvmDataWriter::new().write(U256::from(value.len()));419420		for inner in value {421			// Any offset in items are relative to the start of the item instead of the422			// start of the array. However if there is offseted data it must but appended after423			// all items (offsets) are written. We thus need to rely on `compute_offsets` to do424			// that, and must store a "shift" to correct the offsets.425			let shift = inner_writer.data.len();426			let item_writer = EvmDataWriter::new().write(inner);427428			inner_writer = inner_writer.write_raw_bytes(&item_writer.data);429			for mut offset_datum in item_writer.offset_data {430				offset_datum.offset_shift += 32;431				offset_datum.offset_position += shift;432				inner_writer.offset_data.push(offset_datum);433			}434		}435436		writer.write_pointer(inner_writer.build());437	}438}439440impl EvmData for Bytes {441	fn read(reader: &mut EvmDataReader, gasometer: &Gasometer) -> EvmResult<Self> {442		let mut inner_reader = reader.read_pointer(gasometer)?;443444		// Read bytes/string size.445		let array_size: usize = inner_reader446			.read::<U256>(gasometer)447			.map_err(|_| gasometer.revert("tried to parse bytes/string length out of bounds"))?448			.try_into()449			.map_err(|_| gasometer.revert("bytes/string length is too large"))?;450451		// Get valid range over the bytes data.452		let range = inner_reader.move_cursor(gasometer, array_size)?;453454		let data = inner_reader455			.input456			.get(range)457			.ok_or_else(|| gasometer.revert("tried to parse bytes/string out of bounds"))?;458459		let bytes = Self(data.to_owned());460461		Ok(bytes)462	}463464	fn write(writer: &mut EvmDataWriter, value: Self) {465		let length = value.0.len();466467		// Pad the data.468		// Leave it as is if a multiple of 32, otherwise pad to next469		// multiple or 32.470		let chunks = length / 32;471		let padded_size = match length % 32 {472			0 => chunks * 32,473			_ => (chunks + 1) * 32,474		};475476		let mut value = value.0.to_vec();477		value.resize(padded_size, 0);478479		writer.write_pointer(480			EvmDataWriter::new()481				.write(U256::from(length))482				.write_raw_bytes(&value)483				.build(),484		);485	}486}
after · runtime/common/ethereum/precompiles/utils/data.rs
1// Copyright 2019-2022 PureStake Inc.2// Copyright 2022      Stake Technologies3// This file is part of Utils package, originally developed by Purestake Inc.4// Utils package used in Astar Network in terms of GPLv3.5//6// Utils is free software: you can redistribute it and/or modify7// it under the terms of the GNU General Public License as published by8// the Free Software Foundation, either version 3 of the License, or9// (at your option) any later version.1011// Utils is distributed in the hope that it will be useful,12// but WITHOUT ANY WARRANTY; without even the implied warranty of13// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the14// GNU General Public License for more details.1516// You should have received a copy of the GNU General Public License17// along with Utils.  If not, see <http://www.gnu.org/licenses/>.1819use super::{EvmResult, Gasometer};2021use sp_std::borrow::ToOwned;22use core::{any::type_name, ops::Range};23use sp_core::{H160, H256, U256};24use sp_std::{convert::TryInto, vec, vec::Vec};2526/// The `address` type of Solidity.27/// H160 could represent 2 types of data (bytes20 and address) that are not encoded the same way.28/// To avoid issues writing H160 is thus not supported.29#[derive(Clone, Copy, Debug, Eq, PartialEq)]30pub struct Address(pub H160);3132impl From<H160> for Address {33	fn from(a: H160) -> Address {34		Address(a)35	}36}3738impl From<Address> for H160 {39	fn from(a: Address) -> H160 {40		a.041	}42}4344/// The `bytes`/`string` type of Solidity.45/// It is different from `Vec<u8>` which will be serialized with padding for each `u8` element46/// of the array, while `Bytes` is tightly packed.47#[derive(Clone, Debug, Eq, PartialEq)]48pub struct Bytes(pub Vec<u8>);4950impl From<&[u8]> for Bytes {51	fn from(a: &[u8]) -> Self {52		Self(a.to_owned())53	}54}5556impl From<&str> for Bytes {57	fn from(a: &str) -> Self {58		a.as_bytes().into()59	}60}6162impl Into<Vec<u8>> for Bytes {63	fn into(self) -> Vec<u8> {64		self.065	}66}6768/// Wrapper around an EVM input slice, helping to parse it.69/// Provide functions to parse common types.70#[derive(Clone, Copy, Debug)]71pub struct EvmDataReader<'a> {72	input: &'a [u8],73	cursor: usize,74}7576impl<'a> EvmDataReader<'a> {77	/// Create a new input parser.78	pub fn new(input: &'a [u8]) -> Self {79		Self { input, cursor: 0 }80	}8182	/// Create a new input parser from a selector-initial input.83	pub fn new_with_selector<T>(gasometer: &Gasometer, input: &'a [u8]) -> EvmResult<(Self, T)>84	where85		T: num_enum::TryFromPrimitive<Primitive = u32>,86	{87		if input.len() < 4 {88			return Err(gasometer.revert("tried to parse selector out of bounds"));89		}9091		let mut buffer = [0u8; 4];92		buffer.copy_from_slice(&input[0..4]);93		let selector = T::try_from_primitive(u32::from_be_bytes(buffer)).map_err(|_| {94			log::trace!(95				target: "precompile-utils",96				"Failed to match function selector for {}",97				type_name::<T>()98			);99			gasometer.revert("unknown selector")100		})?;101102		Ok((Self::new(&input[4..]), selector))103	}104105	/// Check the input has at least the correct amount of arguments before the end (32 bytes values).106	pub fn expect_arguments(&self, gasometer: &Gasometer, args: usize) -> EvmResult {107		if self.input.len() >= self.cursor + args * 32 {108			Ok(())109		} else {110			Err(gasometer.revert("input doesn't match expected length"))111		}112	}113114	/// Read data from the input.115	/// Must be provided a gasometer to generate correct Revert errors.116	/// TODO : Benchmark and add cost of parsing to gasometer ?117	pub fn read<T: EvmData>(&mut self, gasometer: &Gasometer) -> EvmResult<T> {118		T::read(self, gasometer)119	}120121	/// Reads a pointer, returning a reader targetting the pointed location.122	pub fn read_pointer(&mut self, gasometer: &Gasometer) -> EvmResult<Self> {123		let offset: usize = self124			.read::<U256>(gasometer)125			.map_err(|_| gasometer.revert("tried to parse array offset out of bounds"))?126			.try_into()127			.map_err(|_| gasometer.revert("array offset is too large"))?;128129		if offset >= self.input.len() {130			return Err(gasometer.revert("pointer points out of bounds"));131		}132133		Ok(Self {134			input: &self.input[offset..],135			cursor: 0,136		})137	}138139	/// Move the reading cursor with provided length, and return a range from the previous cursor140	/// location to the new one.141	/// Checks cursor overflows.142	fn move_cursor(&mut self, gasometer: &Gasometer, len: usize) -> EvmResult<Range<usize>> {143		let start = self.cursor;144		let end = self145			.cursor146			.checked_add(len)147			.ok_or_else(|| gasometer.revert("data reading cursor overflow"))?;148149		self.cursor = end;150151		Ok(start..end)152	}153}154155/// Help build an EVM input/output data.156///157/// Functions takes `self` to allow chaining all calls like158/// `EvmDataWriter::new().write(...).write(...).build()`.159/// While it could be more ergonomic to take &mut self, this would160/// prevent to have a `build` function that don't clone the output.161#[derive(Clone, Debug)]162pub struct EvmDataWriter {163	pub(crate) data: Vec<u8>,164	offset_data: Vec<OffsetDatum>,165	selector: Option<u32>,166}167168#[derive(Clone, Debug)]169struct OffsetDatum {170	// Offset location in the container data.171	offset_position: usize,172	// Data pointed by the offset that must be inserted at the end of container data.173	data: Vec<u8>,174	// Inside of arrays, the offset is not from the start of array data (length), but from the start175	// of the item. This shift allow to correct this.176	offset_shift: usize,177}178179impl EvmDataWriter {180	/// Creates a new empty output builder (without selector).181	pub fn new() -> Self {182		Self {183			data: vec![],184			offset_data: vec![],185			selector: None,186		}187	}188189	/// Return the built data.190	pub fn build(mut self) -> Vec<u8> {191		Self::bake_offsets(&mut self.data, self.offset_data);192193		if let Some(selector) = self.selector {194			let mut output = selector.to_be_bytes().to_vec();195			output.append(&mut self.data);196			output197		} else {198			self.data199		}200	}201202	/// Add offseted data at the end of this writer's data, updating the offsets.203	fn bake_offsets(output: &mut Vec<u8>, offsets: Vec<OffsetDatum>) {204		for mut offset_datum in offsets {205			let offset_position = offset_datum.offset_position;206			let offset_position_end = offset_position + 32;207208			// The offset is the distance between the start of the data and the209			// start of the pointed data (start of a struct, length of an array).210			// Offsets in inner data are relative to the start of their respective "container".211			// However in arrays the "container" is actually the item itself instead of the whole212			// array, which is corrected by `offset_shift`.213			let free_space_offset = output.len() - offset_datum.offset_shift;214215			// Override dummy offset to the offset it will be in the final output.216			U256::from(free_space_offset)217				.to_big_endian(&mut output[offset_position..offset_position_end]);218219			// Append this data at the end of the current output.220			output.append(&mut offset_datum.data);221		}222	}223224	/// Write arbitrary bytes.225	/// Doesn't handle any alignement checks, prefer using `write` instead if possible.226	fn write_raw_bytes(mut self, value: &[u8]) -> Self {227		self.data.extend_from_slice(value);228		self229	}230231	/// Write data of requested type.232	pub fn write<T: EvmData>(mut self, value: T) -> Self {233		T::write(&mut self, value);234		self235	}236237	/// Writes a pointer to given data.238	/// The data will be appended when calling `build`.239	/// Initially write a dummy value as offset in this writer's data, which will be replaced by240	/// the correct offset once the pointed data is appended.241	///242	/// Takes `&mut self` since its goal is to be used inside `EvmData` impl and not in chains.243	pub fn write_pointer(&mut self, data: Vec<u8>) {244		let offset_position = self.data.len();245		H256::write(self, H256::repeat_byte(0xff));246247		self.offset_data.push(OffsetDatum {248			offset_position,249			data,250			offset_shift: 0,251		});252	}253}254255impl Default for EvmDataWriter {256	fn default() -> Self {257		Self::new()258	}259}260261/// Data that can be converted from and to EVM data types.262pub trait EvmData: Sized {263	fn read(reader: &mut EvmDataReader, gasometer: &Gasometer) -> EvmResult<Self>;264	fn write(writer: &mut EvmDataWriter, value: Self);265}266267impl EvmData for H256 {268	fn read(reader: &mut EvmDataReader, gasometer: &Gasometer) -> EvmResult<Self> {269		let range = reader.move_cursor(gasometer, 32)?;270271		let data = reader272			.input273			.get(range)274			.ok_or_else(|| gasometer.revert("tried to parse H256 out of bounds"))?;275276		Ok(H256::from_slice(data))277	}278279	fn write(writer: &mut EvmDataWriter, value: Self) {280		writer.data.extend_from_slice(value.as_bytes());281	}282}283284impl EvmData for Address {285	fn read(reader: &mut EvmDataReader, gasometer: &Gasometer) -> EvmResult<Self> {286		let range = reader.move_cursor(gasometer, 32)?;287288		let data = reader289			.input290			.get(range)291			.ok_or_else(|| gasometer.revert("tried to parse H160 out of bounds"))?;292293		Ok(H160::from_slice(&data[12..32]).into())294	}295296	fn write(writer: &mut EvmDataWriter, value: Self) {297		H256::write(writer, value.0.into());298	}299}300301impl EvmData for U256 {302	fn read(reader: &mut EvmDataReader, gasometer: &Gasometer) -> EvmResult<Self> {303		let range = reader.move_cursor(gasometer, 32)?;304305		let data = reader306			.input307			.get(range)308			.ok_or_else(|| gasometer.revert("tried to parse U256 out of bounds"))?;309310		Ok(U256::from_big_endian(data))311	}312313	fn write(writer: &mut EvmDataWriter, value: Self) {314		let mut buffer = [0u8; 32];315		value.to_big_endian(&mut buffer);316		writer.data.extend_from_slice(&buffer);317	}318}319320macro_rules! impl_evmdata_for_uints {321	($($uint:ty, )*) => {322		$(323			impl EvmData for $uint {324				fn read(reader: &mut EvmDataReader, gasometer: &Gasometer) -> EvmResult<Self> {325					let range = reader.move_cursor(gasometer, 32)?;326327					let data = reader328						.input329						.get(range)330						.ok_or_else(|| gasometer.revert(alloc::format!(331							"tried to parse {} out of bounds", core::any::type_name::<Self>()332						)))?;333334					let mut buffer = [0u8; core::mem::size_of::<Self>()];335					buffer.copy_from_slice(&data[32 - core::mem::size_of::<Self>()..]);336					Ok(Self::from_be_bytes(buffer))337				}338339				fn write(writer: &mut EvmDataWriter, value: Self) {340					let mut buffer = [0u8; 32];341					buffer[32 - core::mem::size_of::<Self>()..].copy_from_slice(&value.to_be_bytes());342					writer.data.extend_from_slice(&buffer);343				}344			}345		)*346	};347}348349impl_evmdata_for_uints!(u16, u32, u64, u128,);350351// The implementation for u8 is specific, for performance reasons.352impl EvmData for u8 {353	fn read(reader: &mut EvmDataReader, gasometer: &Gasometer) -> EvmResult<Self> {354		let range = reader.move_cursor(gasometer, 32)?;355356		let data = reader357			.input358			.get(range)359			.ok_or_else(|| gasometer.revert("tried to parse u64 out of bounds"))?;360361		Ok(data[31])362	}363364	fn write(writer: &mut EvmDataWriter, value: Self) {365		let mut buffer = [0u8; 32];366		buffer[31] = value;367368		writer.data.extend_from_slice(&buffer);369	}370}371372impl EvmData for bool {373	fn read(reader: &mut EvmDataReader, gasometer: &Gasometer) -> EvmResult<Self> {374		let h256 = H256::read(reader, gasometer)375			.map_err(|_| gasometer.revert("tried to parse bool out of bounds"))?;376377		Ok(!h256.is_zero())378	}379380	fn write(writer: &mut EvmDataWriter, value: Self) {381		let mut buffer = [0u8; 32];382		if value {383			buffer[31] = 1;384		}385386		writer.data.extend_from_slice(&buffer);387	}388}389390impl<T: EvmData> EvmData for Vec<T> {391	fn read(reader: &mut EvmDataReader, gasometer: &Gasometer) -> EvmResult<Self> {392		let mut inner_reader = reader.read_pointer(gasometer)?;393394		let array_size: usize = inner_reader395			.read::<U256>(gasometer)396			.map_err(|_| gasometer.revert("tried to parse array length out of bounds"))?397			.try_into()398			.map_err(|_| gasometer.revert("array length is too large"))?;399400		let mut array = vec![];401402		let mut item_reader = EvmDataReader {403			input: inner_reader404				.input405				.get(32..)406				.ok_or_else(|| gasometer.revert("try to read array items out of bound"))?,407			cursor: 0,408		};409410		for _ in 0..array_size {411			array.push(item_reader.read(gasometer)?);412		}413414		Ok(array)415	}416417	fn write(writer: &mut EvmDataWriter, value: Self) {418		let mut inner_writer = EvmDataWriter::new().write(U256::from(value.len()));419420		for inner in value {421			// Any offset in items are relative to the start of the item instead of the422			// start of the array. However if there is offseted data it must but appended after423			// all items (offsets) are written. We thus need to rely on `compute_offsets` to do424			// that, and must store a "shift" to correct the offsets.425			let shift = inner_writer.data.len();426			let item_writer = EvmDataWriter::new().write(inner);427428			inner_writer = inner_writer.write_raw_bytes(&item_writer.data);429			for mut offset_datum in item_writer.offset_data {430				offset_datum.offset_shift += 32;431				offset_datum.offset_position += shift;432				inner_writer.offset_data.push(offset_datum);433			}434		}435436		writer.write_pointer(inner_writer.build());437	}438}439440impl EvmData for Bytes {441	fn read(reader: &mut EvmDataReader, gasometer: &Gasometer) -> EvmResult<Self> {442		let mut inner_reader = reader.read_pointer(gasometer)?;443444		// Read bytes/string size.445		let array_size: usize = inner_reader446			.read::<U256>(gasometer)447			.map_err(|_| gasometer.revert("tried to parse bytes/string length out of bounds"))?448			.try_into()449			.map_err(|_| gasometer.revert("bytes/string length is too large"))?;450451		// Get valid range over the bytes data.452		let range = inner_reader.move_cursor(gasometer, array_size)?;453454		let data = inner_reader455			.input456			.get(range)457			.ok_or_else(|| gasometer.revert("tried to parse bytes/string out of bounds"))?;458459		let bytes = Self(data.to_owned());460461		Ok(bytes)462	}463464	fn write(writer: &mut EvmDataWriter, value: Self) {465		let length = value.0.len();466467		// Pad the data.468		// Leave it as is if a multiple of 32, otherwise pad to next469		// multiple or 32.470		let chunks = length / 32;471		let padded_size = match length % 32 {472			0 => chunks * 32,473			_ => (chunks + 1) * 32,474		};475476		let mut value = value.0.to_vec();477		value.resize(padded_size, 0);478479		writer.write_pointer(480			EvmDataWriter::new()481				.write(U256::from(length))482				.write_raw_bytes(&value)483				.build(),484		);485	}486}
modifiedruntime/common/ethereum/precompiles/utils/mod.rsdiffbeforeafterboth
--- a/runtime/common/ethereum/precompiles/utils/mod.rs
+++ b/runtime/common/ethereum/precompiles/utils/mod.rs
@@ -73,7 +73,6 @@
 		}
 	}
 
-	#[must_use]
 	/// Check that a function call is compatible with the context it is
 	/// called into.
 	pub fn check_function_modifier(
modifiedruntime/common/ethereum/sponsoring.rsdiffbeforeafterboth
--- a/runtime/common/ethereum/sponsoring.rs
+++ b/runtime/common/ethereum/sponsoring.rs
@@ -78,7 +78,7 @@
 							let token_id: TokenId = token_id.try_into().ok()?;
 							withdraw_set_token_property::<T>(
 								&collection,
-								&who,
+								who,
 								&token_id,
 								key.len() + value.len(),
 							)
@@ -88,7 +88,7 @@
 							ERC721UniqueExtensionsCall::Transfer { token_id, .. },
 						) => {
 							let token_id: TokenId = token_id.try_into().ok()?;
-							withdraw_transfer::<T>(&collection, &who, &token_id).map(|()| sponsor)
+							withdraw_transfer::<T>(&collection, who, &token_id).map(|()| sponsor)
 						}
 						UniqueNFTCall::ERC721UniqueMintable(
 							ERC721UniqueMintableCall::Mint { .. }
@@ -97,7 +97,7 @@
 							| ERC721UniqueMintableCall::MintWithTokenUriCheckId { .. },
 						) => withdraw_create_item::<T>(
 							&collection,
-							&who,
+							who,
 							&CreateItemData::NFT(CreateNftData::default()),
 						)
 						.map(|()| sponsor),
modifiedruntime/common/ethereum/sponsoring/refungible.rsdiffbeforeafterboth
--- a/runtime/common/ethereum/sponsoring/refungible.rs
+++ b/runtime/common/ethereum/sponsoring/refungible.rs
@@ -16,7 +16,6 @@
 
 //! Implements EVM sponsoring logic via TransactionValidityHack
 
-use core::convert::TryInto;
 use pallet_common::CollectionHandle;
 use pallet_evm::account::CrossAccountId;
 use pallet_fungible::Config as FungibleConfig;
@@ -95,7 +94,7 @@
 			..
 		} => {
 			let token_id = TokenId::try_from(token_id).ok()?;
-			withdraw_set_token_property::<T>(&collection, &who, &token_id, key.len() + value.len())
+			withdraw_set_token_property::<T>(&collection, who, &token_id, key.len() + value.len())
 		}
 	}
 }
@@ -242,7 +241,7 @@
 
 			MintCross { .. } => withdraw_create_item::<T>(
 				&collection,
-				&who,
+				who,
 				&CreateItemData::NFT(CreateNftData::default()),
 			),
 
@@ -250,7 +249,7 @@
 			| TransferFromCross { token_id, .. }
 			| Transfer { token_id, .. } => {
 				let token_id = TokenId::try_from(token_id).ok()?;
-				withdraw_transfer::<T>(&collection, &who, &token_id)
+				withdraw_transfer::<T>(&collection, who, &token_id)
 			}
 		}
 	}
@@ -275,7 +274,7 @@
 			| MintWithTokenUri { .. }
 			| MintWithTokenUriCheckId { .. } => withdraw_create_item::<T>(
 				&collection,
-				&who,
+				who,
 				&CreateItemData::NFT(CreateNftData::default()),
 			),
 		}
@@ -311,18 +310,15 @@
 
 			Transfer { .. } => {
 				let RefungibleTokenHandle(handle, token_id) = token;
-				let token_id = token_id.try_into().ok()?;
-				withdraw_transfer::<T>(&handle, &who, &token_id)
+				withdraw_transfer::<T>(&handle, who, &token_id)
 			}
 			TransferFrom { from, .. } => {
 				let RefungibleTokenHandle(handle, token_id) = token;
-				let token_id = token_id.try_into().ok()?;
 				let from = T::CrossAccountId::from_eth(from);
 				withdraw_transfer::<T>(&handle, &from, &token_id)
 			}
 			Approve { .. } => {
 				let RefungibleTokenHandle(handle, token_id) = token;
-				let token_id = token_id.try_into().ok()?;
 				withdraw_approve::<T>(&handle, who.as_sub(), &token_id)
 			}
 		}
@@ -351,13 +347,11 @@
 
 			TransferCross { .. } | TransferFromCross { .. } => {
 				let RefungibleTokenHandle(handle, token_id) = token;
-				let token_id = token_id.try_into().ok()?;
-				withdraw_transfer::<T>(&handle, &who, &token_id)
+				withdraw_transfer::<T>(&handle, who, &token_id)
 			}
 
 			ApproveCross { .. } => {
 				let RefungibleTokenHandle(handle, token_id) = token;
-				let token_id = token_id.try_into().ok()?;
 				withdraw_approve::<T>(&handle, who.as_sub(), &token_id)
 			}
 		}
modifiedruntime/common/mod.rsdiffbeforeafterboth
--- a/runtime/common/mod.rs
+++ b/runtime/common/mod.rs
@@ -204,10 +204,7 @@
 				&[],
 			);
 
-			let should_upgrade = match version {
-				None => true,
-				Some(_) => false,
-			};
+			let should_upgrade = version.is_none();
 
 			if should_upgrade {
 				log::info!(
@@ -220,7 +217,7 @@
 					.cloned()
 					.filter_map(|authority_id| {
 						weight.saturating_accrue(<Runtime as frame_system::Config>::DbWeight::get().reads_writes(1, 1));
-						let vec = authority_id.clone().to_raw_vec();
+						let vec = authority_id.to_raw_vec();
 						let slice = vec.as_slice();
 						let array: Option<[u8; 32]> = match slice.try_into() {
 							Ok(a) => Some(a),
@@ -248,20 +245,20 @@
 					.into_iter()
 					.map(|(acc, aura)| {
 						(
-							acc.clone(),                        // account id
-							acc,                                // validator id
-							SessionKeys { aura: aura.clone() }, // session keys
+							acc.clone(),          // account id
+							acc,                  // validator id
+							SessionKeys { aura }, // session keys
 						)
 					})
 					.collect::<Vec<_>>();
 
-				for (account, val, keys) in keys.iter().cloned() {
+				for (account, val, keys) in keys.iter() {
 					for id in <Runtime as pallet_session::Config>::Keys::key_ids() {
-						<pallet_session::KeyOwner<Runtime>>::insert((*id, keys.get_raw(*id)), &val)
+						<pallet_session::KeyOwner<Runtime>>::insert((*id, keys.get_raw(*id)), val)
 					}
-					<pallet_session::NextKeys<Runtime>>::insert(&val, &keys);
+					<pallet_session::NextKeys<Runtime>>::insert(val, keys);
 					// todo exercise caution, the following is taken from genesis
-					if frame_system::Pallet::<Runtime>::inc_consumers_without_limit(&account)
+					if frame_system::Pallet::<Runtime>::inc_consumers_without_limit(account)
 						.is_err()
 					{
 						log::warn!(
@@ -271,7 +268,7 @@
 						// genesis) so it's really not a big deal and we assume that the user wants to
 						// do this since it's the only way a non-endowed account can contain a session
 						// key.
-						frame_system::Pallet::<Runtime>::inc_providers(&account);
+						frame_system::Pallet::<Runtime>::inc_providers(account);
 					}
 				}
 
modifiedruntime/common/runtime_apis.rsdiffbeforeafterboth
--- a/runtime/common/runtime_apis.rs
+++ b/runtime/common/runtime_apis.rs
@@ -84,7 +84,7 @@
                 fn topmost_token_owner(collection: CollectionId, token: TokenId) -> Result<Option<CrossAccountId>, DispatchError> {
                     let budget = up_data_structs::budget::Value::new(10);
 
-                    Ok(<pallet_structure::Pallet<Runtime>>::find_topmost_owner(collection, token, &budget)?)
+                    <pallet_structure::Pallet<Runtime>>::find_topmost_owner(collection, token, &budget)
                 }
                 fn token_children(collection: CollectionId, token: TokenId) -> Result<Vec<TokenChild>, DispatchError> {
                     Ok(<pallet_nonfungible::Pallet<Runtime>>::token_children_ids(collection, token))
modifiedruntime/common/sponsoring.rsdiffbeforeafterboth
--- a/runtime/common/sponsoring.rs
+++ b/runtime/common/sponsoring.rs
@@ -240,7 +240,7 @@
 				withdraw_set_token_property(
 					&collection,
 					&T::CrossAccountId::from_sub(who.clone()),
-					&token_id,
+					token_id,
 					// No overflow may happen, as data larger than usize can't reach here
 					properties.iter().map(|p| p.key.len() + p.value.len()).sum(),
 				)
modifiedtest-pallets/utils/src/lib.rsdiffbeforeafterboth
--- a/test-pallets/utils/src/lib.rs
+++ b/test-pallets/utils/src/lib.rs
@@ -170,7 +170,7 @@
 	fn ensure_origin_and_enabled(origin: OriginFor<T>) -> DispatchResult {
 		ensure_signed(origin)?;
 		<Enabled<T>>::get()
-			.then(|| ())
+			.then_some(())
 			.ok_or(<Error<T>>::TestPalletDisabled.into())
 	}
 }