git.delta.rocks / unique-network / refs/commits / 424362fb52a4

--- a/client/rpc/src/lib.rs
+++ b/client/rpc/src/lib.rs
@@ -557,7 +557,10 @@
 	pass_method!(allowlist(collection: CollectionId) -> Vec<CrossAccountId>, unique_api);
 	pass_method!(allowed(collection: CollectionId, user: CrossAccountId) -> bool, unique_api);
 	pass_method!(last_token_id(collection: CollectionId) -> TokenId, unique_api);
-	pass_method!(collection_by_id(collection: CollectionId) -> Option<RpcCollection<AccountId>>, unique_api);
+	pass_method!(
+		collection_by_id(collection: CollectionId) -> Option<RpcCollection<AccountId>>, unique_api;
+		changed_in 3, collection_by_id_before_version_3(collection) => |value| value.map(|coll| coll.into())
+	);
 	pass_method!(collection_stats() -> CollectionStats, unique_api);
 	pass_method!(next_sponsored(collection: CollectionId, account: CrossAccountId, token: TokenId) -> Option<u64>, unique_api);
 	pass_method!(effective_collection_limits(collection_id: CollectionId) -> Option<CollectionLimits>, unique_api);

--- a/primitives/data-structs/src/lib.rs
+++ b/primitives/data-structs/src/lib.rs
@@ -447,6 +447,7 @@
 }
 
 /// Collection parameters, used in RPC calls (see [`Collection`] for the storage version).
+#[struct_versioning::versioned(version = 2, upper)]
 #[derive(Encode, Decode, Clone, PartialEq, TypeInfo)]
 #[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
 pub struct RpcCollection<AccountId> {
@@ -484,6 +485,7 @@
 	pub read_only: bool,
 
 	/// Extra collection flags
+	#[version(2.., upper(RpcCollectionFlags {foreign: false, erc721metadata: false}))]
 	pub flags: RpcCollectionFlags,
 }
 

1616
17#![cfg_attr(not(feature = "std"), no_std)]17#![cfg_attr(not(feature = "std"), no_std)]
18
19extern crate alloc;
1820
19use up_data_structs::{21use up_data_structs::{
20	CollectionId, TokenId, RpcCollection, CollectionStats, CollectionLimits, Property,22	CollectionId, TokenId, RpcCollection, CollectionStats, CollectionLimits, Property,
21	PropertyKeyPermission, TokenData, TokenChild,23	PropertyKeyPermission, TokenData, TokenChild, RpcCollectionVersion1,
22};24};
2325
24use sp_std::vec::Vec;26use sp_std::vec::Vec;
28type Result<T> = core::result::Result<T, DispatchError>;30type Result<T> = core::result::Result<T, DispatchError>;
2931
30sp_api::decl_runtime_apis! {32sp_api::decl_runtime_apis! {
31	#[api_version(2)]33	#[api_version(3)]
32	/// Trait for generate rpc.34	/// Trait for generate rpc.
33	pub trait UniqueApi<CrossAccountId, AccountId> where35	pub trait UniqueApi<CrossAccountId, AccountId> where
34		AccountId: Decode,36		AccountId: Decode,
35		CrossAccountId: pallet_evm::account::CrossAccountId<AccountId>,37		CrossAccountId: pallet_evm::account::CrossAccountId<AccountId>,
36	{38	{
37		#[changed_in(2)]
38		fn token_owner(collection: CollectionId, token: TokenId) -> Result<CrossAccountId>;
39
40		/// Get number of tokens in collection owned by account.39		/// Get number of tokens in collection owned by account.
41		fn account_tokens(collection: CollectionId, account: CrossAccountId) -> Result<Vec<TokenId>>;40		fn account_tokens(collection: CollectionId, account: CrossAccountId) -> Result<Vec<TokenId>>;
110		/// Get collection by id.109		/// Get collection by id.
111		fn collection_by_id(collection: CollectionId) -> Result<Option<RpcCollection<AccountId>>>;110		fn collection_by_id(collection: CollectionId) -> Result<Option<RpcCollection<AccountId>>>;
111
112		#[changed_in(3)]
113		fn collection_by_id(collection: CollectionId) -> Result<Option<RpcCollectionVersion1<AccountId>>>;
112114
113		/// Get collection stats.115		/// Get collection stats.
114		fn collection_stats() -> Result<CollectionStats>;116		fn collection_stats() -> Result<CollectionStats>;