Merge branch 'master' into monthly_chit

Cargo.toml

@@ -192,7 +192,7 @@ ic-ledger-types = "0.11.0"
 ic-stable-structures = "0.6.4"
 ic-transport-types = "0.35.0"
 ic-utils = "0.35.0"
-ic-verifiable-credentials = { git = "https://github.com/dfinity/verifiable-credentials-sdk", rev = "2cc9be24599b755f9584f270dbe429f09ccf473f" }
+ic-verifiable-credentials = { git = "https://github.com/dfinity/verifiable-credentials-sdk", rev = "a116a2e53a13e4a1f6f7e8429960a7d0d6142e70" }
 icrc-ledger-types = "0.1.5"
 ic0 = "0.23.0"
 itertools = "0.13.0"

backend/canisters/community/CHANGELOG.md

@@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [unreleased]
 
+### Added
+
+- Add `Locked` gate ([#6095](https://github.com/open-chat-labs/open-chat/pull/6095))
+
 ### Changed
 
 - Fix fee then retry transfer if fee too high ([#6063](https://github.com/open-chat-labs/open-chat/pull/6063))

backend/canisters/group/CHANGELOG.md

@@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [unreleased]
 
+### Added
+
+- Add `Locked` gate ([#6095](https://github.com/open-chat-labs/open-chat/pull/6095))
+
 ### Changed
 
 - Fix fee then retry transfer if fee too high ([#6063](https://github.com/open-chat-labs/open-chat/pull/6063))

backend/canisters/group_index/CHANGELOG.md

@@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [unreleased]
 
+### Added
+
+- Add `Locked` gate ([#6095](https://github.com/open-chat-labs/open-chat/pull/6095))
+
 ### Changed
 
 - Clear old data from the failed upgrades log ([#6062](https://github.com/open-chat-labs/open-chat/pull/6062))

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

@@ -380,6 +380,8 @@ pub struct AccessGateMetrics {
     pub token_balance: u32,
     #[serde(default)]
     pub composite: u32,
+    #[serde(default)]
+    pub locked: u32,
 }
 
 impl AccessGateMetrics {
@@ -393,6 +395,7 @@ impl AccessGateMetrics {
             AccessGate::Payment(_) => self.payment += 1,
             AccessGate::TokenBalance(_) => self.token_balance += 1,
             AccessGate::Composite(_) => self.composite += 1,
+            AccessGate::Locked => self.locked += 1,
         }
     }
 }

backend/canisters/local_group_index/CHANGELOG.md

@@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [unreleased]
 
+### Added
+
+- Add `Locked` gate ([#6095](https://github.com/open-chat-labs/open-chat/pull/6095))
+
 ### Changed
 
 - Clear old data from the failed upgrades log ([#6062](https://github.com/open-chat-labs/open-chat/pull/6062))

backend/canisters/local_user_index/CHANGELOG.md

@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 - Support submitting proof of uniqueness to LocalUserIndex ([#6068](https://github.com/open-chat-labs/open-chat/pull/6068))
 - Support submitting proof of diamond membership to LocalUserIndex ([#6084](https://github.com/open-chat-labs/open-chat/pull/6084))
+- Add `Locked` gate ([#6095](https://github.com/open-chat-labs/open-chat/pull/6095))
 
 ### Changed
 

backend/canisters/user/CHANGELOG.md

@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [unreleased]
 
+### Added
+
+- Add `Locked` gate ([#6095](https://github.com/open-chat-labs/open-chat/pull/6095))
+
 ### Changed
 
 - Improve check for empty and dormant users ([#6073](https://github.com/open-chat-labs/open-chat/pull/6073))

backend/canisters/user_index/CHANGELOG.md

@@ -20,6 +20,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Ensure UserIndex is only controller before installing LocalUserIndex ([#6070](https://github.com/open-chat-labs/open-chat/pull/6070))
 - Store CHIT balances per month ([#6087](https://github.com/open-chat-labs/open-chat/pull/6087))
 - Add `user_ii_principal` to `submit_proof_of_unique_personhood` args ([#6092](https://github.com/open-chat-labs/open-chat/pull/6092))
+- Bump `ic-verifiable-credentials` to latest version ([#6096](https://github.com/open-chat-labs/open-chat/pull/6096))
 
 ### Removed
 

backend/libraries/gated_groups/src/lib.rs

@@ -67,6 +67,7 @@ async fn check_non_composite_gate(gate: AccessGate, args: CheckGateArgs) -> Chec
         AccessGate::Payment(g) => try_transfer_from(&g, args.user_id, args.this_canister, args.now).await,
         AccessGate::TokenBalance(g) => check_token_balance_gate(&g, args.user_id).await,
         AccessGate::Composite(_) => unreachable!(),
+        AccessGate::Locked => CheckIfPassesGateResult::Failed(GateCheckFailedReason::Locked),
     }
 }
 

backend/libraries/types/can.did

@@ -1526,6 +1526,7 @@ type AccessGate = variant {
         inner : vec AccessGate;
         and : bool;
     };
+    Locked;
 };
 
 type AccessGateUpdate = variant {
@@ -1577,6 +1578,7 @@ type GateCheckFailedReason = variant {
     PaymentFailed : ICRC2_TransferFromError;
     InsufficientBalance : nat;
     FailedVerifiedCredentialCheck : text;
+    Locked;
 };
 
 type VerifiedCredentialGateArgs = record {

backend/libraries/types/src/gated_groups.rs

@@ -16,6 +16,7 @@ pub enum AccessGate {
     Payment(PaymentGate),
     TokenBalance(TokenBalanceGate),
     Composite(CompositeGate),
+    Locked,
 }
 
 impl AccessGate {
@@ -45,6 +46,7 @@ impl AccessGate {
             AccessGate::Payment(_) => "payment",
             AccessGate::TokenBalance(_) => "token_balance",
             AccessGate::Composite(_) => "composite",
+            AccessGate::Locked => "locked",
         }
     }
 }
@@ -101,6 +103,7 @@ pub enum GateCheckFailedReason {
     PaymentFailed(TransferFromError),
     InsufficientBalance(u128),
     FailedVerifiedCredentialCheck(String),
+    Locked,
 }
 
 #[derive(CandidType, Serialize, Deserialize, Clone, Debug)]