Move market logging

Author: tifrel

mintbase-deps/src/logging.rs

@@ -2,17 +2,16 @@ use near_events::{
     near_event_data,
     near_event_data_log,
 };
-use near_sdk::json_types::U64;
+use near_sdk::json_types::{
+    U128,
+    U64,
+};
 #[cfg(feature = "de")]
 use near_sdk::serde::Deserialize;
 #[cfg(feature = "ser")]
 use near_sdk::serde::Serialize;
 use near_sdk::AccountId;
 
-// TODO: events defined here, logging functions into market/store
-mod market;
-pub use market::*;
-
 // ----------------------------- Core (NEP171) ------------------------------ //
 #[cfg_attr(feature = "all", derive(Clone, Debug))]
 #[near_event_data_log(standard = "nep171", version = "1.0.0", event = "nft_mint")]
@@ -138,3 +137,88 @@ impl MbStoreChangeSettingData {
         }
     }
 }
+
+// --------------------------------- Market --------------------------------- //
+#[cfg_attr(feature = "ser", derive(Serialize))]
+#[cfg_attr(feature = "de", derive(Deserialize))]
+#[cfg_attr(any(feature = "ser", feature = "de"), serde(crate = "near_sdk::serde"))]
+pub struct NftListLog {
+    pub list_id: String,
+    pub price: String,
+    pub token_key: String,
+    pub owner_id: String,
+    pub autotransfer: bool,
+    pub approval_id: String,
+    pub token_id: String,
+    pub store_id: String,
+}
+
+#[near_event_data(standard = "mb_market", version = "0.1.0", event = "nft_list")]
+pub struct NftListData(pub Vec<NftListLog>);
+
+#[cfg_attr(feature = "all", derive(Clone, Debug))]
+#[near_event_data(standard = "mb_market", version = "0.1.0", event = "nft_update_list")]
+pub struct NftUpdateListData {
+    pub list_id: String,
+    pub auto_transfer: Option<bool>,
+    pub price: Option<String>,
+}
+
+#[cfg_attr(feature = "all", derive(Clone, Debug))]
+#[near_event_data_log(standard = "mb_market", version = "0.1.0", event = "nft_unlist")]
+pub struct NftUnlistLog {
+    pub list_id: String,
+}
+
+#[cfg_attr(feature = "all", derive(Clone, Debug))]
+#[near_event_data(standard = "mb_market", version = "0.1.0", event = "nft_sold")]
+pub struct NftSaleData {
+    pub list_id: String,
+    pub offer_num: u64,
+    pub token_key: String,
+    pub payout: HashMap<AccountId, U128>,
+    // Not originally in 0.1.0, but option makes it backwards compatible with
+    // serde_json
+    pub mintbase_amount: Option<U128>,
+}
+
+#[cfg_attr(feature = "all", derive(Clone, Debug))]
+#[cfg_attr(feature = "ser", derive(Serialize))]
+#[cfg_attr(feature = "de", derive(Deserialize))]
+#[cfg_attr(any(feature = "ser", feature = "de"), serde(crate = "near_sdk::serde"))]
+pub struct NftMakeOfferLog {
+    pub offer: crate::common::TokenOffer, // TODO: TokenOfferJson to stringify u128?
+    pub list_id: String,
+    pub token_key: String,
+    pub offer_num: u64,
+}
+
+// FIXME: u128 is not supported -_____-
+#[cfg_attr(feature = "all", derive(Clone, Debug))]
+#[near_event_data(standard = "mb_market", version = "0.1.0", event = "nft_make_offer")]
+pub struct NftMakeOfferData(pub Vec<NftMakeOfferLog>);
+
+#[cfg_attr(feature = "all", derive(Clone, Debug))]
+#[near_event_data(
+    standard = "mb_market",
+    version = "0.1.0",
+    event = "nft_withdraw_offer"
+)]
+pub struct NftWithdrawOfferData {
+    pub list_id: String,
+    pub offer_num: u64,
+}
+
+#[cfg_attr(feature = "all", derive(Clone, Debug))]
+#[near_event_data(standard = "mb_market", version = "0.1.0", event = "update_banlist")]
+pub struct UpdateBanlistData {
+    pub account_id: String,
+    pub state: bool,
+}
+
+#[cfg_attr(feature = "all", derive(Clone, Debug))]
+#[near_event_data(standard = "mb_market", version = "0.1.0", event = "update_allowlist")]
+pub struct UpdateAllowlistData {
+    pub account_id: String,
+    pub state: bool,
+}

mintbase-deps/src/logging/market.rs

