smartcontract: add Permission account support to CLI and SDKs

Author: juan-malbeclabs

client/doublezero/src/cli/command.rs

@@ -4,7 +4,8 @@ use crate::{
         accesspass::AccessPassCliCommand, config::ConfigCliCommand,
         contributor::ContributorCliCommand, device::DeviceCliCommand, exchange::ExchangeCliCommand,
         globalconfig::GlobalConfigCliCommand, link::LinkCliCommand, location::LocationCliCommand,
-        resource::ResourceCliCommand, tenant::TenantCliCommand, user::UserCliCommand,
+        permission::PermissionCliCommand, resource::ResourceCliCommand, tenant::TenantCliCommand,
+        user::UserCliCommand,
     },
     command::{
         connect::ProvisioningCliCommand, disable::DisableCliCommand,
@@ -74,6 +75,9 @@ pub enum Command {
     /// Manage contributors
     #[command()]
     Contributor(ContributorCliCommand),
+    /// Manage permissions
+    #[clap()]
+    Permission(PermissionCliCommand),
     /// Manage tenants
     #[command()]
     Tenant(TenantCliCommand),

client/doublezero/src/cli/mod.rs

@@ -9,6 +9,7 @@ pub mod link;
 pub mod location;
 pub mod multicast;
 pub mod multicastgroup;
+pub mod permission;
 pub mod resource;
 pub mod tenant;
 pub mod user;

client/doublezero/src/cli/permission.rs

@@ -0,0 +1,31 @@
+use clap::{Args, Subcommand};
+
+use doublezero_cli::permission::{delete::*, get::*, list::*, resume::*, set::*, suspend::*};
+
+#[derive(Args, Debug)]
+pub struct PermissionCliCommand {
+    #[command(subcommand)]
+    pub command: PermissionCommands,
+}
+
+#[derive(Debug, Subcommand)]
+pub enum PermissionCommands {
+    /// Create or update a permission account for a pubkey
+    #[clap()]
+    Set(SetPermissionCliCommand),
+    /// Suspend a permission (disables authorization)
+    #[clap()]
+    Suspend(SuspendPermissionCliCommand),
+    /// Resume a suspended permission
+    #[clap()]
+    Resume(ResumePermissionCliCommand),
+    /// Delete a permission account
+    #[clap()]
+    Delete(DeletePermissionCliCommand),
+    /// Get details for a permission account
+    #[clap()]
+    Get(GetPermissionCliCommand),
+    /// List all permission accounts
+    #[clap()]
+    List(ListPermissionCliCommand),
+}

client/doublezero/src/main.rs

@@ -178,6 +178,16 @@ async fn main() -> eyre::Result<()> {
                 args.execute(&client, &mut handle)
             }
         },
+        Command::Permission(command) => match command.command {
+            cli::permission::PermissionCommands::Set(args) => args.execute(&client, &mut handle),
+            cli::permission::PermissionCommands::Suspend(args) => {
+                args.execute(&client, &mut handle)
+            }
+            cli::permission::PermissionCommands::Resume(args) => args.execute(&client, &mut handle),
+            cli::permission::PermissionCommands::Delete(args) => args.execute(&client, &mut handle),
+            cli::permission::PermissionCommands::Get(args) => args.execute(&client, &mut handle),
+            cli::permission::PermissionCommands::List(args) => args.execute(&client, &mut handle),
+        },
         Command::Tenant(command) => match command.command {
             cli::tenant::TenantCommands::Create(args) => args.execute(&client, &mut handle),
             cli::tenant::TenantCommands::Update(args) => args.execute(&client, &mut handle),

controlplane/doublezero-admin/src/cli/command.rs

@@ -2,8 +2,8 @@ use super::multicast::MulticastCliCommand;
 use crate::cli::{
     accesspass::AccessPassCliCommand, config::ConfigCliCommand, contributor::ContributorCliCommand,
     device::DeviceCliCommand, exchange::ExchangeCliCommand, globalconfig::GlobalConfigCliCommand,
-    link::LinkCliCommand, location::LocationCliCommand, tenant::TenantCliCommand,
-    user::UserCliCommand,
+    link::LinkCliCommand, location::LocationCliCommand, permission::PermissionCliCommand,
+    tenant::TenantCliCommand, user::UserCliCommand,
 };
 use clap::{Args, Subcommand};
 use clap_complete::Shell;
@@ -57,6 +57,9 @@ pub enum Command {
     #[command()]
     AccessPass(AccessPassCliCommand),
 
+    /// Manage permission accounts
+    #[command()]
+    Permission(PermissionCliCommand),
     /// Manage users
     #[command()]
     User(UserCliCommand),

controlplane/doublezero-admin/src/cli/mod.rs

@@ -9,5 +9,6 @@ pub mod link;
 pub mod location;
 pub mod multicast;
 pub mod multicastgroup;
+pub mod permission;
 pub mod tenant;
 pub mod user;

controlplane/doublezero-admin/src/cli/permission.rs

@@ -0,0 +1,31 @@
+use clap::{Args, Subcommand};
+
+use doublezero_cli::permission::{delete::*, get::*, list::*, resume::*, set::*, suspend::*};
+
+#[derive(Args, Debug)]
+pub struct PermissionCliCommand {
+    #[command(subcommand)]
+    pub command: PermissionCommands,
+}
+
+#[derive(Debug, Subcommand)]
+pub enum PermissionCommands {
+    /// Create or update a permission account for a pubkey
+    #[clap()]
+    Set(SetPermissionCliCommand),
+    /// Suspend a permission (disables authorization)
+    #[clap()]
+    Suspend(SuspendPermissionCliCommand),
+    /// Resume a suspended permission
+    #[clap()]
+    Resume(ResumePermissionCliCommand),
+    /// Delete a permission account
+    #[clap()]
+    Delete(DeletePermissionCliCommand),
+    /// Get details for a permission account
+    #[clap()]
+    Get(GetPermissionCliCommand),
+    /// List all permission accounts
+    #[clap()]
+    List(ListPermissionCliCommand),
+}

controlplane/doublezero-admin/src/main.rs

@@ -13,6 +13,7 @@ use crate::cli::{
     },
     link::LinkCommands,
     location::LocationCommands,
+    permission::PermissionCommands,
     tenant::TenantCommands,
     user::UserCommands,
 };
@@ -172,6 +173,14 @@ async fn main() -> eyre::Result<()> {
                 args.execute(&client, &mut handle, &mut std::io::stdin().lock())
             }
         },
+        Command::Permission(command) => match command.command {
+            PermissionCommands::Set(args) => args.execute(&client, &mut handle),
+            PermissionCommands::Suspend(args) => args.execute(&client, &mut handle),
+            PermissionCommands::Resume(args) => args.execute(&client, &mut handle),
+            PermissionCommands::Delete(args) => args.execute(&client, &mut handle),
+            PermissionCommands::Get(args) => args.execute(&client, &mut handle),
+            PermissionCommands::List(args) => args.execute(&client, &mut handle),
+        },
         Command::User(command) => match command.command {
             UserCommands::Create(args) => args.execute(&client, &mut handle),
             UserCommands::CreateSubscribe(args) => args.execute(&client, &mut handle),

sdk/serviceability/go/client.go

@@ -28,6 +28,7 @@ type ProgramData struct {
 	ProgramConfig      *ProgramConfig
 	AccessPasses       []AccessPass
 	ResourceExtensions []ResourceExtension
+	Permissions        []Permission
 }
 
 // ProgramDataProvider is an interface for types that can provide program data.
@@ -138,6 +139,7 @@ func (c *Client) GetProgramData(ctx context.Context) (*ProgramData, error) {
 		MulticastGroups:    []MulticastGroup{},
 		AccessPasses:       []AccessPass{},
 		ResourceExtensions: []ResourceExtension{},
+		Permissions:        []Permission{},
 	}
 
 	for _, element := range out {
@@ -212,6 +214,11 @@ func (c *Client) GetProgramData(ctx context.Context) (*ProgramData, error) {
 			DeserializeTenant(reader, &tenant)
 			tenant.PubKey = element.Pubkey
 			pd.Tenants = append(pd.Tenants, tenant)
+		case PermissionType:
+			var perm Permission
+			DeserializePermission(reader, &perm)
+			perm.PubKey = element.Pubkey
+			pd.Permissions = append(pd.Permissions, perm)
 		}
 	}
 

sdk/serviceability/go/deserialize.go

@@ -311,6 +311,17 @@ func DeserializeResourceExtension(reader *ByteReader, ext *ResourceExtension) {
 	}
 }
 
+func DeserializePermission(reader *ByteReader, perm *Permission) {
+	perm.AccountType = AccountType(reader.ReadU8())
+	perm.Owner = reader.ReadPubkey()
+	perm.BumpSeed = reader.ReadU8()
+	perm.Status = PermissionStatus(reader.ReadU8())
+	perm.UserPayer = reader.ReadPubkey()
+	u128 := reader.ReadU128()
+	perm.PermissionsLo = u128.Low
+	perm.PermissionsHi = u128.High
+}
+
 func DeserializeTenant(reader *ByteReader, tenant *Tenant) {
 	tenant.AccountType = AccountType(reader.ReadU8())
 	tenant.Owner = reader.ReadPubkey()