git.delta.rocks / unique-network / refs/commits / ba2c7d200136

difftreelog

fix runtime api versioning for TokenData

Yaroslav Bolyukin2022-10-28parent: #835d378.patch.diff
in: master

3 files changed

modifiedclient/rpc/src/lib.rsdiffbeforeafterboth
551552
552 #[map(|keys| string_keys_to_bytes_keys(keys))]553 #[map(|keys| string_keys_to_bytes_keys(keys))]
553 keys: Option<Vec<String>>,554 keys: Option<Vec<String>>,
554 ) -> TokenData<CrossAccountId>, unique_api);555 ) -> TokenData<CrossAccountId>, unique_api;
556 changed_in 3, token_data_before_version_3(collection, token_id, string_keys_to_bytes_keys(keys)) => |value| value.into()
557 );
555558
556 pass_method!(adminlist(collection: CollectionId) -> Vec<CrossAccountId>, unique_api);559 pass_method!(adminlist(collection: CollectionId) -> Vec<CrossAccountId>, unique_api);
modifiedprimitives/data-structs/src/lib.rsdiffbeforeafterboth
--- a/primitives/data-structs/src/lib.rs
+++ b/primitives/data-structs/src/lib.rs
@@ -221,6 +221,7 @@
 }
 
 /// Token data.
+#[struct_versioning::versioned(version = 2, upper)]
 #[derive(Encode, Decode, Clone, PartialEq, TypeInfo)]
 #[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
 pub struct TokenData<CrossAccountId> {
@@ -231,6 +232,7 @@
 	pub owner: Option<CrossAccountId>,
 
 	/// Token pieces.
+	#[version(2.., upper(0))]
 	pub pieces: u128,
 }
 
modifiedprimitives/rpc/src/lib.rsdiffbeforeafterboth
--- a/primitives/rpc/src/lib.rs
+++ b/primitives/rpc/src/lib.rs
@@ -20,7 +20,7 @@
 
 use up_data_structs::{
 	CollectionId, TokenId, RpcCollection, CollectionStats, CollectionLimits, Property,
-	PropertyKeyPermission, TokenData, TokenChild, RpcCollectionVersion1,
+	PropertyKeyPermission, TokenData, TokenChild, RpcCollectionVersion1, TokenDataVersion1,
 };
 
 use sp_std::vec::Vec;
@@ -77,6 +77,13 @@
 			keys: Option<Vec<Vec<u8>>>
 		) -> Result<TokenData<CrossAccountId>>;
 
+		#[changed_in(3)]
+		fn token_data(
+			collection: CollectionId,
+			token_id: TokenId,
+			keys: Option<Vec<Vec<u8>>>
+		) -> Result<TokenDataVersion1<CrossAccountId>>;
+
 		/// Total number of tokens in collection.
 		fn total_supply(collection: CollectionId) -> Result<u32>;