git.delta.rocks / unique-network / refs/commits / 0fae602fb292

difftreelog

fix foreign-assets related docs

Daniel Shiposha2023-10-25parent: #68c3995.patch.diff
in: master

5 files changed

modifiedjs-packages/playgrounds/types.tsdiffbeforeafterboth
--- a/js-packages/playgrounds/types.ts
+++ b/js-packages/playgrounds/types.ts
@@ -160,7 +160,7 @@
   External = 1,
   /// Supports ERC721Metadata
   Erc721metadata = 64,
-  /// Tokens in foreign collections can be transferred, but not burnt
+  /// A collection of foreign assets
   Foreign = 128,
 }
 
modifiedjs-packages/tests/eth/api/CollectionHelpers.soldiffbeforeafterboth
--- a/js-packages/tests/eth/api/CollectionHelpers.sol
+++ b/js-packages/tests/eth/api/CollectionHelpers.sol
@@ -132,7 +132,7 @@
 type CollectionFlags is uint8;
 
 library CollectionFlagsLib {
-	/// Tokens in foreign collections can be transferred, but not burnt
+	/// A collection of foreign assets
 	CollectionFlags constant foreignField = CollectionFlags.wrap(128);
 	/// Supports ERC721Metadata
 	CollectionFlags constant erc721metadataField = CollectionFlags.wrap(64);
modifiedpallets/foreign-assets/src/lib.rsdiffbeforeafterboth
--- a/pallets/foreign-assets/src/lib.rs
+++ b/pallets/foreign-assets/src/lib.rs
@@ -259,7 +259,7 @@
 		}
 	}
 
-	/// Converts a multiasset to a Unique Network's collection (either local or the foreign one).
+	/// Converts a multiasset to a Unique Network's collection (either local or a foreign one).
 	///
 	/// The function will try to convert the multiasset's reserve location
 	/// to the Unique Network's local collection.
@@ -385,8 +385,6 @@
 	/// Withdraws an asset instance from the `from` account.
 	///
 	/// Transfers the asset instance to the pallet's account.
-	///
-	/// Won't withdraw the instance if it has children.
 	fn withdraw_asset_instance(
 		xcm_ext: &dyn XcmExtensions<T>,
 		collection_id: CollectionId,
modifiedpallets/unique/src/eth/stubs/CollectionHelpers.soldiffbeforeafterboth
--- a/pallets/unique/src/eth/stubs/CollectionHelpers.sol
+++ b/pallets/unique/src/eth/stubs/CollectionHelpers.sol
@@ -199,7 +199,7 @@
 type CollectionFlags is uint8;
 
 library CollectionFlagsLib {
-	/// Tokens in foreign collections can be transferred, but not burnt
+	/// A collection of foreign assets
 	CollectionFlags constant foreignField = CollectionFlags.wrap(128);
 	/// Supports ERC721Metadata
 	CollectionFlags constant erc721metadataField = CollectionFlags.wrap(64);
modifiedprimitives/data-structs/src/lib.rsdiffbeforeafterboth
378#[derive(AbiCoderFlags, Bitfields, Clone, Copy, PartialEq, Eq, Debug, Default)]378#[derive(AbiCoderFlags, Bitfields, Clone, Copy, PartialEq, Eq, Debug, Default)]
379#[bondrewd(enforce_bytes = 1)]379#[bondrewd(enforce_bytes = 1)]
380pub struct CollectionFlags {380pub struct CollectionFlags {
381 /// Reserved flag381 /// A collection of foreign assets
382 #[bondrewd(bits = "0..1")]382 #[bondrewd(bits = "0..1")]
383 pub foreign: bool,383 pub foreign: bool,
384 /// Supports ERC721Metadata384 /// Supports ERC721Metadata