Add AuthorityType variant to use for mint close-authority adjustment (#3111)

Tyera Eulberg · web-flow · commit 2491b29a1e9e · 2022-04-26T07:55:15.000-06:00
diff --git a/token/program-2022-test/tests/mint_close_authority.rs b/token/program-2022-test/tests/mint_close_authority.rs
@@ -67,7 +67,7 @@ async fn set_authority() {
         .set_authority(
             token.get_address(),
             Some(&new_authority.pubkey()),
-            instruction::AuthorityType::CloseAccount,
+            instruction::AuthorityType::CloseMint,
             &wrong,
         )
         .await
@@ -87,7 +87,7 @@ async fn set_authority() {
         .set_authority(
             token.get_address(),
             Some(&new_authority.pubkey()),
-            instruction::AuthorityType::CloseAccount,
+            instruction::AuthorityType::CloseMint,
             &close_authority,
         )
         .await
@@ -104,7 +104,7 @@ async fn set_authority() {
         .set_authority(
             token.get_address(),
             None,
-            instruction::AuthorityType::CloseAccount,
+            instruction::AuthorityType::CloseMint,
             &new_authority,
         )
         .await
@@ -118,7 +118,7 @@ async fn set_authority() {
         .set_authority(
             token.get_address(),
             Some(&close_authority.pubkey()),
-            instruction::AuthorityType::CloseAccount,
+            instruction::AuthorityType::CloseMint,
             &new_authority,
         )
         .await
@@ -187,7 +187,7 @@ async fn fail_without_extension() {
         .set_authority(
             token.get_address(),
             Some(&close_authority),
-            instruction::AuthorityType::CloseAccount,
+            instruction::AuthorityType::CloseMint,
             &mint_authority,
         )
         .await
diff --git a/token/program-2022/src/instruction.rs b/token/program-2022/src/instruction.rs
@@ -915,12 +915,14 @@ pub enum AuthorityType {
     FreezeAccount,
     /// Owner of a given token account
     AccountOwner,
-    /// Authority to close a mint or token account
+    /// Authority to close a token account
     CloseAccount,
     /// Authority to set the transfer fee
     TransferFeeConfig,
     /// Authority to withdraw withheld tokens from a mint
     WithheldWithdraw,
+    /// Authority to close a mint account
+    CloseMint,
 }
 
 impl AuthorityType {
@@ -932,6 +934,7 @@ impl AuthorityType {
             AuthorityType::CloseAccount => 3,
             AuthorityType::TransferFeeConfig => 4,
             AuthorityType::WithheldWithdraw => 5,
+            AuthorityType::CloseMint => 6,
         }
     }
 
@@ -943,6 +946,7 @@ impl AuthorityType {
             3 => Ok(AuthorityType::CloseAccount),
             4 => Ok(AuthorityType::TransferFeeConfig),
             5 => Ok(AuthorityType::WithheldWithdraw),
+            6 => Ok(AuthorityType::CloseMint),
             _ => Err(TokenError::InvalidInstruction.into()),
         }
     }
diff --git a/token/program-2022/src/processor.rs b/token/program-2022/src/processor.rs
@@ -610,7 +610,7 @@ impl Processor {
                     mint.base.freeze_authority = new_authority;
                     mint.pack_base();
                 }
-                AuthorityType::CloseAccount => {
+                AuthorityType::CloseMint => {
                     let extension = mint.get_extension_mut::<MintCloseAuthority>()?;
                     let maybe_close_authority: Option<Pubkey> = extension.close_authority.into();
                     let close_authority =

Original file line number	Diff line number	Diff line change
`@@ -915,12 +915,14 @@ pub enum AuthorityType {`
`915`	`915`	`FreezeAccount,`
`916`	`916`	`/// Owner of a given token account`
`917`	`917`	`AccountOwner,`
`918`		`- /// Authority to close a mint or token account`
	`918`	`+ /// Authority to close a token account`
`919`	`919`	`CloseAccount,`
`920`	`920`	`/// Authority to set the transfer fee`
`921`	`921`	`TransferFeeConfig,`
`922`	`922`	`/// Authority to withdraw withheld tokens from a mint`
`923`	`923`	`WithheldWithdraw,`
	`924`	`+ /// Authority to close a mint account`
	`925`	`+ CloseMint,`
`924`	`926`	`}`
`925`	`927`
`926`	`928`	`impl AuthorityType {`
`@@ -932,6 +934,7 @@ impl AuthorityType {`
`932`	`934`	`AuthorityType::CloseAccount => 3,`
`933`	`935`	`AuthorityType::TransferFeeConfig => 4,`
`934`	`936`	`AuthorityType::WithheldWithdraw => 5,`
	`937`	`+ AuthorityType::CloseMint => 6,`
`935`	`938`	`}`
`936`	`939`	`}`
`937`	`940`
`@@ -943,6 +946,7 @@ impl AuthorityType {`
`943`	`946`	`3 => Ok(AuthorityType::CloseAccount),`
`944`	`947`	`4 => Ok(AuthorityType::TransferFeeConfig),`
`945`	`948`	`5 => Ok(AuthorityType::WithheldWithdraw),`
	`949`	`+ 6 => Ok(AuthorityType::CloseMint),`
`946`	`950`	`_ => Err(TokenError::InvalidInstruction.into()),`
`947`	`951`	`}`
`948`	`952`	`}`
Original file line number	Diff line number	Diff line change
`@@ -610,7 +610,7 @@ impl Processor {`
`610`	`610`	`mint.base.freeze_authority = new_authority;`
`611`	`611`	`mint.pack_base();`
`612`	`612`	`}`
`613`		`- AuthorityType::CloseAccount => {`
	`613`	`+ AuthorityType::CloseMint => {`
`614`	`614`	`let extension = mint.get_extension_mut::<MintCloseAuthority>()?;`
`615`	`615`	`let maybe_close_authority: Option<Pubkey> = extension.close_authority.into();`
`616`	`616`	`let close_authority =`