feat: add Context Groups on-chain support (storage, CRUD, membership, proxy governance)

Cargo.toml

@@ -31,6 +31,9 @@ tokio = "1.35.1"
 
 calimero-context-config-near = { path = "./contracts/near/context-config" }
 
+[patch."https://github.com/calimero-network/core"]
+calimero-context-config = { path = "../core/crates/context/config" }
+
 [profile.release]
 strip = "symbols"
 lto = "fat"

contracts/near/context-config/Cargo.toml

@@ -36,4 +36,5 @@ migrations = []
 ## migrations (mutually exclusive) ##
 01_guard_revisions = []
 02_nonces = []
+03_context_groups = []
 ## migrations (mutually exclusive) ##

contracts/near/context-config/src/lib.rs

@@ -4,7 +4,9 @@
     reason = "Needed to separate NEAR functionality"
 )]
 
-use calimero_context_config::types::{Application, ContextId, ContextIdentity};
+use calimero_context_config::types::{
+    AppKey, Application, ContextGroupId, ContextId, ContextIdentity, SignerId,
+};
 use calimero_context_config::Timestamp;
 use near_sdk::borsh::{BorshDeserialize, BorshSerialize};
 use near_sdk::store::{IterableMap, IterableSet, LazyOption};
@@ -29,6 +31,8 @@ pub struct ContextConfigs {
     proxy_code: LazyOption<Vec<u8>>,
     proxy_code_hash: LazyOption<CryptoHash>,
     next_proxy_id: u64,
+    groups: IterableMap<ContextGroupId, OnChainGroupMeta>,
+    context_group_refs: IterableMap<ContextId, ContextGroupId>,
 }
 
 #[derive(Debug)]
@@ -48,6 +52,23 @@ struct Context {
     pub used_open_invitations: Guard<IterableSet<CryptoHash>>,
     /// A map that stores pending commitments for the given context.
     pub commitments_open_invitations: IterableMap<CryptoHash, BlockHeight>,
+    pub group_id: Option<ContextGroupId>,
+}
+
+#[derive(Debug)]
+#[near(serializers = [borsh])]
+pub struct OnChainGroupMeta {
+    pub app_key: AppKey,
+    pub target_application: Application<'static>,
+    pub admins: IterableSet<SignerId>,
+    pub admin_nonces: IterableMap<SignerId, u64>,
+    pub members: IterableSet<SignerId>,
+    pub approved_registrations: IterableSet<ContextId>,
+    /// Forward index: contexts that belong to this group.
+    /// Enables O(k) pagination in `group_contexts` where k is this group's
+    /// context count, instead of scanning the global `context_group_refs` map.
+    pub context_ids: IterableSet<ContextId>,
+    pub context_count: u64,
 }
 
 #[derive(Copy, Clone, Debug, BorshSerialize, BorshDeserialize, BorshStorageKey)]
@@ -62,6 +83,13 @@ enum Prefix {
     MemberNonces(ContextId) = 6,
     UsedOpenInvitations(ContextId) = 7,
     CommitmentsOpenInvitations(ContextId) = 8,
+    Groups = 9,
+    GroupAdmins(ContextGroupId) = 10,
+    ContextGroupRefs = 11,
+    GroupAdminNonces(ContextGroupId) = 12,
+    GroupMembers(ContextGroupId) = 13,
+    GroupApprovedRegistrations(ContextGroupId) = 14,
+    GroupContextIds(ContextGroupId) = 15,
 }
 
 #[derive(Copy, Clone, Debug)]
@@ -88,6 +116,8 @@ impl Default for ContextConfigs {
             proxy_code: LazyOption::new(Prefix::ProxyCode, None),
             proxy_code_hash: LazyOption::new(Prefix::ProxyCodeHash, None),
             next_proxy_id: 0,
+            groups: IterableMap::new(Prefix::Groups),
+            context_group_refs: IterableMap::new(Prefix::ContextGroupRefs),
         }
     }
 }