@solana/rpc-graphql 2.0.0-experimental.0835c79 → 2.0.0-experimental.098806e

package/dist/index.browser.js

@@ -112,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,
@@ -266,28 +271,22 @@ function normalizeArgs4({ commitment = "confirmed", encoding = "jsonParsed", sig
 }
 async function loadTransaction(rpc, { signature, ...config }) {
   const { encoding } = config;
-  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 jsonParsedConfig = { ...config, encoding: "jsonParsed" };
-    const transactionJsonParsed = await rpc.getTransaction(
+  const [transaction, transactionJsonParsed] = await Promise.all([
+    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) {
-      return null;
-    }
+      config
+    ).send(),
+    (async () => {
+      if (encoding !== "jsonParsed") {
+        return await rpc.getTransaction(signature, { ...config, encoding: "jsonParsed" }).send();
+      }
+    })()
+  ]);
+  if (!transaction) {
+    return null;
+  }
+  if (transactionJsonParsed) {
     transaction.meta = transactionJsonParsed.meta;
   }
   return transformLoadedTransaction({ encoding, transaction });
@@ -332,7 +331,9 @@ var resolveAccount = (fieldName) => {
 var accountTypeDefs = (
   /* GraphQL */
   `
-    # Account interface
+    """
+    Account interface
+    """
     interface Account {
         address: Address
         executable: Boolean
@@ -342,7 +343,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
@@ -353,7 +356,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
@@ -364,7 +369,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
@@ -375,10 +382,12 @@ var accountTypeDefs = (
         rentEpoch: BigInt
     }
 
-    # A nonce account
     type NonceAccountFeeCalculator {
         lamportsPerSignature: String
     }
+    """
+    A nonce account
+    """
     type NonceAccount implements Account {
         address: Address
         executable: Boolean
@@ -391,7 +400,9 @@ var accountTypeDefs = (
         feeCalculator: NonceAccountFeeCalculator
     }
 
-    # A lookup table account
+    """
+    A lookup table account
+    """
     type LookupTableAccount implements Account {
         address: Address
         executable: Boolean
@@ -406,7 +417,9 @@ var accountTypeDefs = (
         lastExtendedSlotStartIndex: Int
     }
 
-    # A mint account
+    """
+    A mint account
+    """
     type MintAccount implements Account {
         address: Address
         executable: Boolean
@@ -421,7 +434,9 @@ var accountTypeDefs = (
         supply: String
     }
 
-    # A token account
+    """
+    A token account
+    """
     type TokenAccount implements Account {
         address: Address
         executable: Boolean
@@ -436,7 +451,6 @@ var accountTypeDefs = (
         tokenAmount: TokenAmount
     }
 
-    # A stake account
     type StakeAccountDataMetaAuthorized {
         staker: Account
         withdrawer: Account
@@ -462,6 +476,9 @@ var accountTypeDefs = (
         creditsObserved: BigInt
         delegation: StakeAccountDataStakeDelegation
     }
+    """
+    A stake account
+    """
     type StakeAccount implements Account {
         address: Address
         executable: Boolean
@@ -473,7 +490,6 @@ var accountTypeDefs = (
         stake: StakeAccountDataStake
     }
 
-    # A vote account
     type VoteAccountDataAuthorizedVoter {
         authorizedVoter: Account
         epoch: BigInt
@@ -491,6 +507,9 @@ var accountTypeDefs = (
         confirmationCount: Int
         slot: BigInt
     }
+    """
+    A vote account
+    """
     type VoteAccount implements Account {
         address: Address
         executable: Boolean
@@ -620,22 +639,26 @@ var blockTypeDefs = (
         version: String
     }
 
-    # Block interface
+    """
+    Block interface
+    """
     interface Block {
         blockhash: String
         blockHeight: BigInt
-        blockTime: Int
+        blockTime: BigInt
         parentSlot: BigInt
         previousBlockhash: String
         rewards: [Reward]
         transactionDetails: String
     }
 
-    # A block with account transaction details
+    """
+    A block with account transaction details
+    """
     type BlockWithAccounts implements Block {
         blockhash: String
         blockHeight: BigInt
-        blockTime: Int
+        blockTime: BigInt
         parentSlot: BigInt
         previousBlockhash: String
         rewards: [Reward]
@@ -643,11 +666,13 @@ var blockTypeDefs = (
         transactionDetails: String
     }
 
-    # A block with full transaction details
+    """
+    A block with full transaction details
+    """
     type BlockWithFull implements Block {
         blockhash: String
         blockHeight: BigInt
-        blockTime: Int
+        blockTime: BigInt
         parentSlot: BigInt
         previousBlockhash: String
         rewards: [Reward]
@@ -655,22 +680,26 @@ var blockTypeDefs = (
         transactionDetails: String
     }
 
-    # A block with none transaction details
+    """
+    A block with no transaction details
+    """
     type BlockWithNone implements Block {
         blockhash: String
         blockHeight: BigInt
-        blockTime: Int
+        blockTime: BigInt
         parentSlot: BigInt
         previousBlockhash: String
         rewards: [Reward]
         transactionDetails: String
     }
 
-    # A block with signature transaction details
+    """
+    A block with signature transaction details
+    """
     type BlockWithSignatures implements Block {
         blockhash: String
         blockHeight: BigInt
-        blockTime: Int
+        blockTime: BigInt
         parentSlot: BigInt
         previousBlockhash: String
         rewards: [Reward]
@@ -849,19 +878,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:*
@@ -872,7 +907,9 @@ var instructionTypeDefs = (
         systemProgram: Account
     }
 
-    # AddressLookupTable: ExtendLookupTable
+    """
+    AddressLookupTable: ExtendLookupTable instruction
+    """
     type ExtendLookupTableInstruction implements TransactionInstruction {
         programId: Address
         lookupTableAccount: Account
@@ -882,21 +919,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
@@ -904,7 +947,9 @@ var instructionTypeDefs = (
         recipient: Account
     }
 
-    # BpfLoader: Write
+    """
+    BpfLoader: Write instruction
+    """
     type BpfLoaderWriteInstruction implements TransactionInstruction {
         programId: Address
         account: Account
@@ -912,19 +957,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
@@ -933,7 +984,9 @@ var instructionTypeDefs = (
         offset: BigInt # FIXME:*
     }
 
-    # BpfUpgradeableLoader: DeployWithMaxDataLen
+    """
+    BpfUpgradeableLoader: DeployWithMaxDataLen instruction
+    """
     type BpfUpgradeableLoaderDeployWithMaxDataLenInstruction implements TransactionInstruction {
         programId: Address
         authority: Account
@@ -946,7 +999,9 @@ var instructionTypeDefs = (
         rentSysvar: Address
     }
 
-    # BpfUpgradeableLoader: Upgrade
+    """
+    BpfUpgradeableLoader: Upgrade instruction
+    """
     type BpfUpgradeableLoaderUpgradeInstruction implements TransactionInstruction {
         programId: Address
         authority: Account
@@ -958,8 +1013,9 @@ var instructionTypeDefs = (
         spillAccount: Account
     }
 
-    # BpfUpgradeableLoader: SetAuthority
-
+    """
+    BpfUpgradeableLoader: SetAuthority instruction
+    """
     type BpfUpgradeableLoaderSetAuthorityInstruction implements TransactionInstruction {
         programId: Address
         account: Account
@@ -967,7 +1023,9 @@ var instructionTypeDefs = (
         newAuthority: Account
     }
 
-    # BpfUpgradeableLoader: SetAuthorityChecked
+    """
+    BpfUpgradeableLoader: SetAuthorityChecked instruction
+    """
     type BpfUpgradeableLoaderSetAuthorityCheckedInstruction implements TransactionInstruction {
         programId: Address
         account: Account
@@ -975,7 +1033,9 @@ var instructionTypeDefs = (
         newAuthority: Account
     }
 
-    # BpfUpgradeableLoader: Close
+    """
+    BpfUpgradeableLoader: Close instruction
+    """
     type BpfUpgradeableLoaderCloseInstruction implements TransactionInstruction {
         programId: Address
         account: Account
@@ -984,7 +1044,9 @@ var instructionTypeDefs = (
         recipient: Account
     }
 
-    # BpfUpgradeableLoader: ExtendProgram
+    """
+    BpfUpgradeableLoader: ExtendProgram instruction
+    """
     type BpfUpgradeableLoaderExtendProgramInstruction implements TransactionInstruction {
         programId: Address
         additionalBytes: BigInt
@@ -994,7 +1056,9 @@ var instructionTypeDefs = (
         systemProgram: Account
     }
 
-    # SplAssociatedTokenAccount: Create
+    """
+    SplAssociatedTokenAccount: Create instruction
+    """
     type SplAssociatedTokenCreateInstruction implements TransactionInstruction {
         programId: Address
         account: Account
@@ -1005,7 +1069,9 @@ var instructionTypeDefs = (
         wallet: Account
     }
 
-    # SplAssociatedTokenAccount: CreateIdempotent
+    """
+    SplAssociatedTokenAccount: CreateIdempotent instruction
+    """
     type SplAssociatedTokenCreateIdempotentInstruction implements TransactionInstruction {
         programId: Address
         account: Account
@@ -1016,7 +1082,9 @@ var instructionTypeDefs = (
         wallet: Account
     }
 
-    # SplAssociatedTokenAccount: RecoverNested
+    """
+    SplAssociatedTokenAccount: RecoverNested instruction
+    """
     type SplAssociatedTokenRecoverNestedInstruction implements TransactionInstruction {
         programId: Address
         destination: Account
@@ -1028,13 +1096,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:*
@@ -1044,7 +1116,9 @@ var instructionTypeDefs = (
         rentSysvar: Address
     }
 
-    # SplToken: InitializeMint2
+    """
+    SplToken: InitializeMint2 instruction
+    """
     type SplTokenInitializeMint2Instruction implements TransactionInstruction {
         programId: Address
         decimals: BigInt # FIXME:*
@@ -1053,7 +1127,9 @@ var instructionTypeDefs = (
         mintAuthority: Account
     }
 
-    # SplToken: InitializeAccount
+    """
+    SplToken: InitializeAccount instruction
+    """
     type SplTokenInitializeAccountInstruction implements TransactionInstruction {
         programId: Address
         account: Account
@@ -1062,7 +1138,9 @@ var instructionTypeDefs = (
         rentSysvar: Address
     }
 
-    # SplToken: InitializeAccount2
+    """
+    SplToken: InitializeAccount2 instruction
+    """
     type SplTokenInitializeAccount2Instruction implements TransactionInstruction {
         programId: Address
         account: Account
@@ -1071,7 +1149,9 @@ var instructionTypeDefs = (
         rentSysvar: Address
     }
 
-    # SplToken: InitializeAccount3
+    """
+    SplToken: InitializeAccount3 instruction
+    """
     type SplTokenInitializeAccount3Instruction implements TransactionInstruction {
         programId: Address
         account: Account
@@ -1079,7 +1159,9 @@ var instructionTypeDefs = (
         owner: Account
     }
 
-    # SplToken: InitializeMultisig
+    """
+    SplToken: InitializeMultisig instruction
+    """
     type SplTokenInitializeMultisigInstruction implements TransactionInstruction {
         programId: Address
         m: BigInt # FIXME:*
@@ -1088,7 +1170,9 @@ var instructionTypeDefs = (
         signers: [Address]
     }
 
-    # SplToken: InitializeMultisig2
+    """
+    SplToken: InitializeMultisig2 instruction
+    """
     type SplTokenInitializeMultisig2Instruction implements TransactionInstruction {
         programId: Address
         m: BigInt # FIXME:*
@@ -1096,7 +1180,9 @@ var instructionTypeDefs = (
         signers: [Address]
     }
 
-    # SplToken: Transfer
+    """
+    SplToken: Transfer instruction
+    """
     type SplTokenTransferInstruction implements TransactionInstruction {
         programId: Address
         amount: String
@@ -1106,7 +1192,9 @@ var instructionTypeDefs = (
         source: Account
     }
 
-    # SplToken: Approve
+    """
+    SplToken: Approve instruction
+    """
     type SplTokenApproveInstruction implements TransactionInstruction {
         programId: Address
         amount: String
@@ -1116,7 +1204,9 @@ var instructionTypeDefs = (
         source: Account
     }
 
-    # SplToken: Revoke
+    """
+    SplToken: Revoke instruction
+    """
     type SplTokenRevokeInstruction implements TransactionInstruction {
         programId: Address
         multisigOwner: Account
@@ -1124,7 +1214,9 @@ var instructionTypeDefs = (
         source: Account
     }
 
-    # SplToken: SetAuthority
+    """
+    SplToken: SetAuthority instruction
+    """
     type SplTokenSetAuthorityInstruction implements TransactionInstruction {
         programId: Address
         authority: Account
@@ -1133,7 +1225,9 @@ var instructionTypeDefs = (
         newAuthority: Account
     }
 
-    # SplToken: MintTo
+    """
+    SplToken: MintTo instruction
+    """
     type SplTokenMintToInstruction implements TransactionInstruction {
         programId: Address
         account: Account
@@ -1144,7 +1238,9 @@ var instructionTypeDefs = (
         multisigMintAuthority: Account
     }
 
-    # SplToken: Burn
+    """
+    SplToken: Burn instruction
+    """
     type SplTokenBurnInstruction implements TransactionInstruction {
         programId: Address
         account: Account
@@ -1154,7 +1250,9 @@ var instructionTypeDefs = (
         multisigAuthority: Account
     }
 
-    # SplToken: CloseAccount
+    """
+    SplToken: CloseAccount instruction
+    """
     type SplTokenCloseAccountInstruction implements TransactionInstruction {
         programId: Address
         account: Account
@@ -1163,7 +1261,9 @@ var instructionTypeDefs = (
         owner: Account
     }
 
-    # SplToken: FreezeAccount
+    """
+    SplToken: FreezeAccount instruction
+    """
     type SplTokenFreezeAccountInstruction implements TransactionInstruction {
         programId: Address
         account: Account
@@ -1172,7 +1272,9 @@ var instructionTypeDefs = (
         multisigFreezeAuthority: Account
     }
 
-    # SplToken: ThawAccount
+    """
+    SplToken: ThawAccount instruction
+    """
     type SplTokenThawAccountInstruction implements TransactionInstruction {
         programId: Address
         account: Account
@@ -1181,7 +1283,9 @@ var instructionTypeDefs = (
         multisigFreezeAuthority: Account
     }
 
-    # SplToken: TransferChecked
+    """
+    SplToken: TransferChecked instruction
+    """
     type SplTokenTransferCheckedInstruction implements TransactionInstruction {
         programId: Address
         amount: String
@@ -1194,7 +1298,9 @@ var instructionTypeDefs = (
         tokenAmount: String
     }
 
-    # SplToken: ApproveChecked
+    """
+    SplToken: ApproveChecked instruction
+    """
     type SplTokenApproveCheckedInstruction implements TransactionInstruction {
         programId: Address
         delegate: Account
@@ -1205,7 +1311,9 @@ var instructionTypeDefs = (
         tokenAmount: String
     }
 
-    # SplToken: MintToChecked
+    """
+    SplToken: MintToChecked instruction
+    """
     type SplTokenMintToCheckedInstruction implements TransactionInstruction {
         programId: Address
         account: Account
@@ -1216,7 +1324,9 @@ var instructionTypeDefs = (
         tokenAmount: String
     }
 
-    # SplToken: BurnChecked
+    """
+    SplToken: BurnChecked instruction
+    """
     type SplTokenBurnCheckedInstruction implements TransactionInstruction {
         programId: Address
         account: Account
@@ -1226,40 +1336,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
@@ -1288,7 +1410,9 @@ var instructionTypeDefs = (
         unixTimestamp: BigInt
     }
 
-    # Stake: Initialize
+    """
+    Stake: Initialize instruction
+    """
     type StakeInitializeInstructionDataAuthorized {
         staker: Account
         withdrawer: Account
@@ -1301,7 +1425,9 @@ var instructionTypeDefs = (
         stakeAccount: Account
     }
 
-    # Stake: Authorize
+    """
+    Stake: Authorize instruction
+    """
     type StakeAuthorizeInstruction implements TransactionInstruction {
         programId: Address
         authority: Account
@@ -1312,7 +1438,9 @@ var instructionTypeDefs = (
         stakeAccount: Account
     }
 
-    # Stake: DelegateStake
+    """
+    Stake: DelegateStake instruction
+    """
     type StakeDelegateStakeInstruction implements TransactionInstruction {
         programId: Address
         clockSysvar: Address
@@ -1323,7 +1451,9 @@ var instructionTypeDefs = (
         voteAccount: Account
     }
 
-    # Stake: Split
+    """
+    Stake: Split instruction
+    """
     type StakeSplitInstruction implements TransactionInstruction {
         programId: Address
         lamports: BigInt
@@ -1332,7 +1462,9 @@ var instructionTypeDefs = (
         stakeAuthority: Account
     }
 
-    # Stake: Withdraw
+    """
+    Stake: Withdraw instruction
+    """
     type StakeWithdrawInstruction implements TransactionInstruction {
         programId: Address
         clockSysvar: Address
@@ -1342,7 +1474,9 @@ var instructionTypeDefs = (
         withdrawAuthority: Account
     }
 
-    # Stake: Deactivate
+    """
+    Stake: Deactivate instruction
+    """
     type StakeDeactivateInstruction implements TransactionInstruction {
         programId: Address
         clockSysvar: Address
@@ -1350,7 +1484,9 @@ var instructionTypeDefs = (
         stakeAuthority: Account
     }
 
-    # Stake: SetLockup
+    """
+    Stake: SetLockup instruction
+    """
     type StakeSetLockupInstruction implements TransactionInstruction {
         programId: Address
         custodian: Account
@@ -1358,7 +1494,9 @@ var instructionTypeDefs = (
         stakeAccount: Account
     }
 
-    # Stake: Merge
+    """
+    Stake: Merge instruction
+    """
     type StakeMergeInstruction implements TransactionInstruction {
         programId: Address
         clockSysvar: Address
@@ -1368,7 +1506,9 @@ var instructionTypeDefs = (
         stakeHistorySysvar: Address
     }
 
-    # Stake: AuthorizeWithSeed
+    """
+    Stake: AuthorizeWithSeed instruction
+    """
     type StakeAuthorizeWithSeedInstruction implements TransactionInstruction {
         programId: Address
         authorityBase: Account
@@ -1381,7 +1521,9 @@ var instructionTypeDefs = (
         stakeAccount: Account
     }
 
-    # Stake: InitializeChecked
+    """
+    Stake: InitializeChecked instruction
+    """
     type StakeInitializeCheckedInstructionDataAuthorized {
         staker: Account
         withdrawer: Account
@@ -1394,7 +1536,9 @@ var instructionTypeDefs = (
         stakeAccount: Account
     }
 
-    # Stake: AuthorizeChecked
+    """
+    Stake: AuthorizeChecked instruction
+    """
     type StakeAuthorizeCheckedInstruction implements TransactionInstruction {
         programId: Address
         authority: Account
@@ -1405,7 +1549,9 @@ var instructionTypeDefs = (
         stakeAccount: Account
     }
 
-    # Stake: AuthorizeCheckedWithSeed
+    """
+    Stake: AuthorizeCheckedWithSeed instruction
+    """
     type StakeAuthorizeCheckedWithSeedInstruction implements TransactionInstruction {
         programId: Address
         authorityBase: Account
@@ -1418,7 +1564,9 @@ var instructionTypeDefs = (
         stakeAccount: Account
     }
 
-    # Stake: SetLockupChecked
+    """
+    Stake: SetLockupChecked instruction
+    """
     type StakeSetLockupCheckedInstruction implements TransactionInstruction {
         programId: Address
         custodian: Account
@@ -1426,7 +1574,9 @@ var instructionTypeDefs = (
         stakeAccount: Account
     }
 
-    # Stake: DeactivateDelinquent
+    """
+    Stake: DeactivateDelinquent instruction
+    """
     type StakeDeactivateDelinquentInstruction implements TransactionInstruction {
         programId: Address
         referenceVoteAccount: Account
@@ -1434,7 +1584,9 @@ var instructionTypeDefs = (
         voteAccount: Account
     }
 
-    # Stake: Redelegate
+    """
+    Stake: Redelegate instruction
+    """
     type StakeRedelegateInstruction implements TransactionInstruction {
         programId: Address
         newStakeAccount: Account
@@ -1444,7 +1596,9 @@ var instructionTypeDefs = (
         voteAccount: Account
     }
 
-    # System: CreateAccount
+    """
+    System: CreateAccount instruction
+    """
     type CreateAccountInstruction implements TransactionInstruction {
         programId: Address
         lamports: BigInt
@@ -1454,14 +1608,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
@@ -1469,7 +1627,9 @@ var instructionTypeDefs = (
         source: Account
     }
 
-    # System: CreateAccountWithSeed
+    """
+    System: CreateAccountWithSeed instruction
+    """
     type CreateAccountWithSeedInstruction implements TransactionInstruction {
         programId: Address
         base: Account
@@ -1479,7 +1639,9 @@ var instructionTypeDefs = (
         space: BigInt
     }
 
-    # System: AdvanceNonceAccount
+    """
+    System: AdvanceNonceAccount instruction
+    """
     type AdvanceNonceAccountInstruction implements TransactionInstruction {
         programId: Address
         nonceAccount: Account
@@ -1487,7 +1649,9 @@ var instructionTypeDefs = (
         recentBlockhashesSysvar: Address
     }
 
-    # System: WithdrawNonceAccount
+    """
+    System: WithdrawNonceAccount instruction
+    """
     type WithdrawNonceAccountInstruction implements TransactionInstruction {
         programId: Address
         destination: Account
@@ -1498,7 +1662,9 @@ var instructionTypeDefs = (
         rentSysvar: Address
     }
 
-    # System: InitializeNonceAccount
+    """
+    System: InitializeNonceAccount instruction
+    """
     type InitializeNonceAccountInstruction implements TransactionInstruction {
         programId: Address
         nonceAccount: Account
@@ -1507,7 +1673,9 @@ var instructionTypeDefs = (
         rentSysvar: Address
     }
 
-    # System: AuthorizeNonceAccount
+    """
+    System: AuthorizeNonceAccount instruction
+    """
     type AuthorizeNonceAccountInstruction implements TransactionInstruction {
         programId: Address
         newAuthorized: Account
@@ -1515,21 +1683,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
@@ -1539,7 +1713,9 @@ var instructionTypeDefs = (
         space: BigInt
     }
 
-    # System: AssignWithSeed
+    """
+    System: AssignWithSeed instruction
+    """
     type AssignWithSeedInstruction implements TransactionInstruction {
         programId: Address
         account: Account
@@ -1548,7 +1724,9 @@ var instructionTypeDefs = (
         seed: String
     }
 
-    # System: TransferWithSeed
+    """
+    System: TransferWithSeed instruction
+    """
     type TransferWithSeedInstruction implements TransactionInstruction {
         programId: Address
         destination: Account
@@ -1559,7 +1737,9 @@ var instructionTypeDefs = (
         sourceSeed: String
     }
 
-    # Vote: InitializeAccount
+    """
+    Vote: InitializeAccount instruction
+    """
     type VoteInitializeAccountInstruction implements TransactionInstruction {
         programId: Address
         authorizedVoter: Account
@@ -1571,7 +1751,9 @@ var instructionTypeDefs = (
         voteAccount: Account
     }
 
-    # Vote: Authorize
+    """
+    Vote: Authorize instruction
+    """
     type VoteAuthorizeInstruction implements TransactionInstruction {
         programId: Address
         authority: Account
@@ -1581,7 +1763,9 @@ var instructionTypeDefs = (
         voteAccount: Account
     }
 
-    # Vote: AuthorizeWithSeed
+    """
+    Vote: AuthorizeWithSeed instruction
+    """
     type VoteAuthorizeWithSeedInstruction implements TransactionInstruction {
         programId: Address
         authorityBaseKey: String
@@ -1593,7 +1777,9 @@ var instructionTypeDefs = (
         voteAccount: Account
     }
 
-    # Vote: AuthorizeCheckedWithSeed
+    """
+    Vote: AuthorizeCheckedWithSeed instruction
+    """
     type VoteAuthorizeCheckedWithSeedInstruction implements TransactionInstruction {
         programId: Address
         authorityBaseKey: String
@@ -1611,7 +1797,9 @@ var instructionTypeDefs = (
         timestamp: BigInt
     }
 
-    # Vote: Vote
+    """
+    Vote: Vote instruction
+    """
     type VoteVoteInstruction implements TransactionInstruction {
         programId: Address
         clockSysvar: Address
@@ -1632,7 +1820,9 @@ var instructionTypeDefs = (
         timestamp: BigInt
     }
 
-    # Vote: UpdateVoteState
+    """
+    Vote: UpdateVoteState instruction
+    """
     type VoteUpdateVoteStateInstruction implements TransactionInstruction {
         programId: Address
         hash: String
@@ -1641,7 +1831,9 @@ var instructionTypeDefs = (
         voteStateUpdate: VoteStateUpdate
     }
 
-    # Vote: UpdateVoteStateSwitch
+    """
+    Vote: UpdateVoteStateSwitch instruction
+    """
     type VoteUpdateVoteStateSwitchInstruction implements TransactionInstruction {
         programId: Address
         hash: String
@@ -1650,7 +1842,9 @@ var instructionTypeDefs = (
         voteStateUpdate: VoteStateUpdate
     }
 
-    # Vote: CompactUpdateVoteState
+    """
+    Vote: CompactUpdateVoteState instruction
+    """
     type VoteCompactUpdateVoteStateInstruction implements TransactionInstruction {
         programId: Address
         hash: String
@@ -1659,7 +1853,9 @@ var instructionTypeDefs = (
         voteStateUpdate: VoteStateUpdate
     }
 
-    # Vote: CompactUpdateVoteStateSwitch
+    """
+    Vote: CompactUpdateVoteStateSwitch instruction
+    """
     type VoteCompactUpdateVoteStateSwitchInstruction implements TransactionInstruction {
         programId: Address
         hash: String
@@ -1668,7 +1864,9 @@ var instructionTypeDefs = (
         voteStateUpdate: VoteStateUpdate
     }
 
-    # Vote: Withdraw
+    """
+    Vote: Withdraw instruction
+    """
     type VoteWithdrawInstruction implements TransactionInstruction {
         programId: Address
         destination: Account
@@ -1677,7 +1875,9 @@ var instructionTypeDefs = (
         withdrawAuthority: Account
     }
 
-    # Vote: UpdateValidatorIdentity
+    """
+    Vote: UpdateValidatorIdentity instruction
+    """
     type VoteUpdateValidatorIdentityInstruction implements TransactionInstruction {
         programId: Address
         newValidatorIdentity: Account
@@ -1685,7 +1885,9 @@ var instructionTypeDefs = (
         withdrawAuthority: Account
     }
 
-    # Vote: UpdateCommission
+    """
+    Vote: UpdateCommission instruction
+    """
     type VoteUpdateCommissionInstruction implements TransactionInstruction {
         programId: Address
         commission: BigInt # FIXME:*
@@ -1693,7 +1895,9 @@ var instructionTypeDefs = (
         withdrawAuthority: Account
     }
 
-    # Vote: VoteSwitch
+    """
+    Vote: VoteSwitch instruction
+    """
     type VoteVoteSwitchInstruction implements TransactionInstruction {
         programId: Address
         clockSysvar: Address
@@ -1704,7 +1908,9 @@ var instructionTypeDefs = (
         voteAuthority: Account
     }
 
-    # Vote: AuthorizeChecked
+    """
+    Vote: AuthorizeChecked instruction
+    """
     type VoteAuthorizeCheckedInstruction implements TransactionInstruction {
         programId: Address
         authority: Account
@@ -2496,39 +2702,47 @@ var transactionTypeDefs = (
         recentBlockhash: String
     }
 
-    # Transaction interface
+    """
+    Transaction interface
+    """
     interface Transaction {
-        blockTime: String
+        blockTime: BigInt
         meta: TransactionMeta
         slot: BigInt
         version: String
     }
 
-    # A transaction with base58 encoded data
+    """
+    A transaction with base58 encoded data
+    """
     type TransactionBase58 implements Transaction {
-        blockTime: String
+        blockTime: BigInt
         data: Base58EncodedBytes
         meta: TransactionMeta
         slot: BigInt
         version: String
     }
 
-    # A transaction with base64 encoded data
+    """
+    A transaction with base64 encoded data
+    """
     type TransactionBase64 implements Transaction {
-        blockTime: String
+        blockTime: BigInt
         data: Base64EncodedBytes
         meta: TransactionMeta
         slot: BigInt
         version: String
     }
 
-    # A transaction with JSON encoded data
+    """
+    A transaction with JSON encoded data
+    """
     type TransactionDataParsed {
         message: TransactionMessage
         signatures: [String]
     }
     type TransactionParsed implements Transaction {
-        blockTime: String
+        blockTime: BigInt
         data: TransactionDataParsed
         meta: TransactionMeta
         slot: BigInt