@metaplex-foundation/mpl-token-metadata - npm Package Compare versions

Comparing version 3.0.0-alpha.16 to 3.0.0-alpha.17

dist/src/createHelpers.d.ts

 import { TransactionBuilder } from '@metaplex-foundation/umi';
-import { createV1, CreateV1InstructionInput, MintV1InstructionInput } from './instructions';
-export declare const createAndMint: (context: Parameters<typeof createV1>[0], input: CreateV1InstructionInput & Omit<MintV1InstructionInput, 'mint'>) => TransactionBuilder;
+import { createV1, mintV1 } from './generated';
+export declare const createAndMint: (context: Parameters<typeof createV1>[0], input: Parameters<typeof createV1>[1] & Omit<Parameters<typeof mintV1>[1], 'mint'>) => TransactionBuilder;
 export declare const createNft: (context: Parameters<typeof createAndMint>[0], input: Omit<Parameters<typeof createAndMint>[1], 'amount' | 'tokenStandard'>) => TransactionBuilder;
@@ -5,0 +5,0 @@ export declare const createProgrammableNft: (context: Parameters<typeof createAndMint>[0], input: Omit<Parameters<typeof createAndMint>[1], 'amount' | 'tokenStandard'>) => TransactionBuilder;

dist/src/createHelpers.js

@@ -6,6 +6,5 @@ "use strict";
 const generated_1 = require("./generated");
-const instructions_1 = require("./instructions");
 const createAndMint = (context, input) => (0, umi_1.transactionBuilder)()
-    .add((0, instructions_1.createV1)(context, input))
-    .add((0, instructions_1.mintV1)(context, { ...input, mint: (0, umi_1.publicKey)(input.mint) }));
+    .add((0, generated_1.createV1)(context, input))
+    .add((0, generated_1.mintV1)(context, { ...input, mint: (0, umi_1.publicKey)(input.mint) }));
 exports.createAndMint = createAndMint;
@@ -24,3 +23,3 @@ const createNft = (context, input) => (0, exports.createAndMint)(context, {
 exports.createProgrammableNft = createProgrammableNft;
-const createFungible = (context, input) => (0, instructions_1.createV1)(context, {
+const createFungible = (context, input) => (0, generated_1.createV1)(context, {
     ...input,
@@ -30,3 +29,3 @@ tokenStandard: generated_1.TokenStandard.Fungible,
 exports.createFungible = createFungible;
-const createFungibleAsset = (context, input) => (0, instructions_1.createV1)(context, {
+const createFungibleAsset = (context, input) => (0, generated_1.createV1)(context, {
     ...input,
@@ -33,0 +32,0 @@ tokenStandard: generated_1.TokenStandard.FungibleAsset,

dist/src/generated/accounts/collectionAuthorityRecord.js

@@ -19,3 +19,3 @@ "use strict";
         ['updateAuthority', s.option(s.publicKey())],
-    ], { description: 'CollectionAuthorityRecord' }), (value) => ({
+    ], { description: 'CollectionAuthorityRecordAccountData' }), (value) => ({
         ...value,
@@ -22,0 +22,0 @@ key: types_1.Key.CollectionAuthorityRecord,

dist/src/generated/accounts/edition.js

@@ -19,3 +19,3 @@ "use strict";
         ['edition', s.u64()],
-    ], { description: 'Edition' }), (value) => ({ ...value, key: types_1.Key.EditionV1 }));
+    ], { description: 'EditionAccountData' }), (value) => ({ ...value, key: types_1.Key.EditionV1 }));
 }
@@ -22,0 +22,0 @@ exports.getEditionAccountDataSerializer = getEditionAccountDataSerializer;

dist/src/generated/accounts/editionMarker.js

@@ -18,3 +18,3 @@ "use strict";
         ['ledger', s.array(s.u8(), { size: 31 })],
-    ], { description: 'EditionMarker' }), (value) => ({ ...value, key: types_1.Key.EditionMarker }));
+    ], { description: 'EditionMarkerAccountData' }), (value) => ({ ...value, key: types_1.Key.EditionMarker }));
 }
@@ -21,0 +21,0 @@ exports.getEditionMarkerAccountDataSerializer = getEditionMarkerAccountDataSerializer;

dist/src/generated/accounts/masterEdition.js

@@ -19,3 +19,3 @@ "use strict";
         ['maxSupply', s.option(s.u64())],
-    ], { description: 'MasterEdition' }), (value) => ({ ...value, key: types_1.Key.MasterEditionV2 }));
+    ], { description: 'MasterEditionAccountData' }), (value) => ({ ...value, key: types_1.Key.MasterEditionV2 }));
 }
@@ -22,0 +22,0 @@ exports.getMasterEditionAccountDataSerializer = getMasterEditionAccountDataSerializer;

dist/src/generated/accounts/metadata.js

@@ -38,3 +38,3 @@ "use strict";
         ],
-    ], { description: 'Metadata' }), (value) => ({ ...value, key: types_1.Key.MetadataV1 }));
+    ], { description: 'MetadataAccountData' }), (value) => ({ ...value, key: types_1.Key.MetadataV1 }));
 }
@@ -41,0 +41,0 @@ exports.getMetadataAccountDataSerializer = getMetadataAccountDataSerializer;

dist/src/generated/accounts/metadataDelegateRecord.d.ts

@@ -47,4 +47,4 @@ /**
     updateAuthority: PublicKey;
-    /** The address of delegate authority */
+    /** The address of the delegate authority */
     delegate: PublicKey;
 }): Pda;

dist/src/generated/accounts/metadataDelegateRecord.js

@@ -22,3 +22,3 @@ "use strict";
         ['updateAuthority', s.publicKey()],
-    ], { description: 'MetadataDelegateRecord' });
+    ], { description: 'MetadataDelegateRecordAccountData' });
 }
@@ -25,0 +25,0 @@ exports.getMetadataDelegateRecordAccountDataSerializer = getMetadataDelegateRecordAccountDataSerializer;

dist/src/generated/accounts/tokenOwnedEscrow.js

@@ -20,3 +20,3 @@ "use strict";
         ['bump', s.u8()],
-    ], { description: 'TokenOwnedEscrow' }), (value) => ({ ...value, key: types_1.Key.TokenOwnedEscrow }));
+    ], { description: 'TokenOwnedEscrowAccountData' }), (value) => ({ ...value, key: types_1.Key.TokenOwnedEscrow }));
 }
@@ -23,0 +23,0 @@ exports.getTokenOwnedEscrowAccountDataSerializer = getTokenOwnedEscrowAccountDataSerializer;

dist/src/generated/accounts/tokenRecord.js

@@ -23,3 +23,3 @@ "use strict";
         ['lockedTransfer', s.option(s.publicKey())],
-    ], { description: 'TokenRecord' }), (value) => ({ ...value, key: types_1.Key.TokenRecord }));
+    ], { description: 'TokenRecordAccountData' }), (value) => ({ ...value, key: types_1.Key.TokenRecord }));
 }
@@ -26,0 +26,0 @@ exports.getTokenRecordAccountDataSerializer = getTokenRecordAccountDataSerializer;

dist/src/generated/accounts/useAuthorityRecord.js

@@ -19,3 +19,3 @@ "use strict";
         ['bump', s.u8()],
