Merge remote-tracking branch 'upstream/master' into issue_11054

client/executor/wasmi/src/lib.rs

@@ -162,7 +162,7 @@ impl Sandbox for FunctionExecutor {
 		};
 
 		if self.memory.set(buf_ptr.into(), &buffer).is_err() {
-			return Ok(sandbox_primitives::ERR_OUT_OF_BOUNDS)
+			return Ok(sandbox_env::ERR_OUT_OF_BOUNDS)
 		}
 
 		Ok(sandbox_env::ERR_OK)
@@ -186,7 +186,7 @@ impl Sandbox for FunctionExecutor {
 		};
 
 		if sandboxed_memory.write_from(Pointer::new(offset as u32), &buffer).is_err() {
-			return Ok(sandbox_primitives::ERR_OUT_OF_BOUNDS)
+			return Ok(sandbox_env::ERR_OUT_OF_BOUNDS);
 		}
 
 		Ok(sandbox_env::ERR_OK)

client/executor/wasmtime/src/host.rs

@@ -316,8 +316,8 @@ impl<'a> Sandbox for HostContext<'a> {
 
 		let instance_idx_or_err_code = match result {
 			Ok(instance) => instance.register(self.sandbox_store_mut(), dispatch_thunk),
-			Err(sandbox::InstantiationError::StartTrapped) => sandbox_primitives::ERR_EXECUTION,
-			Err(_) => sandbox_primitives::ERR_MODULE,
+			Err(sandbox::InstantiationError::StartTrapped) => sandbox_env::ERR_EXECUTION,
+			Err(_) => sandbox_env::ERR_MODULE,
 		};
 
 		Ok(instance_idx_or_err_code as u32)

frame/assets/src/functions.rs

@@ -291,7 +291,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 			(true, Some(dust)) => (amount, Some(dust)),
 			_ => (debit, None),
 		};
-		Self::can_increase(id, dest, credit).into_result()?;
+		Self::can_increase(id, dest, credit, false).into_result()?;
 		Ok((credit, maybe_burn))
 	}
 

frame/balances/src/lib.rs

@@ -1109,7 +1109,7 @@ impl<T: Config<I>, I: 'static> fungible::Mutate<T::AccountId> for Pallet<T, I> {
 			return Ok(())
 		}
 		Self::try_mutate_account(who, |account, _is_new| -> DispatchResult {
-			Self::deposit_consequence(who, amount, account).into_result()?;
+			Self::deposit_consequence(who, amount, account, true).into_result()?;
 			account.free += amount;
 			Ok(())
 		})?;

frame/support/src/traits/tokens/fungible.rs

@@ -89,8 +89,10 @@ pub trait Mutate<AccountId>: Inspect<AccountId> {
 		dest: &AccountId,
 		amount: Self::Balance,
 	) -> Result<Self::Balance, DispatchError> {
-		let extra = Self::can_withdraw(source, amount).into_result()?;
-		Self::can_deposit(dest, amount.saturating_add(extra)).into_result()?;
+		let extra = Self::can_withdraw(&source, amount).into_result()?;
+		// As we first burn and then mint, we don't need to check if `mint` fits into the supply.
+		// If we can withdraw/burn it, we can also mint it again.
+		Self::can_deposit(dest, amount.saturating_add(extra), false).into_result()?;
 		let actual = Self::burn_from(source, amount)?;
 		debug_assert!(
 			actual == amount.saturating_add(extra),

frame/support/src/traits/tokens/fungibles.rs

@@ -142,8 +142,10 @@ pub trait Mutate<AccountId>: Inspect<AccountId> {
 		dest: &AccountId,
 		amount: Self::Balance,
 	) -> Result<Self::Balance, DispatchError> {
-		let extra = Self::can_withdraw(asset, source, amount).into_result()?;
-		Self::can_deposit(asset, dest, amount.saturating_add(extra)).into_result()?;
+		let extra = Self::can_withdraw(asset, &source, amount).into_result()?;
+		// As we first burn and then mint, we don't need to check if `mint` fits into the supply.
+		// If we can withdraw/burn it, we can also mint it again.
+		Self::can_deposit(asset, dest, amount.saturating_add(extra), false).into_result()?;
 		let actual = Self::burn_from(asset, source, amount)?;
 		debug_assert!(
 			actual == amount.saturating_add(extra),