chore: improve ic_message

Author: zensh

Cargo.lock

@@ -1,5 +1,32 @@
 {
   "canisters": {
+    "ic_message": {
+      "candid": "src/ic_message/ic_message.did",
+      "declarations": {
+        "node_compatibility": true
+      },
+      "package": "ic_message",
+      "optimize": "cycles",
+      "type": "rust"
+    },
+    "ic_message_channel": {
+      "candid": "src/ic_message_channel/ic_message_channel.did",
+      "declarations": {
+        "node_compatibility": true
+      },
+      "package": "ic_message_channel",
+      "optimize": "cycles",
+      "type": "rust"
+    },
+    "ic_message_profile": {
+      "candid": "src/ic_message_profile/ic_message_profile.did",
+      "declarations": {
+        "node_compatibility": true
+      },
+      "package": "ic_message_profile",
+      "optimize": "cycles",
+      "type": "rust"
+    },
     "ic_panda_luckypool": {
       "candid": "src/ic_panda_luckypool/ic_panda_luckypool.did",
       "declarations": {

dfx.json

@@ -33,6 +33,7 @@ type ChannelInfo = record {
   created_by : principal;
   canister : principal;
   image : text;
+  message_start : nat32;
   latest_message_at : nat32;
   latest_message_by : principal;
   my_setting : ChannelSetting;
@@ -113,8 +114,10 @@ type StateInfo = record {
   profile_canisters : vec principal;
   names_total : nat64;
   transfer_out_total : nat;
+  next_block_height : nat64;
   users_total : nat64;
   price : Price;
+  next_block_phash : blob;
   cose_canisters : vec principal;
   incoming_total : nat;
   channel_canisters : vec principal;
@@ -134,7 +137,6 @@ type UserInfo = record {
   username : opt text;
   cose_canister : opt principal;
   name : text;
-  paid : nat64;
   image : text;
   profile_canister : principal;
 };

src/ic_message/ic_message.did

@@ -32,10 +32,10 @@ fn admin_add_canister(kind: types::CanisterKind, id: Principal) -> Result<(), St
                 s.cose_canisters.push(id);
             }
             types::CanisterKind::Profile => {
-                s.cose_canisters.push(id);
+                s.profile_canisters.push(id);
             }
             types::CanisterKind::Channel => {
-                s.cose_canisters.push(id);
+                s.channel_canisters.push(id);
             }
         }
         Ok(())

src/ic_message/src/api_admin.rs

@@ -26,6 +26,8 @@ fn get_state() -> Result<types::StateInfo, String> {
         users_total: store::user::users_total(),
         incoming_total: s.incoming_total,
         transfer_out_total: s.transfer_out_total,
+        next_block_height: s.next_block_height,
+        next_block_phash: s.next_block_phash,
     }))
 }
 

src/ic_message/src/api_query.rs

@@ -8,14 +8,13 @@ use crate::{is_authenticated, store, types};
 
 #[ic_cdk::update(guard = "is_authenticated")]
 async fn register_username(username: String) -> Result<UserInfo, String> {
-    if username.len() > types::MAX_USER_NS_SIZE {
+    if username.len() > types::MAX_USER_SIZE {
         Err("username is too long".to_string())?;
     }
-
-    validate_key(&username.to_ascii_lowercase())?;
-    if username.starts_with("-") || username.starts_with("_") {
+    if username.starts_with("_") {
         Err("invalid username".to_string())?;
     }
+    validate_key(&username.to_ascii_lowercase())?;
 
     let caller = ic_cdk::caller();
     let now_ms = ic_cdk::api::time() / MILLISECONDS;

src/ic_message/src/api_update.rs

@@ -74,27 +74,21 @@ pub struct User {
     pub image: String,
     #[serde(rename = "p")]
     pub profile_canister: Principal, // profile canister
-    #[serde(rename = "cn")]
-    pub cose_namespace: Option<(Principal, String)>, // namespace in shared COSE service
-    #[serde(rename = "pa")]
-    pub paid: u64,
+    #[serde(rename = "c")]
+    pub cose_canister: Option<Principal>, // COSE canister
+    #[serde(rename = "u")]
+    pub username: Option<String>,
 }
 
 impl User {
     pub fn into_info(self, id: Principal) -> UserInfo {
-        let (cose_canister, username) = match self.cose_namespace {
-            Some((c, n)) => (Some(c), Some(n)),
-            None => (None, None),
-        };
-
         UserInfo {
             id,
-            name: self.name.clone(),
-            image: self.image.clone(),
+            name: self.name,
+            image: self.image,
             profile_canister: self.profile_canister,
-            username,
-            cose_canister,
-            paid: self.paid,
+            cose_canister: self.cose_canister,
+            username: self.username,
         }
     }
 }
@@ -227,16 +221,16 @@ pub mod user {
                         name,
                         image: "".to_string(),
                         profile_canister,
-                        cose_namespace: None,
-                        paid: 0,
+                        cose_canister: None,
+                        username: None,
                     };
                     m.insert(caller, user.clone());
                     user.into_info(caller)
                 }
             }
         });
 
-        call(
+        let _: Result<(), String> = call(
             info.profile_canister,
             "admin_upsert_profile",
             (caller, None::<(Principal, u64)>),
@@ -259,7 +253,7 @@ pub mod user {
             }
         })?;
 