-    ], { description: 'UseAuthorityRecord' }), (value) => ({
+    ], { description: 'UseAuthorityRecordAccountData' }), (value) => ({
         ...value,
@@ -22,0 +22,0 @@ key: types_1.Key.UseAuthorityRecord,

dist/src/generated/index.d.ts

@@ -12,2 +12,3 @@ /**
 export * from './programs';
+export * from './shared';
 export * from './types';

dist/src/generated/index.js

@@ -28,3 +28,4 @@ "use strict";
 __exportStar(require("./programs"), exports);
+__exportStar(require("./shared"), exports);
 __exportStar(require("./types"), exports);
 //# sourceMappingURL=index.js.map

dist/src/generated/instructions/approveCollectionAuthority.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 function getApproveCollectionAuthorityInstructionDataSerializer(context) {
@@ -27,66 +28,66 @@ const s = context.serializer;
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const collectionAuthorityRecordAccount = input.collectionAuthorityRecord;
-    const newCollectionAuthorityAccount = input.newCollectionAuthority;
-    const updateAuthorityAccount = input.updateAuthority ?? context.identity;
-    const payerAccount = input.payer ?? context.payer;
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const systemProgramAccount = input.systemProgram ?? {
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
+        isWritable: false,
+    };
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'updateAuthority', input.updateAuthority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const rentAccount = input.rent;
+    });
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
     // Collection Authority Record.
     keys.push({
-        pubkey: collectionAuthorityRecordAccount,
+        pubkey: resolvedAccounts.collectionAuthorityRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionAuthorityRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionAuthorityRecord, true),
     });
     // New Collection Authority.
     keys.push({
-        pubkey: newCollectionAuthorityAccount,
+        pubkey: resolvedAccounts.newCollectionAuthority,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(newCollectionAuthorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.newCollectionAuthority, false),
     });
     // Update Authority.
-    signers.push(updateAuthorityAccount);
+    signers.push(resolvedAccounts.updateAuthority);
     keys.push({
-        pubkey: updateAuthorityAccount.publicKey,
+        pubkey: resolvedAccounts.updateAuthority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(updateAuthorityAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.updateAuthority, true),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, false),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Rent (optional).
-    if (rentAccount) {
+    if (resolvedAccounts.rent) {
         keys.push({
-            pubkey: rentAccount,
+            pubkey: resolvedAccounts.rent,
             isSigner: false,
-            isWritable: (0, umi_1.checkForIsWritableOverride)(rentAccount, false),
+            isWritable: (0, shared_1.isWritable)(resolvedAccounts.rent, false),
         });
@@ -93,0 +94,0 @@ }

dist/src/generated/instructions/approveUseAuthority.d.ts

@@ -41,2 +41,3 @@ /**
 export declare function getApproveUseAuthorityInstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<ApproveUseAuthorityInstructionDataArgs, ApproveUseAuthorityInstructionData>;
-export declare function approveUseAuthority(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'payer'>, input: ApproveUseAuthorityInstructionAccounts & ApproveUseAuthorityInstructionDataArgs): TransactionBuilder;
+export type ApproveUseAuthorityInstructionArgs = ApproveUseAuthorityInstructionDataArgs;
+export declare function approveUseAuthority(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'payer'>, input: ApproveUseAuthorityInstructionAccounts & ApproveUseAuthorityInstructionArgs): TransactionBuilder;

dist/src/generated/instructions/approveUseAuthority.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 function getApproveUseAuthorityInstructionDataSerializer(context) {
@@ -27,94 +28,93 @@ const s = context.serializer;
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const useAuthorityRecordAccount = input.useAuthorityRecord;
-    const ownerAccount = input.owner;
-    const payerAccount = input.payer ?? context.payer;
-    const userAccount = input.user;
-    const ownerTokenAccountAccount = input.ownerTokenAccount;
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const burnerAccount = input.burner;
-    const tokenProgramAccount = input.tokenProgram ?? {
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
+        isWritable: false,
+    };
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenProgram', input.tokenProgram ?? {
         ...context.programs.getPublicKey('splToken', 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
         isWritable: false,
-    };
-    const systemProgramAccount = input.systemProgram ?? {
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const rentAccount = input.rent;
+    });
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Use Authority Record.
     keys.push({
-        pubkey: useAuthorityRecordAccount,
+        pubkey: resolvedAccounts.useAuthorityRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(useAuthorityRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.useAuthorityRecord, true),
     });
     // Owner.
-    signers.push(ownerAccount);
+    signers.push(resolvedAccounts.owner);
     keys.push({
-        pubkey: ownerAccount.publicKey,
+        pubkey: resolvedAccounts.owner.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(ownerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.owner, true),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // User.
     keys.push({
-        pubkey: userAccount,
+        pubkey: resolvedAccounts.user,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(userAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.user, false),
     });
     // Owner Token Account.
     keys.push({
-        pubkey: ownerTokenAccountAccount,
+        pubkey: resolvedAccounts.ownerTokenAccount,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(ownerTokenAccountAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.ownerTokenAccount, true),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, false),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Burner.
     keys.push({
-        pubkey: burnerAccount,
+        pubkey: resolvedAccounts.burner,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(burnerAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.burner, false),
     });
     // Token Program.
     keys.push({
-        pubkey: tokenProgramAccount,
+        pubkey: resolvedAccounts.tokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenProgram, false),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Rent (optional).
-    if (rentAccount) {
+    if (resolvedAccounts.rent) {
         keys.push({
-            pubkey: rentAccount,
+            pubkey: resolvedAccounts.rent,
             isSigner: false,
-            isWritable: (0, umi_1.checkForIsWritableOverride)(rentAccount, false),
+            isWritable: (0, shared_1.isWritable)(resolvedAccounts.rent, false),
         });
     }
     // Data.
-    const data = getApproveUseAuthorityInstructionDataSerializer(context).serialize(input);
+    const data = getApproveUseAuthorityInstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -121,0 +121,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/bubblegumSetCollectionSize.d.ts

@@ -30,2 +30,3 @@ /**
 export declare function getBubblegumSetCollectionSizeInstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<BubblegumSetCollectionSizeInstructionDataArgs, BubblegumSetCollectionSizeInstructionData>;
-export declare function bubblegumSetCollectionSize(context: Pick<Context, 'serializer' | 'programs'>, input: BubblegumSetCollectionSizeInstructionAccounts & BubblegumSetCollectionSizeInstructionDataArgs): TransactionBuilder;
+export type BubblegumSetCollectionSizeInstructionArgs = BubblegumSetCollectionSizeInstructionDataArgs;
+export declare function bubblegumSetCollectionSize(context: Pick<Context, 'serializer' | 'programs'>, input: BubblegumSetCollectionSizeInstructionAccounts & BubblegumSetCollectionSizeInstructionArgs): TransactionBuilder;

dist/src/generated/instructions/bubblegumSetCollectionSize.js

@@ -12,2 +12,3 @@ "use strict";
 const umi_1 = require("@metaplex-foundation/umi");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -30,45 +31,47 @@ function getBubblegumSetCollectionSizeInstructionDataSerializer(context) {
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const collectionMetadataAccount = input.collectionMetadata;
-    const collectionAuthorityAccount = input.collectionAuthority;
-    const collectionMintAccount = input.collectionMint;
-    const bubblegumSignerAccount = input.bubblegumSigner;
-    const collectionAuthorityRecordAccount = input.collectionAuthorityRecord;
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
+        isWritable: false,
+    };
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Collection Metadata.
     keys.push({
-        pubkey: collectionMetadataAccount,
+        pubkey: resolvedAccounts.collectionMetadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionMetadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionMetadata, true),
     });
     // Collection Authority.
-    signers.push(collectionAuthorityAccount);
+    signers.push(resolvedAccounts.collectionAuthority);
     keys.push({
-        pubkey: collectionAuthorityAccount.publicKey,
+        pubkey: resolvedAccounts.collectionAuthority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionAuthorityAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionAuthority, true),
     });
     // Collection Mint.
     keys.push({
-        pubkey: collectionMintAccount,
+        pubkey: resolvedAccounts.collectionMint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionMintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionMint, false),
     });
     // Bubblegum Signer.
-    signers.push(bubblegumSignerAccount);
+    signers.push(resolvedAccounts.bubblegumSigner);
     keys.push({
-        pubkey: bubblegumSignerAccount.publicKey,
+        pubkey: resolvedAccounts.bubblegumSigner.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(bubblegumSignerAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.bubblegumSigner, false),
     });
     // Collection Authority Record (optional).
-    if (collectionAuthorityRecordAccount) {
+    if (resolvedAccounts.collectionAuthorityRecord) {
         keys.push({
-            pubkey: collectionAuthorityRecordAccount,
+            pubkey: resolvedAccounts.collectionAuthorityRecord,
             isSigner: false,
-            isWritable: (0, umi_1.checkForIsWritableOverride)(collectionAuthorityRecordAccount, false),
+            isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionAuthorityRecord, false),
         });
     }
     // Data.
-    const data = getBubblegumSetCollectionSizeInstructionDataSerializer(context).serialize(input);
+    const data = getBubblegumSetCollectionSizeInstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -75,0 +78,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/burn.d.ts

@@ -48,2 +48,3 @@ /**
 export declare function getBurnInstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<BurnInstructionDataArgs, BurnInstructionData>;
-export declare function burn(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity'>, input: BurnInstructionAccounts & BurnInstructionDataArgs): TransactionBuilder;
+export type BurnInstructionArgs = BurnInstructionDataArgs;
+export declare function burn(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity'>, input: BurnInstructionAccounts & BurnInstructionArgs): TransactionBuilder;

dist/src/generated/instructions/burn.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -28,131 +29,117 @@ function getBurnInstructionDataSerializer(context) {
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const authorityAccount = input.authority ?? context.identity;
-    const collectionMetadataAccount = input.collectionMetadata ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const editionAccount = input.edition ?? { ...programId, isWritable: false };
-    const tokenAccount = input.token;
-    const masterEditionAccount = input.masterEdition ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const masterEditionMintAccount = input.masterEditionMint ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const masterEditionTokenAccount = input.masterEditionToken ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const editionMarkerAccount = input.editionMarker ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenRecordAccount = input.tokenRecord ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'collectionMetadata', input.collectionMetadata ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'edition', input.edition ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'masterEdition', input.masterEdition ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'masterEditionMint', input.masterEditionMint ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'masterEditionToken', input.masterEditionToken ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'editionMarker', input.editionMarker ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenRecord', input.tokenRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
-    const splTokenProgramAccount = input.splTokenProgram ?? {
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splTokenProgram', input.splTokenProgram ?? {
         ...context.programs.getPublicKey('splToken', 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
         isWritable: false,
-    };
+    });
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, true),
     });
     // Collection Metadata.
     keys.push({
-        pubkey: collectionMetadataAccount,
+        pubkey: resolvedAccounts.collectionMetadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionMetadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionMetadata, true),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Edition.
     keys.push({
-        pubkey: editionAccount,
+        pubkey: resolvedAccounts.edition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(editionAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.edition, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, true),
     });
     // Token.
     keys.push({
-        pubkey: tokenAccount,
+        pubkey: resolvedAccounts.token,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.token, true),
     });
     // Master Edition.
     keys.push({
-        pubkey: masterEditionAccount,
+        pubkey: resolvedAccounts.masterEdition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterEditionAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterEdition, true),
     });
     // Master Edition Mint.
     keys.push({
-        pubkey: masterEditionMintAccount,
+        pubkey: resolvedAccounts.masterEditionMint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterEditionMintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterEditionMint, false),
     });
     // Master Edition Token.
     keys.push({
-        pubkey: masterEditionTokenAccount,
+        pubkey: resolvedAccounts.masterEditionToken,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterEditionTokenAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterEditionToken, false),
     });
     // Edition Marker.
     keys.push({
-        pubkey: editionMarkerAccount,
+        pubkey: resolvedAccounts.editionMarker,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(editionMarkerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.editionMarker, true),
     });
     // Token Record.
     keys.push({
-        pubkey: tokenRecordAccount,
+        pubkey: resolvedAccounts.tokenRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenRecord, true),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Spl Token Program.
     keys.push({
-        pubkey: splTokenProgramAccount,
+        pubkey: resolvedAccounts.splTokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splTokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splTokenProgram, false),
     });
     // Data.
-    const data = getBurnInstructionDataSerializer(context).serialize(input);
+    const data = getBurnInstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -159,0 +146,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/burnEditionNft.js

@@ -12,2 +12,3 @@ "use strict";
 const umi_1 = require("@metaplex-foundation/umi");
+const shared_1 = require("../shared");
 function getBurnEditionNftInstructionDataSerializer(context) {
@@ -25,77 +26,73 @@ const s = context.serializer;
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const metadataAccount = input.metadata;
-    const ownerAccount = input.owner;
-    const printEditionMintAccount = input.printEditionMint;
-    const masterEditionMintAccount = input.masterEditionMint;
-    const printEditionTokenAccountAccount = input.printEditionTokenAccount;
-    const masterEditionTokenAccountAccount = input.masterEditionTokenAccount;
-    const masterEditionAccountAccount = input.masterEditionAccount;
-    const printEditionAccountAccount = input.printEditionAccount;
-    const editionMarkerAccountAccount = input.editionMarkerAccount;
-    const splTokenProgramAccount = input.splTokenProgram ?? {
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
+        isWritable: false,
+    };
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splTokenProgram', input.splTokenProgram ?? {
         ...context.programs.getPublicKey('splToken', 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
         isWritable: false,
-    };
+    });
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Owner.
-    signers.push(ownerAccount);
+    signers.push(resolvedAccounts.owner);
     keys.push({
-        pubkey: ownerAccount.publicKey,
+        pubkey: resolvedAccounts.owner.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(ownerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.owner, true),
     });
     // Print Edition Mint.
     keys.push({
-        pubkey: printEditionMintAccount,
+        pubkey: resolvedAccounts.printEditionMint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(printEditionMintAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.printEditionMint, true),
     });
     // Master Edition Mint.
     keys.push({
-        pubkey: masterEditionMintAccount,
+        pubkey: resolvedAccounts.masterEditionMint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterEditionMintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterEditionMint, false),
     });
     // Print Edition Token Account.
     keys.push({
-        pubkey: printEditionTokenAccountAccount,
+        pubkey: resolvedAccounts.printEditionTokenAccount,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(printEditionTokenAccountAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.printEditionTokenAccount, true),
     });
     // Master Edition Token Account.
     keys.push({
-        pubkey: masterEditionTokenAccountAccount,
+        pubkey: resolvedAccounts.masterEditionTokenAccount,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterEditionTokenAccountAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterEditionTokenAccount, false),
     });
     // Master Edition Account.
     keys.push({
-        pubkey: masterEditionAccountAccount,
+        pubkey: resolvedAccounts.masterEditionAccount,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterEditionAccountAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterEditionAccount, true),
     });
     // Print Edition Account.
     keys.push({
-        pubkey: printEditionAccountAccount,
+        pubkey: resolvedAccounts.printEditionAccount,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(printEditionAccountAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.printEditionAccount, true),
     });
     // Edition Marker Account.
     keys.push({
-        pubkey: editionMarkerAccountAccount,
+        pubkey: resolvedAccounts.editionMarkerAccount,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(editionMarkerAccountAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.editionMarkerAccount, true),
     });
     // Spl Token Program.
     keys.push({
-        pubkey: splTokenProgramAccount,
+        pubkey: resolvedAccounts.splTokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splTokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splTokenProgram, false),
     });
@@ -102,0 +99,0 @@ // Data.

dist/src/generated/instructions/burnNft.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 function getBurnNftInstructionDataSerializer(context) {
@@ -26,58 +27,57 @@ const s = context.serializer;
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const ownerAccount = input.owner;
-    const tokenAccountAccount = input.tokenAccount;
-    const masterEditionAccountAccount = input.masterEditionAccount;
-    const splTokenProgramAccount = input.splTokenProgram ?? {
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
+        isWritable: false,
+    };
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splTokenProgram', input.splTokenProgram ?? {
         ...context.programs.getPublicKey('splToken', 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
         isWritable: false,
-    };
-    const collectionMetadataAccount = input.collectionMetadata;
+    });
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Owner.
-    signers.push(ownerAccount);
+    signers.push(resolvedAccounts.owner);
     keys.push({
-        pubkey: ownerAccount.publicKey,
+        pubkey: resolvedAccounts.owner.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(ownerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.owner, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, true),
     });
     // Token Account.
     keys.push({
-        pubkey: tokenAccountAccount,
+        pubkey: resolvedAccounts.tokenAccount,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccountAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenAccount, true),
     });
     // Master Edition Account.
     keys.push({
-        pubkey: masterEditionAccountAccount,
+        pubkey: resolvedAccounts.masterEditionAccount,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterEditionAccountAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterEditionAccount, true),
     });
     // Spl Token Program.
     keys.push({
-        pubkey: splTokenProgramAccount,
+        pubkey: resolvedAccounts.splTokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splTokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splTokenProgram, false),
     });
     // Collection Metadata (optional).
-    if (collectionMetadataAccount) {
+    if (resolvedAccounts.collectionMetadata) {
         keys.push({
-            pubkey: collectionMetadataAccount,
+            pubkey: resolvedAccounts.collectionMetadata,
             isSigner: false,
-            isWritable: (0, umi_1.checkForIsWritableOverride)(collectionMetadataAccount, true),
+            isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionMetadata, true),
         });
@@ -84,0 +84,0 @@ }

dist/src/generated/instructions/burnV1.d.ts

@@ -48,2 +48,3 @@ /**
 export declare function getBurnV1InstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<BurnV1InstructionDataArgs, BurnV1InstructionData>;
-export declare function burnV1(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity'>, input: BurnV1InstructionAccounts & BurnV1InstructionDataArgs): TransactionBuilder;
+export type BurnV1InstructionArgs = BurnV1InstructionDataArgs;
+export declare function burnV1(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity'>, input: BurnV1InstructionAccounts & BurnV1InstructionArgs): TransactionBuilder;

dist/src/generated/instructions/burnV1.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 function getBurnV1InstructionDataSerializer(context) {
@@ -32,131 +33,117 @@ const s = context.serializer;
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const authorityAccount = input.authority ?? context.identity;
-    const collectionMetadataAccount = input.collectionMetadata ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const editionAccount = input.edition ?? { ...programId, isWritable: false };
-    const tokenAccount = input.token;
-    const masterEditionAccount = input.masterEdition ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const masterEditionMintAccount = input.masterEditionMint ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const masterEditionTokenAccount = input.masterEditionToken ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const editionMarkerAccount = input.editionMarker ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenRecordAccount = input.tokenRecord ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'collectionMetadata', input.collectionMetadata ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'edition', input.edition ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'masterEdition', input.masterEdition ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'masterEditionMint', input.masterEditionMint ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'masterEditionToken', input.masterEditionToken ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'editionMarker', input.editionMarker ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenRecord', input.tokenRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
-    const splTokenProgramAccount = input.splTokenProgram ?? {
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splTokenProgram', input.splTokenProgram ?? {
         ...context.programs.getPublicKey('splToken', 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
         isWritable: false,
-    };
+    });
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, true),
     });
     // Collection Metadata.
     keys.push({
-        pubkey: collectionMetadataAccount,
+        pubkey: resolvedAccounts.collectionMetadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionMetadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionMetadata, true),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Edition.
     keys.push({
-        pubkey: editionAccount,
+        pubkey: resolvedAccounts.edition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(editionAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.edition, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, true),
     });
     // Token.
     keys.push({
-        pubkey: tokenAccount,
+        pubkey: resolvedAccounts.token,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.token, true),
     });
     // Master Edition.
     keys.push({
-        pubkey: masterEditionAccount,
+        pubkey: resolvedAccounts.masterEdition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterEditionAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterEdition, true),
     });
     // Master Edition Mint.
     keys.push({
-        pubkey: masterEditionMintAccount,
+        pubkey: resolvedAccounts.masterEditionMint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterEditionMintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterEditionMint, false),
     });
     // Master Edition Token.
     keys.push({
-        pubkey: masterEditionTokenAccount,
+        pubkey: resolvedAccounts.masterEditionToken,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterEditionTokenAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterEditionToken, false),
     });
     // Edition Marker.
     keys.push({
-        pubkey: editionMarkerAccount,
+        pubkey: resolvedAccounts.editionMarker,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(editionMarkerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.editionMarker, true),
     });
     // Token Record.
     keys.push({
-        pubkey: tokenRecordAccount,
+        pubkey: resolvedAccounts.tokenRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenRecord, true),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Spl Token Program.
     keys.push({
-        pubkey: splTokenProgramAccount,
+        pubkey: resolvedAccounts.splTokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splTokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splTokenProgram, false),
     });
     // Data.
-    const data = getBurnV1InstructionDataSerializer(context).serialize(input);
+    const data = getBurnV1InstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -163,0 +150,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/closeEscrowAccount.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 function getCloseEscrowAccountInstructionDataSerializer(context) {
@@ -26,66 +27,67 @@ const s = context.serializer;
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const escrowAccount = input.escrow;
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const tokenAccountAccount = input.tokenAccount;
-    const editionAccount = input.edition ??
-        (0, accounts_1.findMasterEditionPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const payerAccount = input.payer ?? context.payer;
-    const systemProgramAccount = input.systemProgram ?? {
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
+        isWritable: false,
+    };
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'edition', input.edition ??
+        (0, accounts_1.findMasterEditionPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
     // Escrow.
     keys.push({
-        pubkey: escrowAccount,
+        pubkey: resolvedAccounts.escrow,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(escrowAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.escrow, true),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Token Account.
     keys.push({
-        pubkey: tokenAccountAccount,
+        pubkey: resolvedAccounts.tokenAccount,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccountAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenAccount, false),
     });
     // Edition.
     keys.push({
-        pubkey: editionAccount,
+        pubkey: resolvedAccounts.edition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(editionAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.edition, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
@@ -92,0 +94,0 @@ // Data.

dist/src/generated/instructions/convertMasterEditionV1ToV2.js

@@ -12,2 +12,3 @@ "use strict";
 const umi_1 = require("@metaplex-foundation/umi");
+const shared_1 = require("../shared");
 function getConvertMasterEditionV1ToV2InstructionDataSerializer(context) {
@@ -26,24 +27,26 @@ const s = context.serializer;
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const masterEditionAccount = input.masterEdition;
-    const oneTimeAuthAccount = input.oneTimeAuth;
-    const printingMintAccount = input.printingMint;
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
+        isWritable: false,
+    };
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
     // Master Edition.
     keys.push({
-        pubkey: masterEditionAccount,
+        pubkey: resolvedAccounts.masterEdition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterEditionAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterEdition, true),
     });
     // One Time Auth.
     keys.push({
-        pubkey: oneTimeAuthAccount,
+        pubkey: resolvedAccounts.oneTimeAuth,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(oneTimeAuthAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.oneTimeAuth, true),
     });
     // Printing Mint.
     keys.push({
-        pubkey: printingMintAccount,
+        pubkey: resolvedAccounts.printingMint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(printingMintAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.printingMint, true),
     });
@@ -50,0 +53,0 @@ // Data.

dist/src/generated/instructions/create.d.ts

@@ -38,2 +38,3 @@ /**
 export declare function getCreateInstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<CreateInstructionDataArgs, CreateInstructionData>;
-export declare function create(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: CreateInstructionAccounts & CreateInstructionDataArgs): TransactionBuilder;
+export type CreateInstructionArgs = CreateInstructionDataArgs;
+export declare function create(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: CreateInstructionAccounts & CreateInstructionArgs): TransactionBuilder;

dist/src/generated/instructions/create.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -28,88 +29,90 @@ function getCreateInstructionDataSerializer(context) {
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const masterEditionAccount = input.masterEdition ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const authorityAccount = input.authority ?? context.identity;
-    const payerAccount = input.payer ?? context.payer;
-    const updateAuthorityAccount = input.updateAuthority ?? authorityAccount;
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'masterEdition', input.masterEdition ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'updateAuthority', input.updateAuthority ?? resolvingAccounts.authority);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
-    const splTokenProgramAccount = input.splTokenProgram ?? {
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splTokenProgram', input.splTokenProgram ?? {
         ...context.programs.getPublicKey('splToken', 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
         isWritable: false,
-    };
+    });
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Master Edition.
     keys.push({
-        pubkey: masterEditionAccount,
+        pubkey: resolvedAccounts.masterEdition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterEditionAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterEdition, true),
     });
     // Mint.
-    if ((0, umi_1.isSigner)(mintAccount)) {
-        signers.push(mintAccount);
+    if ((0, umi_1.isSigner)(resolvedAccounts.mint)) {
+        signers.push(resolvedAccounts.mint);
     }
     keys.push({
-        pubkey: (0, umi_1.publicKey)(mintAccount),
-        isSigner: (0, umi_1.isSigner)(mintAccount),
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, true),
+        pubkey: (0, umi_1.publicKey)(resolvedAccounts.mint),
+        isSigner: (0, umi_1.isSigner)(resolvedAccounts.mint),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, true),
     });
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // Update Authority.
-    if ((0, umi_1.isSigner)(updateAuthorityAccount)) {
-        signers.push(updateAuthorityAccount);
+    if ((0, umi_1.isSigner)(resolvedAccounts.updateAuthority)) {
+        signers.push(resolvedAccounts.updateAuthority);
     }
     keys.push({
-        pubkey: (0, umi_1.publicKey)(updateAuthorityAccount),
-        isSigner: (0, umi_1.isSigner)(updateAuthorityAccount),
-        isWritable: (0, umi_1.checkForIsWritableOverride)(updateAuthorityAccount, false),
+        pubkey: (0, umi_1.publicKey)(resolvedAccounts.updateAuthority),
+        isSigner: (0, umi_1.isSigner)(resolvedAccounts.updateAuthority),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.updateAuthority, false),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Spl Token Program.
     keys.push({
-        pubkey: splTokenProgramAccount,
+        pubkey: resolvedAccounts.splTokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splTokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splTokenProgram, false),
     });
     // Data.
-    const data = getCreateInstructionDataSerializer(context).serialize(input);
+    const data = getCreateInstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -116,0 +119,0 @@ const bytesCreatedOnChain = 1427;

dist/src/generated/instructions/createEscrowAccount.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 function getCreateEscrowAccountInstructionDataSerializer(context) {
@@ -26,75 +27,75 @@ const s = context.serializer;
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const escrowAccount = input.escrow;
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const tokenAccountAccount = input.tokenAccount;
-    const editionAccount = input.edition ??
-        (0, accounts_1.findMasterEditionPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const payerAccount = input.payer ?? context.payer;
-    const systemProgramAccount = input.systemProgram ?? {
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
+        isWritable: false,
+    };
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'edition', input.edition ??
+        (0, accounts_1.findMasterEditionPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
-    const authorityAccount = input.authority;
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
     // Escrow.
     keys.push({
-        pubkey: escrowAccount,
+        pubkey: resolvedAccounts.escrow,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(escrowAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.escrow, true),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Token Account.
     keys.push({
-        pubkey: tokenAccountAccount,
+        pubkey: resolvedAccounts.tokenAccount,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccountAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenAccount, false),
     });
     // Edition.
     keys.push({
-        pubkey: editionAccount,
+        pubkey: resolvedAccounts.edition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(editionAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.edition, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Authority (optional).
-    if (authorityAccount) {
-        signers.push(authorityAccount);
+    if (resolvedAccounts.authority) {
+        signers.push(resolvedAccounts.authority);
         keys.push({
-            pubkey: authorityAccount.publicKey,
+            pubkey: resolvedAccounts.authority.publicKey,
             isSigner: true,
-            isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+            isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
         });
@@ -101,0 +102,0 @@ }

dist/src/generated/instructions/createMasterEdition.d.ts

@@ -38,2 +38,3 @@ /**
 export declare function getCreateMasterEditionInstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<CreateMasterEditionInstructionDataArgs, CreateMasterEditionInstructionData>;
-export declare function createMasterEdition(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: CreateMasterEditionInstructionAccounts & CreateMasterEditionInstructionDataArgs): TransactionBuilder;
+export type CreateMasterEditionInstructionArgs = CreateMasterEditionInstructionDataArgs;
+export declare function createMasterEdition(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: CreateMasterEditionInstructionAccounts & CreateMasterEditionInstructionArgs): TransactionBuilder;

dist/src/generated/instructions/createMasterEdition.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -31,80 +32,84 @@ function getCreateMasterEditionInstructionDataSerializer(context) {
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const mintAccount = input.mint;
-    const editionAccount = input.edition ??
-        (0, accounts_1.findMasterEditionPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const updateAuthorityAccount = input.updateAuthority ?? context.identity;
-    const mintAuthorityAccount = input.mintAuthority;
-    const payerAccount = input.payer ?? context.payer;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const tokenProgramAccount = input.tokenProgram ?? {
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
+        isWritable: false,
+    };
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'edition', input.edition ??
+        (0, accounts_1.findMasterEditionPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'updateAuthority', input.updateAuthority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenProgram', input.tokenProgram ?? {
         ...context.programs.getPublicKey('splToken', 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
         isWritable: false,
-    };
-    const systemProgramAccount = input.systemProgram ?? {
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const rentAccount = input.rent ?? (0, umi_1.publicKey)('SysvarRent111111111111111111111111111111111');
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'rent', input.rent ?? (0, umi_1.publicKey)('SysvarRent111111111111111111111111111111111'));
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Edition.
     keys.push({
-        pubkey: editionAccount,
+        pubkey: resolvedAccounts.edition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(editionAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.edition, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, true),
     });
     // Update Authority.
-    signers.push(updateAuthorityAccount);
+    signers.push(resolvedAccounts.updateAuthority);
     keys.push({
-        pubkey: updateAuthorityAccount.publicKey,
+        pubkey: resolvedAccounts.updateAuthority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(updateAuthorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.updateAuthority, false),
     });
     // Mint Authority.
-    signers.push(mintAuthorityAccount);
+    signers.push(resolvedAccounts.mintAuthority);
     keys.push({
-        pubkey: mintAuthorityAccount.publicKey,
+        pubkey: resolvedAccounts.mintAuthority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAuthorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mintAuthority, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, false),
     });
     // Token Program.
     keys.push({
-        pubkey: tokenProgramAccount,
+        pubkey: resolvedAccounts.tokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenProgram, false),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Rent.
     keys.push({
-        pubkey: rentAccount,
+        pubkey: resolvedAccounts.rent,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(rentAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.rent, false),
     });
     // Data.
-    const data = getCreateMasterEditionInstructionDataSerializer(context).serialize(input);
+    const data = getCreateMasterEditionInstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -111,0 +116,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/createMasterEditionV3.d.ts

@@ -38,2 +38,3 @@ /**
 export declare function getCreateMasterEditionV3InstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<CreateMasterEditionV3InstructionDataArgs, CreateMasterEditionV3InstructionData>;
-export declare function createMasterEditionV3(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: CreateMasterEditionV3InstructionAccounts & CreateMasterEditionV3InstructionDataArgs): TransactionBuilder;
+export type CreateMasterEditionV3InstructionArgs = CreateMasterEditionV3InstructionDataArgs;
+export declare function createMasterEditionV3(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: CreateMasterEditionV3InstructionAccounts & CreateMasterEditionV3InstructionArgs): TransactionBuilder;

dist/src/generated/instructions/createMasterEditionV3.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -31,82 +32,85 @@ function getCreateMasterEditionV3InstructionDataSerializer(context) {
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const mintAccount = input.mint;
-    const editionAccount = input.edition ??
-        (0, accounts_1.findMasterEditionPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const updateAuthorityAccount = input.updateAuthority ?? context.identity;
-    const mintAuthorityAccount = input.mintAuthority;
-    const payerAccount = input.payer ?? context.payer;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const tokenProgramAccount = input.tokenProgram ?? {
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
+        isWritable: false,
+    };
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'edition', input.edition ??
+        (0, accounts_1.findMasterEditionPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'updateAuthority', input.updateAuthority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenProgram', input.tokenProgram ?? {
         ...context.programs.getPublicKey('splToken', 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
         isWritable: false,
-    };
-    const systemProgramAccount = input.systemProgram ?? {
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const rentAccount = input.rent;
+    });
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Edition.
     keys.push({
-        pubkey: editionAccount,
+        pubkey: resolvedAccounts.edition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(editionAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.edition, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, true),
     });
     // Update Authority.
-    signers.push(updateAuthorityAccount);
+    signers.push(resolvedAccounts.updateAuthority);
     keys.push({
-        pubkey: updateAuthorityAccount.publicKey,
+        pubkey: resolvedAccounts.updateAuthority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(updateAuthorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.updateAuthority, false),
     });
     // Mint Authority.
-    signers.push(mintAuthorityAccount);
+    signers.push(resolvedAccounts.mintAuthority);
     keys.push({
-        pubkey: mintAuthorityAccount.publicKey,
+        pubkey: resolvedAccounts.mintAuthority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAuthorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mintAuthority, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Token Program.
     keys.push({
-        pubkey: tokenProgramAccount,
+        pubkey: resolvedAccounts.tokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenProgram, false),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Rent (optional).
-    if (rentAccount) {
+    if (resolvedAccounts.rent) {
         keys.push({
-            pubkey: rentAccount,
+            pubkey: resolvedAccounts.rent,
             isSigner: false,
-            isWritable: (0, umi_1.checkForIsWritableOverride)(rentAccount, false),
+            isWritable: (0, shared_1.isWritable)(resolvedAccounts.rent, false),
         });
     }
     // Data.
-    const data = getCreateMasterEditionV3InstructionDataSerializer(context).serialize(input);
+    const data = getCreateMasterEditionV3InstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -113,0 +117,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/createMetadataAccount.d.ts

@@ -48,2 +48,3 @@ /**
 export declare function getCreateMetadataAccountInstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<CreateMetadataAccountInstructionDataArgs, CreateMetadataAccountInstructionData>;
-export declare function createMetadataAccount(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: CreateMetadataAccountInstructionAccounts & CreateMetadataAccountInstructionDataArgs): TransactionBuilder;
+export type CreateMetadataAccountInstructionArgs = CreateMetadataAccountInstructionDataArgs;
+export declare function createMetadataAccount(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: CreateMetadataAccountInstructionAccounts & CreateMetadataAccountInstructionArgs): TransactionBuilder;

dist/src/generated/instructions/createMetadataAccount.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -27,3 +28,3 @@ function getCreateMetadataAccountInstructionDataSerializer(context) {
                 ['creators', s.option(s.array((0, types_1.getCreatorSerializer)(context)))],
-            ], { description: 'Data' }),
+            ]),
         ],
@@ -39,61 +40,65 @@ ['isMutable', s.bool()],
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const mintAuthorityAccount = input.mintAuthority;
-    const payerAccount = input.payer ?? context.payer;
-    const updateAuthorityAccount = input.updateAuthority ?? context.identity.publicKey;
-    const systemProgramAccount = input.systemProgram ?? {
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
+        isWritable: false,
+    };
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'updateAuthority', input.updateAuthority ?? context.identity.publicKey);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const rentAccount = input.rent ?? (0, umi_1.publicKey)('SysvarRent111111111111111111111111111111111');
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'rent', input.rent ?? (0, umi_1.publicKey)('SysvarRent111111111111111111111111111111111'));
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Mint Authority.
-    signers.push(mintAuthorityAccount);
+    signers.push(resolvedAccounts.mintAuthority);
     keys.push({
-        pubkey: mintAuthorityAccount.publicKey,
+        pubkey: resolvedAccounts.mintAuthority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAuthorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mintAuthority, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // Update Authority.
     keys.push({
-        pubkey: updateAuthorityAccount,
+        pubkey: resolvedAccounts.updateAuthority,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(updateAuthorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.updateAuthority, false),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Rent.
     keys.push({
-        pubkey: rentAccount,
+        pubkey: resolvedAccounts.rent,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(rentAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.rent, false),
     });
     // Data.
-    const data = getCreateMetadataAccountInstructionDataSerializer(context).serialize(input);
+    const data = getCreateMetadataAccountInstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -100,0 +105,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/createMetadataAccountV2.d.ts

@@ -36,2 +36,3 @@ /**
 export declare function getCreateMetadataAccountV2InstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<CreateMetadataAccountV2InstructionDataArgs, CreateMetadataAccountV2InstructionData>;
-export declare function createMetadataAccountV2(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: CreateMetadataAccountV2InstructionAccounts & CreateMetadataAccountV2InstructionDataArgs): TransactionBuilder;
+export type CreateMetadataAccountV2InstructionArgs = CreateMetadataAccountV2InstructionDataArgs;
+export declare function createMetadataAccountV2(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: CreateMetadataAccountV2InstructionAccounts & CreateMetadataAccountV2InstructionArgs): TransactionBuilder;

dist/src/generated/instructions/createMetadataAccountV2.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -32,63 +33,66 @@ function getCreateMetadataAccountV2InstructionDataSerializer(context) {
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const mintAuthorityAccount = input.mintAuthority;
-    const payerAccount = input.payer ?? context.payer;
-    const updateAuthorityAccount = input.updateAuthority ?? context.identity.publicKey;
-    const systemProgramAccount = input.systemProgram ?? {
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
+        isWritable: false,
+    };
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'updateAuthority', input.updateAuthority ?? context.identity.publicKey);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const rentAccount = input.rent;
+    });
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Mint Authority.
-    signers.push(mintAuthorityAccount);
+    signers.push(resolvedAccounts.mintAuthority);
     keys.push({
-        pubkey: mintAuthorityAccount.publicKey,
+        pubkey: resolvedAccounts.mintAuthority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAuthorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mintAuthority, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // Update Authority.
     keys.push({
-        pubkey: updateAuthorityAccount,
+        pubkey: resolvedAccounts.updateAuthority,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(updateAuthorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.updateAuthority, false),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Rent (optional).
-    if (rentAccount) {
+    if (resolvedAccounts.rent) {
         keys.push({
-            pubkey: rentAccount,
+            pubkey: resolvedAccounts.rent,
             isSigner: false,
-            isWritable: (0, umi_1.checkForIsWritableOverride)(rentAccount, false),
+            isWritable: (0, shared_1.isWritable)(resolvedAccounts.rent, false),
         });
     }
     // Data.
-    const data = getCreateMetadataAccountV2InstructionDataSerializer(context).serialize(input);
+    const data = getCreateMetadataAccountV2InstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -95,0 +99,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/createMetadataAccountV3.d.ts

@@ -38,2 +38,3 @@ /**
 export declare function getCreateMetadataAccountV3InstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<CreateMetadataAccountV3InstructionDataArgs, CreateMetadataAccountV3InstructionData>;
-export declare function createMetadataAccountV3(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: CreateMetadataAccountV3InstructionAccounts & CreateMetadataAccountV3InstructionDataArgs): TransactionBuilder;
+export type CreateMetadataAccountV3InstructionArgs = CreateMetadataAccountV3InstructionDataArgs;
+export declare function createMetadataAccountV3(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: CreateMetadataAccountV3InstructionAccounts & CreateMetadataAccountV3InstructionArgs): TransactionBuilder;

dist/src/generated/instructions/createMetadataAccountV3.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -36,63 +37,66 @@ function getCreateMetadataAccountV3InstructionDataSerializer(context) {
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const mintAuthorityAccount = input.mintAuthority;
-    const payerAccount = input.payer ?? context.payer;
-    const updateAuthorityAccount = input.updateAuthority ?? context.identity.publicKey;
-    const systemProgramAccount = input.systemProgram ?? {
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
+        isWritable: false,
+    };
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'updateAuthority', input.updateAuthority ?? context.identity.publicKey);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const rentAccount = input.rent;
+    });
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Mint Authority.
-    signers.push(mintAuthorityAccount);
+    signers.push(resolvedAccounts.mintAuthority);
     keys.push({
-        pubkey: mintAuthorityAccount.publicKey,
+        pubkey: resolvedAccounts.mintAuthority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAuthorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mintAuthority, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // Update Authority.
     keys.push({
-        pubkey: updateAuthorityAccount,
+        pubkey: resolvedAccounts.updateAuthority,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(updateAuthorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.updateAuthority, false),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Rent (optional).
-    if (rentAccount) {
+    if (resolvedAccounts.rent) {
         keys.push({
-            pubkey: rentAccount,
+            pubkey: resolvedAccounts.rent,
             isSigner: false,
-            isWritable: (0, umi_1.checkForIsWritableOverride)(rentAccount, false),
+            isWritable: (0, shared_1.isWritable)(resolvedAccounts.rent, false),
         });
     }
     // Data.
-    const data = getCreateMetadataAccountV3InstructionDataSerializer(context).serialize(input);
+    const data = getCreateMetadataAccountV3InstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -99,0 +103,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/createV1.d.ts

@@ -9,2 +9,3 @@ /**
 import { Amount, Context, Option, PublicKey, Serializer, Signer, TransactionBuilder } from '@metaplex-foundation/umi';
+import { PickPartial } from '../shared';
 import { Collection, CollectionArgs, CollectionDetails, CollectionDetailsArgs, Creator, CreatorArgs, PrintSupply, PrintSupplyArgs, TokenStandard, TokenStandardArgs, Uses, UsesArgs } from '../types';
@@ -66,2 +67,6 @@ export type CreateV1InstructionAccounts = {
 export declare function getCreateV1InstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<CreateV1InstructionDataArgs, CreateV1InstructionData>;
-export declare function createV1(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: CreateV1InstructionAccounts & CreateV1InstructionDataArgs): TransactionBuilder;
+export type CreateV1InstructionExtraArgs = {
+    isCollection: boolean;
+};
+export type CreateV1InstructionArgs = PickPartial<CreateV1InstructionDataArgs & CreateV1InstructionExtraArgs, 'tokenStandard' | 'isCollection' | 'collectionDetails' | 'decimals' | 'printSupply' | 'creators'>;
+export declare function createV1(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: CreateV1InstructionAccounts & CreateV1InstructionArgs): TransactionBuilder;

dist/src/generated/instructions/createV1.js

@@ -12,3 +12,5 @@ "use strict";
 const umi_1 = require("@metaplex-foundation/umi");
+const hooked_1 = require("../../hooked");
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -58,90 +60,103 @@ function getCreateV1InstructionDataSerializer(context) {
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const masterEditionAccount = input.masterEdition ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const authorityAccount = input.authority ?? context.identity;
-    const payerAccount = input.payer ?? context.payer;
-    const updateAuthorityAccount = input.updateAuthority ?? authorityAccount;
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingArgs, 'tokenStandard', input.tokenStandard ?? types_1.TokenStandard.NonFungible);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'masterEdition', input.masterEdition ??
+        (0, hooked_1.resolveMasterEdition)(context, { ...input, ...resolvingAccounts }, { ...input, ...resolvingArgs }, programId));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'updateAuthority', input.updateAuthority ?? resolvingAccounts.authority);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
-    const splTokenProgramAccount = input.splTokenProgram ?? {
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splTokenProgram', input.splTokenProgram ?? {
         ...context.programs.getPublicKey('splToken', 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
         isWritable: false,
-    };
+    });
+    (0, shared_1.addObjectProperty)(resolvingArgs, 'isCollection', input.isCollection ?? false);
+    (0, shared_1.addObjectProperty)(resolvingArgs, 'collectionDetails', input.collectionDetails ??
+        (0, hooked_1.resolveCollectionDetails)(context, { ...input, ...resolvingAccounts }, { ...input, ...resolvingArgs }, programId));
+    (0, shared_1.addObjectProperty)(resolvingArgs, 'decimals', input.decimals ??
+        (0, hooked_1.resolveDecimals)(context, { ...input, ...resolvingAccounts }, { ...input, ...resolvingArgs }, programId));
+    (0, shared_1.addObjectProperty)(resolvingArgs, 'printSupply', input.printSupply ??
+        (0, hooked_1.resolvePrintSupply)(context, { ...input, ...resolvingAccounts }, { ...input, ...resolvingArgs }, programId));
+    (0, shared_1.addObjectProperty)(resolvingArgs, 'creators', input.creators ??
+        (0, hooked_1.resolveCreators)(context, { ...input, ...resolvingAccounts }, { ...input, ...resolvingArgs }, programId));
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Master Edition.
     keys.push({
-        pubkey: masterEditionAccount,
+        pubkey: resolvedAccounts.masterEdition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterEditionAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterEdition, true),
     });
     // Mint.
-    if ((0, umi_1.isSigner)(mintAccount)) {
-        signers.push(mintAccount);
+    if ((0, umi_1.isSigner)(resolvedAccounts.mint)) {
+        signers.push(resolvedAccounts.mint);
     }
     keys.push({
-        pubkey: (0, umi_1.publicKey)(mintAccount),
-        isSigner: (0, umi_1.isSigner)(mintAccount),
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, true),
+        pubkey: (0, umi_1.publicKey)(resolvedAccounts.mint),
+        isSigner: (0, umi_1.isSigner)(resolvedAccounts.mint),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, true),
     });
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // Update Authority.
-    if ((0, umi_1.isSigner)(updateAuthorityAccount)) {
-        signers.push(updateAuthorityAccount);
+    if ((0, umi_1.isSigner)(resolvedAccounts.updateAuthority)) {
+        signers.push(resolvedAccounts.updateAuthority);
     }
     keys.push({
-        pubkey: (0, umi_1.publicKey)(updateAuthorityAccount),
-        isSigner: (0, umi_1.isSigner)(updateAuthorityAccount),
-        isWritable: (0, umi_1.checkForIsWritableOverride)(updateAuthorityAccount, false),
+        pubkey: (0, umi_1.publicKey)(resolvedAccounts.updateAuthority),
+        isSigner: (0, umi_1.isSigner)(resolvedAccounts.updateAuthority),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.updateAuthority, false),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Spl Token Program.
     keys.push({
-        pubkey: splTokenProgramAccount,
+        pubkey: resolvedAccounts.splTokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splTokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splTokenProgram, false),
     });
     // Data.
-    const data = getCreateV1InstructionDataSerializer(context).serialize(input);
+    const data = getCreateV1InstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
-    const bytesCreatedOnChain = 1427;
+    const bytesCreatedOnChain = (0, hooked_1.resolveCreateV1Bytes)(context, resolvedAccounts, resolvedArgs, programId);
     return (0, umi_1.transactionBuilder)([
@@ -148,0 +163,0 @@ { instruction: { keys, programId, data }, signers, bytesCreatedOnChain },

dist/src/generated/instructions/delegate.d.ts

@@ -48,2 +48,3 @@ /**
 export declare function getDelegateInstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<DelegateInstructionDataArgs, DelegateInstructionData>;
-export declare function delegate(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: DelegateInstructionAccounts & DelegateInstructionDataArgs): TransactionBuilder;
+export type DelegateInstructionArgs = DelegateInstructionDataArgs;
+export declare function delegate(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: DelegateInstructionAccounts & DelegateInstructionArgs): TransactionBuilder;

dist/src/generated/instructions/delegate.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -28,129 +29,115 @@ function getDelegateInstructionDataSerializer(context) {
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const delegateRecordAccount = input.delegateRecord ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const delegateAccount = input.delegate;
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const masterEditionAccount = input.masterEdition ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenRecordAccount = input.tokenRecord ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenAccount = input.token ?? { ...programId, isWritable: false };
-    const authorityAccount = input.authority ?? context.identity;
-    const payerAccount = input.payer ?? context.payer;
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'delegateRecord', input.delegateRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'masterEdition', input.masterEdition ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenRecord', input.tokenRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'token', input.token ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
-    const splTokenProgramAccount = input.splTokenProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesProgramAccount = input.authorizationRulesProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesAccount = input.authorizationRules ?? {
-        ...programId,
-        isWritable: false,
-    };
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splTokenProgram', input.splTokenProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRulesProgram', input.authorizationRulesProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRules', input.authorizationRules ?? programId);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Delegate Record.
     keys.push({
-        pubkey: delegateRecordAccount,
+        pubkey: resolvedAccounts.delegateRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegateRecord, true),
     });
     // Delegate.
     keys.push({
-        pubkey: delegateAccount,
+        pubkey: resolvedAccounts.delegate,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegate, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Master Edition.
     keys.push({
-        pubkey: masterEditionAccount,
+        pubkey: resolvedAccounts.masterEdition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterEditionAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterEdition, false),
     });
     // Token Record.
     keys.push({
-        pubkey: tokenRecordAccount,
+        pubkey: resolvedAccounts.tokenRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenRecord, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Token.
     keys.push({
-        pubkey: tokenAccount,
+        pubkey: resolvedAccounts.token,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.token, true),
     });
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Spl Token Program.
     keys.push({
-        pubkey: splTokenProgramAccount,
+        pubkey: resolvedAccounts.splTokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splTokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splTokenProgram, false),
     });
     // Authorization Rules Program.
     keys.push({
-        pubkey: authorizationRulesProgramAccount,
+        pubkey: resolvedAccounts.authorizationRulesProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRulesProgram, false),
     });
     // Authorization Rules.
     keys.push({
-        pubkey: authorizationRulesAccount,
+        pubkey: resolvedAccounts.authorizationRules,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRules, false),
     });
     // Data.
-    const data = getDelegateInstructionDataSerializer(context).serialize(input);
+    const data = getDelegateInstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -157,0 +144,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/delegateCollectionV1.d.ts

@@ -49,2 +49,3 @@ /**
 export declare function getDelegateCollectionV1InstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<DelegateCollectionV1InstructionDataArgs, DelegateCollectionV1InstructionData>;
-export declare function delegateCollectionV1(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: DelegateCollectionV1InstructionAccounts & DelegateCollectionV1InstructionDataArgs): TransactionBuilder;
+export type DelegateCollectionV1InstructionArgs = DelegateCollectionV1InstructionDataArgs;
+export declare function delegateCollectionV1(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: DelegateCollectionV1InstructionAccounts & DelegateCollectionV1InstructionArgs): TransactionBuilder;

dist/src/generated/instructions/delegateCollectionV1.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -36,129 +37,115 @@ function getDelegateCollectionV1InstructionDataSerializer(context) {
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const delegateRecordAccount = input.delegateRecord ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const delegateAccount = input.delegate;
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const masterEditionAccount = input.masterEdition ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenRecordAccount = input.tokenRecord ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenAccount = input.token ?? { ...programId, isWritable: false };
-    const authorityAccount = input.authority ?? context.identity;
-    const payerAccount = input.payer ?? context.payer;
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'delegateRecord', input.delegateRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'masterEdition', input.masterEdition ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenRecord', input.tokenRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'token', input.token ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
-    const splTokenProgramAccount = input.splTokenProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesProgramAccount = input.authorizationRulesProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesAccount = input.authorizationRules ?? {
-        ...programId,
-        isWritable: false,
-    };
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splTokenProgram', input.splTokenProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRulesProgram', input.authorizationRulesProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRules', input.authorizationRules ?? programId);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Delegate Record.
     keys.push({
-        pubkey: delegateRecordAccount,
+        pubkey: resolvedAccounts.delegateRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegateRecord, true),
     });
     // Delegate.
     keys.push({
-        pubkey: delegateAccount,
+        pubkey: resolvedAccounts.delegate,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegate, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Master Edition.
     keys.push({
-        pubkey: masterEditionAccount,
+        pubkey: resolvedAccounts.masterEdition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterEditionAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterEdition, false),
     });
     // Token Record.
     keys.push({
-        pubkey: tokenRecordAccount,
+        pubkey: resolvedAccounts.tokenRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenRecord, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Token.
     keys.push({
-        pubkey: tokenAccount,
+        pubkey: resolvedAccounts.token,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.token, true),
     });
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Spl Token Program.
     keys.push({
-        pubkey: splTokenProgramAccount,
+        pubkey: resolvedAccounts.splTokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splTokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splTokenProgram, false),
     });
     // Authorization Rules Program.
     keys.push({
-        pubkey: authorizationRulesProgramAccount,
+        pubkey: resolvedAccounts.authorizationRulesProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRulesProgram, false),
     });
     // Authorization Rules.
     keys.push({
-        pubkey: authorizationRulesAccount,
+        pubkey: resolvedAccounts.authorizationRules,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRules, false),
     });
     // Data.
-    const data = getDelegateCollectionV1InstructionDataSerializer(context).serialize(input);
+    const data = getDelegateCollectionV1InstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -165,0 +152,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/delegateLockedTransferV1.d.ts

@@ -53,2 +53,3 @@ /**
 export declare function getDelegateLockedTransferV1InstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<DelegateLockedTransferV1InstructionDataArgs, DelegateLockedTransferV1InstructionData>;
-export declare function delegateLockedTransferV1(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: DelegateLockedTransferV1InstructionAccounts & DelegateLockedTransferV1InstructionDataArgs): TransactionBuilder;
+export type DelegateLockedTransferV1InstructionArgs = DelegateLockedTransferV1InstructionDataArgs;
+export declare function delegateLockedTransferV1(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: DelegateLockedTransferV1InstructionAccounts & DelegateLockedTransferV1InstructionArgs): TransactionBuilder;

dist/src/generated/instructions/delegateLockedTransferV1.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -38,129 +39,115 @@ function getDelegateLockedTransferV1InstructionDataSerializer(context) {
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const delegateRecordAccount = input.delegateRecord ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const delegateAccount = input.delegate;
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const masterEditionAccount = input.masterEdition ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenRecordAccount = input.tokenRecord ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenAccount = input.token ?? { ...programId, isWritable: false };
-    const authorityAccount = input.authority ?? context.identity;
-    const payerAccount = input.payer ?? context.payer;
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'delegateRecord', input.delegateRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'masterEdition', input.masterEdition ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenRecord', input.tokenRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'token', input.token ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
-    const splTokenProgramAccount = input.splTokenProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesProgramAccount = input.authorizationRulesProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesAccount = input.authorizationRules ?? {
-        ...programId,
-        isWritable: false,
-    };
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splTokenProgram', input.splTokenProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRulesProgram', input.authorizationRulesProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRules', input.authorizationRules ?? programId);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Delegate Record.
     keys.push({
-        pubkey: delegateRecordAccount,
+        pubkey: resolvedAccounts.delegateRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegateRecord, true),
     });
     // Delegate.
     keys.push({
-        pubkey: delegateAccount,
+        pubkey: resolvedAccounts.delegate,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegate, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Master Edition.
     keys.push({
-        pubkey: masterEditionAccount,
+        pubkey: resolvedAccounts.masterEdition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterEditionAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterEdition, false),
     });
     // Token Record.
     keys.push({
-        pubkey: tokenRecordAccount,
+        pubkey: resolvedAccounts.tokenRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenRecord, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Token.
     keys.push({
-        pubkey: tokenAccount,
+        pubkey: resolvedAccounts.token,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.token, true),
     });
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Spl Token Program.
     keys.push({
-        pubkey: splTokenProgramAccount,
+        pubkey: resolvedAccounts.splTokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splTokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splTokenProgram, false),
     });
     // Authorization Rules Program.
     keys.push({
-        pubkey: authorizationRulesProgramAccount,
+        pubkey: resolvedAccounts.authorizationRulesProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRulesProgram, false),
     });
     // Authorization Rules.
     keys.push({
-        pubkey: authorizationRulesAccount,
+        pubkey: resolvedAccounts.authorizationRules,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRules, false),
     });
     // Data.
-    const data = getDelegateLockedTransferV1InstructionDataSerializer(context).serialize(input);
+    const data = getDelegateLockedTransferV1InstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -167,0 +154,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/delegateProgrammableConfigV1.d.ts

@@ -49,2 +49,3 @@ /**
 export declare function getDelegateProgrammableConfigV1InstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<DelegateProgrammableConfigV1InstructionDataArgs, DelegateProgrammableConfigV1InstructionData>;
-export declare function delegateProgrammableConfigV1(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: DelegateProgrammableConfigV1InstructionAccounts & DelegateProgrammableConfigV1InstructionDataArgs): TransactionBuilder;
+export type DelegateProgrammableConfigV1InstructionArgs = DelegateProgrammableConfigV1InstructionDataArgs;
+export declare function delegateProgrammableConfigV1(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: DelegateProgrammableConfigV1InstructionAccounts & DelegateProgrammableConfigV1InstructionArgs): TransactionBuilder;

dist/src/generated/instructions/delegateProgrammableConfigV1.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -36,129 +37,115 @@ function getDelegateProgrammableConfigV1InstructionDataSerializer(context) {
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const delegateRecordAccount = input.delegateRecord ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const delegateAccount = input.delegate;
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const masterEditionAccount = input.masterEdition ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenRecordAccount = input.tokenRecord ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenAccount = input.token ?? { ...programId, isWritable: false };
-    const authorityAccount = input.authority ?? context.identity;
-    const payerAccount = input.payer ?? context.payer;
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'delegateRecord', input.delegateRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'masterEdition', input.masterEdition ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenRecord', input.tokenRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'token', input.token ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
-    const splTokenProgramAccount = input.splTokenProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesProgramAccount = input.authorizationRulesProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesAccount = input.authorizationRules ?? {
-        ...programId,
-        isWritable: false,
-    };
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splTokenProgram', input.splTokenProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRulesProgram', input.authorizationRulesProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRules', input.authorizationRules ?? programId);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Delegate Record.
     keys.push({
-        pubkey: delegateRecordAccount,
+        pubkey: resolvedAccounts.delegateRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegateRecord, true),
     });
     // Delegate.
     keys.push({
-        pubkey: delegateAccount,
+        pubkey: resolvedAccounts.delegate,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegate, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Master Edition.
     keys.push({
-        pubkey: masterEditionAccount,
+        pubkey: resolvedAccounts.masterEdition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterEditionAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterEdition, false),
     });
     // Token Record.
     keys.push({
-        pubkey: tokenRecordAccount,
+        pubkey: resolvedAccounts.tokenRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenRecord, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Token.
     keys.push({
-        pubkey: tokenAccount,
+        pubkey: resolvedAccounts.token,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.token, true),
     });
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Spl Token Program.
     keys.push({
-        pubkey: splTokenProgramAccount,
+        pubkey: resolvedAccounts.splTokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splTokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splTokenProgram, false),
     });
     // Authorization Rules Program.
     keys.push({
-        pubkey: authorizationRulesProgramAccount,
+        pubkey: resolvedAccounts.authorizationRulesProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRulesProgram, false),
     });
     // Authorization Rules.
     keys.push({
-        pubkey: authorizationRulesAccount,
+        pubkey: resolvedAccounts.authorizationRules,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRules, false),
     });
     // Data.
-    const data = getDelegateProgrammableConfigV1InstructionDataSerializer(context).serialize(input);
+    const data = getDelegateProgrammableConfigV1InstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -165,0 +152,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/delegateSaleV1.d.ts

@@ -51,2 +51,3 @@ /**
 export declare function getDelegateSaleV1InstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<DelegateSaleV1InstructionDataArgs, DelegateSaleV1InstructionData>;
-export declare function delegateSaleV1(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: DelegateSaleV1InstructionAccounts & DelegateSaleV1InstructionDataArgs): TransactionBuilder;
+export type DelegateSaleV1InstructionArgs = DelegateSaleV1InstructionDataArgs;
+export declare function delegateSaleV1(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: DelegateSaleV1InstructionAccounts & DelegateSaleV1InstructionArgs): TransactionBuilder;

dist/src/generated/instructions/delegateSaleV1.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -37,129 +38,115 @@ function getDelegateSaleV1InstructionDataSerializer(context) {
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const delegateRecordAccount = input.delegateRecord ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const delegateAccount = input.delegate;
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const masterEditionAccount = input.masterEdition ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenRecordAccount = input.tokenRecord ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenAccount = input.token ?? { ...programId, isWritable: false };
-    const authorityAccount = input.authority ?? context.identity;
-    const payerAccount = input.payer ?? context.payer;
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'delegateRecord', input.delegateRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'masterEdition', input.masterEdition ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenRecord', input.tokenRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'token', input.token ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
-    const splTokenProgramAccount = input.splTokenProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesProgramAccount = input.authorizationRulesProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesAccount = input.authorizationRules ?? {
-        ...programId,
-        isWritable: false,
-    };
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splTokenProgram', input.splTokenProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRulesProgram', input.authorizationRulesProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRules', input.authorizationRules ?? programId);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Delegate Record.
     keys.push({
-        pubkey: delegateRecordAccount,
+        pubkey: resolvedAccounts.delegateRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegateRecord, true),
     });
     // Delegate.
     keys.push({
-        pubkey: delegateAccount,
+        pubkey: resolvedAccounts.delegate,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegate, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Master Edition.
     keys.push({
-        pubkey: masterEditionAccount,
+        pubkey: resolvedAccounts.masterEdition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterEditionAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterEdition, false),
     });
     // Token Record.
     keys.push({
-        pubkey: tokenRecordAccount,
+        pubkey: resolvedAccounts.tokenRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenRecord, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Token.
     keys.push({
-        pubkey: tokenAccount,
+        pubkey: resolvedAccounts.token,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.token, true),
     });
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Spl Token Program.
     keys.push({
-        pubkey: splTokenProgramAccount,
+        pubkey: resolvedAccounts.splTokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splTokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splTokenProgram, false),
     });
     // Authorization Rules Program.
     keys.push({
-        pubkey: authorizationRulesProgramAccount,
+        pubkey: resolvedAccounts.authorizationRulesProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRulesProgram, false),
     });
     // Authorization Rules.
     keys.push({
-        pubkey: authorizationRulesAccount,
+        pubkey: resolvedAccounts.authorizationRules,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRules, false),
     });
     // Data.
-    const data = getDelegateSaleV1InstructionDataSerializer(context).serialize(input);
+    const data = getDelegateSaleV1InstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -166,0 +153,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/delegateStakingV1.d.ts

@@ -51,2 +51,3 @@ /**
 export declare function getDelegateStakingV1InstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<DelegateStakingV1InstructionDataArgs, DelegateStakingV1InstructionData>;
-export declare function delegateStakingV1(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: DelegateStakingV1InstructionAccounts & DelegateStakingV1InstructionDataArgs): TransactionBuilder;
+export type DelegateStakingV1InstructionArgs = DelegateStakingV1InstructionDataArgs;
+export declare function delegateStakingV1(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: DelegateStakingV1InstructionAccounts & DelegateStakingV1InstructionArgs): TransactionBuilder;

dist/src/generated/instructions/delegateStakingV1.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -37,129 +38,115 @@ function getDelegateStakingV1InstructionDataSerializer(context) {
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const delegateRecordAccount = input.delegateRecord ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const delegateAccount = input.delegate;
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const masterEditionAccount = input.masterEdition ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenRecordAccount = input.tokenRecord ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenAccount = input.token ?? { ...programId, isWritable: false };
-    const authorityAccount = input.authority ?? context.identity;
-    const payerAccount = input.payer ?? context.payer;
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'delegateRecord', input.delegateRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'masterEdition', input.masterEdition ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenRecord', input.tokenRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'token', input.token ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
-    const splTokenProgramAccount = input.splTokenProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesProgramAccount = input.authorizationRulesProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesAccount = input.authorizationRules ?? {
-        ...programId,
-        isWritable: false,
-    };
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splTokenProgram', input.splTokenProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRulesProgram', input.authorizationRulesProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRules', input.authorizationRules ?? programId);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Delegate Record.
     keys.push({
-        pubkey: delegateRecordAccount,
+        pubkey: resolvedAccounts.delegateRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegateRecord, true),
     });
     // Delegate.
     keys.push({
-        pubkey: delegateAccount,
+        pubkey: resolvedAccounts.delegate,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegate, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Master Edition.
     keys.push({
-        pubkey: masterEditionAccount,
+        pubkey: resolvedAccounts.masterEdition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterEditionAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterEdition, false),
     });
     // Token Record.
     keys.push({
-        pubkey: tokenRecordAccount,
+        pubkey: resolvedAccounts.tokenRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenRecord, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Token.
     keys.push({
-        pubkey: tokenAccount,
+        pubkey: resolvedAccounts.token,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.token, true),
     });
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Spl Token Program.
     keys.push({
-        pubkey: splTokenProgramAccount,
+        pubkey: resolvedAccounts.splTokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splTokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splTokenProgram, false),
     });
     // Authorization Rules Program.
     keys.push({
-        pubkey: authorizationRulesProgramAccount,
+        pubkey: resolvedAccounts.authorizationRulesProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRulesProgram, false),
     });
     // Authorization Rules.
     keys.push({
-        pubkey: authorizationRulesAccount,
+        pubkey: resolvedAccounts.authorizationRules,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRules, false),
     });
     // Data.
-    const data = getDelegateStakingV1InstructionDataSerializer(context).serialize(input);
+    const data = getDelegateStakingV1InstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -166,0 +153,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/delegateStandardV1.d.ts

@@ -48,2 +48,3 @@ /**
 export declare function getDelegateStandardV1InstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<DelegateStandardV1InstructionDataArgs, DelegateStandardV1InstructionData>;
-export declare function delegateStandardV1(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: DelegateStandardV1InstructionAccounts & DelegateStandardV1InstructionDataArgs): TransactionBuilder;
+export type DelegateStandardV1InstructionArgs = DelegateStandardV1InstructionDataArgs;
+export declare function delegateStandardV1(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: DelegateStandardV1InstructionAccounts & DelegateStandardV1InstructionArgs): TransactionBuilder;

dist/src/generated/instructions/delegateStandardV1.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 function getDelegateStandardV1InstructionDataSerializer(context) {
@@ -32,129 +33,115 @@ const s = context.serializer;
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const delegateRecordAccount = input.delegateRecord ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const delegateAccount = input.delegate;
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const masterEditionAccount = input.masterEdition ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenRecordAccount = input.tokenRecord ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenAccount = input.token ?? { ...programId, isWritable: false };
-    const authorityAccount = input.authority ?? context.identity;
-    const payerAccount = input.payer ?? context.payer;
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'delegateRecord', input.delegateRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'masterEdition', input.masterEdition ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenRecord', input.tokenRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'token', input.token ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
-    const splTokenProgramAccount = input.splTokenProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesProgramAccount = input.authorizationRulesProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesAccount = input.authorizationRules ?? {
-        ...programId,
-        isWritable: false,
-    };
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splTokenProgram', input.splTokenProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRulesProgram', input.authorizationRulesProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRules', input.authorizationRules ?? programId);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Delegate Record.
     keys.push({
-        pubkey: delegateRecordAccount,
+        pubkey: resolvedAccounts.delegateRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegateRecord, true),
     });
     // Delegate.
     keys.push({
-        pubkey: delegateAccount,
+        pubkey: resolvedAccounts.delegate,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegate, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Master Edition.
     keys.push({
-        pubkey: masterEditionAccount,
+        pubkey: resolvedAccounts.masterEdition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterEditionAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterEdition, false),
     });
     // Token Record.
     keys.push({
-        pubkey: tokenRecordAccount,
+        pubkey: resolvedAccounts.tokenRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenRecord, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Token.
     keys.push({
-        pubkey: tokenAccount,
+        pubkey: resolvedAccounts.token,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.token, true),
     });
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Spl Token Program.
     keys.push({
-        pubkey: splTokenProgramAccount,
+        pubkey: resolvedAccounts.splTokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splTokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splTokenProgram, false),
     });
     // Authorization Rules Program.
     keys.push({
-        pubkey: authorizationRulesProgramAccount,
+        pubkey: resolvedAccounts.authorizationRulesProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRulesProgram, false),
     });
     // Authorization Rules.
     keys.push({
-        pubkey: authorizationRulesAccount,
+        pubkey: resolvedAccounts.authorizationRules,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRules, false),
     });
     // Data.
-    const data = getDelegateStandardV1InstructionDataSerializer(context).serialize(input);
+    const data = getDelegateStandardV1InstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -161,0 +148,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/delegateTransferV1.d.ts

@@ -51,2 +51,3 @@ /**
 export declare function getDelegateTransferV1InstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<DelegateTransferV1InstructionDataArgs, DelegateTransferV1InstructionData>;
-export declare function delegateTransferV1(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: DelegateTransferV1InstructionAccounts & DelegateTransferV1InstructionDataArgs): TransactionBuilder;
+export type DelegateTransferV1InstructionArgs = DelegateTransferV1InstructionDataArgs;
+export declare function delegateTransferV1(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: DelegateTransferV1InstructionAccounts & DelegateTransferV1InstructionArgs): TransactionBuilder;

dist/src/generated/instructions/delegateTransferV1.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -37,129 +38,115 @@ function getDelegateTransferV1InstructionDataSerializer(context) {
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const delegateRecordAccount = input.delegateRecord ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const delegateAccount = input.delegate;
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const masterEditionAccount = input.masterEdition ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenRecordAccount = input.tokenRecord ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenAccount = input.token ?? { ...programId, isWritable: false };
-    const authorityAccount = input.authority ?? context.identity;
-    const payerAccount = input.payer ?? context.payer;
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'delegateRecord', input.delegateRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'masterEdition', input.masterEdition ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenRecord', input.tokenRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'token', input.token ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
-    const splTokenProgramAccount = input.splTokenProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesProgramAccount = input.authorizationRulesProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesAccount = input.authorizationRules ?? {
-        ...programId,
-        isWritable: false,
-    };
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splTokenProgram', input.splTokenProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRulesProgram', input.authorizationRulesProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRules', input.authorizationRules ?? programId);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Delegate Record.
     keys.push({
-        pubkey: delegateRecordAccount,
+        pubkey: resolvedAccounts.delegateRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegateRecord, true),
     });
     // Delegate.
     keys.push({
-        pubkey: delegateAccount,
+        pubkey: resolvedAccounts.delegate,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegate, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Master Edition.
     keys.push({
-        pubkey: masterEditionAccount,
+        pubkey: resolvedAccounts.masterEdition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterEditionAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterEdition, false),
     });
     // Token Record.
     keys.push({
-        pubkey: tokenRecordAccount,
+        pubkey: resolvedAccounts.tokenRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenRecord, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Token.
     keys.push({
-        pubkey: tokenAccount,
+        pubkey: resolvedAccounts.token,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.token, true),
     });
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Spl Token Program.
     keys.push({
-        pubkey: splTokenProgramAccount,
+        pubkey: resolvedAccounts.splTokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splTokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splTokenProgram, false),
     });
     // Authorization Rules Program.
     keys.push({
-        pubkey: authorizationRulesProgramAccount,
+        pubkey: resolvedAccounts.authorizationRulesProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRulesProgram, false),
     });
     // Authorization Rules.
     keys.push({
-        pubkey: authorizationRulesAccount,
+        pubkey: resolvedAccounts.authorizationRules,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRules, false),
     });
     // Data.
-    const data = getDelegateTransferV1InstructionDataSerializer(context).serialize(input);
+    const data = getDelegateTransferV1InstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -166,0 +153,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/delegateUpdateV1.d.ts

@@ -49,2 +49,3 @@ /**
 export declare function getDelegateUpdateV1InstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<DelegateUpdateV1InstructionDataArgs, DelegateUpdateV1InstructionData>;
-export declare function delegateUpdateV1(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: DelegateUpdateV1InstructionAccounts & DelegateUpdateV1InstructionDataArgs): TransactionBuilder;
+export type DelegateUpdateV1InstructionArgs = DelegateUpdateV1InstructionDataArgs;
+export declare function delegateUpdateV1(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: DelegateUpdateV1InstructionAccounts & DelegateUpdateV1InstructionArgs): TransactionBuilder;

dist/src/generated/instructions/delegateUpdateV1.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -36,129 +37,115 @@ function getDelegateUpdateV1InstructionDataSerializer(context) {
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const delegateRecordAccount = input.delegateRecord ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const delegateAccount = input.delegate;
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const masterEditionAccount = input.masterEdition ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenRecordAccount = input.tokenRecord ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenAccount = input.token ?? { ...programId, isWritable: false };
-    const authorityAccount = input.authority ?? context.identity;
-    const payerAccount = input.payer ?? context.payer;
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'delegateRecord', input.delegateRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'masterEdition', input.masterEdition ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenRecord', input.tokenRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'token', input.token ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
-    const splTokenProgramAccount = input.splTokenProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesProgramAccount = input.authorizationRulesProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesAccount = input.authorizationRules ?? {
-        ...programId,
-        isWritable: false,
-    };
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splTokenProgram', input.splTokenProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRulesProgram', input.authorizationRulesProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRules', input.authorizationRules ?? programId);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Delegate Record.
     keys.push({
-        pubkey: delegateRecordAccount,
+        pubkey: resolvedAccounts.delegateRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegateRecord, true),
     });
     // Delegate.
     keys.push({
-        pubkey: delegateAccount,
+        pubkey: resolvedAccounts.delegate,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegate, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Master Edition.
     keys.push({
-        pubkey: masterEditionAccount,
+        pubkey: resolvedAccounts.masterEdition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterEditionAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterEdition, false),
     });
     // Token Record.
     keys.push({
-        pubkey: tokenRecordAccount,
+        pubkey: resolvedAccounts.tokenRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenRecord, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Token.
     keys.push({
-        pubkey: tokenAccount,
+        pubkey: resolvedAccounts.token,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.token, true),
     });
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Spl Token Program.
     keys.push({
-        pubkey: splTokenProgramAccount,
+        pubkey: resolvedAccounts.splTokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splTokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splTokenProgram, false),
     });
     // Authorization Rules Program.
     keys.push({
-        pubkey: authorizationRulesProgramAccount,
+        pubkey: resolvedAccounts.authorizationRulesProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRulesProgram, false),
     });
     // Authorization Rules.
     keys.push({
-        pubkey: authorizationRulesAccount,
+        pubkey: resolvedAccounts.authorizationRules,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRules, false),
     });
     // Data.
-    const data = getDelegateUpdateV1InstructionDataSerializer(context).serialize(input);
+    const data = getDelegateUpdateV1InstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -165,0 +152,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/delegateUtilityV1.d.ts

@@ -51,2 +51,3 @@ /**
 export declare function getDelegateUtilityV1InstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<DelegateUtilityV1InstructionDataArgs, DelegateUtilityV1InstructionData>;
-export declare function delegateUtilityV1(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: DelegateUtilityV1InstructionAccounts & DelegateUtilityV1InstructionDataArgs): TransactionBuilder;
+export type DelegateUtilityV1InstructionArgs = DelegateUtilityV1InstructionDataArgs;
+export declare function delegateUtilityV1(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: DelegateUtilityV1InstructionAccounts & DelegateUtilityV1InstructionArgs): TransactionBuilder;

dist/src/generated/instructions/delegateUtilityV1.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -37,129 +38,115 @@ function getDelegateUtilityV1InstructionDataSerializer(context) {
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const delegateRecordAccount = input.delegateRecord ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const delegateAccount = input.delegate;
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const masterEditionAccount = input.masterEdition ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenRecordAccount = input.tokenRecord ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenAccount = input.token ?? { ...programId, isWritable: false };
-    const authorityAccount = input.authority ?? context.identity;
-    const payerAccount = input.payer ?? context.payer;
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'delegateRecord', input.delegateRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'masterEdition', input.masterEdition ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenRecord', input.tokenRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'token', input.token ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
-    const splTokenProgramAccount = input.splTokenProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesProgramAccount = input.authorizationRulesProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesAccount = input.authorizationRules ?? {
-        ...programId,
-        isWritable: false,
-    };
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splTokenProgram', input.splTokenProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRulesProgram', input.authorizationRulesProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRules', input.authorizationRules ?? programId);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Delegate Record.
     keys.push({
-        pubkey: delegateRecordAccount,
+        pubkey: resolvedAccounts.delegateRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegateRecord, true),
     });
     // Delegate.
     keys.push({
-        pubkey: delegateAccount,
+        pubkey: resolvedAccounts.delegate,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegate, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Master Edition.
     keys.push({
-        pubkey: masterEditionAccount,
+        pubkey: resolvedAccounts.masterEdition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterEditionAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterEdition, false),
     });
     // Token Record.
     keys.push({
-        pubkey: tokenRecordAccount,
+        pubkey: resolvedAccounts.tokenRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenRecord, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Token.
     keys.push({
-        pubkey: tokenAccount,
+        pubkey: resolvedAccounts.token,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.token, true),
     });
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Spl Token Program.
     keys.push({
-        pubkey: splTokenProgramAccount,
+        pubkey: resolvedAccounts.splTokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splTokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splTokenProgram, false),
     });
     // Authorization Rules Program.
     keys.push({
-        pubkey: authorizationRulesProgramAccount,
+        pubkey: resolvedAccounts.authorizationRulesProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRulesProgram, false),
     });
     // Authorization Rules.
     keys.push({
-        pubkey: authorizationRulesAccount,
+        pubkey: resolvedAccounts.authorizationRules,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRules, false),
     });
     // Data.
-    const data = getDelegateUtilityV1InstructionDataSerializer(context).serialize(input);
+    const data = getDelegateUtilityV1InstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -166,0 +153,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/deprecatedCreateMasterEdition.d.ts

@@ -46,2 +46,3 @@ /**
 export declare function getDeprecatedCreateMasterEditionInstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<DeprecatedCreateMasterEditionInstructionDataArgs, DeprecatedCreateMasterEditionInstructionData>;
-export declare function deprecatedCreateMasterEdition(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: DeprecatedCreateMasterEditionInstructionAccounts & DeprecatedCreateMasterEditionInstructionDataArgs): TransactionBuilder;
+export type DeprecatedCreateMasterEditionInstructionArgs = DeprecatedCreateMasterEditionInstructionDataArgs;
+export declare function deprecatedCreateMasterEdition(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: DeprecatedCreateMasterEditionInstructionAccounts & DeprecatedCreateMasterEditionInstructionArgs): TransactionBuilder;

dist/src/generated/instructions/deprecatedCreateMasterEdition.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -34,110 +35,110 @@ function getDeprecatedCreateMasterEditionInstructionDataSerializer(context) {
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const mintAccount = input.mint;
-    const editionAccount = input.edition ??
-        (0, accounts_1.findMasterEditionPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const printingMintAccount = input.printingMint;
-    const oneTimePrintingAuthorizationMintAccount = input.oneTimePrintingAuthorizationMint;
-    const updateAuthorityAccount = input.updateAuthority ?? context.identity;
-    const printingMintAuthorityAccount = input.printingMintAuthority;
-    const mintAuthorityAccount = input.mintAuthority;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const payerAccount = input.payer ?? context.payer;
-    const tokenProgramAccount = input.tokenProgram ?? {
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
+        isWritable: false,
+    };
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'edition', input.edition ??
+        (0, accounts_1.findMasterEditionPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'updateAuthority', input.updateAuthority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenProgram', input.tokenProgram ?? {
         ...context.programs.getPublicKey('splToken', 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
         isWritable: false,
-    };
-    const systemProgramAccount = input.systemProgram ?? {
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const rentAccount = input.rent ?? (0, umi_1.publicKey)('SysvarRent111111111111111111111111111111111');
-    const oneTimePrintingAuthorizationMintAuthorityAccount = input.oneTimePrintingAuthorizationMintAuthority;
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'rent', input.rent ?? (0, umi_1.publicKey)('SysvarRent111111111111111111111111111111111'));
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Edition.
     keys.push({
-        pubkey: editionAccount,
+        pubkey: resolvedAccounts.edition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(editionAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.edition, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, true),
     });
     // Printing Mint.
     keys.push({
-        pubkey: printingMintAccount,
+        pubkey: resolvedAccounts.printingMint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(printingMintAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.printingMint, true),
     });
     // One Time Printing Authorization Mint.
     keys.push({
-        pubkey: oneTimePrintingAuthorizationMintAccount,
+        pubkey: resolvedAccounts.oneTimePrintingAuthorizationMint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(oneTimePrintingAuthorizationMintAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.oneTimePrintingAuthorizationMint, true),
     });
     // Update Authority.
-    signers.push(updateAuthorityAccount);
+    signers.push(resolvedAccounts.updateAuthority);
     keys.push({
-        pubkey: updateAuthorityAccount.publicKey,
+        pubkey: resolvedAccounts.updateAuthority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(updateAuthorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.updateAuthority, false),
     });
     // Printing Mint Authority.
-    signers.push(printingMintAuthorityAccount);
+    signers.push(resolvedAccounts.printingMintAuthority);
     keys.push({
-        pubkey: printingMintAuthorityAccount.publicKey,
+        pubkey: resolvedAccounts.printingMintAuthority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(printingMintAuthorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.printingMintAuthority, false),
     });
     // Mint Authority.
-    signers.push(mintAuthorityAccount);
+    signers.push(resolvedAccounts.mintAuthority);
     keys.push({
-        pubkey: mintAuthorityAccount.publicKey,
+        pubkey: resolvedAccounts.mintAuthority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAuthorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mintAuthority, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, false),
     });
     // Token Program.
     keys.push({
-        pubkey: tokenProgramAccount,
+        pubkey: resolvedAccounts.tokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenProgram, false),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Rent.
     keys.push({
-        pubkey: rentAccount,
+        pubkey: resolvedAccounts.rent,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(rentAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.rent, false),
     });
     // One Time Printing Authorization Mint Authority.
-    signers.push(oneTimePrintingAuthorizationMintAuthorityAccount);
+    signers.push(resolvedAccounts.oneTimePrintingAuthorizationMintAuthority);
     keys.push({
-        pubkey: oneTimePrintingAuthorizationMintAuthorityAccount.publicKey,
+        pubkey: resolvedAccounts.oneTimePrintingAuthorizationMintAuthority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(oneTimePrintingAuthorizationMintAuthorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.oneTimePrintingAuthorizationMintAuthority, false),
     });
     // Data.
-    const data = getDeprecatedCreateMasterEditionInstructionDataSerializer(context).serialize(input);
+    const data = getDeprecatedCreateMasterEditionInstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -144,0 +145,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/deprecatedMintNewEditionFromMasterEditionViaPrintingToken.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 function getDeprecatedMintNewEditionFromMasterEditionViaPrintingTokenInstructionDataSerializer(context) {
@@ -29,129 +30,125 @@ const s = context.serializer;
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const editionAccount = input.edition ??
-        (0, accounts_1.findMasterEditionPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const masterEditionAccount = input.masterEdition ??
-        (0, accounts_1.findMasterEditionPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const mintAuthorityAccount = input.mintAuthority;
-    const printingMintAccount = input.printingMint;
-    const masterTokenAccountAccount = input.masterTokenAccount;
-    const editionMarkerAccount = input.editionMarker ??
-        (0, accounts_1.findMasterEditionPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const burnAuthorityAccount = input.burnAuthority;
-    const payerAccount = input.payer ?? context.payer;
-    const masterUpdateAuthorityAccount = input.masterUpdateAuthority;
-    const masterMetadataAccount = input.masterMetadata;
-    const tokenProgramAccount = input.tokenProgram ?? {
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
+        isWritable: false,
+    };
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'edition', input.edition ??
+        (0, accounts_1.findMasterEditionPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'masterEdition', input.masterEdition ??
+        (0, accounts_1.findMasterEditionPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'editionMarker', input.editionMarker ??
+        (0, accounts_1.findMasterEditionPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenProgram', input.tokenProgram ?? {
         ...context.programs.getPublicKey('splToken', 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
         isWritable: false,
-    };
-    const systemProgramAccount = input.systemProgram ?? {
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const rentAccount = input.rent ?? (0, umi_1.publicKey)('SysvarRent111111111111111111111111111111111');
-    const reservationListAccount = input.reservationList;
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'rent', input.rent ?? (0, umi_1.publicKey)('SysvarRent111111111111111111111111111111111'));
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Edition.
     keys.push({
-        pubkey: editionAccount,
+        pubkey: resolvedAccounts.edition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(editionAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.edition, true),
     });
     // Master Edition.
     keys.push({
-        pubkey: masterEditionAccount,
+        pubkey: resolvedAccounts.masterEdition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterEditionAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterEdition, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, true),
     });
     // Mint Authority.
-    signers.push(mintAuthorityAccount);
+    signers.push(resolvedAccounts.mintAuthority);
     keys.push({
-        pubkey: mintAuthorityAccount.publicKey,
+        pubkey: resolvedAccounts.mintAuthority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAuthorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mintAuthority, false),
     });
     // Printing Mint.
     keys.push({
-        pubkey: printingMintAccount,
+        pubkey: resolvedAccounts.printingMint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(printingMintAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.printingMint, true),
     });
     // Master Token Account.
     keys.push({
-        pubkey: masterTokenAccountAccount,
+        pubkey: resolvedAccounts.masterTokenAccount,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterTokenAccountAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterTokenAccount, true),
     });
     // Edition Marker.
     keys.push({
-        pubkey: editionMarkerAccount,
+        pubkey: resolvedAccounts.editionMarker,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(editionMarkerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.editionMarker, true),
     });
     // Burn Authority.
-    signers.push(burnAuthorityAccount);
+    signers.push(resolvedAccounts.burnAuthority);
     keys.push({
-        pubkey: burnAuthorityAccount.publicKey,
+        pubkey: resolvedAccounts.burnAuthority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(burnAuthorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.burnAuthority, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, false),
     });
     // Master Update Authority.
     keys.push({
-        pubkey: masterUpdateAuthorityAccount,
+        pubkey: resolvedAccounts.masterUpdateAuthority,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterUpdateAuthorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterUpdateAuthority, false),
     });
     // Master Metadata.
     keys.push({
-        pubkey: masterMetadataAccount,
+        pubkey: resolvedAccounts.masterMetadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterMetadataAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterMetadata, false),
     });
     // Token Program.
     keys.push({
-        pubkey: tokenProgramAccount,
+        pubkey: resolvedAccounts.tokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenProgram, false),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Rent.
     keys.push({
-        pubkey: rentAccount,
+        pubkey: resolvedAccounts.rent,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(rentAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.rent, false),
     });
     // Reservation List (optional).
-    if (reservationListAccount) {
+    if (resolvedAccounts.reservationList) {
         keys.push({
-            pubkey: reservationListAccount,
+            pubkey: resolvedAccounts.reservationList,
             isSigner: false,
-            isWritable: (0, umi_1.checkForIsWritableOverride)(reservationListAccount, true),
+            isWritable: (0, shared_1.isWritable)(resolvedAccounts.reservationList, true),
         });
@@ -158,0 +155,0 @@ }

dist/src/generated/instructions/deprecatedMintPrintingTokens.d.ts

@@ -34,2 +34,3 @@ /**
 export declare function getDeprecatedMintPrintingTokensInstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<DeprecatedMintPrintingTokensInstructionDataArgs, DeprecatedMintPrintingTokensInstructionData>;
-export declare function deprecatedMintPrintingTokens(context: Pick<Context, 'serializer' | 'programs' | 'identity'>, input: DeprecatedMintPrintingTokensInstructionAccounts & DeprecatedMintPrintingTokensInstructionDataArgs): TransactionBuilder;
+export type DeprecatedMintPrintingTokensInstructionArgs = DeprecatedMintPrintingTokensInstructionDataArgs;
+export declare function deprecatedMintPrintingTokens(context: Pick<Context, 'serializer' | 'programs' | 'identity'>, input: DeprecatedMintPrintingTokensInstructionAccounts & DeprecatedMintPrintingTokensInstructionArgs): TransactionBuilder;

dist/src/generated/instructions/deprecatedMintPrintingTokens.js

@@ -12,2 +12,3 @@ "use strict";
 const umi_1 = require("@metaplex-foundation/umi");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -33,59 +34,62 @@ function getDeprecatedMintPrintingTokensInstructionDataSerializer(context) {
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const destinationAccount = input.destination;
-    const printingMintAccount = input.printingMint;
-    const updateAuthorityAccount = input.updateAuthority ?? context.identity;
-    const metadataAccount = input.metadata;
-    const masterEditionAccount = input.masterEdition;
-    const tokenProgramAccount = input.tokenProgram ?? {
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
+        isWritable: false,
+    };
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'updateAuthority', input.updateAuthority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenProgram', input.tokenProgram ?? {
         ...context.programs.getPublicKey('splToken', 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
         isWritable: false,
-    };
-    const rentAccount = input.rent ?? (0, umi_1.publicKey)('SysvarRent111111111111111111111111111111111');
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'rent', input.rent ?? (0, umi_1.publicKey)('SysvarRent111111111111111111111111111111111'));
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Destination.
     keys.push({
-        pubkey: destinationAccount,
+        pubkey: resolvedAccounts.destination,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(destinationAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.destination, true),
     });
     // Printing Mint.
     keys.push({
-        pubkey: printingMintAccount,
+        pubkey: resolvedAccounts.printingMint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(printingMintAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.printingMint, true),
     });
     // Update Authority.
-    signers.push(updateAuthorityAccount);
+    signers.push(resolvedAccounts.updateAuthority);
     keys.push({
-        pubkey: updateAuthorityAccount.publicKey,
+        pubkey: resolvedAccounts.updateAuthority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(updateAuthorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.updateAuthority, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, false),
     });
     // Master Edition.
     keys.push({
-        pubkey: masterEditionAccount,
+        pubkey: resolvedAccounts.masterEdition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterEditionAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterEdition, false),
     });
     // Token Program.
     keys.push({
-        pubkey: tokenProgramAccount,
+        pubkey: resolvedAccounts.tokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenProgram, false),
     });
     // Rent.
     keys.push({
-        pubkey: rentAccount,
+        pubkey: resolvedAccounts.rent,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(rentAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.rent, false),
     });
     // Data.
-    const data = getDeprecatedMintPrintingTokensInstructionDataSerializer(context).serialize(input);
+    const data = getDeprecatedMintPrintingTokensInstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -92,0 +96,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/deprecatedMintPrintingTokensViaToken.d.ts

@@ -38,2 +38,3 @@ /**
 export declare function getDeprecatedMintPrintingTokensViaTokenInstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<DeprecatedMintPrintingTokensViaTokenInstructionDataArgs, DeprecatedMintPrintingTokensViaTokenInstructionData>;
-export declare function deprecatedMintPrintingTokensViaToken(context: Pick<Context, 'serializer' | 'programs'>, input: DeprecatedMintPrintingTokensViaTokenInstructionAccounts & DeprecatedMintPrintingTokensViaTokenInstructionDataArgs): TransactionBuilder;
+export type DeprecatedMintPrintingTokensViaTokenInstructionArgs = DeprecatedMintPrintingTokensViaTokenInstructionDataArgs;
+export declare function deprecatedMintPrintingTokensViaToken(context: Pick<Context, 'serializer' | 'programs'>, input: DeprecatedMintPrintingTokensViaTokenInstructionAccounts & DeprecatedMintPrintingTokensViaTokenInstructionArgs): TransactionBuilder;

dist/src/generated/instructions/deprecatedMintPrintingTokensViaToken.js

@@ -12,2 +12,3 @@ "use strict";
 const umi_1 = require("@metaplex-foundation/umi");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -33,73 +34,73 @@ function getDeprecatedMintPrintingTokensViaTokenInstructionDataSerializer(context) {
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const destinationAccount = input.destination;
-    const tokenAccount = input.token;
-    const oneTimePrintingAuthorizationMintAccount = input.oneTimePrintingAuthorizationMint;
-    const printingMintAccount = input.printingMint;
-    const burnAuthorityAccount = input.burnAuthority;
-    const metadataAccount = input.metadata;
-    const masterEditionAccount = input.masterEdition;
-    const tokenProgramAccount = input.tokenProgram ?? {
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
+        isWritable: false,
+    };
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenProgram', input.tokenProgram ?? {
         ...context.programs.getPublicKey('splToken', 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
         isWritable: false,
-    };
-    const rentAccount = input.rent ?? (0, umi_1.publicKey)('SysvarRent111111111111111111111111111111111');
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'rent', input.rent ?? (0, umi_1.publicKey)('SysvarRent111111111111111111111111111111111'));
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Destination.
     keys.push({
-        pubkey: destinationAccount,
+        pubkey: resolvedAccounts.destination,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(destinationAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.destination, true),
     });
     // Token.
     keys.push({
-        pubkey: tokenAccount,
+        pubkey: resolvedAccounts.token,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.token, true),
     });
     // One Time Printing Authorization Mint.
     keys.push({
-        pubkey: oneTimePrintingAuthorizationMintAccount,
+        pubkey: resolvedAccounts.oneTimePrintingAuthorizationMint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(oneTimePrintingAuthorizationMintAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.oneTimePrintingAuthorizationMint, true),
     });
     // Printing Mint.
     keys.push({
-        pubkey: printingMintAccount,
+        pubkey: resolvedAccounts.printingMint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(printingMintAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.printingMint, true),
     });
     // Burn Authority.
-    signers.push(burnAuthorityAccount);
+    signers.push(resolvedAccounts.burnAuthority);
     keys.push({
-        pubkey: burnAuthorityAccount.publicKey,
+        pubkey: resolvedAccounts.burnAuthority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(burnAuthorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.burnAuthority, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, false),
     });
     // Master Edition.
     keys.push({
-        pubkey: masterEditionAccount,
+        pubkey: resolvedAccounts.masterEdition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterEditionAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterEdition, false),
     });
     // Token Program.
     keys.push({
-        pubkey: tokenProgramAccount,
+        pubkey: resolvedAccounts.tokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenProgram, false),
     });
     // Rent.
     keys.push({
-        pubkey: rentAccount,
+        pubkey: resolvedAccounts.rent,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(rentAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.rent, false),
     });
     // Data.
-    const data = getDeprecatedMintPrintingTokensViaTokenInstructionDataSerializer(context).serialize(input);
+    const data = getDeprecatedMintPrintingTokensViaTokenInstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -106,0 +107,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/freezeDelegatedAccount.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 function getFreezeDelegatedAccountInstructionDataSerializer(context) {
@@ -24,43 +25,45 @@ const s = context.serializer;
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const delegateAccount = input.delegate;
-    const tokenAccountAccount = input.tokenAccount;
-    const mintAccount = input.mint;
-    const editionAccount = input.edition ??
-        (0, accounts_1.findMasterEditionPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const tokenProgramAccount = input.tokenProgram ?? {
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
+        isWritable: false,
+    };
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'edition', input.edition ??
+        (0, accounts_1.findMasterEditionPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenProgram', input.tokenProgram ?? {
         ...context.programs.getPublicKey('splToken', 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
         isWritable: false,
-    };
+    });
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
     // Delegate.
-    signers.push(delegateAccount);
+    signers.push(resolvedAccounts.delegate);
     keys.push({
-        pubkey: delegateAccount.publicKey,
+        pubkey: resolvedAccounts.delegate.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegate, true),
     });
     // Token Account.
     keys.push({
-        pubkey: tokenAccountAccount,
+        pubkey: resolvedAccounts.tokenAccount,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccountAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenAccount, true),
     });
     // Edition.
     keys.push({
-        pubkey: editionAccount,
+        pubkey: resolvedAccounts.edition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(editionAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.edition, false),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Token Program.
     keys.push({
-        pubkey: tokenProgramAccount,
+        pubkey: resolvedAccounts.tokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenProgram, false),
     });
@@ -67,0 +70,0 @@ // Data.

dist/src/generated/instructions/index.d.ts

@@ -24,2 +24,3 @@ /**
 export * from './createMetadataAccountV3';
+export * from './createV1';
 export * from './delegate';
@@ -47,2 +48,3 @@ export * from './delegateCollectionV1';
 export * from './mintNewEditionFromMasterEditionViaVaultProxy';
+export * from './mintV1';
 export * from './puffMetadata';
@@ -49,0 +51,0 @@ export * from './removeCreatorVerification';

dist/src/generated/instructions/index.js

@@ -40,2 +40,3 @@ "use strict";
 __exportStar(require("./createMetadataAccountV3"), exports);
+__exportStar(require("./createV1"), exports);
 __exportStar(require("./delegate"), exports);
@@ -63,2 +64,3 @@ __exportStar(require("./delegateCollectionV1"), exports);
 __exportStar(require("./mintNewEditionFromMasterEditionViaVaultProxy"), exports);
+__exportStar(require("./mintV1"), exports);
 __exportStar(require("./puffMetadata"), exports);
@@ -65,0 +67,0 @@ __exportStar(require("./removeCreatorVerification"), exports);

dist/src/generated/instructions/lock.d.ts

@@ -46,2 +46,3 @@ /**
 export declare function getLockInstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<LockInstructionDataArgs, LockInstructionData>;
-export declare function lock(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: LockInstructionAccounts & LockInstructionDataArgs): TransactionBuilder;
+export type LockInstructionArgs = LockInstructionDataArgs;
+export declare function lock(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: LockInstructionAccounts & LockInstructionArgs): TransactionBuilder;

dist/src/generated/instructions/lock.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -28,119 +29,108 @@ function getLockInstructionDataSerializer(context) {
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const authorityAccount = input.authority ?? context.identity;
-    const tokenOwnerAccount = input.tokenOwner ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const tokenAccount = input.token;
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const editionAccount = input.edition ?? { ...programId, isWritable: false };
-    const tokenRecordAccount = input.tokenRecord ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const payerAccount = input.payer ?? context.payer;
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenOwner', input.tokenOwner ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'edition', input.edition ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenRecord', input.tokenRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
-    const splTokenProgramAccount = input.splTokenProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesProgramAccount = input.authorizationRulesProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesAccount = input.authorizationRules ?? {
-        ...programId,
-        isWritable: false,
-    };
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splTokenProgram', input.splTokenProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRulesProgram', input.authorizationRulesProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRules', input.authorizationRules ?? programId);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Token Owner.
     keys.push({
-        pubkey: tokenOwnerAccount,
+        pubkey: resolvedAccounts.tokenOwner,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenOwnerAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenOwner, false),
     });
     // Token.
     keys.push({
-        pubkey: tokenAccount,
+        pubkey: resolvedAccounts.token,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.token, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Edition.
     keys.push({
-        pubkey: editionAccount,
+        pubkey: resolvedAccounts.edition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(editionAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.edition, false),
     });
     // Token Record.
     keys.push({
-        pubkey: tokenRecordAccount,
+        pubkey: resolvedAccounts.tokenRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenRecord, true),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Spl Token Program.
     keys.push({
-        pubkey: splTokenProgramAccount,
+        pubkey: resolvedAccounts.splTokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splTokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splTokenProgram, false),
     });
     // Authorization Rules Program.
     keys.push({
-        pubkey: authorizationRulesProgramAccount,
+        pubkey: resolvedAccounts.authorizationRulesProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRulesProgram, false),
     });
     // Authorization Rules.
     keys.push({
-        pubkey: authorizationRulesAccount,
+        pubkey: resolvedAccounts.authorizationRules,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRules, false),
     });
     // Data.
-    const data = getLockInstructionDataSerializer(context).serialize(input);
+    const data = getLockInstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -147,0 +137,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/lockV1.d.ts

@@ -47,2 +47,3 @@ /**
 export declare function getLockV1InstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<LockV1InstructionDataArgs, LockV1InstructionData>;
-export declare function lockV1(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: LockV1InstructionAccounts & LockV1InstructionDataArgs): TransactionBuilder;
+export type LockV1InstructionArgs = LockV1InstructionDataArgs;
+export declare function lockV1(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: LockV1InstructionAccounts & LockV1InstructionArgs): TransactionBuilder;

dist/src/generated/instructions/lockV1.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -36,119 +37,108 @@ function getLockV1InstructionDataSerializer(context) {
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const authorityAccount = input.authority ?? context.identity;
-    const tokenOwnerAccount = input.tokenOwner ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const tokenAccount = input.token;
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const editionAccount = input.edition ?? { ...programId, isWritable: false };
-    const tokenRecordAccount = input.tokenRecord ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const payerAccount = input.payer ?? context.payer;
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenOwner', input.tokenOwner ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'edition', input.edition ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenRecord', input.tokenRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
-    const splTokenProgramAccount = input.splTokenProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesProgramAccount = input.authorizationRulesProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesAccount = input.authorizationRules ?? {
-        ...programId,
-        isWritable: false,
-    };
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splTokenProgram', input.splTokenProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRulesProgram', input.authorizationRulesProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRules', input.authorizationRules ?? programId);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Token Owner.
     keys.push({
-        pubkey: tokenOwnerAccount,
+        pubkey: resolvedAccounts.tokenOwner,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenOwnerAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenOwner, false),
     });
     // Token.
     keys.push({
-        pubkey: tokenAccount,
+        pubkey: resolvedAccounts.token,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.token, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Edition.
     keys.push({
-        pubkey: editionAccount,
+        pubkey: resolvedAccounts.edition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(editionAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.edition, false),
     });
     // Token Record.
     keys.push({
-        pubkey: tokenRecordAccount,
+        pubkey: resolvedAccounts.tokenRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenRecord, true),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Spl Token Program.
     keys.push({
-        pubkey: splTokenProgramAccount,
+        pubkey: resolvedAccounts.splTokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splTokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splTokenProgram, false),
     });
     // Authorization Rules Program.
     keys.push({
-        pubkey: authorizationRulesProgramAccount,
+        pubkey: resolvedAccounts.authorizationRulesProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRulesProgram, false),
     });
     // Authorization Rules.
     keys.push({
-        pubkey: authorizationRulesAccount,
+        pubkey: resolvedAccounts.authorizationRules,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRules, false),
     });
     // Data.
-    const data = getLockV1InstructionDataSerializer(context).serialize(input);
+    const data = getLockV1InstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -155,0 +145,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/migrate.d.ts

@@ -50,2 +50,3 @@ /**
 export declare function getMigrateInstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<MigrateInstructionDataArgs, MigrateInstructionData>;
-export declare function migrate(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: MigrateInstructionAccounts & MigrateInstructionDataArgs): TransactionBuilder;
+export type MigrateInstructionArgs = MigrateInstructionDataArgs;
+export declare function migrate(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: MigrateInstructionAccounts & MigrateInstructionArgs): TransactionBuilder;

dist/src/generated/instructions/migrate.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -28,132 +29,127 @@ function getMigrateInstructionDataSerializer(context) {
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const editionAccount = input.edition ??
-        (0, accounts_1.findMasterEditionPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const tokenAccount = input.token;
-    const tokenOwnerAccount = input.tokenOwner;
-    const payerAccount = input.payer ?? context.payer;
-    const authorityAccount = input.authority ?? context.identity;
-    const collectionMetadataAccount = input.collectionMetadata;
-    const delegateRecordAccount = input.delegateRecord;
-    const tokenRecordAccount = input.tokenRecord ??
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
+        isWritable: false,
+    };
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'edition', input.edition ??
+        (0, accounts_1.findMasterEditionPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenRecord', input.tokenRecord ??
         (0, accounts_1.findTokenRecordPda)(context, {
-            mint: (0, umi_1.publicKey)(mintAccount),
-            token: (0, umi_1.publicKey)(tokenAccount),
-        });
-    const systemProgramAccount = input.systemProgram ?? {
+            mint: (0, umi_1.publicKey)(input.mint),
+            token: (0, umi_1.publicKey)(input.token),
+        }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
-    const splTokenProgramAccount = input.splTokenProgram ?? {
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splTokenProgram', input.splTokenProgram ?? {
         ...context.programs.getPublicKey('splToken', 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
         isWritable: false,
-    };
-    const authorizationRulesProgramAccount = input.authorizationRulesProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesAccount = input.authorizationRules ?? {
-        ...programId,
-        isWritable: false,
-    };
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRulesProgram', input.authorizationRulesProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRules', input.authorizationRules ?? programId);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Edition.
     keys.push({
-        pubkey: editionAccount,
+        pubkey: resolvedAccounts.edition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(editionAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.edition, true),
     });
     // Token.
     keys.push({
-        pubkey: tokenAccount,
+        pubkey: resolvedAccounts.token,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.token, true),
     });
     // Token Owner.
     keys.push({
-        pubkey: tokenOwnerAccount,
+        pubkey: resolvedAccounts.tokenOwner,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenOwnerAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenOwner, false),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Collection Metadata.
     keys.push({
-        pubkey: collectionMetadataAccount,
+        pubkey: resolvedAccounts.collectionMetadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionMetadataAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionMetadata, false),
     });
     // Delegate Record.
     keys.push({
-        pubkey: delegateRecordAccount,
+        pubkey: resolvedAccounts.delegateRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateRecordAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegateRecord, false),
     });
     // Token Record.
     keys.push({
-        pubkey: tokenRecordAccount,
+        pubkey: resolvedAccounts.tokenRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenRecord, true),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Spl Token Program.
     keys.push({
-        pubkey: splTokenProgramAccount,
+        pubkey: resolvedAccounts.splTokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splTokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splTokenProgram, false),
     });
     // Authorization Rules Program.
     keys.push({
-        pubkey: authorizationRulesProgramAccount,
+        pubkey: resolvedAccounts.authorizationRulesProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRulesProgram, false),
     });
     // Authorization Rules.
     keys.push({
-        pubkey: authorizationRulesAccount,
+        pubkey: resolvedAccounts.authorizationRules,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRules, false),
     });
     // Data.
-    const data = getMigrateInstructionDataSerializer(context).serialize(input);
+    const data = getMigrateInstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -160,0 +156,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/migrateV1.d.ts

@@ -53,2 +53,3 @@ /**
 export declare function getMigrateV1InstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<MigrateV1InstructionDataArgs, MigrateV1InstructionData>;
-export declare function migrateV1(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: MigrateV1InstructionAccounts & MigrateV1InstructionDataArgs): TransactionBuilder;
+export type MigrateV1InstructionArgs = MigrateV1InstructionDataArgs;
+export declare function migrateV1(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: MigrateV1InstructionAccounts & MigrateV1InstructionArgs): TransactionBuilder;

dist/src/generated/instructions/migrateV1.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -34,132 +35,127 @@ function getMigrateV1InstructionDataSerializer(context) {
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const editionAccount = input.edition ??
-        (0, accounts_1.findMasterEditionPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const tokenAccount = input.token;
-    const tokenOwnerAccount = input.tokenOwner;
-    const payerAccount = input.payer ?? context.payer;
-    const authorityAccount = input.authority ?? context.identity;
-    const collectionMetadataAccount = input.collectionMetadata;
-    const delegateRecordAccount = input.delegateRecord;
-    const tokenRecordAccount = input.tokenRecord ??
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
+        isWritable: false,
+    };
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'edition', input.edition ??
+        (0, accounts_1.findMasterEditionPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenRecord', input.tokenRecord ??
         (0, accounts_1.findTokenRecordPda)(context, {
-            mint: (0, umi_1.publicKey)(mintAccount),
-            token: (0, umi_1.publicKey)(tokenAccount),
-        });
-    const systemProgramAccount = input.systemProgram ?? {
+            mint: (0, umi_1.publicKey)(input.mint),
+            token: (0, umi_1.publicKey)(input.token),
+        }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
-    const splTokenProgramAccount = input.splTokenProgram ?? {
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splTokenProgram', input.splTokenProgram ?? {
         ...context.programs.getPublicKey('splToken', 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
         isWritable: false,
-    };
-    const authorizationRulesProgramAccount = input.authorizationRulesProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesAccount = input.authorizationRules ?? {
-        ...programId,
-        isWritable: false,
-    };
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRulesProgram', input.authorizationRulesProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRules', input.authorizationRules ?? programId);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Edition.
     keys.push({
-        pubkey: editionAccount,
+        pubkey: resolvedAccounts.edition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(editionAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.edition, true),
     });
     // Token.
     keys.push({
-        pubkey: tokenAccount,
+        pubkey: resolvedAccounts.token,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.token, true),
     });
     // Token Owner.
     keys.push({
-        pubkey: tokenOwnerAccount,
+        pubkey: resolvedAccounts.tokenOwner,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenOwnerAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenOwner, false),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Collection Metadata.
     keys.push({
-        pubkey: collectionMetadataAccount,
+        pubkey: resolvedAccounts.collectionMetadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionMetadataAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionMetadata, false),
     });
     // Delegate Record.
     keys.push({
-        pubkey: delegateRecordAccount,
+        pubkey: resolvedAccounts.delegateRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateRecordAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegateRecord, false),
     });
     // Token Record.
     keys.push({
-        pubkey: tokenRecordAccount,
+        pubkey: resolvedAccounts.tokenRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenRecord, true),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Spl Token Program.
     keys.push({
-        pubkey: splTokenProgramAccount,
+        pubkey: resolvedAccounts.splTokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splTokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splTokenProgram, false),
     });
     // Authorization Rules Program.
     keys.push({
-        pubkey: authorizationRulesProgramAccount,
+        pubkey: resolvedAccounts.authorizationRulesProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRulesProgram, false),
     });
     // Authorization Rules.
     keys.push({
-        pubkey: authorizationRulesAccount,
+        pubkey: resolvedAccounts.authorizationRules,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRules, false),
     });
     // Data.
-    const data = getMigrateV1InstructionDataSerializer(context).serialize(input);
+    const data = getMigrateV1InstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -166,0 +162,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/mint.d.ts

@@ -50,2 +50,3 @@ /**
 export declare function getMintInstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<MintInstructionDataArgs, MintInstructionData>;
-export declare function mint(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: MintInstructionAccounts & MintInstructionDataArgs): TransactionBuilder;
+export type MintInstructionArgs = MintInstructionDataArgs;
+export declare function mint(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: MintInstructionAccounts & MintInstructionArgs): TransactionBuilder;

dist/src/generated/instructions/mint.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -28,142 +29,128 @@ function getMintInstructionDataSerializer(context) {
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const tokenAccount = input.token;
-    const tokenOwnerAccount = input.tokenOwner ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const masterEditionAccount = input.masterEdition ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenRecordAccount = input.tokenRecord ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorityAccount = input.authority ?? context.identity;
-    const delegateRecordAccount = input.delegateRecord ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const payerAccount = input.payer ?? context.payer;
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenOwner', input.tokenOwner ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'masterEdition', input.masterEdition ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenRecord', input.tokenRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'delegateRecord', input.delegateRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
-    const splTokenProgramAccount = input.splTokenProgram ?? {
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splTokenProgram', input.splTokenProgram ?? {
         ...context.programs.getPublicKey('splToken', 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
         isWritable: false,
-    };
-    const splAtaProgramAccount = input.splAtaProgram ?? {
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splAtaProgram', input.splAtaProgram ?? {
         ...context.programs.getPublicKey('splAssociatedToken', 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL'),
         isWritable: false,
-    };
-    const authorizationRulesProgramAccount = input.authorizationRulesProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesAccount = input.authorizationRules ?? {
-        ...programId,
-        isWritable: false,
-    };
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRulesProgram', input.authorizationRulesProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRules', input.authorizationRules ?? programId);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Token.
     keys.push({
-        pubkey: tokenAccount,
+        pubkey: resolvedAccounts.token,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.token, true),
     });
     // Token Owner.
     keys.push({
-        pubkey: tokenOwnerAccount,
+        pubkey: resolvedAccounts.tokenOwner,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenOwnerAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenOwner, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, false),
     });
     // Master Edition.
     keys.push({
-        pubkey: masterEditionAccount,
+        pubkey: resolvedAccounts.masterEdition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterEditionAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterEdition, true),
     });
     // Token Record.
     keys.push({
-        pubkey: tokenRecordAccount,
+        pubkey: resolvedAccounts.tokenRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenRecord, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, true),
     });
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Delegate Record.
     keys.push({
-        pubkey: delegateRecordAccount,
+        pubkey: resolvedAccounts.delegateRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateRecordAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegateRecord, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Spl Token Program.
     keys.push({
-        pubkey: splTokenProgramAccount,
+        pubkey: resolvedAccounts.splTokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splTokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splTokenProgram, false),
     });
     // Spl Ata Program.
     keys.push({
-        pubkey: splAtaProgramAccount,
+        pubkey: resolvedAccounts.splAtaProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splAtaProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splAtaProgram, false),
     });
     // Authorization Rules Program.
     keys.push({
-        pubkey: authorizationRulesProgramAccount,
+        pubkey: resolvedAccounts.authorizationRulesProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRulesProgram, false),
     });
     // Authorization Rules.
     keys.push({
-        pubkey: authorizationRulesAccount,
+        pubkey: resolvedAccounts.authorizationRules,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRules, false),
     });
     // Data.
-    const data = getMintInstructionDataSerializer(context).serialize(input);
+    const data = getMintInstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -170,0 +157,0 @@ const bytesCreatedOnChain = 468;

dist/src/generated/instructions/mintNewEditionFromMasterEditionViaToken.d.ts

@@ -48,2 +48,3 @@ /**
 export declare function getMintNewEditionFromMasterEditionViaTokenInstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<MintNewEditionFromMasterEditionViaTokenInstructionDataArgs, MintNewEditionFromMasterEditionViaTokenInstructionData>;
-export declare function mintNewEditionFromMasterEditionViaToken(context: Pick<Context, 'serializer' | 'programs' | 'payer'>, input: MintNewEditionFromMasterEditionViaTokenInstructionAccounts & MintNewEditionFromMasterEditionViaTokenInstructionDataArgs): TransactionBuilder;
+export type MintNewEditionFromMasterEditionViaTokenInstructionArgs = MintNewEditionFromMasterEditionViaTokenInstructionDataArgs;
+export declare function mintNewEditionFromMasterEditionViaToken(context: Pick<Context, 'serializer' | 'programs' | 'payer'>, input: MintNewEditionFromMasterEditionViaTokenInstructionAccounts & MintNewEditionFromMasterEditionViaTokenInstructionArgs): TransactionBuilder;

dist/src/generated/instructions/mintNewEditionFromMasterEditionViaToken.js

@@ -12,2 +12,3 @@ "use strict";
 const umi_1 = require("@metaplex-foundation/umi");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -33,115 +34,111 @@ function getMintNewEditionFromMasterEditionViaTokenInstructionDataSerializer(context) {
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const newMetadataAccount = input.newMetadata;
-    const newEditionAccount = input.newEdition;
-    const masterEditionAccount = input.masterEdition;
-    const newMintAccount = input.newMint;
-    const editionMarkPdaAccount = input.editionMarkPda;
-    const newMintAuthorityAccount = input.newMintAuthority;
-    const payerAccount = input.payer ?? context.payer;
-    const tokenAccountOwnerAccount = input.tokenAccountOwner;
-    const tokenAccountAccount = input.tokenAccount;
-    const newMetadataUpdateAuthorityAccount = input.newMetadataUpdateAuthority;
-    const metadataAccount = input.metadata;
-    const tokenProgramAccount = input.tokenProgram ?? {
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
+        isWritable: false,
+    };
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenProgram', input.tokenProgram ?? {
         ...context.programs.getPublicKey('splToken', 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
         isWritable: false,
-    };
-    const systemProgramAccount = input.systemProgram ?? {
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const rentAccount = input.rent;
+    });
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // New Metadata.
     keys.push({
-        pubkey: newMetadataAccount,
+        pubkey: resolvedAccounts.newMetadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(newMetadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.newMetadata, true),
     });
     // New Edition.
     keys.push({
-        pubkey: newEditionAccount,
+        pubkey: resolvedAccounts.newEdition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(newEditionAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.newEdition, true),
     });
     // Master Edition.
     keys.push({
-        pubkey: masterEditionAccount,
+        pubkey: resolvedAccounts.masterEdition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterEditionAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterEdition, true),
     });
     // New Mint.
     keys.push({
-        pubkey: newMintAccount,
+        pubkey: resolvedAccounts.newMint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(newMintAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.newMint, true),
     });
     // Edition Mark Pda.
     keys.push({
-        pubkey: editionMarkPdaAccount,
+        pubkey: resolvedAccounts.editionMarkPda,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(editionMarkPdaAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.editionMarkPda, true),
     });
     // New Mint Authority.
-    signers.push(newMintAuthorityAccount);
+    signers.push(resolvedAccounts.newMintAuthority);
     keys.push({
-        pubkey: newMintAuthorityAccount.publicKey,
+        pubkey: resolvedAccounts.newMintAuthority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(newMintAuthorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.newMintAuthority, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // Token Account Owner.
-    signers.push(tokenAccountOwnerAccount);
+    signers.push(resolvedAccounts.tokenAccountOwner);
     keys.push({
-        pubkey: tokenAccountOwnerAccount.publicKey,
+        pubkey: resolvedAccounts.tokenAccountOwner.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccountOwnerAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenAccountOwner, false),
     });
     // Token Account.
     keys.push({
-        pubkey: tokenAccountAccount,
+        pubkey: resolvedAccounts.tokenAccount,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccountAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenAccount, false),
     });
     // New Metadata Update Authority.
     keys.push({
-        pubkey: newMetadataUpdateAuthorityAccount,
+        pubkey: resolvedAccounts.newMetadataUpdateAuthority,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(newMetadataUpdateAuthorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.newMetadataUpdateAuthority, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, false),
     });
     // Token Program.
     keys.push({
-        pubkey: tokenProgramAccount,
+        pubkey: resolvedAccounts.tokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenProgram, false),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Rent (optional).
-    if (rentAccount) {
+    if (resolvedAccounts.rent) {
         keys.push({
-            pubkey: rentAccount,
+            pubkey: resolvedAccounts.rent,
             isSigner: false,
-            isWritable: (0, umi_1.checkForIsWritableOverride)(rentAccount, false),
+            isWritable: (0, shared_1.isWritable)(resolvedAccounts.rent, false),
         });
     }
     // Data.
-    const data = getMintNewEditionFromMasterEditionViaTokenInstructionDataSerializer(context).serialize(input);
+    const data = getMintNewEditionFromMasterEditionViaTokenInstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -148,0 +145,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/mintNewEditionFromMasterEditionViaVaultProxy.d.ts

@@ -54,2 +54,3 @@ /**
 export declare function getMintNewEditionFromMasterEditionViaVaultProxyInstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<MintNewEditionFromMasterEditionViaVaultProxyInstructionDataArgs, MintNewEditionFromMasterEditionViaVaultProxyInstructionData>;
-export declare function mintNewEditionFromMasterEditionViaVaultProxy(context: Pick<Context, 'serializer' | 'programs' | 'payer'>, input: MintNewEditionFromMasterEditionViaVaultProxyInstructionAccounts & MintNewEditionFromMasterEditionViaVaultProxyInstructionDataArgs): TransactionBuilder;
+export type MintNewEditionFromMasterEditionViaVaultProxyInstructionArgs = MintNewEditionFromMasterEditionViaVaultProxyInstructionDataArgs;
+export declare function mintNewEditionFromMasterEditionViaVaultProxy(context: Pick<Context, 'serializer' | 'programs' | 'payer'>, input: MintNewEditionFromMasterEditionViaVaultProxyInstructionAccounts & MintNewEditionFromMasterEditionViaVaultProxyInstructionArgs): TransactionBuilder;

dist/src/generated/instructions/mintNewEditionFromMasterEditionViaVaultProxy.js

@@ -12,2 +12,3 @@ "use strict";
 const umi_1 = require("@metaplex-foundation/umi");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -35,136 +36,129 @@ function getMintNewEditionFromMasterEditionViaVaultProxyInstructionDataSerializer(context) {
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const newMetadataAccount = input.newMetadata;
-    const newEditionAccount = input.newEdition;
-    const masterEditionAccount = input.masterEdition;
-    const newMintAccount = input.newMint;
-    const editionMarkPdaAccount = input.editionMarkPda;
-    const newMintAuthorityAccount = input.newMintAuthority;
-    const payerAccount = input.payer ?? context.payer;
-    const vaultAuthorityAccount = input.vaultAuthority;
-    const safetyDepositStoreAccount = input.safetyDepositStore;
-    const safetyDepositBoxAccount = input.safetyDepositBox;
-    const vaultAccount = input.vault;
-    const newMetadataUpdateAuthorityAccount = input.newMetadataUpdateAuthority;
-    const metadataAccount = input.metadata;
-    const tokenProgramAccount = input.tokenProgram ?? {
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
+        isWritable: false,
+    };
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenProgram', input.tokenProgram ?? {
         ...context.programs.getPublicKey('splToken', 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
         isWritable: false,
-    };
-    const tokenVaultProgramAccount = input.tokenVaultProgram;
-    const systemProgramAccount = input.systemProgram ?? {
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const rentAccount = input.rent;
+    });
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // New Metadata.
     keys.push({
-        pubkey: newMetadataAccount,
+        pubkey: resolvedAccounts.newMetadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(newMetadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.newMetadata, true),
     });
     // New Edition.
     keys.push({
-        pubkey: newEditionAccount,
+        pubkey: resolvedAccounts.newEdition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(newEditionAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.newEdition, true),
     });
     // Master Edition.
     keys.push({
-        pubkey: masterEditionAccount,
+        pubkey: resolvedAccounts.masterEdition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterEditionAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterEdition, true),
     });
     // New Mint.
     keys.push({
-        pubkey: newMintAccount,
+        pubkey: resolvedAccounts.newMint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(newMintAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.newMint, true),
     });
     // Edition Mark Pda.
     keys.push({
-        pubkey: editionMarkPdaAccount,
+        pubkey: resolvedAccounts.editionMarkPda,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(editionMarkPdaAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.editionMarkPda, true),
     });
     // New Mint Authority.
-    signers.push(newMintAuthorityAccount);
+    signers.push(resolvedAccounts.newMintAuthority);
     keys.push({
-        pubkey: newMintAuthorityAccount.publicKey,
+        pubkey: resolvedAccounts.newMintAuthority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(newMintAuthorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.newMintAuthority, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // Vault Authority.
-    signers.push(vaultAuthorityAccount);
+    signers.push(resolvedAccounts.vaultAuthority);
     keys.push({
-        pubkey: vaultAuthorityAccount.publicKey,
+        pubkey: resolvedAccounts.vaultAuthority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(vaultAuthorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.vaultAuthority, false),
     });
     // Safety Deposit Store.
     keys.push({
-        pubkey: safetyDepositStoreAccount,
+        pubkey: resolvedAccounts.safetyDepositStore,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(safetyDepositStoreAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.safetyDepositStore, false),
     });
     // Safety Deposit Box.
     keys.push({
-        pubkey: safetyDepositBoxAccount,
+        pubkey: resolvedAccounts.safetyDepositBox,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(safetyDepositBoxAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.safetyDepositBox, false),
     });
     // Vault.
     keys.push({
-        pubkey: vaultAccount,
+        pubkey: resolvedAccounts.vault,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(vaultAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.vault, false),
     });
     // New Metadata Update Authority.
     keys.push({
-        pubkey: newMetadataUpdateAuthorityAccount,
+        pubkey: resolvedAccounts.newMetadataUpdateAuthority,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(newMetadataUpdateAuthorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.newMetadataUpdateAuthority, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, false),
     });
     // Token Program.
     keys.push({
-        pubkey: tokenProgramAccount,
+        pubkey: resolvedAccounts.tokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenProgram, false),
     });
     // Token Vault Program.
     keys.push({
-        pubkey: tokenVaultProgramAccount,
+        pubkey: resolvedAccounts.tokenVaultProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenVaultProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenVaultProgram, false),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Rent (optional).
-    if (rentAccount) {
+    if (resolvedAccounts.rent) {
         keys.push({
-            pubkey: rentAccount,
+            pubkey: resolvedAccounts.rent,
             isSigner: false,
-            isWritable: (0, umi_1.checkForIsWritableOverride)(rentAccount, false),
+            isWritable: (0, shared_1.isWritable)(resolvedAccounts.rent, false),
         });
     }
     // Data.
-    const data = getMintNewEditionFromMasterEditionViaVaultProxyInstructionDataSerializer(context).serialize(input);
+    const data = getMintNewEditionFromMasterEditionViaVaultProxyInstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -171,0 +165,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/mintV1.d.ts

@@ -9,6 +9,6 @@ /**
 import { Context, Option, PublicKey, Serializer, Signer, TransactionBuilder } from '@metaplex-foundation/umi';
-import { AuthorizationData, AuthorizationDataArgs } from '../types';
+import { AuthorizationData, AuthorizationDataArgs, TokenStandardArgs } from '../types';
 export type MintV1InstructionAccounts = {
     /** Token or Associated Token account */
-    token: PublicKey;
+    token?: PublicKey;
     /** Owner of the token account */
@@ -54,2 +54,6 @@ tokenOwner?: PublicKey;
 export declare function getMintV1InstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<MintV1InstructionDataArgs, MintV1InstructionData>;
-export declare function mintV1(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: MintV1InstructionAccounts & MintV1InstructionDataArgs): TransactionBuilder;
+export type MintV1InstructionExtraArgs = {
+    tokenStandard: TokenStandardArgs;
+};
+export type MintV1InstructionArgs = MintV1InstructionDataArgs & MintV1InstructionExtraArgs;
+export declare function mintV1(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: MintV1InstructionAccounts & MintV1InstructionArgs): TransactionBuilder;

dist/src/generated/instructions/mintV1.js

@@ -11,4 +11,7 @@ "use strict";
 exports.mintV1 = exports.getMintV1InstructionDataSerializer = void 0;
+const mpl_essentials_1 = require("@metaplex-foundation/mpl-essentials");
 const umi_1 = require("@metaplex-foundation/umi");
+const hooked_1 = require("../../hooked");
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -38,142 +41,136 @@ function getMintV1InstructionDataSerializer(context) {
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const tokenAccount = input.token;
-    const tokenOwnerAccount = input.tokenOwner ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const masterEditionAccount = input.masterEdition ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenRecordAccount = input.tokenRecord ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorityAccount = input.authority ?? context.identity;
-    const delegateRecordAccount = input.delegateRecord ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const payerAccount = input.payer ?? context.payer;
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenOwner', input.tokenOwner ??
+        (0, hooked_1.resolveMintTokenOwner)(context, { ...input, ...resolvingAccounts }, { ...input, ...resolvingArgs }, programId));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'token', input.token ??
+        (0, mpl_essentials_1.findAssociatedTokenPda)(context, {
+            mint: (0, umi_1.publicKey)(input.mint),
+            owner: (0, umi_1.publicKey)(resolvingAccounts.tokenOwner),
+        }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'masterEdition', input.masterEdition ??
+        (0, hooked_1.resolveMasterEdition)(context, { ...input, ...resolvingAccounts }, { ...input, ...resolvingArgs }, programId));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenRecord', input.tokenRecord ??
+        (0, hooked_1.resolveTokenRecord)(context, { ...input, ...resolvingAccounts }, { ...input, ...resolvingArgs }, programId));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'delegateRecord', input.delegateRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
-    const splTokenProgramAccount = input.splTokenProgram ?? {
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splTokenProgram', input.splTokenProgram ?? {
         ...context.programs.getPublicKey('splToken', 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
         isWritable: false,
-    };
-    const splAtaProgramAccount = input.splAtaProgram ?? {
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splAtaProgram', input.splAtaProgram ?? {
         ...context.programs.getPublicKey('splAssociatedToken', 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL'),
         isWritable: false,
-    };
-    const authorizationRulesProgramAccount = input.authorizationRulesProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesAccount = input.authorizationRules ?? {
-        ...programId,
-        isWritable: false,
-    };
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRulesProgram', input.authorizationRulesProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRules', input.authorizationRules ?? programId);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Token.
     keys.push({
-        pubkey: tokenAccount,
+        pubkey: resolvedAccounts.token,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.token, true),
     });
     // Token Owner.
     keys.push({
-        pubkey: tokenOwnerAccount,
+        pubkey: resolvedAccounts.tokenOwner,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenOwnerAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenOwner, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, false),
     });
     // Master Edition.
     keys.push({
-        pubkey: masterEditionAccount,
+        pubkey: resolvedAccounts.masterEdition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterEditionAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterEdition, true),
     });
     // Token Record.
     keys.push({
-        pubkey: tokenRecordAccount,
+        pubkey: resolvedAccounts.tokenRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenRecord, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, true),
     });
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Delegate Record.
     keys.push({
-        pubkey: delegateRecordAccount,
+        pubkey: resolvedAccounts.delegateRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateRecordAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegateRecord, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Spl Token Program.
     keys.push({
-        pubkey: splTokenProgramAccount,
+        pubkey: resolvedAccounts.splTokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splTokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splTokenProgram, false),
     });
     // Spl Ata Program.
     keys.push({
-        pubkey: splAtaProgramAccount,
+        pubkey: resolvedAccounts.splAtaProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splAtaProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splAtaProgram, false),
     });
     // Authorization Rules Program.
     keys.push({
-        pubkey: authorizationRulesProgramAccount,
+        pubkey: resolvedAccounts.authorizationRulesProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRulesProgram, false),
     });
     // Authorization Rules.
     keys.push({
-        pubkey: authorizationRulesAccount,
+        pubkey: resolvedAccounts.authorizationRules,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRules, false),
     });
     // Data.
