Mapped assets pallet DebitFlags struct is private to the crate, so the debitFlags parameter from the afloat_do_burn method was removed and the debitFlags created internally, finally updated the afloat pallet accordingly. AssetId type is no longer Copy, so called the clone method where necessary. CollectionId type is no longer Copy, so called the clone method where necessary. JSON NumberValue struct has a new negative field, so this field was added as necesary. GenesisBuild has been deprecated, so the BitcoinVaults and MappedAssets pallets to use the new BuildGenesisConfig trait. Updated the block_number parameter type to be BlockNumberFor. Added does_asset_exist method to the MappedAssets pallet. Updated the way of checking overflow in the MappedAssets pallet to use checked_add. Added back the Rbac type to the MappedAssets pallet.

Author: sebastianmontero

pallets/afloat/src/functions.rs

@@ -8,7 +8,6 @@ use sp_runtime::{traits::StaticLookup, Permill};
 // use frame_support::traits::OriginTrait;
 use core::convert::TryInto;
 use frame_support::{sp_io::hashing::blake2_256, traits::Time};
-use pallet_mapped_assets::DebitFlags;
 use pallet_rbac::types::{IdOrVec, RoleBasedAccessControl, RoleId};
 use scale_info::prelude::vec;
 use sp_runtime::{
@@ -73,22 +72,22 @@ impl<T: Config> Pallet<T> {
 			CreateAsset::New { asset_id, min_balance } => {
 				pallet_mapped_assets::Pallet::<T>::create(
 					RawOrigin::Signed(creator.clone()).into(),
-					asset_id,
+					asset_id.clone().into(),
 					T::Lookup::unlookup(creator.clone()),
 					min_balance,
 				)?;
-				asset_id
+				asset_id.clone()
 			},
 			CreateAsset::Existing { asset_id } => {
 				ensure!(
-					pallet_mapped_assets::Pallet::<T>::does_asset_exists(asset_id),
+					pallet_mapped_assets::Pallet::<T>::does_asset_exist(&asset_id),
 					Error::<T>::AssetNotFound
 				);
-				asset_id
+				asset_id.clone()
 			},
 		};
 
-		AfloatAssetId::<T>::put(asset_id.clone());
+		AfloatAssetId::<T>::put(asset_id);
 		Ok(())
 	}
 	/// This functions sets up the roles for the Afloat pallet.
