fix: removed dip721; added dip721-rs

Cargo.toml

@@ -2,7 +2,6 @@
 members = [
   "integration-tests",
   "src/did",
-  "src/dip721",
   "src/deferred",
   "src/ekoke_erc20_swap",
   "src/ekoke_liquidity_pool",
@@ -31,6 +30,7 @@ ethers-contract = { version = "2", default-features = false, features = [
 ethers-core = "2"
 ethers-signers = "2"
 ethnum = "1"
+dip721-rs = "0.1"
 getrandom = { version = "0.2", features = ["custom"] }
 hex = "0.4"
 ic-cdk = "0.12"

integration-tests/Cargo.toml

@@ -10,7 +10,7 @@ repository = { workspace = true }
 anyhow = { workspace = true }
 candid = { workspace = true }
 did = { path = "../src/did" }
-dip721 = { path = "../src/dip721" }
+dip721-rs = { workspace = true }
 icrc = { path = "../src/icrc" }
 pocket-ic = "2"
 serde = { workspace = true }

integration-tests/src/client/deferred.rs

@@ -1,7 +1,7 @@
 use candid::{Encode, Nat, Principal};
 use did::deferred::{Agency, Contract, ContractRegistration, DeferredResult, TokenInfo};
 use did::ID;
-use dip721::{GenericValue, NftError, TokenIdentifier, TokenMetadata};
+use dip721_rs::{GenericValue, NftError, TokenIdentifier, TokenMetadata};
 
 use crate::actor::{admin, alice};
 use crate::TestEnv;

integration-tests/src/client/marketplace.rs

@@ -1,6 +1,6 @@
 use candid::{Encode, Principal};
 use did::marketplace::MarketplaceResult;
-use dip721::TokenIdentifier;
+use dip721_rs::TokenIdentifier;
 use icrc::icrc1::account::Subaccount;
 
 use crate::TestEnv;

integration-tests/tests/http/deferred.rs

@@ -1,6 +1,6 @@
 use did::deferred::{Agency, Contract, ContractRegistration, ContractType, Seller, TokenInfo};
 use did::ID;
-use dip721::GenericValue;
+use dip721_rs::GenericValue;
 use integration_tests::actor::{admin, alice, bob};
 use integration_tests::client::{DeferredClient, HttpClient};
 use integration_tests::TestEnv;

integration-tests/tests/inspect/deferred.rs

@@ -3,7 +3,7 @@ use did::deferred::{
     Agency, ContractRegistration, ContractType, DeferredResult, GenericValue, Seller,
 };
 use did::ID;
-use dip721::NftError;
+use dip721_rs::NftError;
 use integration_tests::actor::{admin, alice, bob};
 use integration_tests::client::DeferredClient;
 use integration_tests::TestEnv;

integration-tests/tests/use_case/reserve_reward_pool.rs

@@ -1,6 +1,6 @@
 use candid::Nat;
 use did::deferred::{ContractRegistration, ContractType, Seller};
-use dip721::GenericValue;
+use dip721_rs::GenericValue;
 use icrc::icrc1::account::Account;
 use integration_tests::actor::{admin, alice};
 use integration_tests::client::{DeferredClient, EkokeRewardPoolClient, IcrcLedgerClient};

src/deferred/Cargo.toml

@@ -21,7 +21,7 @@ did = []
 async-trait = { workspace = true }
 candid = { workspace = true }
 did = { path = "../did" }
-dip721 = { path = "../dip721" }
+dip721-rs = { workspace = true }
 getrandom = { workspace = true, features = ["custom"] }
 ic-cdk = { workspace = true }
 ic-cdk-macros = { workspace = true }

src/deferred/src/app.rs

@@ -20,7 +20,7 @@ use did::deferred::{
     TokenInfo,
 };
 use did::ID;
-use dip721::{
+use dip721_rs::{
     Dip721, GenericValue, Metadata, NftError, Stats, SupportedInterface, TokenIdentifier,
     TokenMetadata, TxEvent,
 };

src/deferred/src/app/inspect.rs

@@ -5,7 +5,7 @@
 use candid::{Nat, Principal};
 use did::deferred::{Contract, DeferredError, DeferredResult, Seller, Token, TokenError};
 use did::ID;
-use dip721::NftError;
+use dip721_rs::NftError;
 
 use super::roles::RolesManager;
 use super::storage::{Agents, ContractStorage};

src/deferred/src/app/storage.rs

@@ -4,7 +4,7 @@ use did::deferred::{
     Agency, Contract, DeferredError, DeferredResult, StorableTxEvent, Token, TokenError,
 };
 use did::{StorableNat, StorablePrincipal, ID};
-use dip721::TokenIdentifier;
+use dip721_rs::TokenIdentifier;
 use ic_stable_structures::memory_manager::VirtualMemory;
 use ic_stable_structures::{BTreeMap, DefaultMemoryImpl};
 

src/deferred/src/app/storage/contracts.rs

@@ -3,7 +3,7 @@ use did::deferred::{
     Contract, DeferredError, DeferredResult, RestrictedProperty, Seller, Token, TokenError,
 };
 use did::{StorableNat, ID};
-use dip721::{GenericValue, TokenIdentifier, TokenMetadata};
+use dip721_rs::{GenericValue, TokenIdentifier, TokenMetadata};
 use itertools::Itertools;
 
 use super::{
@@ -817,7 +817,7 @@ mod test {
             currency: "EUR".to_string(),
             properties: vec![(
                 "contract:city".to_string(),
-                dip721::GenericValue::TextContent("Rome".to_string()),
+                dip721_rs::GenericValue::TextContent("Rome".to_string()),
             )],
             restricted_properties: vec![],
             agency: None,
@@ -946,11 +946,11 @@ mod test {
         let contract = with_mock_contract(1, 1, |contract| {
             contract.properties.push((
                 "contract:address".to_string(),
-                dip721::GenericValue::TextContent("Rome".to_string()),
+                dip721_rs::GenericValue::TextContent("Rome".to_string()),
             ));
             contract.properties.push((
                 "contract:country".to_string(),
-                dip721::GenericValue::TextContent("Italy".to_string()),
+                dip721_rs::GenericValue::TextContent("Italy".to_string()),
             ));
         });
         assert!(ContractStorage::insert_contract(contract).is_ok());
@@ -974,19 +974,19 @@ mod test {
         let contract = with_mock_contract(1, 1, |contract| {
             contract.properties.push((
                 "contract:address".to_string(),
-                dip721::GenericValue::TextContent("Rome".to_string()),
+                dip721_rs::GenericValue::TextContent("Rome".to_string()),
             ));
             contract.properties.push((
                 "contract:country".to_string(),
-                dip721::GenericValue::TextContent("Italy".to_string()),
+                dip721_rs::GenericValue::TextContent("Italy".to_string()),
             ));
         });
         assert!(ContractStorage::insert_contract(contract).is_ok());
 
         assert!(ContractStorage::update_contract_property(
             &1_u64.into(),
             "contract:address".to_string(),
-            dip721::GenericValue::TextContent("Milan".to_string())
+            dip721_rs::GenericValue::TextContent("Milan".to_string())
         )
         .is_ok());
         assert_eq!(
@@ -1003,7 +1003,7 @@ mod test {
         assert!(ContractStorage::update_contract_property(
             &1_u64.into(),
             "contract:addressLong".to_string(),
-            dip721::GenericValue::TextContent("Trieste".to_string())
+            dip721_rs::GenericValue::TextContent("Trieste".to_string())
         )
         .is_ok());
         assert_eq!(
@@ -1025,7 +1025,7 @@ mod test {
                 "contract:address".to_string(),
                 RestrictedProperty {
                     access_list: vec![RestrictionLevel::Seller],
-                    value: dip721::GenericValue::TextContent("Rome".to_string()),
+                    value: dip721_rs::GenericValue::TextContent("Rome".to_string()),
                 },
             ));
         });
@@ -1036,7 +1036,7 @@ mod test {
             "contract:address".to_string(),
             RestrictedProperty {
                 access_list: vec![RestrictionLevel::Agent, RestrictionLevel::Seller],
-                value: dip721::GenericValue::TextContent("Milan".to_string()),
+                value: dip721_rs::GenericValue::TextContent("Milan".to_string()),
             },
         )
         .is_ok());

src/deferred/src/app/storage/tx_history.rs

@@ -1,6 +1,6 @@
 use candid::Nat;
 use did::deferred::Token;
-use dip721::{GenericValue, TxEvent};
+use dip721_rs::{GenericValue, TxEvent};
 
 use super::{with_tx_history, with_tx_history_mut};
 

src/deferred/src/app/test_utils.rs

@@ -1,7 +1,7 @@
 use candid::Principal;
 use did::deferred::{Agency, Contract, RestrictedProperty, RestrictionLevel, Seller, Token};
 use did::ID;
-use dip721::TokenIdentifier;
+use dip721_rs::TokenIdentifier;
 
 use super::storage::ContractStorage;
 use crate::utils::caller;
@@ -43,13 +43,13 @@ pub fn mock_contract(id: u64, installments: u64) -> Contract {
         currency: "EUR".to_string(),
         properties: vec![(
             "contract:city".to_string(),
-            dip721::GenericValue::TextContent("Rome".to_string()),
+            dip721_rs::GenericValue::TextContent("Rome".to_string()),
         )],
         restricted_properties: vec![(
             "contract:seller_address".to_string(),
             RestrictedProperty {
                 access_list: vec![RestrictionLevel::Agent, RestrictionLevel::Seller],
-                value: dip721::GenericValue::TextContent("Via Roma 123".to_string()),
+                value: dip721_rs::GenericValue::TextContent("Via Roma 123".to_string()),
             },
         )],
         agency: Some(mock_agency()),

src/deferred/src/inspect.rs

@@ -1,7 +1,7 @@
 use candid::{Nat, Principal};
 use did::deferred::ContractRegistration;
 use did::ID;
-use dip721::GenericValue;
+use dip721_rs::GenericValue;
 use ic_cdk::api;
 #[cfg(target_family = "wasm")]
 use ic_cdk_macros::inspect_message;