chore(kinobi): migrate to Kinobi 0.17.0 (#99)

metaplex-foundation · Feb 29, 2024 · 6f5dbcb · 6f5dbcb
1 parent 5df7027
commit 6f5dbcb
Show file tree

Hide file tree

Showing 29 changed files with 686 additions and 487 deletions.
diff --git a/clients/js/src/generated/instructions/createV1.ts b/clients/js/src/generated/instructions/createV1.ts
@@ -121,13 +121,13 @@ export type CreateV1InstructionDataArgs = {
   creators: OptionOrNullable<Array<CreatorArgs>>;
   primarySaleHappened?: boolean;
   isMutable?: boolean;
-  tokenStandard: TokenStandardArgs;
+  tokenStandard?: TokenStandardArgs;
   collection?: OptionOrNullable<CollectionArgs>;
   uses?: OptionOrNullable<UsesArgs>;
-  collectionDetails?: OptionOrNullable<CollectionDetailsArgs>;
+  collectionDetails: OptionOrNullable<CollectionDetailsArgs>;
   ruleSet?: OptionOrNullable<PublicKey>;
-  decimals?: OptionOrNullable<number>;
-  printSupply?: OptionOrNullable<PrintSupplyArgs>;
+  decimals: OptionOrNullable<number>;
+  printSupply: OptionOrNullable<PrintSupplyArgs>;
 };
 
 export function getCreateV1InstructionDataSerializer(): Serializer<
@@ -167,28 +167,26 @@ export function getCreateV1InstructionDataSerializer(): Serializer<
       symbol: value.symbol ?? '',
       primarySaleHappened: value.primarySaleHappened ?? false,
       isMutable: value.isMutable ?? true,
+      tokenStandard: value.tokenStandard ?? TokenStandard.NonFungible,
       collection: value.collection ?? none(),
       uses: value.uses ?? none(),
-      collectionDetails: value.collectionDetails ?? none(),
       ruleSet: value.ruleSet ?? none(),
-      decimals: value.decimals ?? none(),
-      printSupply: value.printSupply ?? none(),
     })
   ) as Serializer<CreateV1InstructionDataArgs, CreateV1InstructionData>;
 }
 
 // Extra Args.
-export type CreateV1InstructionExtraArgs = { isCollection: boolean };
+export type CreateV1InstructionExtraArgs = { isCollection?: boolean };
 
 // Args.
 export type CreateV1InstructionArgs = PickPartial<
   CreateV1InstructionDataArgs & CreateV1InstructionExtraArgs,
   | 'tokenStandard'
+  | 'creators'
   | 'isCollection'
   | 'collectionDetails'
   | 'decimals'
   | 'printSupply'
-  | 'creators'
 >;
 
 // Instruction.
@@ -314,6 +312,15 @@ export function createV1(
       resolvedAccounts.splTokenProgram.isWritable = false;
     }
   }
+  if (!resolvedArgs.creators) {
+    resolvedArgs.creators = resolveCreators(
+      context,
+      resolvedAccounts,
+      resolvedArgs,
+      programId,
+      false
+    );
+  }
   if (!resolvedArgs.isCollection) {
     resolvedArgs.isCollection = false;
   }
@@ -344,15 +351,6 @@ export function createV1(
       false
     );
   }