@@ -293,7 +292,6 @@ impl<T: Config> Pallet<T> {
 	) -> DispatchResult {
 		let authority = ensure_signed(origin.clone())?;
 		let asset_id = AfloatAssetId::<T>::get().expect("AfloatAssetId should be set");
-		let debit_flags = DebitFlags { keep_alive: false, best_effort: true };
 		ensure!(UserInfo::<T>::contains_key(user_address.clone()), Error::<T>::UserNotFound);
 
 		let current_balance = Self::do_get_afloat_balance(user_address.clone());
@@ -304,7 +302,6 @@ impl<T: Config> Pallet<T> {
 				&user_address.clone(),
 				diff,
 				Some(authority.clone()),
-				debit_flags,
 			)?;
 		} else if current_balance < amount {
 			let diff = amount - current_balance;

pallets/bitcoin-vaults/src/functions.rs

@@ -474,6 +474,7 @@ impl<T: Config> Pallet<T> {
 			fraction: 0,
 			fraction_length: 0,
 			exponent: 0,
+			negative: false,
 		};
 		body.push(("threshold".chars().collect::<Vec<char>>(), JsonValue::Number(threshold)));
 		let vault_signers = vault.cosigners.clone().to_vec();
@@ -573,16 +574,18 @@ impl<T: Config> Pallet<T> {
 		let vault = <Vaults<T>>::get(proposal.vault_id.clone())
 			.ok_or(Self::build_offchain_err(false, "Vault not found"))?;
 		let amount = NumberValue {
-			integer: proposal.amount.clone() as i64,
+			integer: proposal.amount.clone() as u64,
 			fraction: 0,
 			fraction_length: 0,
 			exponent: 0,
+			negative: false,
 		};
 		let fee = NumberValue {
 			integer: proposal.fee_sat_per_vb.clone().into(),
 			fraction: 0,
 			fraction_length: 0,
 			exponent: 0,
+			negative: false,
 		};
 		let to_address = str::from_utf8(proposal.to_address.as_slice())
 			.map_err(|_| {

pallets/bitcoin-vaults/src/lib.rs

@@ -39,20 +39,24 @@ pub mod pallet {
 	/* --- Genesis Structs Section --- */
 
 	#[pallet::genesis_config]
-	#[derive(Default)]
-	pub struct GenesisConfig {
+	pub struct GenesisConfig<T: Config> {
 		pub bdk_services_url: Vec<u8>,
+		#[serde(skip)]
+		pub _config: sp_std::marker::PhantomData<T>,
 	}
 
 	#[cfg(feature = "std")]
-	impl Default for GenesisConfig {
+	impl<T: Config> Default for GenesisConfig<T> {
 		fn default() -> Self {
-			Self { bdk_services_url: b"https://bdk.hashed.systems".encode() }
+			Self {
+				bdk_services_url: b"https://bdk.hashed.systems".encode(),
+				_config: Default::default(),
+			}
 		}
 	}
 
 	#[pallet::genesis_build]
-	impl<T: Config> GenesisBuild<T> for GenesisConfig {
+	impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
 		fn build(&self) {
 			<BDKServicesURL<T>>::put(
 				BoundedVec::<u8, ConstU32<32>>::try_from(self.bdk_services_url.clone())
@@ -275,7 +279,7 @@ pub mod pallet {
 		/// Note that it's not guaranteed for offchain workers to run on EVERY block, there might
 		/// be cases where some blocks are skipped, or for some the worker runs twice (re-orgs),
 		/// so the code should be able to handle that.
-		fn offchain_worker(_block_number: T::BlockNumber) {
+		fn offchain_worker(_block_number: BlockNumberFor<T>) {
 			// check if the node has an account available, the offchain worker can't submit
 			// transactions without it
 			let signer = Signer::<T, T::AuthorityId>::any_account();

pallets/fruniques/src/functions.rs

@@ -68,7 +68,7 @@ impl<T: Config> Pallet<T> {
 	}
 
 	pub fn admin_of(class_id: &T::CollectionId, instance_id: &T::ItemId) -> Option<T::AccountId> {
-		pallet_uniques::Pallet::<T>::owner(*class_id, *instance_id)
+		pallet_uniques::Pallet::<T>::owner(class_id.clone(), *instance_id)
 	}
 
 	pub fn is_frozen(collection_id: &T::CollectionId, instance_id: &T::ItemId) -> bool {
@@ -79,14 +79,14 @@ impl<T: Config> Pallet<T> {
 	}
 
 	pub fn collection_exists(class_id: &T::CollectionId) -> bool {
-		if let Some(_owner) = pallet_uniques::Pallet::<T>::collection_owner(*class_id) {
+		if let Some(_owner) = pallet_uniques::Pallet::<T>::collection_owner(class_id.clone()) {
 			return true
 		}
 		false
 	}
 
 	pub fn instance_exists(class_id: &T::CollectionId, instance_id: &T::ItemId) -> bool {
-		if let Some(_owner) = pallet_uniques::Pallet::<T>::owner(*class_id, *instance_id) {
+		if let Some(_owner) = pallet_uniques::Pallet::<T>::owner(class_id.clone(), *instance_id) {
 			return true
 		}
 		false
@@ -164,7 +164,7 @@ impl<T: Config> Pallet<T> {
 	) -> DispatchResult {
 		pallet_uniques::Pallet::<T>::set_attribute(
 			origin,
-			*class_id.clone(),
+			class_id.clone(),
 			Some(instance_id),
 			key,
 			value,
@@ -247,7 +247,7 @@ impl<T: Config> Pallet<T> {
 
 		pallet_uniques::Pallet::<T>::burn(
 			origin,
-			*class_id,
+			class_id.clone(),
 			instance_id,
 			Some(Self::account_id_to_lookup_source(&admin.unwrap())),
 		)?;
@@ -372,7 +372,7 @@ impl<T: Config> Pallet<T> {
 		let child_percentage: Permill = parent_info.parent_weight * frunique_parent.weight;
 
 		let parent_data: ParentInfo<T> = ParentInfo {
-			collection_id: parent_info.collection_id,
+			collection_id: parent_info.collection_id.clone(),
 			parent_id: parent_info.parent_id,
 			parent_weight: child_percentage,
 			is_hierarchical: parent_info.is_hierarchical,
@@ -400,7 +400,7 @@ impl<T: Config> Pallet<T> {
 		};
 
 		<FruniqueInfo<T>>::try_mutate::<_, _, _, DispatchError, _>(
-			parent_info.collection_id,
+			parent_info.collection_id.clone(),
 			parent_info.parent_id,
 			|frunique_data| -> DispatchResult {
 				let frunique = frunique_data.as_mut().ok_or(Error::<T>::FruniqueNotFound)?;