-        call(
+        let _: Result<(), String> = call(
             user_profile_canister,
             "admin_upsert_profile",
             (caller, None::<(Principal, u64)>),
@@ -325,8 +319,10 @@ pub mod user {
             let blk = NameBlock {
                 height: s.next_block_height,
                 phash: s.next_block_phash,
-                name: ln.clone(),
+                name: ln,
                 user: caller,
+                from: None,
+                value: amount,
                 timestamp: now_ms,
             };
             let blk = to_cbor_bytes(&blk);
@@ -344,12 +340,11 @@ pub mod user {
             cose_canister,
             "admin_create_namespace",
             (CreateNamespaceInput {
-                name: ln.clone(),
+                name: caller.to_text().replace("-", "_"),
                 visibility: 0,
                 desc: Some(format!(
-                    "registered by {}, $PANDA block: {}",
-                    caller.to_text(),
-                    blk
+                    "register_username: {}, $PANDA block: {}",
+                    username, blk
                 )),
                 max_payload_size: Some(1024),
                 managers: BTreeSet::from([ic_cdk::id()]),
@@ -364,8 +359,8 @@ pub mod user {
             let mut m = r.borrow_mut();
             match m.get(&caller) {
                 Some(mut user) => {
-                    user.paid = amount;
-                    user.cose_namespace = Some((cose_canister, username));
+                    user.cose_canister = Some(cose_canister);
+                    user.username = Some(username);
                     m.insert(caller, user.clone());
                     user.into_info(caller)
                 }
@@ -374,16 +369,16 @@ pub mod user {
                         name: username.clone(),
                         image: "".to_string(),
                         profile_canister,
-                        cose_namespace: Some((cose_canister, username)),
-                        paid: amount,
+                        cose_canister: Some(cose_canister),
+                        username: Some(username),
                     };
                     m.insert(caller, user.clone());
                     user.into_info(caller)
                 }
             }
         });
 
-        call(
+        let _: Result<(), String> = call(
             info.profile_canister,
             "admin_upsert_profile",
             (caller, None::<(Principal, u64)>),
@@ -525,8 +520,8 @@ pub mod channel {
                         name: input.name.clone(),
                         image: "".to_string(),
                         profile_canister,
-                        cose_namespace: None,
-                        paid: 0,
+                        cose_canister: None,
+                        username: None,
                     };
                     m.insert(caller, user.clone());
                     (profile_canister, true)
@@ -535,7 +530,7 @@ pub mod channel {
         });
 
         if is_new {
-            call(
+            let _: Result<(), String> = call(
                 user_profile_canister,
                 "admin_upsert_profile",
                 (caller, None::<(Principal, u64)>),
@@ -565,7 +560,7 @@ pub mod channel {
             call(channel_canister, "admin_create_channel", (input,), 0).await?;
         let res = res?;
 
-        call(
+        let _: Result<(), String> = call(
             user_profile_canister,
             "admin_upsert_profile",
             (caller, Some((res.canister, res.id))),
@@ -576,16 +571,16 @@ pub mod channel {
     }
 
     pub async fn save_channel_kek(caller: Principal, input: ChannelKEKInput) -> Result<(), String> {
-        let user_cose = USER_STORE
-            .with(|r| r.borrow().get(&caller).map(|u| u.cose_namespace))
+        let cose_canister = USER_STORE
+            .with(|r| r.borrow().get(&caller).map(|u| u.cose_canister))
             .ok_or_else(|| "user not found".to_string())?;
-        let user_cose = user_cose.ok_or_else(|| "user has no COSE namespace".to_string())?;
+        let cose_canister = cose_canister.ok_or_else(|| "user has no COSE service".to_string())?;
         let res: Result<CreateSettingOutput, String> = call(
-            user_cose.0,
+            cose_canister,
             "setting_create",
             (
                 SettingPath {
-                    ns: user_cose.1.to_ascii_lowercase(),
+                    ns: caller.to_text().replace("-", "_"),
                     user_owned: false,
                     subject: Some(caller),
                     key: channel_kek_key(&input.canister, input.id),

src/ic_message/src/store.rs

@@ -1,13 +1,14 @@
 use candid::{CandidType, Principal};
 use serde::{Deserialize, Serialize};
+use serde_bytes::ByteArray;
 use std::collections::BTreeSet;
 
 pub const TOKEN_1: u64 = 100_000_000;
 pub const TOKEN_FEE: u64 = 10_000; // 0.0001 token
 pub const MIN_NAME_PRICE: u64 = TOKEN_1;
 pub const MIN_CHANNEL_PRICE: u64 = TOKEN_1;
 pub const MAX_USER_NAME_SIZE: usize = 32;
-pub const MAX_USER_NS_SIZE: usize = 16;
+pub const MAX_USER_SIZE: usize = 20;
 
 #[derive(CandidType, Clone, Debug, Deserialize, Serialize)]
 pub struct StateInfo {
@@ -21,6 +22,8 @@ pub struct StateInfo {
     pub users_total: u64,
     pub incoming_total: u128,
     pub transfer_out_total: u128,
+    pub next_block_height: u64,
+    pub next_block_phash: ByteArray<32>,
 }
 
 #[derive(CandidType, Clone, Debug, Default, Deserialize, Serialize)]