Merge branch 'master' into native/connect-with-otp

Author: ivan-jukic

Cargo.lock

@@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [unreleased]
 
+### Changed
+
+- Expose `liquid_cycles_balance` in metrics ([#8350](https://github.com/open-chat-labs/open-chat/pull/8350))
+- Add delay before retrying c2c call under certain error conditions ([#8355](https://github.com/open-chat-labs/open-chat/pull/8355))
+
 ## [[2.0.1811](https://github.com/open-chat-labs/open-chat/releases/tag/v2.0.1811-airdrop_bot)] - 2025-07-01
 
 ### Changed

backend/canisters/airdrop_bot/CHANGELOG.md

@@ -10,13 +10,13 @@ use tracing::{error, info, trace};
 use types::icrc1::{self, Account};
 use types::{
     BotMessage, CanisterId, ChannelId, CommunityId, CompletedCryptoTransaction, CryptoContent, CryptoTransaction,
-    MessageContentInitial, UserId,
+    MessageContentInitial, Milliseconds, UserId,
 };
-use utils::canister::should_retry_failed_c2c_call;
+use utils::canister::delay_if_should_retry_failed_c2c_call;
 use utils::time::{MONTHS, MonthKey};
 
 impl TimerJobItem for Action {
-    async fn process(&self) -> Result<(), bool> {
+    async fn process(&self) -> Result<(), Option<Milliseconds>> {
         match self.clone() {
             Action::JoinChannel(community_id, channel_id) => join_channel(community_id, channel_id).await,
             Action::SendMessage(a) if matches!(a.airdrop_type, AirdropType::Lottery(_)) => {
@@ -66,7 +66,7 @@ pub struct LotteryAirdrop {
     pub position: usize,
 }
 
-async fn join_channel(community_id: CommunityId, channel_id: ChannelId) -> Result<(), bool> {
+async fn join_channel(community_id: CommunityId, channel_id: ChannelId) -> Result<(), Option<Milliseconds>> {
     info!(?community_id, ?channel_id, "Join channel");
 
     let local_user_index_canister_id = match community_canister_c2c_client::local_user_index(
@@ -77,8 +77,8 @@ async fn join_channel(community_id: CommunityId, channel_id: ChannelId) -> Resul
     {
         Ok(community_canister::local_user_index::Response::Success(canister_id)) => canister_id,
         Err(error) => {
-            let retry = should_retry_failed_c2c_call(error.reject_code(), error.message());
-            return Err(retry);
+            let delay_if_should_retry = delay_if_should_retry_failed_c2c_call(error.reject_code(), error.message());
+            return Err(delay_if_should_retry);
         }
     };
 
@@ -99,15 +99,15 @@ async fn join_channel(community_id: CommunityId, channel_id: ChannelId) -> Resul
         | Ok(local_user_index_canister::join_channel::Response::SuccessJoinedCommunity(_)) => (),
         Ok(local_user_index_canister::join_channel::Response::InternalError(err)) => {
             error!("Failed to join_channel {err:?}");
-            return Err(true);
+            return Err(Some(0));
         }
         Ok(resp) => {
             error!("Failed to join_channel {resp:?}");
-            return Err(false);
+            return Err(None);
         }
         Err(err) => {
             error!("Failed to join_channel {err:?}");
-            return Err(true);
+            return Err(Some(0));
         }
     }
 
@@ -118,7 +118,7 @@ async fn join_channel(community_id: CommunityId, channel_id: ChannelId) -> Resul
     Ok(())
 }
 
-async fn handle_transfer_action(action: AirdropTransfer) -> Result<(), bool> {
+async fn handle_transfer_action(action: AirdropTransfer) -> Result<(), Option<Milliseconds>> {
     let amount = action.amount.into();
 
     trace!(?amount, "CHAT Transfer");
@@ -187,14 +187,14 @@ async fn handle_transfer_action(action: AirdropTransfer) -> Result<(), bool> {
         }
         Err(error) => {
             error!(?args, ?error, "Failed to transfer CHAT, retrying");
-            return Err(true);
+            return Err(Some(0));
         }
     }
 
     Ok(())
 }
 
-async fn handle_main_message_action(action: AirdropMessage) -> Result<(), bool> {
+async fn handle_main_message_action(action: AirdropMessage) -> Result<(), Option<Milliseconds>> {
     trace!("Send DM");
 
     let AirdropType::Main(MainAirdrop { chit, shares }) = action.airdrop_type else {
@@ -231,21 +231,21 @@ async fn handle_main_message_action(action: AirdropMessage) -> Result<(), bool>
         Ok(user_canister::c2c_handle_bot_messages::Response::Success) => Ok(()),
         Ok(resp) => {
             error!(?args, ?resp, "Failed to send DM");
-            Err(false)
+            Err(None)
         }
         Err(error) => {
-            let retry = should_retry_failed_c2c_call(error.reject_code(), error.message());
+            let delay_if_should_retry = delay_if_should_retry_failed_c2c_call(error.reject_code(), error.message());
             error!(?args, ?error, "Failed to send DM");
-            Err(retry)
+            Err(delay_if_should_retry)
         }
     }
 }
 
-async fn handle_lottery_message_action(action: AirdropMessage) -> Result<(), bool> {
+async fn handle_lottery_message_action(action: AirdropMessage) -> Result<(), Option<Milliseconds>> {
     info!("Send lottery winners message");
 
     let AirdropType::Lottery(LotteryAirdrop { position }): AirdropType = action.airdrop_type else {
-        return Err(false);
+        return Err(None);
     };
 
     let Some((community_id, channel_id, message_id)) = mutate_state(|state| {
@@ -255,7 +255,7 @@ async fn handle_lottery_message_action(action: AirdropMessage) -> Result<(), boo
             .current(state.env.now())
             .map(|c| (c.community_id, c.channel_id, state.env.rng().r#gen()))
     }) else {
-        return Err(false);
+        return Err(None);
     };
 
     let position = match position {
@@ -295,12 +295,12 @@ async fn handle_lottery_message_action(action: AirdropMessage) -> Result<(), boo
         Ok(community_canister::send_message::Response::Success(_)) => Ok(()),
         Ok(resp) => {
             error!(?args, ?resp, "Failed to send lottery message");
-            Err(false)
+            Err(None)
         }
         Err(error) => {
             error!(?args, ?error, "Failed to send lottery message");
-            let retry = should_retry_failed_c2c_call(error.reject_code(), error.message());
-            Err(retry)
+            let delay_if_should_retry = delay_if_should_retry_failed_c2c_call(error.reject_code(), error.message());
+            Err(delay_if_should_retry)
         }
     }
 }

backend/canisters/airdrop_bot/impl/src/actions.rs

@@ -54,6 +54,7 @@ impl RuntimeState {
             stable_memory_used: utils::memory::stable(),
             now: self.env.now(),
             cycles_balance: self.env.cycles_balance(),
+            liquid_cycles_balance: self.env.liquid_cycles_balance(),
             wasm_version: WASM_VERSION.with_borrow(|v| **v),
             git_commit_id: utils::git::git_commit_id().to_string(),
             airdrops: self.data.airdrops.metrics(),
@@ -120,6 +121,7 @@ pub struct Metrics {
     pub heap_memory_used: u64,
     pub stable_memory_used: u64,
     pub cycles_balance: Cycles,
+    pub liquid_cycles_balance: Cycles,
     pub wasm_version: BuildVersion,
     pub git_commit_id: String,
     pub canister_ids: CanisterIds,

backend/canisters/airdrop_bot/impl/src/lib.rs

@@ -9,6 +9,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Changed
 
 - When a bot invites a user also send an invitation ([#8320](https://github.com/open-chat-labs/open-chat/pull/8320))
+- Expose `liquid_cycles_balance` in metrics ([#8350](https://github.com/open-chat-labs/open-chat/pull/8350))
+- Add delay before retrying c2c call under certain error conditions ([#8355](https://github.com/open-chat-labs/open-chat/pull/8355))
+- Allow members to read community summary/membership ([#8357](https://github.com/open-chat-labs/open-chat/pull/8357))
 
 ### Fixed
 

backend/canisters/community/CHANGELOG.md

@@ -350,6 +350,7 @@ impl RuntimeState {
             stable_memory_used: utils::memory::stable(),
             now: self.env.now(),
             cycles_balance: self.env.cycles_balance(),
+            liquid_cycles_balance: self.env.liquid_cycles_balance(),
             wasm_version: WASM_VERSION.with_borrow(|v| **v),
             git_commit_id: utils::git::git_commit_id().to_string(),
             public: self.data.is_public.value,
@@ -1182,6 +1183,7 @@ pub struct Metrics {
     pub stable_memory_used: u64,
     pub now: TimestampMillis,
     pub cycles_balance: Cycles,
+    pub liquid_cycles_balance: Cycles,
     pub wasm_version: BuildVersion,
     pub git_commit_id: String,
     pub public: bool,

backend/canisters/community/impl/src/lib.rs

@@ -1,13 +1,13 @@
 use crate::{can_borrow_state, run_regular_jobs};
 use local_user_index_canister::CommunityEvent;
 use timer_job_queues::{TimerJobItem, timer_job_batch};
-use types::{CanisterId, IdempotentEnvelope};
-use utils::canister::should_retry_failed_c2c_call;
+use types::{CanisterId, IdempotentEnvelope, Milliseconds};
+use utils::canister::delay_if_should_retry_failed_c2c_call;
 
 timer_job_batch!(LocalUserIndexEventBatch, CanisterId, IdempotentEnvelope<CommunityEvent>, 10);
 
 impl TimerJobItem for LocalUserIndexEventBatch {
-    async fn process(&self) -> Result<(), bool> {
+    async fn process(&self) -> Result<(), Option<Milliseconds>> {
         if can_borrow_state() {
             run_regular_jobs();
         }
@@ -23,8 +23,8 @@ impl TimerJobItem for LocalUserIndexEventBatch {
         match response {
             Ok(local_user_index_canister::c2c_community_canister::Response::Success) => Ok(()),
             Err(error) => {
-                let retry = should_retry_failed_c2c_call(error.reject_code(), error.message());
-                Err(retry)
+                let delay_if_should_retry = delay_if_should_retry_failed_c2c_call(error.reject_code(), error.message());
+                Err(delay_if_should_retry)
             }
         }
     }

backend/canisters/community/impl/src/model/local_user_index_event_batch.rs

@@ -1,13 +1,13 @@
 use crate::{can_borrow_state, run_regular_jobs};
 use timer_job_queues::{TimerJobItem, grouped_timer_job_batch};
-use types::{IdempotentEnvelope, UserId};
+use types::{IdempotentEnvelope, Milliseconds, UserId};
 use user_canister::CommunityCanisterEvent;
-use utils::canister::should_retry_failed_c2c_call;
+use utils::canister::delay_if_should_retry_failed_c2c_call;
 
 grouped_timer_job_batch!(UserEventBatch, UserId, IdempotentEnvelope<CommunityCanisterEvent>, 1000);
 
 impl TimerJobItem for UserEventBatch {
-    async fn process(&self) -> Result<(), bool> {
+    async fn process(&self) -> Result<(), Option<Milliseconds>> {
         if can_borrow_state() {
             run_regular_jobs();
         }
@@ -23,8 +23,8 @@ impl TimerJobItem for UserEventBatch {
         match response {
             Ok(user_canister::c2c_community_canister::Response::Success) => Ok(()),
             Err(error) => {
-                let retry = should_retry_failed_c2c_call(error.reject_code(), error.message());
-                Err(retry)
+                let delay_if_should_retry = delay_if_should_retry_failed_c2c_call(error.reject_code(), error.message());
+                Err(delay_if_should_retry)
             }
         }
     }

backend/canisters/community/impl/src/model/user_event_batch.rs

@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [unreleased]
 
+### Changed
+
+- Expose `liquid_cycles_balance` in metrics ([#8350](https://github.com/open-chat-labs/open-chat/pull/8350))
+
 ## [[2.0.1826](https://github.com/open-chat-labs/open-chat/releases/tag/v2.0.1826-cycles_dispenser)] - 2025-07-09
 
 ### Changed

backend/canisters/cycles_dispenser/CHANGELOG.md

@@ -47,6 +47,7 @@ impl State {
             stable_memory_used: utils::memory::stable(),
             now: self.env.now(),
             cycles_balance: self.env.cycles_balance(),
+            liquid_cycles_balance: self.env.liquid_cycles_balance(),
             wasm_version: WASM_VERSION.with_borrow(|v| **v),
             git_commit_id: utils::git::git_commit_id().to_string(),
             governance_principals: self.data.governance_principals.iter().copied().collect(),
@@ -123,6 +124,7 @@ pub struct Metrics {
     pub heap_memory_used: u64,
     pub stable_memory_used: u64,
     pub cycles_balance: Cycles,
+    pub liquid_cycles_balance: Cycles,
     pub wasm_version: BuildVersion,
     pub git_commit_id: String,
     pub governance_principals: Vec<Principal>,