token-cli: Add command authorize support for TokenGroup (#6165)

* Add command Authorize support for TokenGroup * Add TokenGroup CliAuthorityType * Add test for changing token update_authority * fixed err for wrong extension * fixed var names in test * Update token/cli/src/clap_app.rs Co-authored-by: Jon C <[email protected]> * Update token/cli/src/clap_app.rs Co-authored-by: Jon C <[email protected]> * Renamed instances of TokenGroup to Group for CliAuthorityType --------- Co-authored-by: Jon C <[email protected]>
solana-labs · Jan 23, 2024 · 9888848 · 9888848
1 parent 1a59767
commit 9888848
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 14 deletions.
diff --git a/token/cli/src/clap_app.rs b/token/cli/src/clap_app.rs
@@ -191,6 +191,7 @@ pub enum CliAuthorityType {
     Metadata,
     GroupPointer,
     GroupMemberPointer,
+    Group,
 }
 impl TryFrom<CliAuthorityType> for AuthorityType {
     type Error = Error;
@@ -218,6 +219,9 @@ impl TryFrom<CliAuthorityType> for AuthorityType {
             }
             CliAuthorityType::GroupPointer => Ok(AuthorityType::GroupPointer),
             CliAuthorityType::GroupMemberPointer => Ok(AuthorityType::GroupMemberPointer),
+            CliAuthorityType::Group => {
+                Err("Group update authority does not map to a token authority type".into())
+            }
         }
     }
 }

diff --git a/token/cli/src/command.rs b/token/cli/src/command.rs
@@ -70,6 +70,7 @@ use {
         client::{ProgramRpcClientSendTransaction, RpcClientResponse},
         token::{ExtensionInitializationParams, Token},
     },
+    spl_token_group_interface::state::TokenGroup,
     spl_token_metadata_interface::state::{Field, TokenMetadata},
     std::{collections::HashMap, fmt::Display, process::exit, rc::Rc, str::FromStr, sync::Arc},
 };
@@ -1016,6 +1017,13 @@ async fn command_authorize(
                         ))
                     }
                 }
+                CliAuthorityType::Group => {
+                    if let Ok(extension) = mint.get_extension::<TokenGroup>() {
+                        Ok(Option::<Pubkey>::from(extension.update_authority))
+                    } else {
+                        Err(format!("Mint `{}` does not support token groups", account))
+                    }
+                }
             }?;
 
             Ok((account, previous_authority))
@@ -1056,6 +1064,7 @@ async fn command_authorize(
                 | CliAuthorityType::MetadataPointer
                 | CliAuthorityType::Metadata
                 | CliAuthorityType::GroupPointer
+                | CliAuthorityType::Group
                 | CliAuthorityType::GroupMemberPointer => Err(format!(
                     "Authority type `{auth_str}` not supported for SPL Token accounts",
                 )),
@@ -1107,20 +1116,28 @@ async fn command_authorize(
         ),
     );
 
-    let res = if let CliAuthorityType::Metadata = authority_type {
-        token
-            .token_metadata_update_authority(&authority, new_authority, &bulk_signers)
-            .await?
-    } else {
-        token
-            .set_authority(
-                &account,
-                &authority,
-                new_authority.as_ref(),
-                authority_type.try_into()?,
-                &bulk_signers,
-            )
-            .await?
+    let res = match authority_type {
+        CliAuthorityType::Metadata => {
+            token
+                .token_metadata_update_authority(&authority, new_authority, &bulk_signers)
+                .await?
+        }
+        CliAuthorityType::Group => {
+            token
+                .token_group_update_authority(&authority, new_authority, &bulk_signers)
+                .await?
+        }
+        _ => {
+            token
+                .set_authority(
+                    &account,
+                    &authority,
+                    new_authority.as_ref(),
+                    authority_type.try_into()?,
+                    &bulk_signers,
+                )
+                .await?
+        }
     };
 
     let tx_return = finish_tx(config, &res, false).await?;

diff --git a/token/cli/tests/command.rs b/token/cli/tests/command.rs
@@ -3912,4 +3912,24 @@ async fn group(test_validator: &TestValidator, payer: &Keypair) {
     assert_eq!(extension.group, mint);
     assert_eq!(extension.mint, member_mint);
     assert_eq!(u32::from(extension.member_number), 1);
+
+    // update authority
+    process_test_command(
+        &config,
+        payer,
+        &[
+            "spl-token",
+            CommandName::Authorize.into(),
+            &mint.to_string(),
+            "group",
+            &mint.to_string(),
+        ],
+    )
+    .await
+    .unwrap();
+
+    let account = config.rpc_client.get_account(&mint).await.unwrap();
+    let mint_state = StateWithExtensionsOwned::<Mint>::unpack(account.data).unwrap();
+    let extension = mint_state.get_extension::<TokenGroup>().unwrap();
+    assert_eq!(extension.update_authority, Some(mint).try_into().unwrap());
 }