Data structure for collectibles

Author: tupui

contracts/collection/src/contract.rs

@@ -1,8 +1,7 @@
 //! NFC Collection
 
-use soroban_sdk::{contractimpl, contracttype, panic_with_error, Address, Bytes, BytesN, Env, String, Vec};
-use soroban_sdk::xdr::ToXdr;
-use crate::{errors, events, Collection, CollectionArgs, CollectionClient, CollectionTrait};
+use soroban_sdk::{contractimpl, contracttype, Address, BytesN, Env, String, Vec};
+use crate::{Collection, CollectionArgs, CollectionClient, CollectionTrait};
 
 #[contracttype]
 pub enum DataKey {
@@ -13,7 +12,8 @@ pub enum DataKey {
 pub enum CollectionKey {
     NFTContract,
     Collections,
-    Collectibles(Address),
+    Collectibles(Address, u32), // (contract ID; Token ID) - Owner
+    OwnerCollectibles(Address), // Owner - (contract ID; Token ID)
 }
 
 
@@ -31,29 +31,43 @@ impl CollectionTrait for Collection {
         e.deployer().update_current_contract_wasm(wasm_hash.clone());
     }
 
-    fn create_collection(e: &Env, wasm_hash: BytesN<32>, name: String, symbol: String, uri: String, max_tokens: u32) {
+    fn create_collection(e: &Env, wasm_hash: BytesN<32>, name: String, symbol: String, uri: String, max_tokens: u32) -> Address {
         let admin: Address = e.storage().instance().get(&DataKey::Admin).unwrap();
         admin.require_auth();
 
         let salt: BytesN<32> = e.crypto().sha256(&symbol.to_bytes()).into();
         let deployer = e.deployer().with_current_contract(salt);
-        let contract_address = deployer.deploy_v2(wasm_hash, (name, symbol, uri, max_tokens));
+        let contract_address = deployer.deploy_v2(wasm_hash, (admin, name, symbol, uri, max_tokens));
 
         let mut collections: Vec<Address> = e.storage().instance().get(&CollectionKey::Collections).unwrap_or(Vec::new(&e));
         collections.push_back(contract_address.clone());
-        e.storage().instance().set(&CollectionKey::Collections, &contract_address);
+        e.storage().instance().set(&CollectionKey::Collections, &contract_address.clone());
+        contract_address
     }
 
     fn assign_collectible(e: &Env, collection: Address, to: Address, token_id: u32) {
         collection.require_auth();
 
-        let mut collectibles: Vec<(Address, u32)> = e.storage().instance().get(&CollectionKey::Collectibles(to.clone())).unwrap_or(Vec::new(&e));
-        collectibles.push_back((collection, token_id));
-        e.storage().instance().set(&CollectionKey::Collectibles(to), &collectibles);
+        let collectible = (collection.clone(), token_id);
+
+        let owned_collectible: Option<Address> = e.storage().instance().get(&CollectionKey::Collectibles(collection.clone(), token_id.clone())).unwrap();
+        e.storage().instance().set(&CollectionKey::Collectibles(collection.clone(), token_id.clone()), &to.clone());
+
+        // transferring the collectible by removing from previous owner if any
+        if owned_collectible.is_some() {
+            let mut owner_collectibles: Vec<(Address, u32)> = e.storage().instance().get(&CollectionKey::OwnerCollectibles(owned_collectible.unwrap().clone())).unwrap_or(Vec::new(&e));
+            let idx_collectible = owner_collectibles.first_index_of(collectible.clone()).unwrap();
+            owner_collectibles.remove(idx_collectible);
+            e.storage().instance().set(&CollectionKey::OwnerCollectibles(to.clone()), &owner_collectibles);
+        }
+
+        let mut owner_collectibles: Vec<(Address, u32)> = e.storage().instance().get(&CollectionKey::OwnerCollectibles(to.clone())).unwrap_or(Vec::new(&e));
+        owner_collectibles.push_back(collectible);
+        e.storage().instance().set(&CollectionKey::OwnerCollectibles(to), &owner_collectibles);
     }
 
     fn collectibles(e: &Env, from: Address) -> Vec<(Address, u32)> {
-        e.storage().instance().get(&CollectionKey::Collectibles(from.clone())).unwrap_or(Vec::new(&e))
+        e.storage().instance().get(&CollectionKey::OwnerCollectibles(from.clone())).unwrap_or(Vec::new(&e))
     }
 
 }

contracts/collection/src/lib.rs

@@ -1,7 +1,7 @@
 #![no_std]
 #![allow(dead_code)]
 
-use soroban_sdk::{contract, contractmeta, Env, Address, String, BytesN, Bytes, Vec};
+use soroban_sdk::{contract, contractmeta, Env, Address, String, BytesN, Vec};
 
 contractmeta!(key = "Description", val = "ChimpDAO Collection");
 
@@ -21,7 +21,7 @@ pub trait CollectionTrait {
 
     fn upgrade(e: &Env, wasm_hash: BytesN<32>);
 
-    fn create_collection(e: &Env, wasm_hash: BytesN<32>, name: String, symbol: String, uri: String, max_tokens: u32);
+    fn create_collection(e: &Env, wasm_hash: BytesN<32>, name: String, symbol: String, uri: String, max_tokens: u32) -> Address;
 
     fn assign_collectible(e: &Env, collection: Address, to: Address, token_id: u32);
 

contracts/collection/src/test.rs

@@ -1,7 +1,12 @@
-use soroban_sdk::{testutils::Address as _, Address, Env};
+use soroban_sdk::{testutils::Address as _, Address, Env, String};
 
 use crate::{Collection, CollectionClient};
 
+mod nfc_nft_contract {
+    soroban_sdk::contractimport!(file = "../nfc_nft.wasm");
+}
+
+
 fn create_client<'a>(e: &Env, admin: &Address) -> CollectionClient<'a> {
     let address = e.register(
         Collection,
@@ -13,11 +18,20 @@ fn create_client<'a>(e: &Env, admin: &Address) -> CollectionClient<'a> {
 }
 
 #[test]
-fn test_metadata() {
+fn test_create_collection() {
     let e = Env::default();
     e.mock_all_auths();
 
     let admin = Address::generate(&e);
     let client = create_client(&e, &admin);
 
+    let wasm = e.deployer().upload_contract_wasm(nfc_nft_contract::WASM);
+
+    let _collection_address = client.create_collection(
+        &wasm,
+        &String::from_str(&e, "TestNFT"),
+        &String::from_str(&e, "TNFT"),
+        &String::from_str(&e, "ipfs://abcd"),
+        &10u32,
+    );
 }