@@ -20,22 +20,6 @@ use near_sdk::{
 use crate::common::TokenOffer;
 
 // ----------------------------- create listing ----------------------------- //
-#[cfg_attr(feature = "ser", derive(Serialize))]
-#[cfg_attr(feature = "de", derive(Deserialize))]
-#[cfg_attr(any(feature = "ser", feature = "de"), serde(crate = "near_sdk::serde"))]
-pub struct NftListLog {
-    pub list_id: String,
-    pub price: String,
-    pub token_key: String,
-    pub owner_id: String,
-    pub autotransfer: bool,
-    pub approval_id: String,
-    pub token_id: String,
-    pub store_id: String,
-}
-
-#[near_event_data(standard = "mb_market", version = "0.1.0", event = "nft_list")]
-pub struct NftListData(Vec<NftListLog>);
 
 #[cfg(feature = "ser")]
 pub fn log_listing_created(
@@ -98,13 +82,6 @@ pub fn log_batch_listing_created(
 
 // ---------------------------- update listings ----------------------------- //
 // TODO: test!
-#[cfg_attr(feature = "all", derive(Clone, Debug))]
-#[near_event_data(standard = "mb_market", version = "0.1.0", event = "nft_update_list")]
-pub struct NftUpdateListData {
-    pub list_id: String,
-    pub auto_transfer: Option<bool>,
-    pub price: Option<String>,
-}
 
 #[cfg(feature = "ser")]
 pub fn log_set_token_autotransfer(
@@ -132,151 +109,10 @@ pub fn log_set_token_asking_price(
     env::log_str(&data.serialize_event());
 }
 
-// ------------------------------- unlisting -------------------------------- //
-#[cfg_attr(feature = "all", derive(Clone, Debug))]
-#[near_event_data_log(standard = "mb_market", version = "0.1.0", event = "nft_unlist")]
-pub struct NftUnlistLog {
-    pub list_id: String,
-}
-
 #[cfg(feature = "ser")]
 pub fn log_token_removed(list_id: &str) {
     let log = NftUnlistLog {
         list_id: list_id.to_string(),
     };
     env::log_str(&log.serialize_event());
 }
-
-// ------------------------------ sell listing ------------------------------ //
-#[cfg_attr(feature = "all", derive(Clone, Debug))]
-#[near_event_data(standard = "mb_market", version = "0.1.0", event = "nft_sold")]
-pub struct NftSaleData {
-    pub list_id: String,
-    pub offer_num: u64,
-    pub token_key: String,
-    pub payout: HashMap<AccountId, U128>,
-    // Not originally in 0.1.0, but option makes it backwards compatible with
-    // serde_json
-    pub mintbase_amount: Option<U128>,
-}
-
-#[cfg(feature = "ser")]
-pub fn log_sale(
-    list_id: &str,
-    offer_num: u64,
-    token_key: &str,
-    payout: &HashMap<AccountId, U128>,
-    mintbase_amount: U128,
-) {
-    let data = NftSaleData {
-        list_id: list_id.to_string(),
-        offer_num,
-        token_key: token_key.to_string(),
-        payout: payout.clone(),
-        mintbase_amount: Some(mintbase_amount),
-    };
-    env::log_str(&data.serialize_event());
-}
-
-// ----------------------------- creating offer ----------------------------- //
-#[cfg_attr(feature = "all", derive(Clone, Debug))]
-#[cfg_attr(feature = "ser", derive(Serialize))]
-#[cfg_attr(feature = "de", derive(Deserialize))]
-#[cfg_attr(any(feature = "ser", feature = "de"), serde(crate = "near_sdk::serde"))]
-pub struct NftMakeOfferLog {
-    pub offer: TokenOffer, // TODO: TokenOfferJson to stringify u128?
-    pub list_id: String,
-    pub token_key: String,
-    pub offer_num: u64,
-}
-
-// FIXME: u128 is not supported -_____-
-#[cfg_attr(feature = "all", derive(Clone, Debug))]
-#[near_event_data(standard = "mb_market", version = "0.1.0", event = "nft_make_offer")]
-pub struct NftMakeOfferData(Vec<NftMakeOfferLog>);
-
-#[cfg(feature = "ser")]
-pub fn log_make_offer(
-    offer: Vec<&TokenOffer>,
-    token_key: Vec<&String>,
-    list_id: Vec<String>,
-    offer_num: Vec<u64>,
-) {
-    let data = NftMakeOfferData(
-        offer
-            .iter()
-            .enumerate()
-            .map(|(u, &x)| NftMakeOfferLog {
-                offer: x.clone(),
-                list_id: list_id[u].clone(),
-                token_key: token_key[u].clone(),
-                offer_num: offer_num[u],
-            })
-            .collect::<Vec<_>>(),
-    );
-    env::log_str(&data.serialize_event());
-}
-
-// --------------------------- withdrawing offer ---------------------------- //
-// TODO: testing!
-#[cfg_attr(feature = "all", derive(Clone, Debug))]
-#[near_event_data(
-    standard = "mb_market",
-    version = "0.1.0",
-    event = "nft_withdraw_offer"
-)]
-pub struct NftWithdrawOfferData {
-    pub list_id: String,
-    pub offer_num: u64,
-}
-
-#[cfg(feature = "ser")]
-pub fn log_withdraw_token_offer(
-    list_id: &str,
-    offer_num: u64,
-) {
-    let data = NftWithdrawOfferData {
-        offer_num,
-        list_id: list_id.to_string(),
-    };
-    env::log_str(&data.serialize_event());
-}
-
-// ----------------------- updating banlist/allowlist ----------------------- //
-#[cfg_attr(feature = "all", derive(Clone, Debug))]
-#[near_event_data(standard = "mb_market", version = "0.1.0", event = "update_banlist")]
-pub struct UpdateBanlistData {
-    pub account_id: String,
-    pub state: bool,
-}
-
-#[cfg(feature = "ser")]
-pub fn log_banlist_update(
-    account_id: &AccountId,
-    state: bool,
-) {
-    let data = UpdateBanlistData {
-        account_id: account_id.to_string(),
-        state,
-    };
-    env::log_str(&data.serialize_event());
-}
-
-#[cfg_attr(feature = "all", derive(Clone, Debug))]
-#[near_event_data(standard = "mb_market", version = "0.1.0", event = "update_allowlist")]
-pub struct UpdateAllowlistData {
-    pub account_id: String,
-    pub state: bool,
-}
-
-#[cfg(feature = "ser")]
-pub fn log_allowlist_update(
-    account_id: &AccountId,
-    state: bool,
-) {
-    let data = UpdateAllowlistData {
-        account_id: account_id.to_string(),
-        state,
-    };
-    env::log_str(&data.serialize_event());
-}

store/src/approvals.rs

@@ -210,7 +210,7 @@ impl MintbaseStore {
     }
 }
 
-pub fn log_approve(
+fn log_approve(
     token_id: u64,
     approval_id: u64,
     account_id: &AccountId,
@@ -223,7 +223,7 @@ pub fn log_approve(
     env::log_str(&data.serialize_event());
 }
 
-pub fn log_batch_approve(
+fn log_batch_approve(
     tokens: &[U64],
     approvals: &[U64],
     account_id: &AccountId,
@@ -242,7 +242,7 @@ pub fn log_batch_approve(
     env::log_str(&data.serialize_event());
 }
 
-pub fn log_revoke(
+fn log_revoke(
     token_id: u64,
     account_id: &AccountId,
 ) {
@@ -255,7 +255,7 @@ pub fn log_revoke(
     );
 }
 
-pub fn log_revoke_all(token_id: u64) {
+fn log_revoke_all(token_id: u64) {
     env::log_str(
         &NftRevokeAllData {
             token_id: token_id.into(),

store/src/burning.rs

@@ -75,7 +75,7 @@ impl MintbaseStore {
     // -------------------------- internal methods -------------------------
 }
 
-pub fn log_nft_batch_burn(
+fn log_nft_batch_burn(
     token_ids: &[U64],
     owner_id: String,
 ) {

store/src/core.rs

@@ -296,7 +296,7 @@ impl MintbaseStore {
     }
 }
 
-pub fn log_nft_transfer(
+fn log_nft_transfer(
     to: &AccountId,
     token_id: u64,
     memo: &Option<String>,
@@ -313,7 +313,7 @@ pub fn log_nft_transfer(
     env::log_str(data.serialize_event().as_str());
 }
 
-pub fn log_nft_batch_transfer(
+fn log_nft_batch_transfer(
     tokens: &[U64],
     accounts: &[AccountId],
     old_owners: Vec<String>,

store/src/minting.rs

@@ -350,7 +350,7 @@ fn option_string_is_u64(opt_s: &Option<String>) -> bool {
 }
 
 #[allow(clippy::too_many_arguments)]
-pub fn log_nft_batch_mint(
+fn log_nft_batch_mint(
     first_token_id: u64,
     last_token_id: u64,
     minter: &str,
@@ -380,7 +380,7 @@ pub fn log_nft_batch_mint(
     env::log_str(log.serialize_event().as_str());
 }
 
-pub fn log_grant_minter(account_id: &AccountId) {
+pub(crate) fn log_grant_minter(account_id: &AccountId) {
     env::log_str(
         &MbStoreChangeSettingData {
             granted_minter: Some(account_id.to_string()),
@@ -390,7 +390,7 @@ pub fn log_grant_minter(account_id: &AccountId) {
     );
 }
 
-pub fn log_revoke_minter(account_id: &AccountId) {
+pub(crate) fn log_revoke_minter(account_id: &AccountId) {
     env::log_str(
         &MbStoreChangeSettingData {
             revoked_minter: Some(account_id.to_string()),

store/src/ownership.rs

@@ -111,7 +111,7 @@ impl MintbaseStore {
     }
 }
 
-pub fn log_transfer_store(account_id: &AccountId) {
+fn log_transfer_store(account_id: &AccountId) {
     env::log_str(
         &MbStoreChangeSettingData {
             new_owner: Some(account_id.to_string()),