-  if (!resolvedArgs.creators) {
-    resolvedArgs.creators = resolveCreators(
-      context,
-      resolvedAccounts,
-      resolvedArgs,
-      programId,
-      false
-    );
-  }
 
   // Accounts in order.
   const orderedAccounts: ResolvedAccount[] = Object.values(

diff --git a/clients/js/src/generated/instructions/delegateAuthorityItemV1.ts b/clients/js/src/generated/instructions/delegateAuthorityItemV1.ts
@@ -230,9 +230,9 @@ export function delegateAuthorityItemV1(
     resolvedAccounts.delegateRecord.value = findMetadataDelegateRecordPda(
       context,
       {
-        mint: expectPublicKey(resolvedAccounts.mint.value),
         delegateRole: MetadataDelegateRole.AuthorityItem,
         updateAuthority: expectSome(resolvedArgs.updateAuthority),
+        mint: expectPublicKey(resolvedAccounts.mint.value),
         delegate: expectPublicKey(resolvedAccounts.delegate.value),
       }
     );

diff --git a/clients/js/src/generated/instructions/delegateCollectionItemV1.ts b/clients/js/src/generated/instructions/delegateCollectionItemV1.ts
@@ -230,9 +230,9 @@ export function delegateCollectionItemV1(
     resolvedAccounts.delegateRecord.value = findMetadataDelegateRecordPda(
       context,
       {
-        mint: expectPublicKey(resolvedAccounts.mint.value),
         delegateRole: MetadataDelegateRole.CollectionItem,
         updateAuthority: expectSome(resolvedArgs.updateAuthority),
+        mint: expectPublicKey(resolvedAccounts.mint.value),
         delegate: expectPublicKey(resolvedAccounts.delegate.value),
       }
     );

diff --git a/clients/js/src/generated/instructions/delegateCollectionV1.ts b/clients/js/src/generated/instructions/delegateCollectionV1.ts
@@ -230,9 +230,9 @@ export function delegateCollectionV1(
     resolvedAccounts.delegateRecord.value = findMetadataDelegateRecordPda(
       context,
       {
-        mint: expectPublicKey(resolvedAccounts.mint.value),
         delegateRole: MetadataDelegateRole.Collection,
         updateAuthority: expectSome(resolvedArgs.updateAuthority),
+        mint: expectPublicKey(resolvedAccounts.mint.value),
         delegate: expectPublicKey(resolvedAccounts.delegate.value),
       }
     );

diff --git a/clients/js/src/generated/instructions/delegateDataItemV1.ts b/clients/js/src/generated/instructions/delegateDataItemV1.ts
@@ -230,9 +230,9 @@ export function delegateDataItemV1(
     resolvedAccounts.delegateRecord.value = findMetadataDelegateRecordPda(
       context,
       {
-        mint: expectPublicKey(resolvedAccounts.mint.value),
         delegateRole: MetadataDelegateRole.DataItem,
         updateAuthority: expectSome(resolvedArgs.updateAuthority),
+        mint: expectPublicKey(resolvedAccounts.mint.value),
         delegate: expectPublicKey(resolvedAccounts.delegate.value),
       }
     );

diff --git a/clients/js/src/generated/instructions/delegateDataV1.ts b/clients/js/src/generated/instructions/delegateDataV1.ts
@@ -228,9 +228,9 @@ export function delegateDataV1(
     resolvedAccounts.delegateRecord.value = findMetadataDelegateRecordPda(
       context,
       {
-        mint: expectPublicKey(resolvedAccounts.mint.value),
         delegateRole: MetadataDelegateRole.Data,
         updateAuthority: expectSome(resolvedArgs.updateAuthority),
+        mint: expectPublicKey(resolvedAccounts.mint.value),
         delegate: expectPublicKey(resolvedAccounts.delegate.value),
       }
     );

diff --git a/clients/js/src/generated/instructions/delegateProgrammableConfigItemV1.ts b/clients/js/src/generated/instructions/delegateProgrammableConfigItemV1.ts
@@ -232,9 +232,9 @@ export function delegateProgrammableConfigItemV1(
     resolvedAccounts.delegateRecord.value = findMetadataDelegateRecordPda(
       context,
       {
-        mint: expectPublicKey(resolvedAccounts.mint.value),
         delegateRole: MetadataDelegateRole.ProgrammableConfigItem,
         updateAuthority: expectSome(resolvedArgs.updateAuthority),
+        mint: expectPublicKey(resolvedAccounts.mint.value),
         delegate: expectPublicKey(resolvedAccounts.delegate.value),
       }
     );

diff --git a/clients/js/src/generated/instructions/delegateProgrammableConfigV1.ts b/clients/js/src/generated/instructions/delegateProgrammableConfigV1.ts
@@ -232,9 +232,9 @@ export function delegateProgrammableConfigV1(
     resolvedAccounts.delegateRecord.value = findMetadataDelegateRecordPda(
       context,
       {
-        mint: expectPublicKey(resolvedAccounts.mint.value),
         delegateRole: MetadataDelegateRole.ProgrammableConfig,
         updateAuthority: expectSome(resolvedArgs.updateAuthority),
+        mint: expectPublicKey(resolvedAccounts.mint.value),
         delegate: expectPublicKey(resolvedAccounts.delegate.value),
       }
     );

diff --git a/clients/js/src/generated/instructions/revokeAuthorityItemV1.ts b/clients/js/src/generated/instructions/revokeAuthorityItemV1.ts
@@ -214,9 +214,9 @@ export function revokeAuthorityItemV1(
     resolvedAccounts.delegateRecord.value = findMetadataDelegateRecordPda(
       context,
       {
-        mint: expectPublicKey(resolvedAccounts.mint.value),
         delegateRole: MetadataDelegateRole.AuthorityItem,
         updateAuthority: expectSome(resolvedArgs.updateAuthority),
+        mint: expectPublicKey(resolvedAccounts.mint.value),
         delegate: expectPublicKey(resolvedAccounts.delegate.value),
       }
     );

diff --git a/clients/js/src/generated/instructions/revokeCollectionItemV1.ts b/clients/js/src/generated/instructions/revokeCollectionItemV1.ts
@@ -214,9 +214,9 @@ export function revokeCollectionItemV1(
     resolvedAccounts.delegateRecord.value = findMetadataDelegateRecordPda(
       context,
       {
-        mint: expectPublicKey(resolvedAccounts.mint.value),
         delegateRole: MetadataDelegateRole.CollectionItem,
         updateAuthority: expectSome(resolvedArgs.updateAuthority),
+        mint: expectPublicKey(resolvedAccounts.mint.value),
         delegate: expectPublicKey(resolvedAccounts.delegate.value),
       }
     );

diff --git a/clients/js/src/generated/instructions/revokeCollectionV1.ts b/clients/js/src/generated/instructions/revokeCollectionV1.ts
@@ -214,9 +214,9 @@ export function revokeCollectionV1(
     resolvedAccounts.delegateRecord.value = findMetadataDelegateRecordPda(
       context,
       {
-        mint: expectPublicKey(resolvedAccounts.mint.value),
         delegateRole: MetadataDelegateRole.Collection,
         updateAuthority: expectSome(resolvedArgs.updateAuthority),
+        mint: expectPublicKey(resolvedAccounts.mint.value),
         delegate: expectPublicKey(resolvedAccounts.delegate.value),
       }
     );

diff --git a/clients/js/src/generated/instructions/revokeDataItemV1.ts b/clients/js/src/generated/instructions/revokeDataItemV1.ts
@@ -213,9 +213,9 @@ export function revokeDataItemV1(
     resolvedAccounts.delegateRecord.value = findMetadataDelegateRecordPda(
       context,
       {
-        mint: expectPublicKey(resolvedAccounts.mint.value),
         delegateRole: MetadataDelegateRole.DataItem,
         updateAuthority: expectSome(resolvedArgs.updateAuthority),
+        mint: expectPublicKey(resolvedAccounts.mint.value),
         delegate: expectPublicKey(resolvedAccounts.delegate.value),
       }
     );

diff --git a/clients/js/src/generated/instructions/revokeDataV1.ts b/clients/js/src/generated/instructions/revokeDataV1.ts
@@ -206,9 +206,9 @@ export function revokeDataV1(
     resolvedAccounts.delegateRecord.value = findMetadataDelegateRecordPda(
       context,
       {
-        mint: expectPublicKey(resolvedAccounts.mint.value),
         delegateRole: MetadataDelegateRole.Data,
         updateAuthority: expectSome(resolvedArgs.updateAuthority),
+        mint: expectPublicKey(resolvedAccounts.mint.value),
         delegate: expectPublicKey(resolvedAccounts.delegate.value),
       }
     );

diff --git a/clients/js/src/generated/instructions/revokeProgrammableConfigItemV1.ts b/clients/js/src/generated/instructions/revokeProgrammableConfigItemV1.ts
@@ -216,9 +216,9 @@ export function revokeProgrammableConfigItemV1(
     resolvedAccounts.delegateRecord.value = findMetadataDelegateRecordPda(
       context,
       {
-        mint: expectPublicKey(resolvedAccounts.mint.value),
         delegateRole: MetadataDelegateRole.ProgrammableConfigItem,
         updateAuthority: expectSome(resolvedArgs.updateAuthority),
+        mint: expectPublicKey(resolvedAccounts.mint.value),
         delegate: expectPublicKey(resolvedAccounts.delegate.value),
       }
     );

diff --git a/clients/js/src/generated/instructions/revokeProgrammableConfigV1.ts b/clients/js/src/generated/instructions/revokeProgrammableConfigV1.ts
@@ -214,9 +214,9 @@ export function revokeProgrammableConfigV1(
     resolvedAccounts.delegateRecord.value = findMetadataDelegateRecordPda(
       context,
       {
-        mint: expectPublicKey(resolvedAccounts.mint.value),
         delegateRole: MetadataDelegateRole.ProgrammableConfig,
         updateAuthority: expectSome(resolvedArgs.updateAuthority),
+        mint: expectPublicKey(resolvedAccounts.mint.value),
         delegate: expectPublicKey(resolvedAccounts.delegate.value),
       }
     );

diff --git a/clients/js/src/generated/instructions/transferV1.ts b/clients/js/src/generated/instructions/transferV1.ts
@@ -274,8 +274,8 @@ export function transferV1(
       resolvedAccounts.destinationTokenRecord.value = findTokenRecordPda(
         context,
         {
-          mint: expectPublicKey(resolvedAccounts.mint.value),
           token: expectPublicKey(resolvedAccounts.destinationToken.value),
+          mint: expectPublicKey(resolvedAccounts.mint.value),
         }
       );
     }

diff --git a/clients/js/src/generated/instructions/updateAsAuthorityItemDelegateV2.ts b/clients/js/src/generated/instructions/updateAsAuthorityItemDelegateV2.ts
@@ -223,10 +223,10 @@ export function updateAsAuthorityItemDelegateV2(
     resolvedAccounts.delegateRecord.value = findMetadataDelegateRecordPda(
       context,
       {
-        mint: expectPublicKey(resolvedAccounts.mint.value),
         delegateRole: MetadataDelegateRole.AuthorityItem,
         updateAuthority: expectSome(resolvedArgs.updateAuthority),
         delegate: expectPublicKey(resolvedAccounts.authority.value),
+        mint: expectPublicKey(resolvedAccounts.mint.value),
       }
     );
   }

diff --git a/clients/js/src/generated/instructions/updateAsCollectionItemDelegateV2.ts b/clients/js/src/generated/instructions/updateAsCollectionItemDelegateV2.ts
@@ -210,10 +210,10 @@ export function updateAsCollectionItemDelegateV2(
     resolvedAccounts.delegateRecord.value = findMetadataDelegateRecordPda(
       context,
       {
-        mint: expectPublicKey(resolvedAccounts.mint.value),
         delegateRole: MetadataDelegateRole.CollectionItem,
         updateAuthority: expectSome(resolvedArgs.updateAuthority),
         delegate: expectPublicKey(resolvedAccounts.authority.value),
+        mint: expectPublicKey(resolvedAccounts.mint.value),
       }
     );
   }

diff --git a/clients/js/src/generated/instructions/updateAsDataItemDelegateV2.ts b/clients/js/src/generated/instructions/updateAsDataItemDelegateV2.ts
@@ -207,10 +207,10 @@ export function updateAsDataItemDelegateV2(
     resolvedAccounts.delegateRecord.value = findMetadataDelegateRecordPda(
       context,
       {
-        mint: expectPublicKey(resolvedAccounts.mint.value),
         delegateRole: MetadataDelegateRole.DataItem,
         updateAuthority: expectSome(resolvedArgs.updateAuthority),
         delegate: expectPublicKey(resolvedAccounts.authority.value),
+        mint: expectPublicKey(resolvedAccounts.mint.value),
       }
     );
   }

diff --git a/clients/js/src/generated/instructions/updateAsProgrammableConfigItemDelegateV2.ts b/clients/js/src/generated/instructions/updateAsProgrammableConfigItemDelegateV2.ts
@@ -210,10 +210,10 @@ export function updateAsProgrammableConfigItemDelegateV2(
     resolvedAccounts.delegateRecord.value = findMetadataDelegateRecordPda(
       context,
       {
-        mint: expectPublicKey(resolvedAccounts.mint.value),
         delegateRole: MetadataDelegateRole.ProgrammableConfigItem,
         updateAuthority: expectSome(resolvedArgs.updateAuthority),
         delegate: expectPublicKey(resolvedAccounts.authority.value),
+        mint: expectPublicKey(resolvedAccounts.mint.value),
       }
     );
   }

diff --git a/clients/rust/src/generated/accounts/edition_marker.rs b/clients/rust/src/generated/accounts/edition_marker.rs
@@ -19,6 +19,7 @@ pub struct EditionMarker {
 
 impl EditionMarker {
     pub const LEN: usize = 32;
+
     /// Prefix values used to generate a PDA for this account.
     ///
     /// Values are positional and appear in the following order:

diff --git a/clients/rust/src/generated/accounts/holder_delegate_record.rs b/clients/rust/src/generated/accounts/holder_delegate_record.rs
@@ -35,6 +35,7 @@ pub struct HolderDelegateRecord {
 
 impl HolderDelegateRecord {
     pub const LEN: usize = 98;
+
     /// Prefix values used to generate a PDA for this account.
     ///
     /// Values are positional and appear in the following order:

diff --git a/clients/rust/src/generated/accounts/metadata_delegate_record.rs b/clients/rust/src/generated/accounts/metadata_delegate_record.rs
@@ -35,6 +35,7 @@ pub struct MetadataDelegateRecord {
 
 impl MetadataDelegateRecord {
     pub const LEN: usize = 98;
+
     /// Prefix values used to generate a PDA for this account.
     ///
     /// Values are positional and appear in the following order:

diff --git a/clients/rust/src/generated/accounts/token_record.rs b/clients/rust/src/generated/accounts/token_record.rs
@@ -26,6 +26,7 @@ pub struct TokenRecord {
 
 impl TokenRecord {
     pub const LEN: usize = 80;
+
     /// Prefix values used to generate a PDA for this account.
     ///
     /// Values are positional and appear in the following order:

diff --git a/clients/rust/src/generated/accounts/use_authority_record.rs b/clients/rust/src/generated/accounts/use_authority_record.rs
@@ -20,6 +20,7 @@ pub struct UseAuthorityRecord {
 
 impl UseAuthorityRecord {
     pub const LEN: usize = 10;
+
     /// Prefix values used to generate a PDA for this account.
     ///
     /// Values are positional and appear in the following order:

diff --git a/clients/rust/src/generated/instructions/create_v1.rs b/clients/rust/src/generated/instructions/create_v1.rs
@@ -302,6 +302,7 @@ impl CreateV1Builder {
         self.is_mutable = Some(is_mutable);
         self
     }
+    /// `[optional argument, defaults to 'TokenStandard::NonFungible']`
     #[inline(always)]
     pub fn token_standard(&mut self, token_standard: TokenStandard) -> &mut Self {
         self.token_standard = Some(token_standard);
@@ -392,7 +393,7 @@ impl CreateV1Builder {
             token_standard: self
                 .token_standard
                 .clone()
-                .expect("token_standard is not set"),
+                .unwrap_or(TokenStandard::NonFungible),
             collection: self.collection.clone(),
             uses: self.uses.clone(),
             collection_details: self.collection_details.clone(),
@@ -769,6 +770,7 @@ impl<'a, 'b> CreateV1CpiBuilder<'a, 'b> {
         self.instruction.is_mutable = Some(is_mutable);
         self
     }
+    /// `[optional argument, defaults to 'TokenStandard::NonFungible']`
     #[inline(always)]
     pub fn token_standard(&mut self, token_standard: TokenStandard) -> &mut Self {
         self.instruction.token_standard = Some(token_standard);
@@ -871,7 +873,7 @@ impl<'a, 'b> CreateV1CpiBuilder<'a, 'b> {
                 .instruction
                 .token_standard
                 .clone()
-                .expect("token_standard is not set"),
+                .unwrap_or(TokenStandard::NonFungible),
             collection: self.instruction.collection.clone(),
             uses: self.instruction.uses.clone(),
             collection_details: self.instruction.collection_details.clone(),