-    const data = getMintV1InstructionDataSerializer(context).serialize(input);
+    const data = getMintV1InstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -180,0 +177,0 @@ const bytesCreatedOnChain = 468;

dist/src/generated/instructions/puffMetadata.js

@@ -12,2 +12,3 @@ "use strict";
 const umi_1 = require("@metaplex-foundation/umi");
+const shared_1 = require("../shared");
 function getPuffMetadataInstructionDataSerializer(context) {
@@ -25,10 +26,14 @@ const s = context.serializer;
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const metadataAccount = input.metadata;
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
+        isWritable: false,
+    };
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
@@ -35,0 +40,0 @@ // Data.

dist/src/generated/instructions/removeCreatorVerification.js

@@ -12,2 +12,3 @@ "use strict";
 const umi_1 = require("@metaplex-foundation/umi");
+const shared_1 = require("../shared");
 function getRemoveCreatorVerificationInstructionDataSerializer(context) {
@@ -26,18 +27,21 @@ const s = context.serializer;
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const metadataAccount = input.metadata;
-    const creatorAccount = input.creator;
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
+        isWritable: false,
+    };
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Creator.
-    signers.push(creatorAccount);
+    signers.push(resolvedAccounts.creator);
     keys.push({
-        pubkey: creatorAccount.publicKey,
+        pubkey: resolvedAccounts.creator.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(creatorAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.creator, false),
     });
