Update Shank version and regenerate IDL

metaplex-foundation · Feb 5, 2024 · db6a4a8 · db6a4a8
1 parent 0733744
commit db6a4a8
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 33 deletions.
diff --git a/idls/mpl_token_auth_rules.json b/idls/mpl_token_auth_rules.json
@@ -9,26 +9,34 @@
           "name": "payer",
           "isMut": true,
           "isSigner": true,
-          "desc": "Payer and creator of the RuleSet"
+          "docs": [
+            "Payer and creator of the RuleSet"
+          ]
         },
         {
           "name": "ruleSetPda",
           "isMut": true,
           "isSigner": false,
-          "desc": "The PDA account where the RuleSet is stored"
+          "docs": [
+            "The PDA account where the RuleSet is stored"
+          ]
         },
         {
           "name": "systemProgram",
           "isMut": false,
           "isSigner": false,
-          "desc": "System program"
+          "docs": [
+            "System program"
+          ]
         },
         {
           "name": "bufferPda",
           "isMut": false,
           "isSigner": false,
-          "desc": "The buffer to copy a complete ruleset from",
-          "optional": true
+          "isOptional": true,
+          "docs": [
+            "The buffer to copy a complete ruleset from"
+          ]
         }
       ],
       "args": [
@@ -39,7 +47,6 @@
           }
         }
       ],
-      "defaultOptionalAccounts": true,
       "discriminant": {
         "type": "u8",
         "value": 0
@@ -52,40 +59,52 @@
           "name": "ruleSetPda",
           "isMut": false,
           "isSigner": false,
-          "desc": "The PDA account where the RuleSet is stored"
+          "docs": [
+            "The PDA account where the RuleSet is stored"
+          ]
         },
         {
           "name": "mint",
           "isMut": false,
           "isSigner": false,
-          "desc": "Mint of token asset"
+          "docs": [
+            "Mint of token asset"
+          ]
         },
         {
           "name": "systemProgram",
           "isMut": false,
           "isSigner": false,
-          "desc": "System program"
+          "docs": [
+            "System program"
+          ]
         },
         {
           "name": "payer",
           "isMut": true,
           "isSigner": true,
-          "desc": "Payer for RuleSet state PDA account",
-          "optional": true
+          "isOptional": true,
+          "docs": [
+            "Payer for RuleSet state PDA account"
+          ]
         },
         {
           "name": "ruleAuthority",
           "isMut": false,
           "isSigner": true,
-          "desc": "Signing authority for any Rule state updates",
-          "optional": true
+          "isOptional": true,
+          "docs": [
+            "Signing authority for any Rule state updates"
+          ]
         },
         {
           "name": "ruleSetStatePda",
           "isMut": true,
           "isSigner": false,
-          "desc": "The PDA account where any RuleSet state is stored",
-          "optional": true
+          "isOptional": true,
+          "docs": [
+            "The PDA account where any RuleSet state is stored"
+          ]
         }
       ],
       "args": [
@@ -96,7 +115,6 @@
           }
         }
       ],
-      "defaultOptionalAccounts": true,
       "discriminant": {
         "type": "u8",
         "value": 1
@@ -109,19 +127,25 @@
           "name": "payer",
           "isMut": true,
           "isSigner": true,
-          "desc": "Payer and creator of the RuleSet"
+          "docs": [
+            "Payer and creator of the RuleSet"
+          ]
         },
         {
           "name": "bufferPda",
           "isMut": true,
           "isSigner": false,
-          "desc": "The PDA account where the RuleSet buffer is stored"
+          "docs": [
+            "The PDA account where the RuleSet buffer is stored"
+          ]
         },
         {
           "name": "systemProgram",
           "isMut": false,
           "isSigner": false,
-          "desc": "System program"
+          "docs": [
+            "System program"
+          ]
         }
       ],
       "args": [
@@ -144,19 +168,25 @@
           "name": "payer",
           "isMut": true,
           "isSigner": true,
-          "desc": "Payer and creator of the RuleSet"
+          "docs": [
+            "Payer and creator of the RuleSet"
+          ]
         },
         {
           "name": "ruleSetPda",
           "isMut": true,
           "isSigner": false,
-          "desc": "The PDA account where the RuleSet is stored"
+          "docs": [
+            "The PDA account where the RuleSet is stored"
+          ]
         },
         {
           "name": "systemProgram",
           "isMut": false,
           "isSigner": false,
-          "desc": "System program"
+          "docs": [
+            "System program"
+          ]
         }
       ],
       "args": [
@@ -634,7 +664,7 @@
   "metadata": {
     "origin": "shank",
     "address": "auth9SigNpDKz4sJJ1DfCTuZrZNSAgh9sFD3rboVmgg",
-    "binaryVersion": "0.0.11",
-    "libVersion": "0.0.11"
+    "binaryVersion": "0.3.0",
+    "libVersion": "0.3.0"
   }
 }
diff --git a/programs/token-auth-rules/Cargo.lock b/programs/token-auth-rules/Cargo.lock
diff --git a/programs/token-auth-rules/Cargo.toml b/programs/token-auth-rules/Cargo.toml
@@ -18,7 +18,7 @@ num-traits = "0.2"
 rmp-serde = "1.1.1"
 serde = { version = "1.0.149", features = ["derive"]}
 serde_with = { version = "1.14.0", optional = true }
-shank = "0.0.11"
+shank = "0.3.0"
 solana-program = ">= 1.14.13, < 1.17"
 solana-zk-token-sdk = ">= 1.14.13, < 1.17"
 thiserror = "1.0"

diff --git a/programs/token-auth-rules/src/instruction.rs b/programs/token-auth-rules/src/instruction.rs
@@ -69,7 +69,6 @@ pub enum RuleSetInstruction {
     #[account(1, writable, name="rule_set_pda", desc = "The PDA account where the RuleSet is stored")]
     #[account(2, name = "system_program", desc = "System program")]
     #[account(3, optional, name="buffer_pda", desc = "The buffer to copy a complete ruleset from")]
-    #[default_optional_accounts]
     CreateOrUpdate(CreateOrUpdateArgs),
 
     /// This instruction executes the RuleSet stored in the rule_set PDA account by calling the
@@ -85,7 +84,6 @@ pub enum RuleSetInstruction {
     #[account(4, optional, signer, name="rule_authority", desc="Signing authority for any Rule state updates")]
     #[account(5, optional, writable, name="rule_set_state_pda", desc = "The PDA account where any RuleSet state is stored")]
     #[args(additional_rule_accounts: Vec<AccountMeta>)]
-    #[default_optional_accounts]
     Validate(ValidateArgs),
 
     /// This instruction appends a pre-serialized `RuleSet` chunk into the rule_set PDA account.