Merge pull request #75 from wd30130/polkadot-v1.7.0

merge from main branch
Magport · Apr 3, 2024 · 6070fb2 · 6070fb2
2 parents 7a8fc82 + f96825c
commit 6070fb2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "parachain-magnet-node"
-version = "0.5.6"
+version = "0.6.0"
 authors = ["Magnet"]
 description = "A scalable evm smart contract platform node, utilizing DOT as the gas fee."
 license = "Apache License 2.0"

diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "parachain-magnet-runtime"
-version = "0.5.6"
+version = "0.6.0"
 authors = ["Magnet"]
 description = "A scalable evm smart contract platform runtime, utilizing DOT as the gas fee."
 license = "Apache License 2.0"

diff --git a/runtime/src/xcms/xcm_weight.rs b/runtime/src/xcms/xcm_weight.rs
@@ -307,6 +307,8 @@ impl<
 		}
 		let required = (AssetId(AssetIdValue::get()), u128_amount).into();
 		let unused = payment.checked_sub(required).map_err(|_| XcmError::TooExpensive)?;
+
+		let amount: Currency::Balance = u128_amount.saturated_into();
 		self.0 = self.0.saturating_add(weight);
 		self.1 = self.1.saturating_add(amount);
 		Ok(unused)