@@ -44,0 +48,0 @@ // Data.

dist/src/generated/instructions/revoke.d.ts

@@ -48,2 +48,3 @@ /**
 export declare function getRevokeInstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<RevokeInstructionDataArgs, RevokeInstructionData>;
-export declare function revoke(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: RevokeInstructionAccounts & RevokeInstructionDataArgs): TransactionBuilder;
+export type RevokeInstructionArgs = RevokeInstructionDataArgs;
+export declare function revoke(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: RevokeInstructionAccounts & RevokeInstructionArgs): TransactionBuilder;

dist/src/generated/instructions/revoke.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -28,129 +29,115 @@ function getRevokeInstructionDataSerializer(context) {
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const delegateRecordAccount = input.delegateRecord ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const delegateAccount = input.delegate;
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const masterEditionAccount = input.masterEdition ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenRecordAccount = input.tokenRecord ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenAccount = input.token ?? { ...programId, isWritable: false };
-    const authorityAccount = input.authority ?? context.identity;
-    const payerAccount = input.payer ?? context.payer;
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'delegateRecord', input.delegateRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'masterEdition', input.masterEdition ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenRecord', input.tokenRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'token', input.token ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
-    const splTokenProgramAccount = input.splTokenProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesProgramAccount = input.authorizationRulesProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesAccount = input.authorizationRules ?? {
-        ...programId,
-        isWritable: false,
-    };
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splTokenProgram', input.splTokenProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRulesProgram', input.authorizationRulesProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRules', input.authorizationRules ?? programId);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Delegate Record.
     keys.push({
-        pubkey: delegateRecordAccount,
+        pubkey: resolvedAccounts.delegateRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegateRecord, true),
     });
     // Delegate.
     keys.push({
-        pubkey: delegateAccount,
+        pubkey: resolvedAccounts.delegate,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegate, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Master Edition.
     keys.push({
-        pubkey: masterEditionAccount,
+        pubkey: resolvedAccounts.masterEdition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterEditionAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterEdition, false),
     });
     // Token Record.
     keys.push({
-        pubkey: tokenRecordAccount,
+        pubkey: resolvedAccounts.tokenRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenRecord, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Token.
     keys.push({
-        pubkey: tokenAccount,
+        pubkey: resolvedAccounts.token,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.token, true),
     });
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Spl Token Program.
     keys.push({
-        pubkey: splTokenProgramAccount,
+        pubkey: resolvedAccounts.splTokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splTokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splTokenProgram, false),
     });
     // Authorization Rules Program.
     keys.push({
-        pubkey: authorizationRulesProgramAccount,
+        pubkey: resolvedAccounts.authorizationRulesProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRulesProgram, false),
     });
     // Authorization Rules.
     keys.push({
-        pubkey: authorizationRulesAccount,
+        pubkey: resolvedAccounts.authorizationRules,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRules, false),
     });
     // Data.
-    const data = getRevokeInstructionDataSerializer(context).serialize(input);
+    const data = getRevokeInstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -157,0 +144,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/revokeCollectionAuthority.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 function getRevokeCollectionAuthorityInstructionDataSerializer(context) {
@@ -27,40 +28,40 @@ const s = context.serializer;
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const collectionAuthorityRecordAccount = input.collectionAuthorityRecord;
-    const delegateAuthorityAccount = input.delegateAuthority;
-    const revokeAuthorityAccount = input.revokeAuthority;
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
+        isWritable: false,
+    };
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
     // Collection Authority Record.
     keys.push({
-        pubkey: collectionAuthorityRecordAccount,
+        pubkey: resolvedAccounts.collectionAuthorityRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionAuthorityRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionAuthorityRecord, true),
     });
     // Delegate Authority.
     keys.push({
-        pubkey: delegateAuthorityAccount,
+        pubkey: resolvedAccounts.delegateAuthority,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateAuthorityAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegateAuthority, true),
     });
     // Revoke Authority.
-    signers.push(revokeAuthorityAccount);
+    signers.push(resolvedAccounts.revokeAuthority);
     keys.push({
-        pubkey: revokeAuthorityAccount.publicKey,
+        pubkey: resolvedAccounts.revokeAuthority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(revokeAuthorityAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.revokeAuthority, true),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, false),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
@@ -67,0 +68,0 @@ // Data.

dist/src/generated/instructions/revokeCollectionV1.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 function getRevokeCollectionV1InstructionDataSerializer(context) {
@@ -31,126 +32,110 @@ const s = context.serializer;
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const delegateRecordAccount = input.delegateRecord ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const delegateAccount = input.delegate;
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const masterEditionAccount = input.masterEdition ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenRecordAccount = input.tokenRecord ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenAccount = input.token ?? { ...programId, isWritable: false };
-    const authorityAccount = input.authority ?? context.identity;
-    const payerAccount = input.payer ?? context.payer;
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'delegateRecord', input.delegateRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'masterEdition', input.masterEdition ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenRecord', input.tokenRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'token', input.token ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
-    const splTokenProgramAccount = input.splTokenProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesProgramAccount = input.authorizationRulesProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesAccount = input.authorizationRules ?? {
-        ...programId,
-        isWritable: false,
-    };
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splTokenProgram', input.splTokenProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRulesProgram', input.authorizationRulesProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRules', input.authorizationRules ?? programId);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
     // Delegate Record.
     keys.push({
-        pubkey: delegateRecordAccount,
+        pubkey: resolvedAccounts.delegateRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegateRecord, true),
     });
     // Delegate.
     keys.push({
-        pubkey: delegateAccount,
+        pubkey: resolvedAccounts.delegate,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegate, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Master Edition.
     keys.push({
-        pubkey: masterEditionAccount,
+        pubkey: resolvedAccounts.masterEdition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterEditionAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterEdition, false),
     });
     // Token Record.
     keys.push({
-        pubkey: tokenRecordAccount,
+        pubkey: resolvedAccounts.tokenRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenRecord, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Token.
     keys.push({
-        pubkey: tokenAccount,
+        pubkey: resolvedAccounts.token,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.token, true),
     });
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Spl Token Program.
     keys.push({
-        pubkey: splTokenProgramAccount,
+        pubkey: resolvedAccounts.splTokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splTokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splTokenProgram, false),
     });
     // Authorization Rules Program.
     keys.push({
-        pubkey: authorizationRulesProgramAccount,
+        pubkey: resolvedAccounts.authorizationRulesProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRulesProgram, false),
     });
     // Authorization Rules.
     keys.push({
-        pubkey: authorizationRulesAccount,
+        pubkey: resolvedAccounts.authorizationRules,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRules, false),
     });
@@ -157,0 +142,0 @@ // Data.

dist/src/generated/instructions/revokeLockedTransferV1.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 function getRevokeLockedTransferV1InstructionDataSerializer(context) {
@@ -31,126 +32,110 @@ const s = context.serializer;
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const delegateRecordAccount = input.delegateRecord ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const delegateAccount = input.delegate;
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const masterEditionAccount = input.masterEdition ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenRecordAccount = input.tokenRecord ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenAccount = input.token ?? { ...programId, isWritable: false };
-    const authorityAccount = input.authority ?? context.identity;
-    const payerAccount = input.payer ?? context.payer;
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'delegateRecord', input.delegateRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'masterEdition', input.masterEdition ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenRecord', input.tokenRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'token', input.token ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
-    const splTokenProgramAccount = input.splTokenProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesProgramAccount = input.authorizationRulesProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesAccount = input.authorizationRules ?? {
-        ...programId,
-        isWritable: false,
-    };
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splTokenProgram', input.splTokenProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRulesProgram', input.authorizationRulesProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRules', input.authorizationRules ?? programId);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
     // Delegate Record.
     keys.push({
-        pubkey: delegateRecordAccount,
+        pubkey: resolvedAccounts.delegateRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegateRecord, true),
     });
     // Delegate.
     keys.push({
-        pubkey: delegateAccount,
+        pubkey: resolvedAccounts.delegate,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegate, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Master Edition.
     keys.push({
-        pubkey: masterEditionAccount,
+        pubkey: resolvedAccounts.masterEdition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterEditionAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterEdition, false),
     });
     // Token Record.
     keys.push({
-        pubkey: tokenRecordAccount,
+        pubkey: resolvedAccounts.tokenRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenRecord, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Token.
     keys.push({
-        pubkey: tokenAccount,
+        pubkey: resolvedAccounts.token,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.token, true),
     });
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Spl Token Program.
     keys.push({
-        pubkey: splTokenProgramAccount,
+        pubkey: resolvedAccounts.splTokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splTokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splTokenProgram, false),
     });
     // Authorization Rules Program.
     keys.push({
-        pubkey: authorizationRulesProgramAccount,
+        pubkey: resolvedAccounts.authorizationRulesProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRulesProgram, false),
     });
     // Authorization Rules.
     keys.push({
-        pubkey: authorizationRulesAccount,
+        pubkey: resolvedAccounts.authorizationRules,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRules, false),
     });
@@ -157,0 +142,0 @@ // Data.

dist/src/generated/instructions/revokeMigrationV1.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 function getRevokeMigrationV1InstructionDataSerializer(context) {
@@ -31,126 +32,110 @@ const s = context.serializer;
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const delegateRecordAccount = input.delegateRecord ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const delegateAccount = input.delegate;
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const masterEditionAccount = input.masterEdition ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenRecordAccount = input.tokenRecord ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenAccount = input.token ?? { ...programId, isWritable: false };
-    const authorityAccount = input.authority ?? context.identity;
-    const payerAccount = input.payer ?? context.payer;
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'delegateRecord', input.delegateRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'masterEdition', input.masterEdition ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenRecord', input.tokenRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'token', input.token ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
-    const splTokenProgramAccount = input.splTokenProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesProgramAccount = input.authorizationRulesProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesAccount = input.authorizationRules ?? {
-        ...programId,
-        isWritable: false,
-    };
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splTokenProgram', input.splTokenProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRulesProgram', input.authorizationRulesProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRules', input.authorizationRules ?? programId);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
     // Delegate Record.
     keys.push({
-        pubkey: delegateRecordAccount,
+        pubkey: resolvedAccounts.delegateRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegateRecord, true),
     });
     // Delegate.
     keys.push({
-        pubkey: delegateAccount,
+        pubkey: resolvedAccounts.delegate,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegate, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Master Edition.
     keys.push({
-        pubkey: masterEditionAccount,
+        pubkey: resolvedAccounts.masterEdition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterEditionAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterEdition, false),
     });
     // Token Record.
     keys.push({
-        pubkey: tokenRecordAccount,
+        pubkey: resolvedAccounts.tokenRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenRecord, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Token.
     keys.push({
-        pubkey: tokenAccount,
+        pubkey: resolvedAccounts.token,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.token, true),
     });
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Spl Token Program.
     keys.push({
-        pubkey: splTokenProgramAccount,
+        pubkey: resolvedAccounts.splTokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splTokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splTokenProgram, false),
     });
     // Authorization Rules Program.
     keys.push({
-        pubkey: authorizationRulesProgramAccount,
+        pubkey: resolvedAccounts.authorizationRulesProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRulesProgram, false),
     });
     // Authorization Rules.
     keys.push({
-        pubkey: authorizationRulesAccount,
+        pubkey: resolvedAccounts.authorizationRules,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRules, false),
     });
@@ -157,0 +142,0 @@ // Data.

dist/src/generated/instructions/revokeProgrammableConfigV1.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 function getRevokeProgrammableConfigV1InstructionDataSerializer(context) {
@@ -31,126 +32,110 @@ const s = context.serializer;
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const delegateRecordAccount = input.delegateRecord ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const delegateAccount = input.delegate;
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const masterEditionAccount = input.masterEdition ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenRecordAccount = input.tokenRecord ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenAccount = input.token ?? { ...programId, isWritable: false };
-    const authorityAccount = input.authority ?? context.identity;
-    const payerAccount = input.payer ?? context.payer;
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'delegateRecord', input.delegateRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'masterEdition', input.masterEdition ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenRecord', input.tokenRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'token', input.token ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
-    const splTokenProgramAccount = input.splTokenProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesProgramAccount = input.authorizationRulesProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesAccount = input.authorizationRules ?? {
-        ...programId,
-        isWritable: false,
-    };
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splTokenProgram', input.splTokenProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRulesProgram', input.authorizationRulesProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRules', input.authorizationRules ?? programId);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
     // Delegate Record.
     keys.push({
-        pubkey: delegateRecordAccount,
+        pubkey: resolvedAccounts.delegateRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegateRecord, true),
     });
     // Delegate.
     keys.push({
-        pubkey: delegateAccount,
+        pubkey: resolvedAccounts.delegate,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegate, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Master Edition.
     keys.push({
-        pubkey: masterEditionAccount,
+        pubkey: resolvedAccounts.masterEdition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterEditionAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterEdition, false),
     });
     // Token Record.
     keys.push({
-        pubkey: tokenRecordAccount,
+        pubkey: resolvedAccounts.tokenRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenRecord, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Token.
     keys.push({
-        pubkey: tokenAccount,
+        pubkey: resolvedAccounts.token,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.token, true),
     });
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Spl Token Program.
     keys.push({
-        pubkey: splTokenProgramAccount,
+        pubkey: resolvedAccounts.splTokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splTokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splTokenProgram, false),
     });
     // Authorization Rules Program.
     keys.push({
-        pubkey: authorizationRulesProgramAccount,
+        pubkey: resolvedAccounts.authorizationRulesProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRulesProgram, false),
     });
     // Authorization Rules.
     keys.push({
-        pubkey: authorizationRulesAccount,
+        pubkey: resolvedAccounts.authorizationRules,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRules, false),
     });
@@ -157,0 +142,0 @@ // Data.

dist/src/generated/instructions/revokeSaleV1.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 function getRevokeSaleV1InstructionDataSerializer(context) {
@@ -31,126 +32,110 @@ const s = context.serializer;
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const delegateRecordAccount = input.delegateRecord ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const delegateAccount = input.delegate;
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const masterEditionAccount = input.masterEdition ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenRecordAccount = input.tokenRecord ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenAccount = input.token ?? { ...programId, isWritable: false };
-    const authorityAccount = input.authority ?? context.identity;
-    const payerAccount = input.payer ?? context.payer;
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'delegateRecord', input.delegateRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'masterEdition', input.masterEdition ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenRecord', input.tokenRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'token', input.token ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
-    const splTokenProgramAccount = input.splTokenProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesProgramAccount = input.authorizationRulesProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesAccount = input.authorizationRules ?? {
-        ...programId,
-        isWritable: false,
-    };
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splTokenProgram', input.splTokenProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRulesProgram', input.authorizationRulesProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRules', input.authorizationRules ?? programId);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
     // Delegate Record.
     keys.push({
-        pubkey: delegateRecordAccount,
+        pubkey: resolvedAccounts.delegateRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegateRecord, true),
     });
     // Delegate.
     keys.push({
-        pubkey: delegateAccount,
+        pubkey: resolvedAccounts.delegate,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegate, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Master Edition.
     keys.push({
-        pubkey: masterEditionAccount,
+        pubkey: resolvedAccounts.masterEdition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterEditionAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterEdition, false),
     });
     // Token Record.
     keys.push({
-        pubkey: tokenRecordAccount,
+        pubkey: resolvedAccounts.tokenRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenRecord, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Token.
     keys.push({
-        pubkey: tokenAccount,
+        pubkey: resolvedAccounts.token,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.token, true),
     });
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Spl Token Program.
     keys.push({
-        pubkey: splTokenProgramAccount,
+        pubkey: resolvedAccounts.splTokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splTokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splTokenProgram, false),
     });
     // Authorization Rules Program.
     keys.push({
-        pubkey: authorizationRulesProgramAccount,
+        pubkey: resolvedAccounts.authorizationRulesProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRulesProgram, false),
     });
     // Authorization Rules.
     keys.push({
-        pubkey: authorizationRulesAccount,
+        pubkey: resolvedAccounts.authorizationRules,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRules, false),
     });
@@ -157,0 +142,0 @@ // Data.

dist/src/generated/instructions/revokeStakingV1.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 function getRevokeStakingV1InstructionDataSerializer(context) {
@@ -31,126 +32,110 @@ const s = context.serializer;
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const delegateRecordAccount = input.delegateRecord ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const delegateAccount = input.delegate;
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const masterEditionAccount = input.masterEdition ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenRecordAccount = input.tokenRecord ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenAccount = input.token ?? { ...programId, isWritable: false };
-    const authorityAccount = input.authority ?? context.identity;
-    const payerAccount = input.payer ?? context.payer;
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'delegateRecord', input.delegateRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'masterEdition', input.masterEdition ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenRecord', input.tokenRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'token', input.token ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
-    const splTokenProgramAccount = input.splTokenProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesProgramAccount = input.authorizationRulesProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesAccount = input.authorizationRules ?? {
-        ...programId,
-        isWritable: false,
-    };
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splTokenProgram', input.splTokenProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRulesProgram', input.authorizationRulesProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRules', input.authorizationRules ?? programId);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
     // Delegate Record.
     keys.push({
-        pubkey: delegateRecordAccount,
+        pubkey: resolvedAccounts.delegateRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegateRecord, true),
     });
     // Delegate.
     keys.push({
-        pubkey: delegateAccount,
+        pubkey: resolvedAccounts.delegate,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegate, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Master Edition.
     keys.push({
-        pubkey: masterEditionAccount,
+        pubkey: resolvedAccounts.masterEdition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterEditionAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterEdition, false),
     });
     // Token Record.
     keys.push({
-        pubkey: tokenRecordAccount,
+        pubkey: resolvedAccounts.tokenRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenRecord, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Token.
     keys.push({
-        pubkey: tokenAccount,
+        pubkey: resolvedAccounts.token,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.token, true),
     });
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Spl Token Program.
     keys.push({
-        pubkey: splTokenProgramAccount,
+        pubkey: resolvedAccounts.splTokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splTokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splTokenProgram, false),
     });
     // Authorization Rules Program.
     keys.push({
-        pubkey: authorizationRulesProgramAccount,
+        pubkey: resolvedAccounts.authorizationRulesProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRulesProgram, false),
     });
     // Authorization Rules.
     keys.push({
-        pubkey: authorizationRulesAccount,
+        pubkey: resolvedAccounts.authorizationRules,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRules, false),
     });
@@ -157,0 +142,0 @@ // Data.

dist/src/generated/instructions/revokeStandardV1.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 function getRevokeStandardV1InstructionDataSerializer(context) {
@@ -31,126 +32,110 @@ const s = context.serializer;
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const delegateRecordAccount = input.delegateRecord ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const delegateAccount = input.delegate;
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const masterEditionAccount = input.masterEdition ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenRecordAccount = input.tokenRecord ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenAccount = input.token ?? { ...programId, isWritable: false };
-    const authorityAccount = input.authority ?? context.identity;
-    const payerAccount = input.payer ?? context.payer;
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'delegateRecord', input.delegateRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'masterEdition', input.masterEdition ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenRecord', input.tokenRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'token', input.token ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
-    const splTokenProgramAccount = input.splTokenProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesProgramAccount = input.authorizationRulesProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesAccount = input.authorizationRules ?? {
-        ...programId,
-        isWritable: false,
-    };
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splTokenProgram', input.splTokenProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRulesProgram', input.authorizationRulesProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRules', input.authorizationRules ?? programId);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
     // Delegate Record.
     keys.push({
-        pubkey: delegateRecordAccount,
+        pubkey: resolvedAccounts.delegateRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegateRecord, true),
     });
     // Delegate.
     keys.push({
-        pubkey: delegateAccount,
+        pubkey: resolvedAccounts.delegate,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegate, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Master Edition.
     keys.push({
-        pubkey: masterEditionAccount,
+        pubkey: resolvedAccounts.masterEdition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterEditionAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterEdition, false),
     });
     // Token Record.
     keys.push({
-        pubkey: tokenRecordAccount,
+        pubkey: resolvedAccounts.tokenRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenRecord, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Token.
     keys.push({
-        pubkey: tokenAccount,
+        pubkey: resolvedAccounts.token,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.token, true),
     });
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Spl Token Program.
     keys.push({
-        pubkey: splTokenProgramAccount,
+        pubkey: resolvedAccounts.splTokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splTokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splTokenProgram, false),
     });
     // Authorization Rules Program.
     keys.push({
-        pubkey: authorizationRulesProgramAccount,
+        pubkey: resolvedAccounts.authorizationRulesProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRulesProgram, false),
     });
     // Authorization Rules.
     keys.push({
-        pubkey: authorizationRulesAccount,
+        pubkey: resolvedAccounts.authorizationRules,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRules, false),
     });
@@ -157,0 +142,0 @@ // Data.

dist/src/generated/instructions/revokeTransferV1.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 function getRevokeTransferV1InstructionDataSerializer(context) {
@@ -31,126 +32,110 @@ const s = context.serializer;
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const delegateRecordAccount = input.delegateRecord ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const delegateAccount = input.delegate;
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const masterEditionAccount = input.masterEdition ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenRecordAccount = input.tokenRecord ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenAccount = input.token ?? { ...programId, isWritable: false };
-    const authorityAccount = input.authority ?? context.identity;
-    const payerAccount = input.payer ?? context.payer;
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'delegateRecord', input.delegateRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'masterEdition', input.masterEdition ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenRecord', input.tokenRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'token', input.token ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
-    const splTokenProgramAccount = input.splTokenProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesProgramAccount = input.authorizationRulesProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesAccount = input.authorizationRules ?? {
-        ...programId,
-        isWritable: false,
-    };
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splTokenProgram', input.splTokenProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRulesProgram', input.authorizationRulesProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRules', input.authorizationRules ?? programId);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
     // Delegate Record.
     keys.push({
-        pubkey: delegateRecordAccount,
+        pubkey: resolvedAccounts.delegateRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegateRecord, true),
     });
     // Delegate.
     keys.push({
-        pubkey: delegateAccount,
+        pubkey: resolvedAccounts.delegate,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegate, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Master Edition.
     keys.push({
-        pubkey: masterEditionAccount,
+        pubkey: resolvedAccounts.masterEdition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterEditionAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterEdition, false),
     });
     // Token Record.
     keys.push({
-        pubkey: tokenRecordAccount,
+        pubkey: resolvedAccounts.tokenRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenRecord, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Token.
     keys.push({
-        pubkey: tokenAccount,
+        pubkey: resolvedAccounts.token,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.token, true),
     });
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Spl Token Program.
     keys.push({
-        pubkey: splTokenProgramAccount,
+        pubkey: resolvedAccounts.splTokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splTokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splTokenProgram, false),
     });
     // Authorization Rules Program.
     keys.push({
-        pubkey: authorizationRulesProgramAccount,
+        pubkey: resolvedAccounts.authorizationRulesProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRulesProgram, false),
     });
     // Authorization Rules.
     keys.push({
-        pubkey: authorizationRulesAccount,
+        pubkey: resolvedAccounts.authorizationRules,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRules, false),
     });
@@ -157,0 +142,0 @@ // Data.

dist/src/generated/instructions/revokeUpdateV1.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 function getRevokeUpdateV1InstructionDataSerializer(context) {
@@ -31,126 +32,110 @@ const s = context.serializer;
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const delegateRecordAccount = input.delegateRecord ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const delegateAccount = input.delegate;
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const masterEditionAccount = input.masterEdition ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenRecordAccount = input.tokenRecord ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenAccount = input.token ?? { ...programId, isWritable: false };
-    const authorityAccount = input.authority ?? context.identity;
-    const payerAccount = input.payer ?? context.payer;
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'delegateRecord', input.delegateRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'masterEdition', input.masterEdition ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenRecord', input.tokenRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'token', input.token ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
-    const splTokenProgramAccount = input.splTokenProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesProgramAccount = input.authorizationRulesProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesAccount = input.authorizationRules ?? {
-        ...programId,
-        isWritable: false,
-    };
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splTokenProgram', input.splTokenProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRulesProgram', input.authorizationRulesProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRules', input.authorizationRules ?? programId);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
     // Delegate Record.
     keys.push({
-        pubkey: delegateRecordAccount,
+        pubkey: resolvedAccounts.delegateRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegateRecord, true),
     });
     // Delegate.
     keys.push({
-        pubkey: delegateAccount,
+        pubkey: resolvedAccounts.delegate,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegate, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Master Edition.
     keys.push({
-        pubkey: masterEditionAccount,
+        pubkey: resolvedAccounts.masterEdition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterEditionAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterEdition, false),
     });
     // Token Record.
     keys.push({
-        pubkey: tokenRecordAccount,
+        pubkey: resolvedAccounts.tokenRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenRecord, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Token.
     keys.push({
-        pubkey: tokenAccount,
+        pubkey: resolvedAccounts.token,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.token, true),
     });
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Spl Token Program.
     keys.push({
-        pubkey: splTokenProgramAccount,
+        pubkey: resolvedAccounts.splTokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splTokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splTokenProgram, false),
     });
     // Authorization Rules Program.
     keys.push({
-        pubkey: authorizationRulesProgramAccount,
+        pubkey: resolvedAccounts.authorizationRulesProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRulesProgram, false),
     });
     // Authorization Rules.
     keys.push({
-        pubkey: authorizationRulesAccount,
+        pubkey: resolvedAccounts.authorizationRules,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRules, false),
     });
@@ -157,0 +142,0 @@ // Data.

dist/src/generated/instructions/revokeUseAuthority.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 function getRevokeUseAuthorityInstructionDataSerializer(context) {
@@ -26,75 +27,73 @@ const s = context.serializer;
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const useAuthorityRecordAccount = input.useAuthorityRecord;
-    const ownerAccount = input.owner;
-    const userAccount = input.user;
-    const ownerTokenAccountAccount = input.ownerTokenAccount;
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const tokenProgramAccount = input.tokenProgram ?? {
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
+        isWritable: false,
+    };
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenProgram', input.tokenProgram ?? {
         ...context.programs.getPublicKey('splToken', 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
         isWritable: false,
-    };
-    const systemProgramAccount = input.systemProgram ?? {
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const rentAccount = input.rent;
+    });
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
     // Use Authority Record.
     keys.push({
-        pubkey: useAuthorityRecordAccount,
+        pubkey: resolvedAccounts.useAuthorityRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(useAuthorityRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.useAuthorityRecord, true),
     });
     // Owner.
-    signers.push(ownerAccount);
+    signers.push(resolvedAccounts.owner);
     keys.push({
-        pubkey: ownerAccount.publicKey,
+        pubkey: resolvedAccounts.owner.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(ownerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.owner, true),
     });
     // User.
     keys.push({
-        pubkey: userAccount,
+        pubkey: resolvedAccounts.user,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(userAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.user, false),
     });
     // Owner Token Account.
     keys.push({
-        pubkey: ownerTokenAccountAccount,
+        pubkey: resolvedAccounts.ownerTokenAccount,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(ownerTokenAccountAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.ownerTokenAccount, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, false),
     });
     // Token Program.
     keys.push({
-        pubkey: tokenProgramAccount,
+        pubkey: resolvedAccounts.tokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenProgram, false),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Rent (optional).
-    if (rentAccount) {
+    if (resolvedAccounts.rent) {
         keys.push({
-            pubkey: rentAccount,
+            pubkey: resolvedAccounts.rent,
             isSigner: false,
-            isWritable: (0, umi_1.checkForIsWritableOverride)(rentAccount, false),
+            isWritable: (0, shared_1.isWritable)(resolvedAccounts.rent, false),
         });
@@ -101,0 +100,0 @@ }

dist/src/generated/instructions/revokeUtilityV1.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 function getRevokeUtilityV1InstructionDataSerializer(context) {
@@ -31,126 +32,110 @@ const s = context.serializer;
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const delegateRecordAccount = input.delegateRecord ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const delegateAccount = input.delegate;
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const masterEditionAccount = input.masterEdition ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenRecordAccount = input.tokenRecord ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const tokenAccount = input.token ?? { ...programId, isWritable: false };
-    const authorityAccount = input.authority ?? context.identity;
-    const payerAccount = input.payer ?? context.payer;
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'delegateRecord', input.delegateRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'masterEdition', input.masterEdition ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenRecord', input.tokenRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'token', input.token ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
-    const splTokenProgramAccount = input.splTokenProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesProgramAccount = input.authorizationRulesProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesAccount = input.authorizationRules ?? {
-        ...programId,
-        isWritable: false,
-    };
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splTokenProgram', input.splTokenProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRulesProgram', input.authorizationRulesProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRules', input.authorizationRules ?? programId);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
     // Delegate Record.
     keys.push({
-        pubkey: delegateRecordAccount,
+        pubkey: resolvedAccounts.delegateRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegateRecord, true),
     });
     // Delegate.
     keys.push({
-        pubkey: delegateAccount,
+        pubkey: resolvedAccounts.delegate,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegate, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Master Edition.
     keys.push({
-        pubkey: masterEditionAccount,
+        pubkey: resolvedAccounts.masterEdition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(masterEditionAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.masterEdition, false),
     });
     // Token Record.
     keys.push({
-        pubkey: tokenRecordAccount,
+        pubkey: resolvedAccounts.tokenRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenRecord, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Token.
     keys.push({
-        pubkey: tokenAccount,
+        pubkey: resolvedAccounts.token,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.token, true),
     });
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Spl Token Program.
     keys.push({
-        pubkey: splTokenProgramAccount,
+        pubkey: resolvedAccounts.splTokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splTokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splTokenProgram, false),
     });
     // Authorization Rules Program.
     keys.push({
-        pubkey: authorizationRulesProgramAccount,
+        pubkey: resolvedAccounts.authorizationRulesProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRulesProgram, false),
     });
     // Authorization Rules.
     keys.push({
-        pubkey: authorizationRulesAccount,
+        pubkey: resolvedAccounts.authorizationRules,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRules, false),
     });
@@ -157,0 +142,0 @@ // Data.

dist/src/generated/instructions/setAndVerifyCollection.js

@@ -12,2 +12,3 @@ "use strict";
 const umi_1 = require("@metaplex-foundation/umi");
+const shared_1 = require("../shared");
 function getSetAndVerifyCollectionInstructionDataSerializer(context) {
@@ -23,62 +24,61 @@ const s = context.serializer;
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const metadataAccount = input.metadata;
-    const collectionAuthorityAccount = input.collectionAuthority;
-    const payerAccount = input.payer ?? context.payer;
-    const updateAuthorityAccount = input.updateAuthority ?? context.identity.publicKey;
-    const collectionMintAccount = input.collectionMint;
-    const collectionAccount = input.collection;
-    const collectionMasterEditionAccountAccount = input.collectionMasterEditionAccount;
-    const collectionAuthorityRecordAccount = input.collectionAuthorityRecord;
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
+        isWritable: false,
+    };
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'updateAuthority', input.updateAuthority ?? context.identity.publicKey);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Collection Authority.
-    signers.push(collectionAuthorityAccount);
+    signers.push(resolvedAccounts.collectionAuthority);
     keys.push({
-        pubkey: collectionAuthorityAccount.publicKey,
+        pubkey: resolvedAccounts.collectionAuthority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionAuthorityAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionAuthority, true),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // Update Authority.
     keys.push({
-        pubkey: updateAuthorityAccount,
+        pubkey: resolvedAccounts.updateAuthority,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(updateAuthorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.updateAuthority, false),
     });
     // Collection Mint.
     keys.push({
-        pubkey: collectionMintAccount,
+        pubkey: resolvedAccounts.collectionMint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionMintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionMint, false),
     });
     // Collection.
     keys.push({
-        pubkey: collectionAccount,
+        pubkey: resolvedAccounts.collection,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collection, false),
     });
     // Collection Master Edition Account.
     keys.push({
-        pubkey: collectionMasterEditionAccountAccount,
+        pubkey: resolvedAccounts.collectionMasterEditionAccount,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionMasterEditionAccountAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionMasterEditionAccount, false),
     });
     // Collection Authority Record (optional).
-    if (collectionAuthorityRecordAccount) {
+    if (resolvedAccounts.collectionAuthorityRecord) {
         keys.push({
-            pubkey: collectionAuthorityRecordAccount,
+            pubkey: resolvedAccounts.collectionAuthorityRecord,
             isSigner: false,
-            isWritable: (0, umi_1.checkForIsWritableOverride)(collectionAuthorityRecordAccount, false),
+            isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionAuthorityRecord, false),
         });
@@ -85,0 +85,0 @@ }

dist/src/generated/instructions/setAndVerifySizedCollectionItem.js

@@ -12,2 +12,3 @@ "use strict";
 const umi_1 = require("@metaplex-foundation/umi");
+const shared_1 = require("../shared");
 function getSetAndVerifySizedCollectionItemInstructionDataSerializer(context) {
@@ -26,62 +27,61 @@ const s = context.serializer;
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const metadataAccount = input.metadata;
-    const collectionAuthorityAccount = input.collectionAuthority;
-    const payerAccount = input.payer ?? context.payer;
-    const updateAuthorityAccount = input.updateAuthority ?? context.identity.publicKey;
-    const collectionMintAccount = input.collectionMint;
-    const collectionAccount = input.collection;
-    const collectionMasterEditionAccountAccount = input.collectionMasterEditionAccount;
-    const collectionAuthorityRecordAccount = input.collectionAuthorityRecord;
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
+        isWritable: false,
+    };
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'updateAuthority', input.updateAuthority ?? context.identity.publicKey);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Collection Authority.
-    signers.push(collectionAuthorityAccount);
+    signers.push(resolvedAccounts.collectionAuthority);
     keys.push({
-        pubkey: collectionAuthorityAccount.publicKey,
+        pubkey: resolvedAccounts.collectionAuthority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionAuthorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionAuthority, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // Update Authority.
     keys.push({
-        pubkey: updateAuthorityAccount,
+        pubkey: resolvedAccounts.updateAuthority,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(updateAuthorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.updateAuthority, false),
     });
     // Collection Mint.
     keys.push({
-        pubkey: collectionMintAccount,
+        pubkey: resolvedAccounts.collectionMint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionMintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionMint, false),
     });
     // Collection.
     keys.push({
-        pubkey: collectionAccount,
+        pubkey: resolvedAccounts.collection,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collection, true),
     });
     // Collection Master Edition Account.
     keys.push({
-        pubkey: collectionMasterEditionAccountAccount,
+        pubkey: resolvedAccounts.collectionMasterEditionAccount,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionMasterEditionAccountAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionMasterEditionAccount, true),
     });
     // Collection Authority Record (optional).
-    if (collectionAuthorityRecordAccount) {
+    if (resolvedAccounts.collectionAuthorityRecord) {
         keys.push({
-            pubkey: collectionAuthorityRecordAccount,
+            pubkey: resolvedAccounts.collectionAuthorityRecord,
             isSigner: false,
-            isWritable: (0, umi_1.checkForIsWritableOverride)(collectionAuthorityRecordAccount, false),
+            isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionAuthorityRecord, false),
         });
@@ -88,0 +88,0 @@ }

dist/src/generated/instructions/setCollectionSize.d.ts

@@ -28,2 +28,3 @@ /**
 export declare function getSetCollectionSizeInstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<SetCollectionSizeInstructionDataArgs, SetCollectionSizeInstructionData>;
-export declare function setCollectionSize(context: Pick<Context, 'serializer' | 'programs'>, input: SetCollectionSizeInstructionAccounts & SetCollectionSizeInstructionDataArgs): TransactionBuilder;
+export type SetCollectionSizeInstructionArgs = SetCollectionSizeInstructionDataArgs;
+export declare function setCollectionSize(context: Pick<Context, 'serializer' | 'programs'>, input: SetCollectionSizeInstructionAccounts & SetCollectionSizeInstructionArgs): TransactionBuilder;

dist/src/generated/instructions/setCollectionSize.js

@@ -12,2 +12,3 @@ "use strict";
 const umi_1 = require("@metaplex-foundation/umi");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -27,37 +28,40 @@ function getSetCollectionSizeInstructionDataSerializer(context) {
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const collectionMetadataAccount = input.collectionMetadata;
-    const collectionAuthorityAccount = input.collectionAuthority;
-    const collectionMintAccount = input.collectionMint;
-    const collectionAuthorityRecordAccount = input.collectionAuthorityRecord;
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
+        isWritable: false,
+    };
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Collection Metadata.
     keys.push({
-        pubkey: collectionMetadataAccount,
+        pubkey: resolvedAccounts.collectionMetadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionMetadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionMetadata, true),
     });
     // Collection Authority.
-    signers.push(collectionAuthorityAccount);
+    signers.push(resolvedAccounts.collectionAuthority);
     keys.push({
-        pubkey: collectionAuthorityAccount.publicKey,
+        pubkey: resolvedAccounts.collectionAuthority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionAuthorityAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionAuthority, true),
     });
     // Collection Mint.
     keys.push({
-        pubkey: collectionMintAccount,
+        pubkey: resolvedAccounts.collectionMint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionMintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionMint, false),
     });
     // Collection Authority Record (optional).
-    if (collectionAuthorityRecordAccount) {
+    if (resolvedAccounts.collectionAuthorityRecord) {
         keys.push({
-            pubkey: collectionAuthorityRecordAccount,
+            pubkey: resolvedAccounts.collectionAuthorityRecord,
             isSigner: false,
-            isWritable: (0, umi_1.checkForIsWritableOverride)(collectionAuthorityRecordAccount, false),
+            isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionAuthorityRecord, false),
         });
     }
     // Data.
-    const data = getSetCollectionSizeInstructionDataSerializer(context).serialize(input);
+    const data = getSetCollectionSizeInstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -64,0 +68,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/setTokenStandard.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 function getSetTokenStandardInstructionDataSerializer(context) {
@@ -26,34 +27,36 @@ const s = context.serializer;
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const updateAuthorityAccount = input.updateAuthority ?? context.identity;
-    const editionAccount = input.edition;
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
+        isWritable: false,
+    };
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'updateAuthority', input.updateAuthority ?? context.identity);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Update Authority.
-    signers.push(updateAuthorityAccount);
+    signers.push(resolvedAccounts.updateAuthority);
     keys.push({
-        pubkey: updateAuthorityAccount.publicKey,
+        pubkey: resolvedAccounts.updateAuthority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(updateAuthorityAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.updateAuthority, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Edition (optional).
-    if (editionAccount) {
+    if (resolvedAccounts.edition) {
         keys.push({
-            pubkey: editionAccount,
+            pubkey: resolvedAccounts.edition,
             isSigner: false,
-            isWritable: (0, umi_1.checkForIsWritableOverride)(editionAccount, false),
+            isWritable: (0, shared_1.isWritable)(resolvedAccounts.edition, false),
         });
@@ -60,0 +63,0 @@ }

dist/src/generated/instructions/signMetadata.js

@@ -12,2 +12,3 @@ "use strict";
 const umi_1 = require("@metaplex-foundation/umi");
+const shared_1 = require("../shared");
 function getSignMetadataInstructionDataSerializer(context) {
@@ -25,18 +26,21 @@ const s = context.serializer;
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const metadataAccount = input.metadata;
-    const creatorAccount = input.creator;
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
+        isWritable: false,
+    };
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Creator.
-    signers.push(creatorAccount);
+    signers.push(resolvedAccounts.creator);
     keys.push({
-        pubkey: creatorAccount.publicKey,
+        pubkey: resolvedAccounts.creator.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(creatorAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.creator, false),
     });
@@ -43,0 +47,0 @@ // Data.

dist/src/generated/instructions/thawDelegatedAccount.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 function getThawDelegatedAccountInstructionDataSerializer(context) {
@@ -26,43 +27,45 @@ const s = context.serializer;
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const delegateAccount = input.delegate;
-    const tokenAccountAccount = input.tokenAccount;
-    const mintAccount = input.mint;
-    const editionAccount = input.edition ??
-        (0, accounts_1.findMasterEditionPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const tokenProgramAccount = input.tokenProgram ?? {
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
+        isWritable: false,
+    };
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'edition', input.edition ??
+        (0, accounts_1.findMasterEditionPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenProgram', input.tokenProgram ?? {
         ...context.programs.getPublicKey('splToken', 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
         isWritable: false,
-    };
+    });
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
     // Delegate.
-    signers.push(delegateAccount);
+    signers.push(resolvedAccounts.delegate);
     keys.push({
-        pubkey: delegateAccount.publicKey,
+        pubkey: resolvedAccounts.delegate.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegate, true),
     });
     // Token Account.
     keys.push({
-        pubkey: tokenAccountAccount,
+        pubkey: resolvedAccounts.tokenAccount,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccountAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenAccount, true),
     });
     // Edition.
     keys.push({
-        pubkey: editionAccount,
+        pubkey: resolvedAccounts.edition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(editionAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.edition, false),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Token Program.
     keys.push({
-        pubkey: tokenProgramAccount,
+        pubkey: resolvedAccounts.tokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenProgram, false),
     });
@@ -69,0 +72,0 @@ // Data.

dist/src/generated/instructions/transfer.d.ts

@@ -54,2 +54,3 @@ /**
 export declare function getTransferInstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<TransferInstructionDataArgs, TransferInstructionData>;
-export declare function transfer(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: TransferInstructionAccounts & TransferInstructionDataArgs): TransactionBuilder;
+export type TransferInstructionArgs = TransferInstructionDataArgs;
+export declare function transfer(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: TransferInstructionAccounts & TransferInstructionArgs): TransactionBuilder;

dist/src/generated/instructions/transfer.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -28,150 +29,139 @@ function getTransferInstructionDataSerializer(context) {
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const tokenAccount = input.token;
-    const tokenOwnerAccount = input.tokenOwner;
-    const destinationAccount = input.destination;
-    const destinationOwnerAccount = input.destinationOwner;
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const editionAccount = input.edition ?? { ...programId, isWritable: false };
-    const ownerTokenRecordAccount = input.ownerTokenRecord ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const destinationTokenRecordAccount = input.destinationTokenRecord ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorityAccount = input.authority ?? context.identity;
-    const payerAccount = input.payer ?? context.payer;
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'edition', input.edition ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'ownerTokenRecord', input.ownerTokenRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'destinationTokenRecord', input.destinationTokenRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
-    const splTokenProgramAccount = input.splTokenProgram ?? {
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splTokenProgram', input.splTokenProgram ?? {
         ...context.programs.getPublicKey('splToken', 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
         isWritable: false,
-    };
-    const splAtaProgramAccount = input.splAtaProgram ?? {
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splAtaProgram', input.splAtaProgram ?? {
         ...context.programs.getPublicKey('splAssociatedToken', 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL'),
         isWritable: false,
-    };
-    const authorizationRulesProgramAccount = input.authorizationRulesProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesAccount = input.authorizationRules ?? {
-        ...programId,
-        isWritable: false,
-    };
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRulesProgram', input.authorizationRulesProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRules', input.authorizationRules ?? programId);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Token.
     keys.push({
-        pubkey: tokenAccount,
+        pubkey: resolvedAccounts.token,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.token, true),
     });
     // Token Owner.
     keys.push({
-        pubkey: tokenOwnerAccount,
+        pubkey: resolvedAccounts.tokenOwner,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenOwnerAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenOwner, false),
     });
     // Destination.
     keys.push({
-        pubkey: destinationAccount,
+        pubkey: resolvedAccounts.destination,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(destinationAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.destination, true),
     });
     // Destination Owner.
     keys.push({
-        pubkey: destinationOwnerAccount,
+        pubkey: resolvedAccounts.destinationOwner,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(destinationOwnerAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.destinationOwner, false),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Edition.
     keys.push({
-        pubkey: editionAccount,
+        pubkey: resolvedAccounts.edition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(editionAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.edition, false),
     });
     // Owner Token Record.
     keys.push({
-        pubkey: ownerTokenRecordAccount,
+        pubkey: resolvedAccounts.ownerTokenRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(ownerTokenRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.ownerTokenRecord, true),
     });
     // Destination Token Record.
     keys.push({
-        pubkey: destinationTokenRecordAccount,
+        pubkey: resolvedAccounts.destinationTokenRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(destinationTokenRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.destinationTokenRecord, true),
     });
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Spl Token Program.
     keys.push({
-        pubkey: splTokenProgramAccount,
+        pubkey: resolvedAccounts.splTokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splTokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splTokenProgram, false),
     });
     // Spl Ata Program.
     keys.push({
-        pubkey: splAtaProgramAccount,
+        pubkey: resolvedAccounts.splAtaProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splAtaProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splAtaProgram, false),
     });
     // Authorization Rules Program.
     keys.push({
-        pubkey: authorizationRulesProgramAccount,
+        pubkey: resolvedAccounts.authorizationRulesProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRulesProgram, false),
     });
     // Authorization Rules.
     keys.push({
-        pubkey: authorizationRulesAccount,
+        pubkey: resolvedAccounts.authorizationRules,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRules, false),
     });
     // Data.
-    const data = getTransferInstructionDataSerializer(context).serialize(input);
+    const data = getTransferInstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -178,0 +168,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/transferOutOfEscrow.d.ts

@@ -45,2 +45,3 @@ /**
 export declare function getTransferOutOfEscrowInstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<TransferOutOfEscrowInstructionDataArgs, TransferOutOfEscrowInstructionData>;
-export declare function transferOutOfEscrow(context: Pick<Context, 'serializer' | 'programs' | 'payer'>, input: TransferOutOfEscrowInstructionAccounts & TransferOutOfEscrowInstructionDataArgs): TransactionBuilder;
+export type TransferOutOfEscrowInstructionArgs = TransferOutOfEscrowInstructionDataArgs;
+export declare function transferOutOfEscrow(context: Pick<Context, 'serializer' | 'programs' | 'payer'>, input: TransferOutOfEscrowInstructionAccounts & TransferOutOfEscrowInstructionArgs): TransactionBuilder;

dist/src/generated/instructions/transferOutOfEscrow.js

@@ -12,2 +12,3 @@ "use strict";
 const umi_1 = require("@metaplex-foundation/umi");
+const shared_1 = require("../shared");
 function getTransferOutOfEscrowInstructionDataSerializer(context) {
@@ -26,111 +27,110 @@ const s = context.serializer;
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const escrowAccount = input.escrow;
-    const metadataAccount = input.metadata;
-    const payerAccount = input.payer ?? context.payer;
-    const attributeMintAccount = input.attributeMint;
-    const attributeSrcAccount = input.attributeSrc;
-    const attributeDstAccount = input.attributeDst;
-    const escrowMintAccount = input.escrowMint;
-    const escrowAccountAccount = input.escrowAccount;
-    const systemProgramAccount = input.systemProgram ?? {
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
+        isWritable: false,
+    };
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const ataProgramAccount = input.ataProgram ?? {
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'ataProgram', input.ataProgram ?? {
         ...context.programs.getPublicKey('splAssociatedToken', 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL'),
         isWritable: false,
-    };
-    const tokenProgramAccount = input.tokenProgram ?? {
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenProgram', input.tokenProgram ?? {
         ...context.programs.getPublicKey('splToken', 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
-    const authorityAccount = input.authority;
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Escrow.
     keys.push({
-        pubkey: escrowAccount,
+        pubkey: resolvedAccounts.escrow,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(escrowAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.escrow, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // Attribute Mint.
     keys.push({
-        pubkey: attributeMintAccount,
+        pubkey: resolvedAccounts.attributeMint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(attributeMintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.attributeMint, false),
     });
     // Attribute Src.
     keys.push({
-        pubkey: attributeSrcAccount,
+        pubkey: resolvedAccounts.attributeSrc,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(attributeSrcAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.attributeSrc, true),
     });
     // Attribute Dst.
     keys.push({
-        pubkey: attributeDstAccount,
+        pubkey: resolvedAccounts.attributeDst,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(attributeDstAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.attributeDst, true),
     });
     // Escrow Mint.
     keys.push({
-        pubkey: escrowMintAccount,
+        pubkey: resolvedAccounts.escrowMint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(escrowMintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.escrowMint, false),
     });
     // Escrow Account.
     keys.push({
-        pubkey: escrowAccountAccount,
+        pubkey: resolvedAccounts.escrowAccount,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(escrowAccountAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.escrowAccount, false),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Ata Program.
     keys.push({
-        pubkey: ataProgramAccount,
+        pubkey: resolvedAccounts.ataProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(ataProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.ataProgram, false),
     });
     // Token Program.
     keys.push({
-        pubkey: tokenProgramAccount,
+        pubkey: resolvedAccounts.tokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Authority (optional).
-    if (authorityAccount) {
-        signers.push(authorityAccount);
+    if (resolvedAccounts.authority) {
+        signers.push(resolvedAccounts.authority);
         keys.push({
-            pubkey: authorityAccount.publicKey,
+            pubkey: resolvedAccounts.authority.publicKey,
             isSigner: true,
-            isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+            isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
         });
     }
     // Data.
-    const data = getTransferOutOfEscrowInstructionDataSerializer(context).serialize(input);
+    const data = getTransferOutOfEscrowInstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -137,0 +137,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/transferV1.d.ts

@@ -57,2 +57,3 @@ /**
 export declare function getTransferV1InstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<TransferV1InstructionDataArgs, TransferV1InstructionData>;
-export declare function transferV1(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: TransferV1InstructionAccounts & TransferV1InstructionDataArgs): TransactionBuilder;
+export type TransferV1InstructionArgs = TransferV1InstructionDataArgs;
+export declare function transferV1(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: TransferV1InstructionAccounts & TransferV1InstructionArgs): TransactionBuilder;

dist/src/generated/instructions/transferV1.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -37,150 +38,139 @@ function getTransferV1InstructionDataSerializer(context) {
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const tokenAccount = input.token;
-    const tokenOwnerAccount = input.tokenOwner;
-    const destinationAccount = input.destination;
-    const destinationOwnerAccount = input.destinationOwner;
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const editionAccount = input.edition ?? { ...programId, isWritable: false };
-    const ownerTokenRecordAccount = input.ownerTokenRecord ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const destinationTokenRecordAccount = input.destinationTokenRecord ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorityAccount = input.authority ?? context.identity;
-    const payerAccount = input.payer ?? context.payer;
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'edition', input.edition ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'ownerTokenRecord', input.ownerTokenRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'destinationTokenRecord', input.destinationTokenRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
-    const splTokenProgramAccount = input.splTokenProgram ?? {
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splTokenProgram', input.splTokenProgram ?? {
         ...context.programs.getPublicKey('splToken', 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
         isWritable: false,
-    };
-    const splAtaProgramAccount = input.splAtaProgram ?? {
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splAtaProgram', input.splAtaProgram ?? {
         ...context.programs.getPublicKey('splAssociatedToken', 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL'),
         isWritable: false,
-    };
-    const authorizationRulesProgramAccount = input.authorizationRulesProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesAccount = input.authorizationRules ?? {
-        ...programId,
-        isWritable: false,
-    };
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRulesProgram', input.authorizationRulesProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRules', input.authorizationRules ?? programId);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Token.
     keys.push({
-        pubkey: tokenAccount,
+        pubkey: resolvedAccounts.token,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.token, true),
     });
     // Token Owner.
     keys.push({
-        pubkey: tokenOwnerAccount,
+        pubkey: resolvedAccounts.tokenOwner,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenOwnerAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenOwner, false),
     });
     // Destination.
     keys.push({
-        pubkey: destinationAccount,
+        pubkey: resolvedAccounts.destination,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(destinationAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.destination, true),
     });
     // Destination Owner.
     keys.push({
-        pubkey: destinationOwnerAccount,
+        pubkey: resolvedAccounts.destinationOwner,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(destinationOwnerAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.destinationOwner, false),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Edition.
     keys.push({
-        pubkey: editionAccount,
+        pubkey: resolvedAccounts.edition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(editionAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.edition, false),
     });
     // Owner Token Record.
     keys.push({
-        pubkey: ownerTokenRecordAccount,
+        pubkey: resolvedAccounts.ownerTokenRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(ownerTokenRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.ownerTokenRecord, true),
     });
     // Destination Token Record.
     keys.push({
-        pubkey: destinationTokenRecordAccount,
+        pubkey: resolvedAccounts.destinationTokenRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(destinationTokenRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.destinationTokenRecord, true),
     });
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Spl Token Program.
     keys.push({
-        pubkey: splTokenProgramAccount,
+        pubkey: resolvedAccounts.splTokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splTokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splTokenProgram, false),
     });
     // Spl Ata Program.
     keys.push({
-        pubkey: splAtaProgramAccount,
+        pubkey: resolvedAccounts.splAtaProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splAtaProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splAtaProgram, false),
     });
     // Authorization Rules Program.
     keys.push({
-        pubkey: authorizationRulesProgramAccount,
+        pubkey: resolvedAccounts.authorizationRulesProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRulesProgram, false),
     });
     // Authorization Rules.
     keys.push({
-        pubkey: authorizationRulesAccount,
+        pubkey: resolvedAccounts.authorizationRules,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRules, false),
     });
     // Data.
-    const data = getTransferV1InstructionDataSerializer(context).serialize(input);
+    const data = getTransferV1InstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -187,0 +177,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/unlock.d.ts

@@ -46,2 +46,3 @@ /**
 export declare function getUnlockInstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<UnlockInstructionDataArgs, UnlockInstructionData>;
-export declare function unlock(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: UnlockInstructionAccounts & UnlockInstructionDataArgs): TransactionBuilder;
+export type UnlockInstructionArgs = UnlockInstructionDataArgs;
+export declare function unlock(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: UnlockInstructionAccounts & UnlockInstructionArgs): TransactionBuilder;

dist/src/generated/instructions/unlock.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -28,119 +29,108 @@ function getUnlockInstructionDataSerializer(context) {
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const authorityAccount = input.authority ?? context.identity;
-    const tokenOwnerAccount = input.tokenOwner ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const tokenAccount = input.token;
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const editionAccount = input.edition ?? { ...programId, isWritable: false };
-    const tokenRecordAccount = input.tokenRecord ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const payerAccount = input.payer ?? context.payer;
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenOwner', input.tokenOwner ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'edition', input.edition ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenRecord', input.tokenRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
-    const splTokenProgramAccount = input.splTokenProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesProgramAccount = input.authorizationRulesProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesAccount = input.authorizationRules ?? {
-        ...programId,
-        isWritable: false,
-    };
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splTokenProgram', input.splTokenProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRulesProgram', input.authorizationRulesProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRules', input.authorizationRules ?? programId);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Token Owner.
     keys.push({
-        pubkey: tokenOwnerAccount,
+        pubkey: resolvedAccounts.tokenOwner,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenOwnerAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenOwner, false),
     });
     // Token.
     keys.push({
-        pubkey: tokenAccount,
+        pubkey: resolvedAccounts.token,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.token, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Edition.
     keys.push({
-        pubkey: editionAccount,
+        pubkey: resolvedAccounts.edition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(editionAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.edition, false),
     });
     // Token Record.
     keys.push({
-        pubkey: tokenRecordAccount,
+        pubkey: resolvedAccounts.tokenRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenRecord, true),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Spl Token Program.
     keys.push({
-        pubkey: splTokenProgramAccount,
+        pubkey: resolvedAccounts.splTokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splTokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splTokenProgram, false),
     });
     // Authorization Rules Program.
     keys.push({
-        pubkey: authorizationRulesProgramAccount,
+        pubkey: resolvedAccounts.authorizationRulesProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRulesProgram, false),
     });
     // Authorization Rules.
     keys.push({
-        pubkey: authorizationRulesAccount,
+        pubkey: resolvedAccounts.authorizationRules,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRules, false),
     });
     // Data.
-    const data = getUnlockInstructionDataSerializer(context).serialize(input);
+    const data = getUnlockInstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -147,0 +137,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/unlockV1.d.ts

@@ -47,2 +47,3 @@ /**
 export declare function getUnlockV1InstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<UnlockV1InstructionDataArgs, UnlockV1InstructionData>;
-export declare function unlockV1(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: UnlockV1InstructionAccounts & UnlockV1InstructionDataArgs): TransactionBuilder;
+export type UnlockV1InstructionArgs = UnlockV1InstructionDataArgs;
+export declare function unlockV1(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: UnlockV1InstructionAccounts & UnlockV1InstructionArgs): TransactionBuilder;

dist/src/generated/instructions/unlockV1.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -36,119 +37,108 @@ function getUnlockV1InstructionDataSerializer(context) {
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const authorityAccount = input.authority ?? context.identity;
-    const tokenOwnerAccount = input.tokenOwner ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const tokenAccount = input.token;
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const editionAccount = input.edition ?? { ...programId, isWritable: false };
-    const tokenRecordAccount = input.tokenRecord ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const payerAccount = input.payer ?? context.payer;
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenOwner', input.tokenOwner ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'edition', input.edition ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenRecord', input.tokenRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
-    const splTokenProgramAccount = input.splTokenProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesProgramAccount = input.authorizationRulesProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesAccount = input.authorizationRules ?? {
-        ...programId,
-        isWritable: false,
-    };
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splTokenProgram', input.splTokenProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRulesProgram', input.authorizationRulesProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRules', input.authorizationRules ?? programId);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Token Owner.
     keys.push({
-        pubkey: tokenOwnerAccount,
+        pubkey: resolvedAccounts.tokenOwner,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenOwnerAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenOwner, false),
     });
     // Token.
     keys.push({
-        pubkey: tokenAccount,
+        pubkey: resolvedAccounts.token,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.token, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Edition.
     keys.push({
-        pubkey: editionAccount,
+        pubkey: resolvedAccounts.edition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(editionAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.edition, false),
     });
     // Token Record.
     keys.push({
-        pubkey: tokenRecordAccount,
+        pubkey: resolvedAccounts.tokenRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenRecord, true),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Spl Token Program.
     keys.push({
-        pubkey: splTokenProgramAccount,
+        pubkey: resolvedAccounts.splTokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splTokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splTokenProgram, false),
     });
     // Authorization Rules Program.
     keys.push({
-        pubkey: authorizationRulesProgramAccount,
+        pubkey: resolvedAccounts.authorizationRulesProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRulesProgram, false),
     });
     // Authorization Rules.
     keys.push({
-        pubkey: authorizationRulesAccount,
+        pubkey: resolvedAccounts.authorizationRules,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRules, false),
     });
     // Data.
-    const data = getUnlockV1InstructionDataSerializer(context).serialize(input);
+    const data = getUnlockV1InstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -155,0 +145,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/unverify.d.ts

@@ -34,2 +34,3 @@ /**
 export declare function getUnverifyInstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<UnverifyInstructionDataArgs, UnverifyInstructionData>;
-export declare function unverify(context: Pick<Context, 'serializer' | 'programs' | 'identity'>, input: UnverifyInstructionAccounts & UnverifyInstructionDataArgs): TransactionBuilder;
+export type UnverifyInstructionArgs = UnverifyInstructionDataArgs;
+export declare function unverify(context: Pick<Context, 'serializer' | 'programs' | 'identity'>, input: UnverifyInstructionAccounts & UnverifyInstructionArgs): TransactionBuilder;

dist/src/generated/instructions/unverify.js

@@ -12,2 +12,3 @@ "use strict";
 const umi_1 = require("@metaplex-foundation/umi");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -27,69 +28,66 @@ function getUnverifyInstructionDataSerializer(context) {
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const authorityAccount = input.authority ?? context.identity;
-    const delegateRecordAccount = input.delegateRecord ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const metadataAccount = input.metadata;
-    const collectionMintAccount = input.collectionMint ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const collectionMetadataAccount = input.collectionMetadata ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'delegateRecord', input.delegateRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'collectionMint', input.collectionMint ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'collectionMetadata', input.collectionMetadata ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Delegate Record.
     keys.push({
-        pubkey: delegateRecordAccount,
+        pubkey: resolvedAccounts.delegateRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateRecordAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegateRecord, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Collection Mint.
     keys.push({
-        pubkey: collectionMintAccount,
+        pubkey: resolvedAccounts.collectionMint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionMintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionMint, false),
     });
     // Collection Metadata.
     keys.push({
-        pubkey: collectionMetadataAccount,
+        pubkey: resolvedAccounts.collectionMetadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionMetadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionMetadata, true),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Data.
-    const data = getUnverifyInstructionDataSerializer(context).serialize(input);
+    const data = getUnverifyInstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -96,0 +94,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/unverifyCollection.js

@@ -12,2 +12,3 @@ "use strict";
 const umi_1 = require("@metaplex-foundation/umi");
+const shared_1 = require("../shared");
 function getUnverifyCollectionInstructionDataSerializer(context) {
@@ -25,47 +26,46 @@ const s = context.serializer;
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const metadataAccount = input.metadata;
-    const collectionAuthorityAccount = input.collectionAuthority;
-    const collectionMintAccount = input.collectionMint;
-    const collectionAccount = input.collection;
-    const collectionMasterEditionAccountAccount = input.collectionMasterEditionAccount;
-    const collectionAuthorityRecordAccount = input.collectionAuthorityRecord;
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
+        isWritable: false,
+    };
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Collection Authority.
-    signers.push(collectionAuthorityAccount);
+    signers.push(resolvedAccounts.collectionAuthority);
     keys.push({
-        pubkey: collectionAuthorityAccount.publicKey,
+        pubkey: resolvedAccounts.collectionAuthority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionAuthorityAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionAuthority, true),
     });
     // Collection Mint.
     keys.push({
-        pubkey: collectionMintAccount,
+        pubkey: resolvedAccounts.collectionMint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionMintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionMint, false),
     });
     // Collection.
     keys.push({
-        pubkey: collectionAccount,
+        pubkey: resolvedAccounts.collection,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collection, false),
     });
     // Collection Master Edition Account.
     keys.push({
-        pubkey: collectionMasterEditionAccountAccount,
+        pubkey: resolvedAccounts.collectionMasterEditionAccount,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionMasterEditionAccountAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionMasterEditionAccount, false),
     });
     // Collection Authority Record (optional).
-    if (collectionAuthorityRecordAccount) {
+    if (resolvedAccounts.collectionAuthorityRecord) {
         keys.push({
-            pubkey: collectionAuthorityRecordAccount,
+            pubkey: resolvedAccounts.collectionAuthorityRecord,
             isSigner: false,
-            isWritable: (0, umi_1.checkForIsWritableOverride)(collectionAuthorityRecordAccount, false),
+            isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionAuthorityRecord, false),
         });
@@ -72,0 +72,0 @@ }

dist/src/generated/instructions/unverifyCollectionV1.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 function getUnverifyCollectionV1InstructionDataSerializer(context) {
@@ -31,61 +32,61 @@ const s = context.serializer;
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const authorityAccount = input.authority ?? context.identity;
-    const delegateRecordAccount = input.delegateRecord ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const metadataAccount = input.metadata;
-    const collectionMintAccount = input.collectionMint;
-    const collectionMetadataAccount = input.collectionMetadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(collectionMintAccount) });
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'delegateRecord', input.delegateRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'collectionMetadata', input.collectionMetadata ??
+        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.collectionMint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Delegate Record.
     keys.push({
-        pubkey: delegateRecordAccount,
+        pubkey: resolvedAccounts.delegateRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateRecordAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegateRecord, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Collection Mint.
     keys.push({
-        pubkey: collectionMintAccount,
+        pubkey: resolvedAccounts.collectionMint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionMintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionMint, false),
     });
     // Collection Metadata.
     keys.push({
-        pubkey: collectionMetadataAccount,
+        pubkey: resolvedAccounts.collectionMetadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionMetadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionMetadata, true),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
@@ -92,0 +93,0 @@ // Data.

dist/src/generated/instructions/unverifyCreatorV1.js

@@ -12,2 +12,3 @@ "use strict";
 const umi_1 = require("@metaplex-foundation/umi");
+const shared_1 = require("../shared");
 function getUnverifyCreatorV1InstructionDataSerializer(context) {
@@ -30,66 +31,61 @@ const s = context.serializer;
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const authorityAccount = input.authority ?? context.identity;
-    const delegateRecordAccount = input.delegateRecord ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const metadataAccount = input.metadata;
-    const collectionMintAccount = input.collectionMint ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const collectionMetadataAccount = input.collectionMetadata ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'delegateRecord', input.delegateRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'collectionMint', input.collectionMint ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'collectionMetadata', input.collectionMetadata ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Delegate Record.
     keys.push({
-        pubkey: delegateRecordAccount,
+        pubkey: resolvedAccounts.delegateRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateRecordAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegateRecord, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Collection Mint.
     keys.push({
-        pubkey: collectionMintAccount,
+        pubkey: resolvedAccounts.collectionMint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionMintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionMint, false),
     });
     // Collection Metadata.
     keys.push({
-        pubkey: collectionMetadataAccount,
+        pubkey: resolvedAccounts.collectionMetadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionMetadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionMetadata, true),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
@@ -96,0 +92,0 @@ // Data.

dist/src/generated/instructions/unverifySizedCollectionItem.js

@@ -12,2 +12,3 @@ "use strict";
 const umi_1 = require("@metaplex-foundation/umi");
+const shared_1 = require("../shared");
 function getUnverifySizedCollectionItemInstructionDataSerializer(context) {
@@ -26,55 +27,54 @@ const s = context.serializer;
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const metadataAccount = input.metadata;
-    const collectionAuthorityAccount = input.collectionAuthority;
-    const payerAccount = input.payer ?? context.payer;
-    const collectionMintAccount = input.collectionMint;
-    const collectionAccount = input.collection;
-    const collectionMasterEditionAccountAccount = input.collectionMasterEditionAccount;
-    const collectionAuthorityRecordAccount = input.collectionAuthorityRecord;
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
+        isWritable: false,
+    };
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Collection Authority.
-    signers.push(collectionAuthorityAccount);
+    signers.push(resolvedAccounts.collectionAuthority);
     keys.push({
-        pubkey: collectionAuthorityAccount.publicKey,
+        pubkey: resolvedAccounts.collectionAuthority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionAuthorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionAuthority, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // Collection Mint.
     keys.push({
-        pubkey: collectionMintAccount,
+        pubkey: resolvedAccounts.collectionMint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionMintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionMint, false),
     });
     // Collection.
     keys.push({
-        pubkey: collectionAccount,
+        pubkey: resolvedAccounts.collection,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collection, true),
     });
     // Collection Master Edition Account.
     keys.push({
-        pubkey: collectionMasterEditionAccountAccount,
+        pubkey: resolvedAccounts.collectionMasterEditionAccount,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionMasterEditionAccountAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionMasterEditionAccount, false),
     });
     // Collection Authority Record (optional).
-    if (collectionAuthorityRecordAccount) {
+    if (resolvedAccounts.collectionAuthorityRecord) {
         keys.push({
-            pubkey: collectionAuthorityRecordAccount,
+            pubkey: resolvedAccounts.collectionAuthorityRecord,
             isSigner: false,
-            isWritable: (0, umi_1.checkForIsWritableOverride)(collectionAuthorityRecordAccount, false),
+            isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionAuthorityRecord, false),
         });
@@ -81,0 +81,0 @@ }

dist/src/generated/instructions/update.d.ts

@@ -42,2 +42,3 @@ /**
 export declare function getUpdateInstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<UpdateInstructionDataArgs, UpdateInstructionData>;
-export declare function update(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: UpdateInstructionAccounts & UpdateInstructionDataArgs): TransactionBuilder;
+export type UpdateInstructionArgs = UpdateInstructionDataArgs;
+export declare function update(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: UpdateInstructionAccounts & UpdateInstructionArgs): TransactionBuilder;

dist/src/generated/instructions/update.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -28,99 +29,95 @@ function getUpdateInstructionDataSerializer(context) {
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const authorityAccount = input.authority ?? context.identity;
-    const delegateRecordAccount = input.delegateRecord ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const tokenAccount = input.token ?? { ...programId, isWritable: false };
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const editionAccount = input.edition ?? { ...programId, isWritable: false };
-    const payerAccount = input.payer ?? context.payer;
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'delegateRecord', input.delegateRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'token', input.token ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'edition', input.edition ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
-    const authorizationRulesProgramAccount = input.authorizationRulesProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesAccount = input.authorizationRules ?? {
-        ...programId,
-        isWritable: false,
-    };
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRulesProgram', input.authorizationRulesProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRules', input.authorizationRules ?? programId);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Delegate Record.
     keys.push({
-        pubkey: delegateRecordAccount,
+        pubkey: resolvedAccounts.delegateRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateRecordAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegateRecord, false),
     });
     // Token.
     keys.push({
-        pubkey: tokenAccount,
+        pubkey: resolvedAccounts.token,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.token, false),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Edition.
     keys.push({
-        pubkey: editionAccount,
+        pubkey: resolvedAccounts.edition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(editionAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.edition, true),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Authorization Rules Program.
     keys.push({
-        pubkey: authorizationRulesProgramAccount,
+        pubkey: resolvedAccounts.authorizationRulesProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRulesProgram, false),
     });
     // Authorization Rules.
     keys.push({
-        pubkey: authorizationRulesAccount,
+        pubkey: resolvedAccounts.authorizationRules,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRules, false),
     });
     // Data.
-    const data = getUpdateInstructionDataSerializer(context).serialize(input);
+    const data = getUpdateInstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -127,0 +124,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/updateMetadataAccount.d.ts

@@ -40,2 +40,3 @@ /**
 export declare function getUpdateMetadataAccountInstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<UpdateMetadataAccountInstructionDataArgs, UpdateMetadataAccountInstructionData>;
-export declare function updateMetadataAccount(context: Pick<Context, 'serializer' | 'programs' | 'identity'>, input: UpdateMetadataAccountInstructionAccounts & UpdateMetadataAccountInstructionDataArgs): TransactionBuilder;
+export type UpdateMetadataAccountInstructionArgs = UpdateMetadataAccountInstructionDataArgs;
+export declare function updateMetadataAccount(context: Pick<Context, 'serializer' | 'programs' | 'identity'>, input: UpdateMetadataAccountInstructionAccounts & UpdateMetadataAccountInstructionArgs): TransactionBuilder;

dist/src/generated/instructions/updateMetadataAccount.js

@@ -12,2 +12,3 @@ "use strict";
 const umi_1 = require("@metaplex-foundation/umi");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -26,3 +27,3 @@ function getUpdateMetadataAccountInstructionDataSerializer(context) {
                 ['creators', s.option(s.array((0, types_1.getCreatorSerializer)(context)))],
-            ], { description: 'Data' })),
+            ])),
         ],
@@ -39,21 +40,27 @@ ['newUpdateAuthority', s.option(s.publicKey())],
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const metadataAccount = input.metadata;
-    const updateAuthorityAccount = input.updateAuthority ?? context.identity;
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
+        isWritable: false,
+    };
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'updateAuthority', input.updateAuthority ?? context.identity);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Update Authority.
-    signers.push(updateAuthorityAccount);
+    signers.push(resolvedAccounts.updateAuthority);
     keys.push({
-        pubkey: updateAuthorityAccount.publicKey,
+        pubkey: resolvedAccounts.updateAuthority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(updateAuthorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.updateAuthority, false),
     });
     // Data.
-    const data = getUpdateMetadataAccountInstructionDataSerializer(context).serialize(input);
+    const data = getUpdateMetadataAccountInstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -60,0 +67,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/updateMetadataAccountV2.d.ts

@@ -30,2 +30,3 @@ /**
 export declare function getUpdateMetadataAccountV2InstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<UpdateMetadataAccountV2InstructionDataArgs, UpdateMetadataAccountV2InstructionData>;
-export declare function updateMetadataAccountV2(context: Pick<Context, 'serializer' | 'programs' | 'identity'>, input: UpdateMetadataAccountV2InstructionAccounts & UpdateMetadataAccountV2InstructionDataArgs): TransactionBuilder;
+export type UpdateMetadataAccountV2InstructionArgs = UpdateMetadataAccountV2InstructionDataArgs;
+export declare function updateMetadataAccountV2(context: Pick<Context, 'serializer' | 'programs' | 'identity'>, input: UpdateMetadataAccountV2InstructionAccounts & UpdateMetadataAccountV2InstructionArgs): TransactionBuilder;

dist/src/generated/instructions/updateMetadataAccountV2.js

@@ -12,2 +12,3 @@ "use strict";
 const umi_1 = require("@metaplex-foundation/umi");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -33,21 +34,27 @@ function getUpdateMetadataAccountV2InstructionDataSerializer(context) {
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const metadataAccount = input.metadata;
-    const updateAuthorityAccount = input.updateAuthority ?? context.identity;
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
+        isWritable: false,
+    };
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'updateAuthority', input.updateAuthority ?? context.identity);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Update Authority.
-    signers.push(updateAuthorityAccount);
+    signers.push(resolvedAccounts.updateAuthority);
     keys.push({
-        pubkey: updateAuthorityAccount.publicKey,
+        pubkey: resolvedAccounts.updateAuthority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(updateAuthorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.updateAuthority, false),
     });
     // Data.
-    const data = getUpdateMetadataAccountV2InstructionDataSerializer(context).serialize(input);
+    const data = getUpdateMetadataAccountV2InstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -54,0 +61,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/updatePrimarySaleHappenedViaToken.js

@@ -12,2 +12,3 @@ "use strict";
 const umi_1 = require("@metaplex-foundation/umi");
+const shared_1 = require("../shared");
 function getUpdatePrimarySaleHappenedViaTokenInstructionDataSerializer(context) {
@@ -26,25 +27,27 @@ const s = context.serializer;
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const metadataAccount = input.metadata;
-    const ownerAccount = input.owner;
-    const tokenAccount = input.token;
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
+        isWritable: false,
+    };
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Owner.
-    signers.push(ownerAccount);
+    signers.push(resolvedAccounts.owner);
     keys.push({
-        pubkey: ownerAccount.publicKey,
+        pubkey: resolvedAccounts.owner.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(ownerAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.owner, false),
     });
     // Token.
     keys.push({
-        pubkey: tokenAccount,
+        pubkey: resolvedAccounts.token,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.token, false),
     });
@@ -51,0 +54,0 @@ // Data.

dist/src/generated/instructions/updateV1.d.ts

@@ -71,2 +71,3 @@ /**
 export declare function getUpdateV1InstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<UpdateV1InstructionDataArgs, UpdateV1InstructionData>;
-export declare function updateV1(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: UpdateV1InstructionAccounts & UpdateV1InstructionDataArgs): TransactionBuilder;
+export type UpdateV1InstructionArgs = UpdateV1InstructionDataArgs;
+export declare function updateV1(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: UpdateV1InstructionAccounts & UpdateV1InstructionArgs): TransactionBuilder;

dist/src/generated/instructions/updateV1.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -29,3 +30,3 @@ function getUpdateV1InstructionDataSerializer(context) {
                 ['creators', s.option(s.array((0, types_1.getCreatorSerializer)(context)))],
-            ], { description: 'Data' })),
+            ])),
         ],
@@ -63,99 +64,95 @@ ['primarySaleHappened', s.option(s.bool())],
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const authorityAccount = input.authority ?? context.identity;
-    const delegateRecordAccount = input.delegateRecord ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const tokenAccount = input.token ?? { ...programId, isWritable: false };
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const editionAccount = input.edition ?? { ...programId, isWritable: false };
-    const payerAccount = input.payer ?? context.payer;
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'delegateRecord', input.delegateRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'token', input.token ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'edition', input.edition ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
-    const authorizationRulesProgramAccount = input.authorizationRulesProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesAccount = input.authorizationRules ?? {
-        ...programId,
-        isWritable: false,
-    };
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRulesProgram', input.authorizationRulesProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRules', input.authorizationRules ?? programId);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Delegate Record.
     keys.push({
-        pubkey: delegateRecordAccount,
+        pubkey: resolvedAccounts.delegateRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateRecordAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegateRecord, false),
     });
     // Token.
     keys.push({
-        pubkey: tokenAccount,
+        pubkey: resolvedAccounts.token,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.token, false),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Edition.
     keys.push({
-        pubkey: editionAccount,
+        pubkey: resolvedAccounts.edition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(editionAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.edition, true),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Authorization Rules Program.
     keys.push({
-        pubkey: authorizationRulesProgramAccount,
+        pubkey: resolvedAccounts.authorizationRulesProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRulesProgram, false),
     });
     // Authorization Rules.
     keys.push({
-        pubkey: authorizationRulesAccount,
+        pubkey: resolvedAccounts.authorizationRules,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRules, false),
     });
     // Data.
-    const data = getUpdateV1InstructionDataSerializer(context).serialize(input);
+    const data = getUpdateV1InstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -162,0 +159,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/use.d.ts

@@ -44,2 +44,3 @@ /**
 export declare function getUseInstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<UseInstructionDataArgs, UseInstructionData>;
-export declare function use(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: UseInstructionAccounts & UseInstructionDataArgs): TransactionBuilder;
+export type UseInstructionArgs = UseInstructionDataArgs;
+export declare function use(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: UseInstructionAccounts & UseInstructionArgs): TransactionBuilder;

dist/src/generated/instructions/use.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -28,109 +29,102 @@ function getUseInstructionDataSerializer(context) {
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const authorityAccount = input.authority ?? context.identity;
-    const delegateRecordAccount = input.delegateRecord ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const tokenAccount = input.token ?? { ...programId, isWritable: false };
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const editionAccount = input.edition ?? { ...programId, isWritable: false };
-    const payerAccount = input.payer ?? context.payer;
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'delegateRecord', input.delegateRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'token', input.token ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'edition', input.edition ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
-    const splTokenProgramAccount = input.splTokenProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesProgramAccount = input.authorizationRulesProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesAccount = input.authorizationRules ?? {
-        ...programId,
-        isWritable: false,
-    };
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splTokenProgram', input.splTokenProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRulesProgram', input.authorizationRulesProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRules', input.authorizationRules ?? programId);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Delegate Record.
     keys.push({
-        pubkey: delegateRecordAccount,
+        pubkey: resolvedAccounts.delegateRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegateRecord, true),
     });
     // Token.
     keys.push({
-        pubkey: tokenAccount,
+        pubkey: resolvedAccounts.token,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.token, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Edition.
     keys.push({
-        pubkey: editionAccount,
+        pubkey: resolvedAccounts.edition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(editionAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.edition, true),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, false),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Spl Token Program.
     keys.push({
-        pubkey: splTokenProgramAccount,
+        pubkey: resolvedAccounts.splTokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splTokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splTokenProgram, false),
     });
     // Authorization Rules Program.
     keys.push({
-        pubkey: authorizationRulesProgramAccount,
+        pubkey: resolvedAccounts.authorizationRulesProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRulesProgram, false),
     });
     // Authorization Rules.
     keys.push({
-        pubkey: authorizationRulesAccount,
+        pubkey: resolvedAccounts.authorizationRules,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRules, false),
     });
     // Data.
-    const data = getUseInstructionDataSerializer(context).serialize(input);
+    const data = getUseInstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -137,0 +131,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/useV1.d.ts

@@ -45,2 +45,3 @@ /**
 export declare function getUseV1InstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<UseV1InstructionDataArgs, UseV1InstructionData>;
-export declare function useV1(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: UseV1InstructionAccounts & UseV1InstructionDataArgs): TransactionBuilder;
+export type UseV1InstructionArgs = UseV1InstructionDataArgs;
+export declare function useV1(context: Pick<Context, 'serializer' | 'programs' | 'eddsa' | 'identity' | 'payer'>, input: UseV1InstructionAccounts & UseV1InstructionArgs): TransactionBuilder;

dist/src/generated/instructions/useV1.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -36,109 +37,102 @@ function getUseV1InstructionDataSerializer(context) {
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const authorityAccount = input.authority ?? context.identity;
-    const delegateRecordAccount = input.delegateRecord ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const tokenAccount = input.token ?? { ...programId, isWritable: false };
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const editionAccount = input.edition ?? { ...programId, isWritable: false };
-    const payerAccount = input.payer ?? context.payer;
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'delegateRecord', input.delegateRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'token', input.token ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'edition', input.edition ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
-    const splTokenProgramAccount = input.splTokenProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesProgramAccount = input.authorizationRulesProgram ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const authorizationRulesAccount = input.authorizationRules ?? {
-        ...programId,
-        isWritable: false,
-    };
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'splTokenProgram', input.splTokenProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRulesProgram', input.authorizationRulesProgram ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authorizationRules', input.authorizationRules ?? programId);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Delegate Record.
     keys.push({
-        pubkey: delegateRecordAccount,
+        pubkey: resolvedAccounts.delegateRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateRecordAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegateRecord, true),
     });
     // Token.
     keys.push({
-        pubkey: tokenAccount,
+        pubkey: resolvedAccounts.token,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.token, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Edition.
     keys.push({
-        pubkey: editionAccount,
+        pubkey: resolvedAccounts.edition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(editionAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.edition, true),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, false),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Spl Token Program.
     keys.push({
-        pubkey: splTokenProgramAccount,
+        pubkey: resolvedAccounts.splTokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(splTokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.splTokenProgram, false),
     });
     // Authorization Rules Program.
     keys.push({
-        pubkey: authorizationRulesProgramAccount,
+        pubkey: resolvedAccounts.authorizationRulesProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRulesProgram, false),
     });
     // Authorization Rules.
     keys.push({
-        pubkey: authorizationRulesAccount,
+        pubkey: resolvedAccounts.authorizationRules,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorizationRulesAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authorizationRules, false),
     });
     // Data.
-    const data = getUseV1InstructionDataSerializer(context).serialize(input);
+    const data = getUseV1InstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -145,0 +139,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/utilize.d.ts

@@ -41,2 +41,3 @@ /**
 export declare function getUtilizeInstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<UtilizeInstructionDataArgs, UtilizeInstructionData>;
-export declare function utilize(context: Pick<Context, 'serializer' | 'programs' | 'eddsa'>, input: UtilizeInstructionAccounts & UtilizeInstructionDataArgs): TransactionBuilder;
+export type UtilizeInstructionArgs = UtilizeInstructionDataArgs;
+export declare function utilize(context: Pick<Context, 'serializer' | 'programs' | 'eddsa'>, input: UtilizeInstructionAccounts & UtilizeInstructionArgs): TransactionBuilder;

dist/src/generated/instructions/utilize.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 function getUtilizeInstructionDataSerializer(context) {
@@ -27,98 +28,98 @@ const s = context.serializer;
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const mintAccount = input.mint;
-    const metadataAccount = input.metadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(mintAccount) });
-    const tokenAccountAccount = input.tokenAccount;
-    const useAuthorityAccount = input.useAuthority;
-    const ownerAccount = input.owner;
-    const tokenProgramAccount = input.tokenProgram ?? {
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
+        isWritable: false,
+    };
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'metadata', input.metadata ?? (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.mint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'tokenProgram', input.tokenProgram ?? {
         ...context.programs.getPublicKey('splToken', 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
         isWritable: false,
-    };
-    const ataProgramAccount = input.ataProgram ?? {
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'ataProgram', input.ataProgram ?? {
         ...context.programs.getPublicKey('splAssociatedToken', 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL'),
         isWritable: false,
-    };
-    const systemProgramAccount = input.systemProgram ?? {
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const rentAccount = input.rent ?? (0, umi_1.publicKey)('SysvarRent111111111111111111111111111111111');
-    const useAuthorityRecordAccount = input.useAuthorityRecord;
-    const burnerAccount = input.burner;
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'rent', input.rent ?? (0, umi_1.publicKey)('SysvarRent111111111111111111111111111111111'));
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Token Account.
     keys.push({
-        pubkey: tokenAccountAccount,
+        pubkey: resolvedAccounts.tokenAccount,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenAccountAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenAccount, true),
     });
     // Mint.
     keys.push({
-        pubkey: mintAccount,
+        pubkey: resolvedAccounts.mint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(mintAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.mint, true),
     });
     // Use Authority.
-    signers.push(useAuthorityAccount);
+    signers.push(resolvedAccounts.useAuthority);
     keys.push({
-        pubkey: useAuthorityAccount.publicKey,
+        pubkey: resolvedAccounts.useAuthority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(useAuthorityAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.useAuthority, true),
     });
     // Owner.
     keys.push({
-        pubkey: ownerAccount,
+        pubkey: resolvedAccounts.owner,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(ownerAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.owner, false),
     });
     // Token Program.
     keys.push({
-        pubkey: tokenProgramAccount,
+        pubkey: resolvedAccounts.tokenProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(tokenProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.tokenProgram, false),
     });
     // Ata Program.
     keys.push({
-        pubkey: ataProgramAccount,
+        pubkey: resolvedAccounts.ataProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(ataProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.ataProgram, false),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Rent.
     keys.push({
-        pubkey: rentAccount,
+        pubkey: resolvedAccounts.rent,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(rentAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.rent, false),
     });
     // Use Authority Record (optional).
-    if (useAuthorityRecordAccount) {
+    if (resolvedAccounts.useAuthorityRecord) {
         keys.push({
-            pubkey: useAuthorityRecordAccount,
+            pubkey: resolvedAccounts.useAuthorityRecord,
             isSigner: false,
-            isWritable: (0, umi_1.checkForIsWritableOverride)(useAuthorityRecordAccount, true),
+            isWritable: (0, shared_1.isWritable)(resolvedAccounts.useAuthorityRecord, true),
         });
     }
     // Burner (optional).
-    if (burnerAccount) {
+    if (resolvedAccounts.burner) {
         keys.push({
-            pubkey: burnerAccount,
+            pubkey: resolvedAccounts.burner,
             isSigner: false,
-            isWritable: (0, umi_1.checkForIsWritableOverride)(burnerAccount, false),
+            isWritable: (0, shared_1.isWritable)(resolvedAccounts.burner, false),
         });
     }
     // Data.
-    const data = getUtilizeInstructionDataSerializer(context).serialize(input);
+    const data = getUtilizeInstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -125,0 +126,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/verify.d.ts

@@ -36,2 +36,3 @@ /**
 export declare function getVerifyInstructionDataSerializer(context: Pick<Context, 'serializer'>): Serializer<VerifyInstructionDataArgs, VerifyInstructionData>;
-export declare function verify(context: Pick<Context, 'serializer' | 'programs' | 'identity'>, input: VerifyInstructionAccounts & VerifyInstructionDataArgs): TransactionBuilder;
+export type VerifyInstructionArgs = VerifyInstructionDataArgs;
+export declare function verify(context: Pick<Context, 'serializer' | 'programs' | 'identity'>, input: VerifyInstructionAccounts & VerifyInstructionArgs): TransactionBuilder;

dist/src/generated/instructions/verify.js

@@ -12,2 +12,3 @@ "use strict";
 const umi_1 = require("@metaplex-foundation/umi");
+const shared_1 = require("../shared");
 const types_1 = require("../types");
@@ -27,79 +28,73 @@ function getVerifyInstructionDataSerializer(context) {
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const authorityAccount = input.authority ?? context.identity;
-    const delegateRecordAccount = input.delegateRecord ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const metadataAccount = input.metadata;
-    const collectionMintAccount = input.collectionMint ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const collectionMetadataAccount = input.collectionMetadata ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const collectionMasterEditionAccount = input.collectionMasterEdition ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    const resolvingArgs = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'delegateRecord', input.delegateRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'collectionMint', input.collectionMint ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'collectionMetadata', input.collectionMetadata ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'collectionMasterEdition', input.collectionMasterEdition ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
+    const resolvedArgs = { ...input, ...resolvingArgs };
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Delegate Record.
     keys.push({
-        pubkey: delegateRecordAccount,
+        pubkey: resolvedAccounts.delegateRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateRecordAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegateRecord, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Collection Mint.
     keys.push({
-        pubkey: collectionMintAccount,
+        pubkey: resolvedAccounts.collectionMint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionMintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionMint, false),
     });
     // Collection Metadata.
     keys.push({
-        pubkey: collectionMetadataAccount,
+        pubkey: resolvedAccounts.collectionMetadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionMetadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionMetadata, true),
     });
     // Collection Master Edition.
     keys.push({
-        pubkey: collectionMasterEditionAccount,
+        pubkey: resolvedAccounts.collectionMasterEdition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionMasterEditionAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionMasterEdition, false),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
     // Data.
-    const data = getVerifyInstructionDataSerializer(context).serialize(input);
+    const data = getVerifyInstructionDataSerializer(context).serialize(resolvedArgs);
     // Bytes Created On Chain.
@@ -106,0 +101,0 @@ const bytesCreatedOnChain = 0;

dist/src/generated/instructions/verifyCollection.js

@@ -12,2 +12,3 @@ "use strict";
 const umi_1 = require("@metaplex-foundation/umi");
+const shared_1 = require("../shared");
 function getVerifyCollectionInstructionDataSerializer(context) {
@@ -25,47 +26,47 @@ const s = context.serializer;
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const metadataAccount = input.metadata;
-    const collectionAuthorityAccount = input.collectionAuthority;
-    const payerAccount = input.payer ?? context.payer;
-    const collectionMintAccount = input.collectionMint;
-    const collectionAccount = input.collection;
-    const collectionMasterEditionAccountAccount = input.collectionMasterEditionAccount;
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
+        isWritable: false,
+    };
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Collection Authority.
-    signers.push(collectionAuthorityAccount);
+    signers.push(resolvedAccounts.collectionAuthority);
     keys.push({
-        pubkey: collectionAuthorityAccount.publicKey,
+        pubkey: resolvedAccounts.collectionAuthority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionAuthorityAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionAuthority, true),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // Collection Mint.
     keys.push({
-        pubkey: collectionMintAccount,
+        pubkey: resolvedAccounts.collectionMint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionMintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionMint, false),
     });
     // Collection.
     keys.push({
-        pubkey: collectionAccount,
+        pubkey: resolvedAccounts.collection,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collection, false),
     });
     // Collection Master Edition Account.
     keys.push({
-        pubkey: collectionMasterEditionAccountAccount,
+        pubkey: resolvedAccounts.collectionMasterEditionAccount,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionMasterEditionAccountAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionMasterEditionAccount, false),
     });
@@ -72,0 +73,0 @@ // Data.

dist/src/generated/instructions/verifyCollectionV1.js

@@ -13,2 +13,3 @@ "use strict";
 const accounts_1 = require("../accounts");
+const shared_1 = require("../shared");
 function getVerifyCollectionV1InstructionDataSerializer(context) {
@@ -31,69 +32,69 @@ const s = context.serializer;
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const authorityAccount = input.authority ?? context.identity;
-    const delegateRecordAccount = input.delegateRecord ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const metadataAccount = input.metadata;
-    const collectionMintAccount = input.collectionMint;
-    const collectionMetadataAccount = input.collectionMetadata ??
-        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(collectionMintAccount) });
-    const collectionMasterEditionAccount = input.collectionMasterEdition ??
-        (0, accounts_1.findMasterEditionPda)(context, { mint: (0, umi_1.publicKey)(collectionMintAccount) });
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'delegateRecord', input.delegateRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'collectionMetadata', input.collectionMetadata ??
+        (0, accounts_1.findMetadataPda)(context, { mint: (0, umi_1.publicKey)(input.collectionMint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'collectionMasterEdition', input.collectionMasterEdition ??
+        (0, accounts_1.findMasterEditionPda)(context, { mint: (0, umi_1.publicKey)(input.collectionMint) }));
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Delegate Record.
     keys.push({
-        pubkey: delegateRecordAccount,
+        pubkey: resolvedAccounts.delegateRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateRecordAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegateRecord, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Collection Mint.
     keys.push({
-        pubkey: collectionMintAccount,
+        pubkey: resolvedAccounts.collectionMint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionMintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionMint, false),
     });
     // Collection Metadata.
     keys.push({
-        pubkey: collectionMetadataAccount,
+        pubkey: resolvedAccounts.collectionMetadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionMetadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionMetadata, true),
     });
     // Collection Master Edition.
     keys.push({
-        pubkey: collectionMasterEditionAccount,
+        pubkey: resolvedAccounts.collectionMasterEdition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionMasterEditionAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionMasterEdition, false),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
@@ -100,0 +101,0 @@ // Data.

dist/src/generated/instructions/verifyCreatorV1.js

@@ -12,2 +12,3 @@ "use strict";
 const umi_1 = require("@metaplex-foundation/umi");
+const shared_1 = require("../shared");
 function getVerifyCreatorV1InstructionDataSerializer(context) {
@@ -30,76 +31,68 @@ const s = context.serializer;
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const authorityAccount = input.authority ?? context.identity;
-    const delegateRecordAccount = input.delegateRecord ?? {
-        ...programId,
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
         isWritable: false,
     };
-    const metadataAccount = input.metadata;
-    const collectionMintAccount = input.collectionMint ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const collectionMetadataAccount = input.collectionMetadata ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const collectionMasterEditionAccount = input.collectionMasterEdition ?? {
-        ...programId,
-        isWritable: false,
-    };
-    const systemProgramAccount = input.systemProgram ?? {
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'authority', input.authority ?? context.identity);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'delegateRecord', input.delegateRecord ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'collectionMint', input.collectionMint ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'collectionMetadata', input.collectionMetadata ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'collectionMasterEdition', input.collectionMasterEdition ?? programId);
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'systemProgram', input.systemProgram ?? {
         ...context.programs.getPublicKey('splSystem', '11111111111111111111111111111111'),
         isWritable: false,
-    };
-    const sysvarInstructionsAccount = input.sysvarInstructions ??
-        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111');
+    });
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'sysvarInstructions', input.sysvarInstructions ??
+        (0, umi_1.publicKey)('Sysvar1nstructions1111111111111111111111111'));
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
     // Authority.
-    signers.push(authorityAccount);
+    signers.push(resolvedAccounts.authority);
     keys.push({
-        pubkey: authorityAccount.publicKey,
+        pubkey: resolvedAccounts.authority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(authorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.authority, false),
     });
     // Delegate Record.
     keys.push({
-        pubkey: delegateRecordAccount,
+        pubkey: resolvedAccounts.delegateRecord,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(delegateRecordAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.delegateRecord, false),
     });
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Collection Mint.
     keys.push({
-        pubkey: collectionMintAccount,
+        pubkey: resolvedAccounts.collectionMint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionMintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionMint, false),
     });
     // Collection Metadata.
     keys.push({
-        pubkey: collectionMetadataAccount,
+        pubkey: resolvedAccounts.collectionMetadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionMetadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionMetadata, true),
     });
     // Collection Master Edition.
     keys.push({
-        pubkey: collectionMasterEditionAccount,
+        pubkey: resolvedAccounts.collectionMasterEdition,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionMasterEditionAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionMasterEdition, false),
     });
     // System Program.
     keys.push({
-        pubkey: systemProgramAccount,
+        pubkey: resolvedAccounts.systemProgram,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(systemProgramAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.systemProgram, false),
     });
     // Sysvar Instructions.
     keys.push({
-        pubkey: sysvarInstructionsAccount,
+        pubkey: resolvedAccounts.sysvarInstructions,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(sysvarInstructionsAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.sysvarInstructions, false),
     });
@@ -106,0 +99,0 @@ // Data.

dist/src/generated/instructions/verifySizedCollectionItem.js

@@ -12,2 +12,3 @@ "use strict";
 const umi_1 = require("@metaplex-foundation/umi");
+const shared_1 = require("../shared");
 function getVerifySizedCollectionItemInstructionDataSerializer(context) {
@@ -26,55 +27,54 @@ const s = context.serializer;
     // Program ID.
-    const programId = context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s');
-    // Resolved accounts.
-    const metadataAccount = input.metadata;
-    const collectionAuthorityAccount = input.collectionAuthority;
-    const payerAccount = input.payer ?? context.payer;
-    const collectionMintAccount = input.collectionMint;
-    const collectionAccount = input.collection;
-    const collectionMasterEditionAccountAccount = input.collectionMasterEditionAccount;
-    const collectionAuthorityRecordAccount = input.collectionAuthorityRecord;
+    const programId = {
+        ...context.programs.getPublicKey('mplTokenMetadata', 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s'),
+        isWritable: false,
+    };
+    // Resolved inputs.
+    const resolvingAccounts = {};
+    (0, shared_1.addObjectProperty)(resolvingAccounts, 'payer', input.payer ?? context.payer);
+    const resolvedAccounts = { ...input, ...resolvingAccounts };
     // Metadata.
     keys.push({
-        pubkey: metadataAccount,
+        pubkey: resolvedAccounts.metadata,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(metadataAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.metadata, true),
     });
     // Collection Authority.
-    signers.push(collectionAuthorityAccount);
+    signers.push(resolvedAccounts.collectionAuthority);
     keys.push({
-        pubkey: collectionAuthorityAccount.publicKey,
+        pubkey: resolvedAccounts.collectionAuthority.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionAuthorityAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionAuthority, false),
     });
     // Payer.
-    signers.push(payerAccount);
+    signers.push(resolvedAccounts.payer);
     keys.push({
-        pubkey: payerAccount.publicKey,
+        pubkey: resolvedAccounts.payer.publicKey,
         isSigner: true,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(payerAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.payer, true),
     });
     // Collection Mint.
     keys.push({
-        pubkey: collectionMintAccount,
+        pubkey: resolvedAccounts.collectionMint,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionMintAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionMint, false),
     });
     // Collection.
     keys.push({
-        pubkey: collectionAccount,
+        pubkey: resolvedAccounts.collection,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionAccount, true),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collection, true),
     });
     // Collection Master Edition Account.
     keys.push({
-        pubkey: collectionMasterEditionAccountAccount,
+        pubkey: resolvedAccounts.collectionMasterEditionAccount,
         isSigner: false,
-        isWritable: (0, umi_1.checkForIsWritableOverride)(collectionMasterEditionAccountAccount, false),
+        isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionMasterEditionAccount, false),
     });
     // Collection Authority Record (optional).
-    if (collectionAuthorityRecordAccount) {
+    if (resolvedAccounts.collectionAuthorityRecord) {
         keys.push({
-            pubkey: collectionAuthorityRecordAccount,
+            pubkey: resolvedAccounts.collectionAuthorityRecord,
             isSigner: false,
-            isWritable: (0, umi_1.checkForIsWritableOverride)(collectionAuthorityRecordAccount, false),
+            isWritable: (0, shared_1.isWritable)(resolvedAccounts.collectionAuthorityRecord, false),
         });
@@ -81,0 +81,0 @@ }

dist/src/generated/types/burnArgs.js

@@ -16,3 +16,3 @@ "use strict";
             'V1',
-            s.struct([['amount', s.u64()]], { description: 'V1' }),
+            s.struct([['amount', s.u64()]]),
         ],
@@ -19,0 +19,0 @@ ], { description: 'BurnArgs' });

dist/src/generated/types/collectionDetails.js

@@ -16,3 +16,5 @@ "use strict";
             'V1',
-            s.struct([['size', s.u64()]], { description: 'V1' }),
+            s.struct([
+                ['size', s.u64()],
+            ]),
         ],
@@ -19,0 +21,0 @@ ], { description: 'CollectionDetails' });

dist/src/generated/types/collectionDetailsToggle.js

@@ -19,3 +19,5 @@ "use strict";
             'Set',
-            s.struct([['fields', s.tuple([(0, _1.getCollectionDetailsSerializer)(context)])]], { description: 'Set' }),
+            s.struct([
+                ['fields', s.tuple([(0, _1.getCollectionDetailsSerializer)(context)])],
+            ]),
         ],
@@ -22,0 +24,0 @@ ], { description: 'CollectionDetailsToggle' });

dist/src/generated/types/collectionToggle.js

@@ -19,3 +19,5 @@ "use strict";
             'Set',
-            s.struct([['fields', s.tuple([(0, _1.getCollectionSerializer)(context)])]], { description: 'Set' }),
+            s.struct([
+                ['fields', s.tuple([(0, _1.getCollectionSerializer)(context)])],
+            ]),
         ],
@@ -22,0 +24,0 @@ ], { description: 'CollectionToggle' });

dist/src/generated/types/createArgs.js

@@ -36,3 +36,3 @@ "use strict";
                 ['printSupply', s.option((0, _1.getPrintSupplySerializer)(context))],
-            ], { description: 'V1' }), (value) => ({
+            ]), (value) => ({
                 ...value,
@@ -39,0 +39,0 @@ symbol: value.symbol ?? '',

dist/src/generated/types/delegateArgs.js

@@ -22,3 +22,3 @@ "use strict";
                 ],
-            ], { description: 'CollectionV1' }),
+            ]),
         ],
@@ -33,3 +33,3 @@ [
                 ],
-            ], { description: 'SaleV1' }),
+            ]),
         ],
@@ -44,3 +44,3 @@ [
                 ],
-            ], { description: 'TransferV1' }),
+            ]),
         ],
@@ -54,3 +54,3 @@ [
                 ],
-            ], { description: 'UpdateV1' }),
+            ]),
         ],
@@ -65,3 +65,3 @@ [
                 ],
-            ], { description: 'UtilityV1' }),
+            ]),
         ],
@@ -76,7 +76,9 @@ [
                 ],
-            ], { description: 'StakingV1' }),
+            ]),
         ],
         [
             'StandardV1',
-            s.struct([['amount', s.u64()]], { description: 'StandardV1' }),
+            s.struct([
+                ['amount', s.u64()],
+            ]),
         ],
@@ -92,3 +94,3 @@ [
                 ],
-            ], { description: 'LockedTransferV1' }),
+            ]),
         ],
@@ -102,3 +104,3 @@ [
                 ],
-            ], { description: 'ProgrammableConfigV1' }),
+            ]),
         ],
@@ -105,0 +107,0 @@ ], { description: 'DelegateArgs' });

dist/src/generated/types/escrowAuthority.js

@@ -17,3 +17,5 @@ "use strict";
             'Creator',
-            s.struct([['fields', s.tuple([s.publicKey()])]], { description: 'Creator' }),
+            s.struct([
+                ['fields', s.tuple([s.publicKey()])],
+            ]),
         ],
@@ -20,0 +22,0 @@ ], { description: 'EscrowAuthority' });

dist/src/generated/types/leafInfo.d.ts

@@ -11,5 +11,5 @@ /**
     leaf: Uint8Array;
-    proof: Array<Array<number>>;
+    proof: Array<Uint8Array>;
 };
 export type LeafInfoArgs = LeafInfo;
 export declare function getLeafInfoSerializer(context: Pick<Context, 'serializer'>): Serializer<LeafInfoArgs, LeafInfo>;

dist/src/generated/types/leafInfo.js

@@ -14,4 +14,4 @@ "use strict";
     return s.struct([
-        ['leaf', s.bytes()],
-        ['proof', s.array(s.array(s.u8(), { size: 32 }))],
+        ['leaf', s.bytes({ size: 32 })],
+        ['proof', s.array(s.bytes({ size: 32 }))],
     ], { description: 'LeafInfo' });
@@ -18,0 +18,0 @@ }

dist/src/generated/types/lockArgs.js

@@ -22,3 +22,3 @@ "use strict";
                 ],
-            ], { description: 'V1' }),
+            ]),
         ],
@@ -25,0 +25,0 @@ ], { description: 'LockArgs' });

dist/src/generated/types/migrateArgs.js

@@ -20,3 +20,3 @@ "use strict";
                 ['ruleSet', s.option(s.publicKey())],
-            ], { description: 'V1' }),
+            ]),
         ],
@@ -23,0 +23,0 @@ ], { description: 'MigrateArgs' });

dist/src/generated/types/mintArgs.js

@@ -24,3 +24,3 @@ "use strict";
                 ],
-            ], { description: 'V1' }), (value) => ({
+            ]), (value) => ({
                 ...value,
@@ -27,0 +27,0 @@ authorizationData: value.authorizationData ?? (0, umi_1.none)(),

dist/src/generated/types/payloadType.js

@@ -17,15 +17,23 @@ "use strict";
             'Pubkey',
-            s.struct([['fields', s.tuple([s.publicKey()])]], { description: 'Pubkey' }),
+            s.struct([
+                ['fields', s.tuple([s.publicKey()])],
+            ]),
         ],
         [
             'Seeds',
-            s.struct([['fields', s.tuple([(0, _1.getSeedsVecSerializer)(context)])]], { description: 'Seeds' }),
+            s.struct([
+                ['fields', s.tuple([(0, _1.getSeedsVecSerializer)(context)])],
+            ]),
         ],
         [
             'MerkleProof',
-            s.struct([['fields', s.tuple([(0, _1.getLeafInfoSerializer)(context)])]], { description: 'MerkleProof' }),
+            s.struct([
+                ['fields', s.tuple([(0, _1.getLeafInfoSerializer)(context)])],
+            ]),
         ],
         [
             'Number',
-            s.struct([['fields', s.tuple([s.u64()])]], { description: 'Number' }),
+            s.struct([
+                ['fields', s.tuple([s.u64()])],
+            ]),
         ],
@@ -32,0 +40,0 @@ ], { description: 'PayloadType' });

dist/src/generated/types/printSupply.js

@@ -17,3 +17,5 @@ "use strict";
             'Limited',
-            s.struct([['fields', s.tuple([s.u64()])]], { description: 'Limited' }),
+            s.struct([
+                ['fields', s.tuple([s.u64()])],
+            ]),
         ],
@@ -20,0 +22,0 @@ ['Unlimited', s.unit()],

dist/src/generated/types/programmableConfig.js

@@ -16,3 +16,5 @@ "use strict";
             'V1',
-            s.struct([['ruleSet', s.option(s.publicKey())]], { description: 'V1' }),
+            s.struct([
+                ['ruleSet', s.option(s.publicKey())],
+            ]),
         ],
@@ -19,0 +21,0 @@ ], { description: 'ProgrammableConfig' });

dist/src/generated/types/ruleSetToggle.js

@@ -18,3 +18,5 @@ "use strict";
             'Set',
-            s.struct([['fields', s.tuple([s.publicKey()])]], { description: 'Set' }),
+            s.struct([
+                ['fields', s.tuple([s.publicKey()])],
+            ]),
         ],
@@ -21,0 +23,0 @@ ], { description: 'RuleSetToggle' });

dist/src/generated/types/transferArgs.js

@@ -23,3 +23,3 @@ "use strict";
                 ],
-            ], { description: 'V1' }),
+            ]),
         ],
@@ -26,0 +26,0 @@ ], { description: 'TransferArgs' });

dist/src/generated/types/unlockArgs.js

@@ -22,3 +22,3 @@ "use strict";
                 ],
-            ], { description: 'V1' }),
+            ]),
         ],
@@ -25,0 +25,0 @@ ], { description: 'UnlockArgs' });

dist/src/generated/types/updateArgs.js

@@ -31,3 +31,3 @@ "use strict";
                         ],
-                    ], { description: 'Data' })),
+                    ])),
                 ],
@@ -47,3 +47,3 @@ ['primarySaleHappened', s.option(s.bool())],
                 ],
-            ], { description: 'V1' }), (value) => ({
+            ]), (value) => ({
                 ...value,
@@ -50,0 +50,0 @@ newUpdateAuthority: value.newUpdateAuthority ?? (0, umi_1.none)(),

dist/src/generated/types/useArgs.js

@@ -22,3 +22,3 @@ "use strict";
                 ],
-            ], { description: 'V1' }),
+            ]),
         ],
@@ -25,0 +25,0 @@ ], { description: 'UseArgs' });

dist/src/generated/types/usesToggle.js

@@ -19,3 +19,5 @@ "use strict";
             'Set',
-            s.struct([['fields', s.tuple([(0, _1.getUsesSerializer)(context)])]], { description: 'Set' }),
+            s.struct([
+                ['fields', s.tuple([(0, _1.getUsesSerializer)(context)])],
+            ]),
         ],
@@ -22,0 +24,0 @@ ], { description: 'UsesToggle' });

dist/src/hooked/index.d.ts

 export * from './metadataDelegateRoleSeed';
+export * from './resolvers';

dist/src/hooked/index.js

@@ -18,2 +18,3 @@ "use strict";
 __exportStar(require("./metadataDelegateRoleSeed"), exports);
+__exportStar(require("./resolvers"), exports);
 //# sourceMappingURL=index.js.map

dist/src/index.d.ts

 export * from './generated';
 export * from './hooked';
-export * from './instructions';
 export * from './createHelpers';
@@ -8,2 +7,3 @@ export * from './digitalAsset';
 export * from './errors';
+export * from './fetchJsonMetadata';
 export * from './plugin';

dist/src/index.js

@@ -19,3 +19,2 @@ "use strict";
 __exportStar(require("./hooked"), exports);
-__exportStar(require("./instructions"), exports);
 __exportStar(require("./createHelpers"), exports);
@@ -25,3 +24,4 @@ __exportStar(require("./digitalAsset"), exports);
 __exportStar(require("./errors"), exports);
+__exportStar(require("./fetchJsonMetadata"), exports);
 __exportStar(require("./plugin"), exports);
 //# sourceMappingURL=index.js.map

package.json

 {
   "name": "@metaplex-foundation/mpl-token-metadata",
-  "version": "3.0.0-alpha.16",
+  "version": "3.0.0-alpha.17",
   "description": "JavaScript client for Token Metadata",
@@ -5,0 +5,0 @@ "main": "dist/src/index.js",

No alert changes

Improved metrics

Total package byte prevSize

1435150

increased by5.05%

Worsened metrics

Lines of code

21691

decreased by-0.97%

No dependency changes