Merge pull request #97 from cardinal-labs/collector

CRD-97: Allow alternative collector
solana-nft-programs · Mar 12, 2022 · 321de22 · 321de22
2 parents f3abb69 + a1ef654
commit 321de22
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/programs/cardinal-time-invalidator/src/instructions/invalidate.rs b/programs/cardinal-time-invalidator/src/instructions/invalidate.rs
@@ -19,8 +19,9 @@ pub struct InvalidateCtx<'info> {
     )]
     time_invalidator: Box<Account<'info, TimeInvalidator>>,
 
+    /// CHECK: This is not dangerous because we don't read or write from this account
     #[account(mut)]
-    invalidator: Signer<'info>,
+    invalidator: AccountInfo<'info>,
 
     cardinal_token_manager: Program<'info, CardinalTokenManager>,
     /// CHECK: This is not dangerous because we don't read or write from this account

diff --git a/programs/cardinal-use-invalidator/src/instructions/invalidate.rs b/programs/cardinal-use-invalidator/src/instructions/invalidate.rs
@@ -12,8 +12,9 @@ pub struct InvalidateCtx<'info> {
     #[account(mut, constraint = use_invalidator.usages >= use_invalidator.total_usages.unwrap() @ ErrorCode::InsufficientUsages)]
     use_invalidator: Box<Account<'info, UseInvalidator>>,
 
+    /// CHECK: This is not dangerous because we don't read or write from this account
     #[account(mut)]
-    invalidator: Signer<'info>,
+    invalidator: AccountInfo<'info>,
 
     // programs
     cardinal_token_manager: Program<'info, CardinalTokenManager>,

diff --git a/src/idl/cardinal_time_invalidator.ts b/src/idl/cardinal_time_invalidator.ts
@@ -113,7 +113,7 @@ export type CardinalTimeInvalidator = {
         {
           name: "invalidator";
           isMut: true;
-          isSigner: true;
+          isSigner: false;
         },
         {
           name: "cardinalTokenManager";
@@ -451,7 +451,7 @@ export const IDL: CardinalTimeInvalidator = {
         {
           name: "invalidator",
           isMut: true,
-          isSigner: true,
+          isSigner: false,
         },
         {
           name: "cardinalTokenManager",

diff --git a/src/idl/cardinal_use_invalidator.ts b/src/idl/cardinal_use_invalidator.ts
@@ -128,7 +128,7 @@ export type CardinalUseInvalidator = {
         {
           name: "invalidator";
           isMut: true;
-          isSigner: true;
+          isSigner: false;
         },
         {
           name: "cardinalTokenManager";
@@ -463,7 +463,7 @@ export const IDL: CardinalUseInvalidator = {
         {
           name: "invalidator",
           isMut: true,
-          isSigner: true,
+          isSigner: false,
         },
         {
           name: "cardinalTokenManager",