diff --git a/contract/src/lib.rs b/contract/src/lib.rs index e8424d6..6dc58b2 100644 --- a/contract/src/lib.rs +++ b/contract/src/lib.rs @@ -39,6 +39,7 @@ pub struct TokenSeries { #[derive(Serialize, Deserialize)] #[serde(crate = "near_sdk::serde")] pub struct TokenSeriesJson { + token_series_id: TokenSeriesId, metadata: TokenMetadata, creator_id: AccountId, royalty: HashMap @@ -115,7 +116,7 @@ impl Contract { creator_id: ValidAccountId, price: Option, royalty: Option>, - ) { + ) -> TokenSeriesJson { let initial_storage_usage = env::storage_usage(); let owner_id = env::predecessor_account_id(); assert_eq!( @@ -184,6 +185,13 @@ impl Contract { ); refund_deposit(env::storage_usage() - initial_storage_usage, 0); + + TokenSeriesJson{ + token_series_id: token_series_id, + metadata: token_metadata, + creator_id: creator_id.into(), + royalty: royalty_res, + } } #[payable] @@ -394,6 +402,7 @@ impl Contract { pub fn nft_get_series_single(&self, token_series_id: TokenSeriesId) -> TokenSeriesJson { let token_series = self.token_series_by_id.get(&token_series_id).expect("Series does not exist"); TokenSeriesJson{ + token_series_id: token_series_id, metadata: token_series.metadata, creator_id: token_series.creator_id, royalty: token_series.royalty, @@ -425,7 +434,8 @@ impl Contract { .iter() .skip(start_index as usize) .take(limit) - .map(|(_, token_series)| TokenSeriesJson{ + .map(|(token_series_id, token_series)| TokenSeriesJson{ + token_series_id: token_series_id, metadata: token_series.metadata, creator_id: token_series.creator_id, royalty: token_series.royalty,