@solana/rpc-graphql 2.0.0-experimental.ef2569b → 2.0.0-experimental.f2a2e5b

package/dist/index.browser.js

@@ -1,9 +1,16 @@
 import { graphql, Kind } from 'graphql';
 import DataLoader from 'dataloader';
-import fastStableStringify from 'fast-stable-stringify';
+import stringify from 'json-stable-stringify';
 import { makeExecutableSchema } from '@graphql-tools/schema';
 
 // src/rpc.ts
+function replacer(_, value) {
+  if (typeof value === "bigint") {
+    return value.toString() + "n";
+  }
+  return value;
+}
+var cacheKeyFn = (obj) => stringify(obj, { replacer });
 
 // src/loaders/common/resolve-info.ts
 function onlyPresentFieldRequested(fieldName, info) {
@@ -91,7 +98,7 @@ function createAccountBatchLoadFn(rpc) {
   };
 }
 function createAccountLoader(rpc) {
-  const loader = new DataLoader(createAccountBatchLoadFn(rpc), { cacheKeyFn: fastStableStringify });
+  const loader = new DataLoader(createAccountBatchLoadFn(rpc), { cacheKeyFn });
   return {
     load: async (args, info) => {
       if (onlyPresentFieldRequested("address", info)) {
@@ -105,6 +112,11 @@ function createAccountLoader(rpc) {
 // src/loaders/transformers/transaction.ts
 function transformParsedInstruction(parsedInstruction) {
   if ("parsed" in parsedInstruction) {
+    if (typeof parsedInstruction.parsed === "string" && parsedInstruction.program === "spl-memo") {
+      const { parsed: memo, program: programName2, programId: programId2 } = parsedInstruction;
+      const instructionType2 = "memo";
+      return { instructionType: instructionType2, memo, programId: programId2, programName: programName2 };
+    }
     const {
       parsed: { info: data, type: instructionType },
       program: programName,
@@ -181,7 +193,11 @@ function normalizeArgs2({
   };
 }
 async function loadBlock(rpc, { slot, ...config }) {
-  const block = await rpc.getBlock(slot, config).send().catch((e) => {
+  const block = await rpc.getBlock(
+    slot,
+    // @ts-expect-error FIXME: https://github.com/solana-labs/solana-web3.js/issues/1984
+    config
+  ).send().catch((e) => {
     throw e;
   });
   return block === null ? { slot } : transformLoadedBlock({ block, encoding: config.encoding, transactionDetails: config.transactionDetails });
@@ -193,7 +209,7 @@ function createBlockBatchLoadFn(rpc) {
   };
 }
 function createBlockLoader(rpc) {
-  const loader = new DataLoader(createBlockBatchLoadFn(rpc), { cacheKeyFn: fastStableStringify });
+  const loader = new DataLoader(createBlockBatchLoadFn(rpc), { cacheKeyFn });
   return {
     load: async (args, info) => {
       if (onlyPresentFieldRequested("slot", info)) {
@@ -214,12 +230,7 @@ function normalizeArgs3({
   return { commitment, dataSlice, encoding, filters, minContextSlot, programAddress };
 }
 async function loadProgramAccounts(rpc, { programAddress, ...config }) {
-  const programAccounts = await rpc.getProgramAccounts(programAddress, config).send().then((res) => {
-    if ("value" in res) {
-      return res.value;
-    }
-    return res;
-  }).catch((e) => {
+  const programAccounts = await rpc.getProgramAccounts(programAddress, config).send().catch((e) => {
     throw e;
   });
   return programAccounts.map(
@@ -239,7 +250,7 @@ function createProgramAccountsBatchLoadFn(rpc) {
   };
 }
 function createProgramAccountsLoader(rpc) {
-  const loader = new DataLoader(createProgramAccountsBatchLoadFn(rpc), { cacheKeyFn: fastStableStringify });
+  const loader = new DataLoader(createProgramAccountsBatchLoadFn(rpc), { cacheKeyFn });
   return {
     load: async (args, info) => {
       if (onlyPresentFieldRequested("programAddress", info)) {
@@ -260,14 +271,23 @@ function normalizeArgs4({ commitment = "confirmed", encoding = "jsonParsed", sig
 }
 async function loadTransaction(rpc, { signature, ...config }) {
   const { encoding } = config;
-  const transaction = await rpc.getTransaction(signature, config).send().catch((e) => {
+  const transaction = await rpc.getTransaction(
+    signature,
+    // @ts-expect-error FIXME: https://github.com/solana-labs/solana-web3.js/issues/1984
+    config
+  ).send().catch((e) => {
     throw e;
   });
   if (transaction === null) {
     return null;
   }
   if (encoding !== "jsonParsed") {
-    const transactionJsonParsed = await rpc.getTransaction(signature, config).send().catch((e) => {
+    const jsonParsedConfig = { ...config, encoding: "jsonParsed" };
+    const transactionJsonParsed = await rpc.getTransaction(
+      signature,
+      // @ts-expect-error FIXME: https://github.com/solana-labs/solana-web3.js/issues/1984
+      jsonParsedConfig
+    ).send().catch((e) => {
       throw e;
     });
     if (transactionJsonParsed === null) {
@@ -284,7 +304,7 @@ function createTransactionBatchLoadFn(rpc) {
   };
 }
 function createTransactionLoader(rpc) {
-  const loader = new DataLoader(createTransactionBatchLoadFn(rpc), { cacheKeyFn: fastStableStringify });
+  const loader = new DataLoader(createTransactionBatchLoadFn(rpc), { cacheKeyFn });
   return {
     load: async (args, info) => {
       if (onlyPresentFieldRequested("signature", info)) {
@@ -317,7 +337,9 @@ var resolveAccount = (fieldName) => {
 var accountTypeDefs = (
   /* GraphQL */
   `
-    # Account interface
+    """
+    Account interface
+    """
     interface Account {
         address: Address
         executable: Boolean
@@ -327,7 +349,9 @@ var accountTypeDefs = (
         rentEpoch: BigInt
     }
 
-    # An account with base58 encoded data
+    """
+    An account with base58 encoded data
+    """
     type AccountBase58 implements Account {
         address: Address
         data: Base58EncodedBytes
@@ -338,7 +362,9 @@ var accountTypeDefs = (
         rentEpoch: BigInt
     }
 
-    # An account with base64 encoded data
+    """
+    An account with base64 encoded data
+    """
     type AccountBase64 implements Account {
         address: Address
         data: Base64EncodedBytes
@@ -349,7 +375,9 @@ var accountTypeDefs = (
         rentEpoch: BigInt
     }
 
-    # An account with base64+zstd encoded data
+    """
+    An account with base64+zstd encoded data
+    """
     type AccountBase64Zstd implements Account {
         address: Address
         data: Base64ZstdEncodedBytes
@@ -360,10 +388,12 @@ var accountTypeDefs = (
         rentEpoch: BigInt
     }
 
-    # A nonce account
     type NonceAccountFeeCalculator {
         lamportsPerSignature: String
     }
+    """
+    A nonce account
+    """
     type NonceAccount implements Account {
         address: Address
         executable: Boolean
@@ -376,7 +406,9 @@ var accountTypeDefs = (
         feeCalculator: NonceAccountFeeCalculator
     }
 
-    # A lookup table account
+    """
+    A lookup table account
+    """
     type LookupTableAccount implements Account {
         address: Address
         executable: Boolean
@@ -391,7 +423,9 @@ var accountTypeDefs = (
         lastExtendedSlotStartIndex: Int
     }
 
-    # A mint account
+    """
+    A mint account
+    """
     type MintAccount implements Account {
         address: Address
         executable: Boolean
@@ -406,7 +440,9 @@ var accountTypeDefs = (
         supply: String
     }
 
-    # A token account
+    """
+    A token account
+    """
     type TokenAccount implements Account {
         address: Address
         executable: Boolean
@@ -421,7 +457,6 @@ var accountTypeDefs = (
         tokenAmount: TokenAmount
     }
 
-    # A stake account
     type StakeAccountDataMetaAuthorized {
         staker: Account
         withdrawer: Account
@@ -447,6 +482,9 @@ var accountTypeDefs = (
         creditsObserved: BigInt
         delegation: StakeAccountDataStakeDelegation
     }
+    """
+    A stake account
+    """
     type StakeAccount implements Account {
         address: Address
         executable: Boolean
@@ -458,7 +496,6 @@ var accountTypeDefs = (
         stake: StakeAccountDataStake
     }
 
-    # A vote account
     type VoteAccountDataAuthorizedVoter {
         authorizedVoter: Account
         epoch: BigInt
@@ -476,6 +513,9 @@ var accountTypeDefs = (
         confirmationCount: Int
         slot: BigInt
     }
+    """
+    A vote account
+    """
     type VoteAccount implements Account {
         address: Address
         executable: Boolean
@@ -605,7 +645,9 @@ var blockTypeDefs = (
         version: String
     }
 
-    # Block interface
+    """
+    Block interface
+    """
     interface Block {
         blockhash: String
         blockHeight: BigInt
@@ -616,7 +658,9 @@ var blockTypeDefs = (
         transactionDetails: String
     }
 
-    # A block with account transaction details
+    """
+    A block with account transaction details
+    """
     type BlockWithAccounts implements Block {
         blockhash: String
         blockHeight: BigInt
@@ -628,7 +672,9 @@ var blockTypeDefs = (
         transactionDetails: String
     }
 
-    # A block with full transaction details
+    """
+    A block with full transaction details
+    """
     type BlockWithFull implements Block {
         blockhash: String
         blockHeight: BigInt
@@ -640,7 +686,9 @@ var blockTypeDefs = (
         transactionDetails: String
     }
 
-    # A block with none transaction details
+    """
+    A block with no transaction details
+    """
     type BlockWithNone implements Block {
         blockhash: String
         blockHeight: BigInt
@@ -651,7 +699,9 @@ var blockTypeDefs = (
         transactionDetails: String
     }
 
-    # A block with signature transaction details
+    """
+    A block with signature transaction details
+    """
     type BlockWithSignatures implements Block {
         blockhash: String
         blockHeight: BigInt
@@ -834,19 +884,25 @@ var commonResolvers = {
 var instructionTypeDefs = (
   /* GraphQL */
   `
-    # Transaction instruction interface
+    """
+    Transaction instruction interface
+    """
     interface TransactionInstruction {
         programId: Address
     }
 
-    # Generic transaction instruction
+    """
+    Generic transaction instruction
+    """
     type GenericInstruction implements TransactionInstruction {
         accounts: [Address]
         data: Base64EncodedBytes
         programId: Address
     }
 
-    # AddressLookupTable: CreateLookupTable
+    """
+    AddressLookupTable: CreateLookupTable instruction
+    """
     type CreateLookupTableInstruction implements TransactionInstruction {
         programId: Address
         bumpSeed: BigInt # FIXME:*
@@ -857,7 +913,9 @@ var instructionTypeDefs = (
         systemProgram: Account
     }
 
-    # AddressLookupTable: ExtendLookupTable
+    """
+    AddressLookupTable: ExtendLookupTable instruction
+    """
     type ExtendLookupTableInstruction implements TransactionInstruction {
         programId: Address
         lookupTableAccount: Account
@@ -867,21 +925,27 @@ var instructionTypeDefs = (
         systemProgram: Account
     }
 
-    # AddressLookupTable: FreezeLookupTable
+    """
+    AddressLookupTable: FreezeLookupTable instruction
+    """
     type FreezeLookupTableInstruction implements TransactionInstruction {
         programId: Address
         lookupTableAccount: Account
         lookupTableAuthority: Account
     }
 
-    # AddressLookupTable: DeactivateLookupTable
+    """
+    AddressLookupTable: DeactivateLookupTable instruction
+    """
     type DeactivateLookupTableInstruction implements TransactionInstruction {
         programId: Address
         lookupTableAccount: Account
         lookupTableAuthority: Account
     }
 
-    # AddressLookupTable: CloseLookupTable
+    """
+    AddressLookupTable: CloseLookupTable instruction
+    """
     type CloseLookupTableInstruction implements TransactionInstruction {
         programId: Address
         lookupTableAccount: Account
@@ -889,7 +953,9 @@ var instructionTypeDefs = (
         recipient: Account
     }
 
-    # BpfLoader: Write
+    """
+    BpfLoader: Write instruction
+    """
     type BpfLoaderWriteInstruction implements TransactionInstruction {
         programId: Address
         account: Account
@@ -897,19 +963,25 @@ var instructionTypeDefs = (
         offset: BigInt # FIXME:*
     }
 
-    # BpfLoader: Finalize
+    """
+    BpfLoader: Finalize instruction
+    """
     type BpfLoaderFinalizeInstruction implements TransactionInstruction {
         programId: Address
         account: Account
     }
 
-    # BpfUpgradeableLoader: InitializeBuffer
+    """
+    BpfUpgradeableLoader: InitializeBuffer instruction
+    """
     type BpfUpgradeableLoaderInitializeBufferInstruction implements TransactionInstruction {
         programId: Address
         account: Account
     }
 
-    # BpfUpgradeableLoader: Write
+    """
+    BpfUpgradeableLoader: Write instruction
+    """
     type BpfUpgradeableLoaderWriteInstruction implements TransactionInstruction {
         programId: Address
         account: Account
@@ -918,7 +990,9 @@ var instructionTypeDefs = (
         offset: BigInt # FIXME:*
     }
 
-    # BpfUpgradeableLoader: DeployWithMaxDataLen
+    """
+    BpfUpgradeableLoader: DeployWithMaxDataLen instruction
+    """
     type BpfUpgradeableLoaderDeployWithMaxDataLenInstruction implements TransactionInstruction {
         programId: Address
         authority: Account
@@ -931,7 +1005,9 @@ var instructionTypeDefs = (
         rentSysvar: Address
     }
 
-    # BpfUpgradeableLoader: Upgrade
+    """
+    BpfUpgradeableLoader: Upgrade instruction
+    """
     type BpfUpgradeableLoaderUpgradeInstruction implements TransactionInstruction {
         programId: Address
         authority: Account
@@ -943,8 +1019,9 @@ var instructionTypeDefs = (
         spillAccount: Account
     }
 
-    # BpfUpgradeableLoader: SetAuthority
-
+    """
+    BpfUpgradeableLoader: SetAuthority instruction
+    """
     type BpfUpgradeableLoaderSetAuthorityInstruction implements TransactionInstruction {
         programId: Address
         account: Account
@@ -952,7 +1029,9 @@ var instructionTypeDefs = (
         newAuthority: Account
     }
 
-    # BpfUpgradeableLoader: SetAuthorityChecked
+    """
+    BpfUpgradeableLoader: SetAuthorityChecked instruction
+    """
     type BpfUpgradeableLoaderSetAuthorityCheckedInstruction implements TransactionInstruction {
         programId: Address
         account: Account
@@ -960,7 +1039,9 @@ var instructionTypeDefs = (
         newAuthority: Account
     }
 
-    # BpfUpgradeableLoader: Close
+    """
+    BpfUpgradeableLoader: Close instruction
+    """
     type BpfUpgradeableLoaderCloseInstruction implements TransactionInstruction {
         programId: Address
         account: Account
@@ -969,7 +1050,9 @@ var instructionTypeDefs = (
         recipient: Account
     }
 
-    # BpfUpgradeableLoader: ExtendProgram
+    """
+    BpfUpgradeableLoader: ExtendProgram instruction
+    """
     type BpfUpgradeableLoaderExtendProgramInstruction implements TransactionInstruction {
         programId: Address
         additionalBytes: BigInt
@@ -979,7 +1062,9 @@ var instructionTypeDefs = (
         systemProgram: Account
     }
 
-    # SplAssociatedTokenAccount: Create
+    """
+    SplAssociatedTokenAccount: Create instruction
+    """
     type SplAssociatedTokenCreateInstruction implements TransactionInstruction {
         programId: Address
         account: Account
@@ -990,7 +1075,9 @@ var instructionTypeDefs = (
         wallet: Account
     }
 
-    # SplAssociatedTokenAccount: CreateIdempotent
+    """
+    SplAssociatedTokenAccount: CreateIdempotent instruction
+    """
     type SplAssociatedTokenCreateIdempotentInstruction implements TransactionInstruction {
         programId: Address
         account: Account
@@ -1001,7 +1088,9 @@ var instructionTypeDefs = (
         wallet: Account
     }
 
-    # SplAssociatedTokenAccount: RecoverNested
+    """
+    SplAssociatedTokenAccount: RecoverNested instruction
+    """
     type SplAssociatedTokenRecoverNestedInstruction implements TransactionInstruction {
         programId: Address
         destination: Account
@@ -1013,13 +1102,17 @@ var instructionTypeDefs = (
         wallet: Account
     }
 
-    # SplMemo
+    """
+    SplMemo instruction
+    """
     type SplMemoInstruction implements TransactionInstruction {
         programId: Address
-        data: String
+        memo: String
     }
 
-    # SplToken: InitializeMint
+    """
+    SplToken: InitializeMint instruction
+    """
     type SplTokenInitializeMintInstruction implements TransactionInstruction {
         programId: Address
         decimals: BigInt # FIXME:*
@@ -1029,7 +1122,9 @@ var instructionTypeDefs = (
         rentSysvar: Address
     }
 
-    # SplToken: InitializeMint2
+    """
+    SplToken: InitializeMint2 instruction
+    """
     type SplTokenInitializeMint2Instruction implements TransactionInstruction {
         programId: Address
         decimals: BigInt # FIXME:*
@@ -1038,7 +1133,9 @@ var instructionTypeDefs = (
         mintAuthority: Account
     }
 
-    # SplToken: InitializeAccount
+    """
+    SplToken: InitializeAccount instruction
+    """
     type SplTokenInitializeAccountInstruction implements TransactionInstruction {
         programId: Address
         account: Account
@@ -1047,7 +1144,9 @@ var instructionTypeDefs = (
         rentSysvar: Address
     }
 
-    # SplToken: InitializeAccount2
+    """
+    SplToken: InitializeAccount2 instruction
+    """
     type SplTokenInitializeAccount2Instruction implements TransactionInstruction {
         programId: Address
         account: Account
@@ -1056,7 +1155,9 @@ var instructionTypeDefs = (
         rentSysvar: Address
     }
 
-    # SplToken: InitializeAccount3
+    """
+    SplToken: InitializeAccount3 instruction
+    """
     type SplTokenInitializeAccount3Instruction implements TransactionInstruction {
         programId: Address
         account: Account
@@ -1064,7 +1165,9 @@ var instructionTypeDefs = (
         owner: Account
     }
 
-    # SplToken: InitializeMultisig
+    """
+    SplToken: InitializeMultisig instruction
+    """
     type SplTokenInitializeMultisigInstruction implements TransactionInstruction {
         programId: Address
         m: BigInt # FIXME:*
@@ -1073,7 +1176,9 @@ var instructionTypeDefs = (
         signers: [Address]
     }
 
-    # SplToken: InitializeMultisig2
+    """
+    SplToken: InitializeMultisig2 instruction
+    """
     type SplTokenInitializeMultisig2Instruction implements TransactionInstruction {
         programId: Address
         m: BigInt # FIXME:*
@@ -1081,7 +1186,9 @@ var instructionTypeDefs = (
         signers: [Address]
     }
 
-    # SplToken: Transfer
+    """
+    SplToken: Transfer instruction
+    """
     type SplTokenTransferInstruction implements TransactionInstruction {
         programId: Address
         amount: String
@@ -1091,7 +1198,9 @@ var instructionTypeDefs = (
         source: Account
     }
 
-    # SplToken: Approve
+    """
+    SplToken: Approve instruction
+    """
     type SplTokenApproveInstruction implements TransactionInstruction {
         programId: Address
         amount: String
@@ -1101,7 +1210,9 @@ var instructionTypeDefs = (
         source: Account
     }
 
-    # SplToken: Revoke
+    """
+    SplToken: Revoke instruction
+    """
     type SplTokenRevokeInstruction implements TransactionInstruction {
         programId: Address
         multisigOwner: Account
@@ -1109,7 +1220,9 @@ var instructionTypeDefs = (
         source: Account
     }
 
-    # SplToken: SetAuthority
+    """
+    SplToken: SetAuthority instruction
+    """
     type SplTokenSetAuthorityInstruction implements TransactionInstruction {
         programId: Address
         authority: Account
@@ -1118,7 +1231,9 @@ var instructionTypeDefs = (
         newAuthority: Account
     }
 
-    # SplToken: MintTo
+    """
+    SplToken: MintTo instruction
+    """
     type SplTokenMintToInstruction implements TransactionInstruction {
         programId: Address
         account: Account
@@ -1129,7 +1244,9 @@ var instructionTypeDefs = (
         multisigMintAuthority: Account
     }
 
-    # SplToken: Burn
+    """
+    SplToken: Burn instruction
+    """
     type SplTokenBurnInstruction implements TransactionInstruction {
         programId: Address
         account: Account
@@ -1139,7 +1256,9 @@ var instructionTypeDefs = (
         multisigAuthority: Account
     }
 
-    # SplToken: CloseAccount
+    """
+    SplToken: CloseAccount instruction
+    """
     type SplTokenCloseAccountInstruction implements TransactionInstruction {
         programId: Address
         account: Account
@@ -1148,7 +1267,9 @@ var instructionTypeDefs = (
         owner: Account
     }
 
-    # SplToken: FreezeAccount
+    """
+    SplToken: FreezeAccount instruction
+    """
     type SplTokenFreezeAccountInstruction implements TransactionInstruction {
         programId: Address
         account: Account
@@ -1157,7 +1278,9 @@ var instructionTypeDefs = (
         multisigFreezeAuthority: Account
     }
 
-    # SplToken: ThawAccount
+    """
+    SplToken: ThawAccount instruction
+    """
     type SplTokenThawAccountInstruction implements TransactionInstruction {
         programId: Address
         account: Account
@@ -1166,7 +1289,9 @@ var instructionTypeDefs = (
         multisigFreezeAuthority: Account
     }
 
-    # SplToken: TransferChecked
+    """
+    SplToken: TransferChecked instruction
+    """
     type SplTokenTransferCheckedInstruction implements TransactionInstruction {
         programId: Address
         amount: String
@@ -1179,7 +1304,9 @@ var instructionTypeDefs = (
         tokenAmount: String
     }
 
-    # SplToken: ApproveChecked
+    """
+    SplToken: ApproveChecked instruction
+    """
     type SplTokenApproveCheckedInstruction implements TransactionInstruction {
         programId: Address
         delegate: Account
@@ -1190,7 +1317,9 @@ var instructionTypeDefs = (
         tokenAmount: String
     }
 
-    # SplToken: MintToChecked
+    """
+    SplToken: MintToChecked instruction
+    """
     type SplTokenMintToCheckedInstruction implements TransactionInstruction {
         programId: Address
         account: Account
@@ -1201,7 +1330,9 @@ var instructionTypeDefs = (
         tokenAmount: String
     }
 
-    # SplToken: BurnChecked
+    """
+    SplToken: BurnChecked instruction
+    """
     type SplTokenBurnCheckedInstruction implements TransactionInstruction {
         programId: Address
         account: Account
@@ -1211,40 +1342,52 @@ var instructionTypeDefs = (
         tokenAmount: String
     }
 
-    # SplToken: SyncNative
+    """
+    SplToken: SyncNative instruction
+    """
     type SplTokenSyncNativeInstruction implements TransactionInstruction {
         programId: Address
         account: Account
     }
 
-    # SplToken: GetAccountDataSize
+    """
+    SplToken: GetAccountDataSize instruction
+    """
     type SplTokenGetAccountDataSizeInstruction implements TransactionInstruction {
         programId: Address
         extensionTypes: [String]
         mint: Account
     }
 
-    # SplToken: InitializeImmutableOwner
+    """
+    SplToken: InitializeImmutableOwner instruction
+    """
     type SplTokenInitializeImmutableOwnerInstruction implements TransactionInstruction {
         programId: Address
         account: Account
     }
 
-    # SplToken: AmountToUiAmount
+    """
+    SplToken: AmountToUiAmount instruction
+    """
     type SplTokenAmountToUiAmountInstruction implements TransactionInstruction {
         programId: Address
         amount: String
         mint: Account
     }
 
-    # SplToken: UiAmountToAmount
+    """
+    SplToken: UiAmountToAmount instruction
+    """
     type SplTokenUiAmountToAmountInstruction implements TransactionInstruction {
         programId: Address
         mint: Account
         uiAmount: String
     }
 
-    # SplToken: InitializeMintCloseAuthority
+    """
+    SplToken: InitializeMintCloseAuthority instruction
+    """
     type SplTokenInitializeMintCloseAuthorityInstruction implements TransactionInstruction {
         programId: Address
         mint: Account
@@ -1273,7 +1416,9 @@ var instructionTypeDefs = (
         unixTimestamp: BigInt
     }
 
-    # Stake: Initialize
+    """
+    Stake: Initialize instruction
+    """
     type StakeInitializeInstructionDataAuthorized {
         staker: Account
         withdrawer: Account
@@ -1286,7 +1431,9 @@ var instructionTypeDefs = (
         stakeAccount: Account
     }
 
-    # Stake: Authorize
+    """
+    Stake: Authorize instruction
+    """
     type StakeAuthorizeInstruction implements TransactionInstruction {
         programId: Address
         authority: Account
@@ -1297,7 +1444,9 @@ var instructionTypeDefs = (
         stakeAccount: Account
     }
 
-    # Stake: DelegateStake
+    """
+    Stake: DelegateStake instruction
+    """
     type StakeDelegateStakeInstruction implements TransactionInstruction {
         programId: Address
         clockSysvar: Address
@@ -1308,7 +1457,9 @@ var instructionTypeDefs = (
         voteAccount: Account
     }
 
-    # Stake: Split
+    """
+    Stake: Split instruction
+    """
     type StakeSplitInstruction implements TransactionInstruction {
         programId: Address
         lamports: BigInt
@@ -1317,7 +1468,9 @@ var instructionTypeDefs = (
         stakeAuthority: Account
     }
 
-    # Stake: Withdraw
+    """
+    Stake: Withdraw instruction
+    """
     type StakeWithdrawInstruction implements TransactionInstruction {
         programId: Address
         clockSysvar: Address
@@ -1327,7 +1480,9 @@ var instructionTypeDefs = (
         withdrawAuthority: Account
     }
 
-    # Stake: Deactivate
+    """
+    Stake: Deactivate instruction
+    """
     type StakeDeactivateInstruction implements TransactionInstruction {
         programId: Address
         clockSysvar: Address
@@ -1335,7 +1490,9 @@ var instructionTypeDefs = (
         stakeAuthority: Account
     }
 
-    # Stake: SetLockup
+    """
+    Stake: SetLockup instruction
+    """
     type StakeSetLockupInstruction implements TransactionInstruction {
         programId: Address
         custodian: Account
@@ -1343,7 +1500,9 @@ var instructionTypeDefs = (
         stakeAccount: Account
     }
 
-    # Stake: Merge
+    """
+    Stake: Merge instruction
+    """
     type StakeMergeInstruction implements TransactionInstruction {
         programId: Address
         clockSysvar: Address
@@ -1353,7 +1512,9 @@ var instructionTypeDefs = (
         stakeHistorySysvar: Address
     }
 
-    # Stake: AuthorizeWithSeed
+    """
+    Stake: AuthorizeWithSeed instruction
+    """
     type StakeAuthorizeWithSeedInstruction implements TransactionInstruction {
         programId: Address
         authorityBase: Account
@@ -1366,7 +1527,9 @@ var instructionTypeDefs = (
         stakeAccount: Account
     }
 
-    # Stake: InitializeChecked
+    """
+    Stake: InitializeChecked instruction
+    """
     type StakeInitializeCheckedInstructionDataAuthorized {
         staker: Account
         withdrawer: Account
@@ -1379,7 +1542,9 @@ var instructionTypeDefs = (
         stakeAccount: Account
     }
 
-    # Stake: AuthorizeChecked
+    """
+    Stake: AuthorizeChecked instruction
+    """
     type StakeAuthorizeCheckedInstruction implements TransactionInstruction {
         programId: Address
         authority: Account
@@ -1390,7 +1555,9 @@ var instructionTypeDefs = (
         stakeAccount: Account
     }
 
-    # Stake: AuthorizeCheckedWithSeed
+    """
+    Stake: AuthorizeCheckedWithSeed instruction
+    """
     type StakeAuthorizeCheckedWithSeedInstruction implements TransactionInstruction {
         programId: Address
         authorityBase: Account
@@ -1403,7 +1570,9 @@ var instructionTypeDefs = (
         stakeAccount: Account
     }
 
-    # Stake: SetLockupChecked
+    """
+    Stake: SetLockupChecked instruction
+    """
     type StakeSetLockupCheckedInstruction implements TransactionInstruction {
         programId: Address
         custodian: Account
@@ -1411,7 +1580,9 @@ var instructionTypeDefs = (
         stakeAccount: Account
     }
 
-    # Stake: DeactivateDelinquent
+    """
+    Stake: DeactivateDelinquent instruction
+    """
     type StakeDeactivateDelinquentInstruction implements TransactionInstruction {
         programId: Address
         referenceVoteAccount: Account
@@ -1419,7 +1590,9 @@ var instructionTypeDefs = (
         voteAccount: Account
     }
 
-    # Stake: Redelegate
+    """
+    Stake: Redelegate instruction
+    """
     type StakeRedelegateInstruction implements TransactionInstruction {
         programId: Address
         newStakeAccount: Account
@@ -1429,7 +1602,9 @@ var instructionTypeDefs = (
         voteAccount: Account
     }
 
-    # System: CreateAccount
+    """
+    System: CreateAccount instruction
+    """
     type CreateAccountInstruction implements TransactionInstruction {
         programId: Address
         lamports: BigInt
@@ -1439,14 +1614,18 @@ var instructionTypeDefs = (
         space: BigInt
     }
 
-    # System: Assign
+    """
+    System: Assign instruction
+    """
     type AssignInstruction implements TransactionInstruction {
         programId: Address
         account: Account
         owner: Account
     }
 
-    # System: Transfer
+    """
+    System: Transfer instruction
+    """
     type TransferInstruction implements TransactionInstruction {
         programId: Address
         destination: Account
@@ -1454,7 +1633,9 @@ var instructionTypeDefs = (
         source: Account
     }
 
-    # System: CreateAccountWithSeed
+    """
+    System: CreateAccountWithSeed instruction
+    """
     type CreateAccountWithSeedInstruction implements TransactionInstruction {
         programId: Address
         base: Account
@@ -1464,7 +1645,9 @@ var instructionTypeDefs = (
         space: BigInt
     }
 
-    # System: AdvanceNonceAccount
+    """
+    System: AdvanceNonceAccount instruction
+    """
     type AdvanceNonceAccountInstruction implements TransactionInstruction {
         programId: Address
         nonceAccount: Account
@@ -1472,7 +1655,9 @@ var instructionTypeDefs = (
         recentBlockhashesSysvar: Address
     }
 
-    # System: WithdrawNonceAccount
+    """
+    System: WithdrawNonceAccount instruction
+    """
     type WithdrawNonceAccountInstruction implements TransactionInstruction {
         programId: Address
         destination: Account
@@ -1483,7 +1668,9 @@ var instructionTypeDefs = (
         rentSysvar: Address
     }
 
-    # System: InitializeNonceAccount
+    """
+    System: InitializeNonceAccount instruction
+    """
     type InitializeNonceAccountInstruction implements TransactionInstruction {
         programId: Address
         nonceAccount: Account
@@ -1492,7 +1679,9 @@ var instructionTypeDefs = (
         rentSysvar: Address
     }
 
-    # System: AuthorizeNonceAccount
+    """
+    System: AuthorizeNonceAccount instruction
+    """
     type AuthorizeNonceAccountInstruction implements TransactionInstruction {
         programId: Address
         newAuthorized: Account
@@ -1500,21 +1689,27 @@ var instructionTypeDefs = (
         nonceAuthority: Account
     }
 
-    # System: UpgradeNonceAccount
+    """
+    System: UpgradeNonceAccount instruction
+    """
     type UpgradeNonceAccountInstruction implements TransactionInstruction {
         programId: Address
         nonceAccount: Account
         nonceAuthority: Account
     }
 
-    # System: Allocate
+    """
+    System: Allocate instruction
+    """
     type AllocateInstruction implements TransactionInstruction {
         programId: Address
         account: Account
         space: BigInt
     }
 
-    # System: AllocateWithSeed
+    """
+    System: AllocateWithSeed instruction
+    """
     type AllocateWithSeedInstruction implements TransactionInstruction {
         programId: Address
         account: Account
@@ -1524,7 +1719,9 @@ var instructionTypeDefs = (
         space: BigInt
     }
 
-    # System: AssignWithSeed
+    """
+    System: AssignWithSeed instruction
+    """
     type AssignWithSeedInstruction implements TransactionInstruction {
         programId: Address
         account: Account
@@ -1533,7 +1730,9 @@ var instructionTypeDefs = (
         seed: String
     }
 
-    # System: TransferWithSeed
+    """
+    System: TransferWithSeed instruction
+    """
     type TransferWithSeedInstruction implements TransactionInstruction {
         programId: Address
         destination: Account
@@ -1544,7 +1743,9 @@ var instructionTypeDefs = (
         sourceSeed: String
     }
 
-    # Vote: InitializeAccount
+    """
+    Vote: InitializeAccount instruction
+    """
     type VoteInitializeAccountInstruction implements TransactionInstruction {
         programId: Address
         authorizedVoter: Account
@@ -1556,7 +1757,9 @@ var instructionTypeDefs = (
         voteAccount: Account
     }
 
-    # Vote: Authorize
+    """
+    Vote: Authorize instruction
+    """
     type VoteAuthorizeInstruction implements TransactionInstruction {
         programId: Address
         authority: Account
@@ -1566,7 +1769,9 @@ var instructionTypeDefs = (
         voteAccount: Account
     }
 
-    # Vote: AuthorizeWithSeed
+    """
+    Vote: AuthorizeWithSeed instruction
+    """
     type VoteAuthorizeWithSeedInstruction implements TransactionInstruction {
         programId: Address
         authorityBaseKey: String
@@ -1578,7 +1783,9 @@ var instructionTypeDefs = (
         voteAccount: Account
     }
 
-    # Vote: AuthorizeCheckedWithSeed
+    """
+    Vote: AuthorizeCheckedWithSeed instruction
+    """
     type VoteAuthorizeCheckedWithSeedInstruction implements TransactionInstruction {
         programId: Address
         authorityBaseKey: String
@@ -1596,7 +1803,9 @@ var instructionTypeDefs = (
         timestamp: BigInt
     }
 
-    # Vote: Vote
+    """
+    Vote: Vote instruction
+    """
     type VoteVoteInstruction implements TransactionInstruction {
         programId: Address
         clockSysvar: Address
@@ -1617,7 +1826,9 @@ var instructionTypeDefs = (
         timestamp: BigInt
     }
 
-    # Vote: UpdateVoteState
+    """
+    Vote: UpdateVoteState instruction
+    """
     type VoteUpdateVoteStateInstruction implements TransactionInstruction {
         programId: Address
         hash: String
@@ -1626,7 +1837,9 @@ var instructionTypeDefs = (
         voteStateUpdate: VoteStateUpdate
     }
 
-    # Vote: UpdateVoteStateSwitch
+    """
+    Vote: UpdateVoteStateSwitch instruction
+    """
     type VoteUpdateVoteStateSwitchInstruction implements TransactionInstruction {
         programId: Address
         hash: String
@@ -1635,7 +1848,9 @@ var instructionTypeDefs = (
         voteStateUpdate: VoteStateUpdate
     }
 
-    # Vote: CompactUpdateVoteState
+    """
+    Vote: CompactUpdateVoteState instruction
+    """
     type VoteCompactUpdateVoteStateInstruction implements TransactionInstruction {
         programId: Address
         hash: String
@@ -1644,7 +1859,9 @@ var instructionTypeDefs = (
         voteStateUpdate: VoteStateUpdate
     }
 
-    # Vote: CompactUpdateVoteStateSwitch
+    """
+    Vote: CompactUpdateVoteStateSwitch instruction
+    """
     type VoteCompactUpdateVoteStateSwitchInstruction implements TransactionInstruction {
         programId: Address
         hash: String
@@ -1653,7 +1870,9 @@ var instructionTypeDefs = (
         voteStateUpdate: VoteStateUpdate
     }
 
-    # Vote: Withdraw
+    """
+    Vote: Withdraw instruction
+    """
     type VoteWithdrawInstruction implements TransactionInstruction {
         programId: Address
         destination: Account
@@ -1662,7 +1881,9 @@ var instructionTypeDefs = (
         withdrawAuthority: Account
     }
 
-    # Vote: UpdateValidatorIdentity
+    """
+    Vote: UpdateValidatorIdentity instruction
+    """
     type VoteUpdateValidatorIdentityInstruction implements TransactionInstruction {
         programId: Address
         newValidatorIdentity: Account
@@ -1670,7 +1891,9 @@ var instructionTypeDefs = (
         withdrawAuthority: Account
     }
 
-    # Vote: UpdateCommission
+    """
+    Vote: UpdateCommission instruction
+    """
     type VoteUpdateCommissionInstruction implements TransactionInstruction {
         programId: Address
         commission: BigInt # FIXME:*
@@ -1678,7 +1901,9 @@ var instructionTypeDefs = (
         withdrawAuthority: Account
     }
 
-    # Vote: VoteSwitch
+    """
+    Vote: VoteSwitch instruction
+    """
     type VoteVoteSwitchInstruction implements TransactionInstruction {
         programId: Address
         clockSysvar: Address
@@ -1689,7 +1914,9 @@ var instructionTypeDefs = (
         voteAuthority: Account
     }
 
-    # Vote: AuthorizeChecked
+    """
+    Vote: AuthorizeChecked instruction
+    """
     type VoteAuthorizeCheckedInstruction implements TransactionInstruction {
         programId: Address
         authority: Account
@@ -2481,7 +2708,9 @@ var transactionTypeDefs = (
         recentBlockhash: String
     }
 
-    # Transaction interface
+    """
+    Transaction interface
+    """
     interface Transaction {
         blockTime: String
         meta: TransactionMeta
@@ -2489,7 +2718,9 @@ var transactionTypeDefs = (
         version: String
     }
 
-    # A transaction with base58 encoded data
+    """
+    A transaction with base58 encoded data
+    """
     type TransactionBase58 implements Transaction {
         blockTime: String
         data: Base58EncodedBytes
@@ -2498,7 +2729,9 @@ var transactionTypeDefs = (
         version: String
     }
 
-    # A transaction with base64 encoded data
+    """
+    A transaction with base64 encoded data
+    """
     type TransactionBase64 implements Transaction {
         blockTime: String
         data: Base64EncodedBytes
@@ -2507,7 +2740,9 @@ var transactionTypeDefs = (
         version: String
     }
 
-    # A transaction with JSON encoded data
+    """
+    A transaction with JSON encoded data
+    """
     type TransactionDataParsed {
         message: TransactionMessage
         signatures: [String]