@solana/rpc-graphql 2.0.0-experimental.aa4a701 → 2.0.0-experimental.ab12c29

package/dist/index.browser.cjs

@@ -12,41 +12,6 @@ var fastStableStringify__default = /*#__PURE__*/_interopDefault(fastStableString
 
 // src/rpc.ts
 
-// src/cache.ts
-var stringifyValue = (value) => JSON.stringify(value, (_, value2) => {
-  if (typeof value2 === "bigint") {
-    return value2.toString() + "n";
-  }
-  return value2;
-});
-var parseValue = (value) => JSON.parse(value, (_, value2) => {
-  if (typeof value2 === "string" && /\d+n$/.test(value2)) {
-    return BigInt(value2.slice(0, -1));
-  }
-  return value2;
-});
-var cacheKey = (key, variables) => `GraphQLCache:${stringifyValue(key)}:${stringifyValue(variables)}`;
-function createGraphQLCache() {
-  return {
-    // Browser
-    flush: () => {
-      for (let i = localStorage.length - 1; i >= 0; i--) {
-        const storageKey = localStorage.key(i);
-        if (storageKey && storageKey.startsWith("GraphQLCache:")) {
-          localStorage.removeItem(storageKey);
-        }
-      }
-    },
-    get: (key, variables) => {
-      const value = localStorage.getItem(cacheKey(key, variables));
-      return value === null ? null : parseValue(value);
-    },
-    insert: (key, variables, value) => {
-      localStorage.setItem(cacheKey(key, variables), stringifyValue(value));
-    }
-  } ;
-}
-
 // src/loaders/common/resolve-info.ts
 function onlyPresentFieldRequested(fieldName, info) {
   if (info && info.fieldNodes[0].selectionSet) {
@@ -127,15 +92,14 @@ function createAccountLoader(rpc) {
     }
   };
 }
-
-// src/loaders/transaction.ts
 function normalizeArgs2(args) {
-  const { commitment, encoding } = args;
+  const { commitment, encoding, signature } = args;
   return {
     commitment: commitment ?? "confirmed",
     encoding: encoding ?? "jsonParsed",
     // Always use 0 to avoid silly errors
-    maxSupportedTransactionVersion: 0
+    maxSupportedTransactionVersion: 0,
+    signature
   };
 }
 function refineJsonParsedInstructionData(jsonParsedInstructionData) {
@@ -188,21 +152,16 @@ function refineJsonParsedTransaction({ encoding, transaction }) {
 function processQueryResponse2({ encoding, transaction }) {
   return refineJsonParsedTransaction({ encoding, transaction });
 }
-async function loadTransaction({ signature, ...config }, cache, rpc, _info) {
-  const requestConfig = normalizeArgs2(config);
-  const { encoding } = requestConfig;
-  const cached = cache.get(signature, requestConfig);
-  if (cached !== null) {
-    return cached;
-  }
-  let transaction = await rpc.getTransaction(signature, requestConfig).send().catch((e) => {
+async function loadTransaction(rpc, { signature, ...config }) {
+  const { encoding } = config;
+  let transaction = await rpc.getTransaction(signature, config).send().catch((e) => {
     throw e;
   });
   if (transaction === null) {
     return null;
   }
   if (encoding !== "jsonParsed") {
-    const transactionJsonParsed = await rpc.getTransaction(signature, requestConfig).send().catch((e) => {
+    const transactionJsonParsed = await rpc.getTransaction(signature, config).send().catch((e) => {
       throw e;
     });
     if (transactionJsonParsed === null) {
@@ -215,18 +174,35 @@ async function loadTransaction({ signature, ...config }, cache, rpc, _info) {
     };
   }
   const queryResponse = processQueryResponse2({ encoding, transaction });
-  cache.insert(signature, requestConfig, queryResponse);
   return queryResponse;
 }
+function createTransactionBatchLoadFn(rpc) {
+  const resolveTransactionUsingRpc = loadTransaction.bind(null, rpc);
+  return async (transactionQueryArgs) => {
+    return await Promise.all(transactionQueryArgs.map(async (args) => await resolveTransactionUsingRpc(args)));
+  };
+}
+function createTransactionLoader(rpc) {
+  const loader = new DataLoader__default.default(createTransactionBatchLoadFn(rpc), { cacheKeyFn: fastStableStringify__default.default });
+  return {
+    load: async (args, info) => {
+      if (onlyPresentFieldRequested("signature", info)) {
+        return { signature: args.signature };
+      }
+      return loader.load(normalizeArgs2(args));
+    }
+  };
+}
 
 // src/loaders/block.ts
 function normalizeArgs3(args) {
-  const { commitment, encoding, transactionDetails } = args;
+  const { commitment, encoding, slot, transactionDetails } = args;
   return {
     commitment: commitment ?? "confirmed",
     encoding: encoding ?? "jsonParsed",
     // Always use 0 to avoid silly errors
     maxSupportedTransactionVersion: 0,
+    slot,
     transactionDetails: transactionDetails ?? "full"
   };
 }
@@ -261,33 +237,43 @@ function processQueryResponse3({
     transactionDetails
   };
 }
-async function loadBlock({ slot, ...config }, cache, rpc, _info) {
-  const requestConfig = normalizeArgs3(config);
-  const { encoding, transactionDetails } = requestConfig;
-  const cached = cache.get(slot, config);
-  if (cached !== null) {
-    return cached;
-  }
-  const block = await rpc.getBlock(slot, requestConfig).send().catch((e) => {
+async function loadBlock(rpc, { slot, ...config }) {
+  const { encoding, transactionDetails } = config;
+  const block = await rpc.getBlock(slot, config).send().catch((e) => {
     throw e;
   });
   if (block === null) {
     return { slot };
   }
   const queryResponse = processQueryResponse3({ block, encoding, transactionDetails });
-  cache.insert(slot, requestConfig, queryResponse);
   return queryResponse;
 }
-
-// src/loaders/program-accounts.ts
+function createBlockBatchLoadFn(rpc) {
+  const resolveBlockUsingRpc = loadBlock.bind(null, rpc);
+  return async (blockQueryArgs) => {
+    return await Promise.all(blockQueryArgs.map(async (args) => await resolveBlockUsingRpc(args)));
+  };
+}
+function createBlockLoader(rpc) {
+  const loader = new DataLoader__default.default(createBlockBatchLoadFn(rpc), { cacheKeyFn: fastStableStringify__default.default });
+  return {
+    load: async (args, info) => {
+      if (onlyPresentFieldRequested("slot", info)) {
+        return { slot: args.slot };
+      }
+      return loader.load(normalizeArgs3(args));
+    }
+  };
+}
 function normalizeArgs4(args) {
-  const { commitment, dataSlice, encoding, filters, minContextSlot } = args;
+  const { commitment, dataSlice, encoding, filters, minContextSlot, programAddress } = args;
   return {
     commitment: commitment ?? "confirmed",
     dataSlice,
     encoding: encoding ?? "jsonParsed",
     filters,
-    minContextSlot
+    minContextSlot,
+    programAddress
   };
 }
 function processQueryResponse4({ encoding, programAccounts }) {
@@ -309,14 +295,9 @@ function processQueryResponse4({ encoding, programAccounts }) {
     };
   });
 }
-async function loadProgramAccounts({ programAddress, ...config }, cache, rpc, _info) {
-  const requestConfig = normalizeArgs4(config);
-  const { encoding } = requestConfig;
-  const cached = cache.get(programAddress, requestConfig);
-  if (cached !== null) {
-    return cached;
-  }
-  const programAccounts = await rpc.getProgramAccounts(programAddress, requestConfig).send().then((res) => {
+async function loadProgramAccounts(rpc, { programAddress, ...config }) {
+  const { encoding } = config;
+  const programAccounts = await rpc.getProgramAccounts(programAddress, config).send().then((res) => {
     if ("value" in res) {
       return res.value;
     }
@@ -325,24 +306,36 @@ async function loadProgramAccounts({ programAddress, ...config }, cache, rpc, _i
     throw e;
   });
   const queryResponse = processQueryResponse4({ encoding, programAccounts });
-  cache.insert(programAddress, requestConfig, queryResponse);
   return queryResponse;
 }
+function createProgramAccountsBatchLoadFn(rpc) {
+  const resolveProgramAccountsUsingRpc = loadProgramAccounts.bind(null, rpc);
+  return async (programAccountsQueryArgs) => {
+    return await Promise.all(
+      programAccountsQueryArgs.map(async (args) => await resolveProgramAccountsUsingRpc(args))
+    );
+  };
+}
+function createProgramAccountsLoader(rpc) {
+  const loader = new DataLoader__default.default(createProgramAccountsBatchLoadFn(rpc), { cacheKeyFn: fastStableStringify__default.default });
+  return {
+    load: async (args, info) => {
+      if (onlyPresentFieldRequested("programAddress", info)) {
+        return { programAddress: args.programAddress };
+      }
+      return loader.load(normalizeArgs4(args));
+    }
+  };
+}
 
 // src/context.ts
 function createSolanaGraphQLContext(rpc) {
-  const cache = createGraphQLCache();
   return {
-    accountLoader: createAccountLoader(rpc),
-    cache,
-    loadBlock(args, info) {
-      return loadBlock(args, this.cache, this.rpc);
-    },
-    loadProgramAccounts(args, info) {
-      return loadProgramAccounts(args, this.cache, this.rpc);
-    },
-    loadTransaction(args, info) {
-      return loadTransaction(args, this.cache, this.rpc);
+    loaders: {
+      account: createAccountLoader(rpc),
+      block: createBlockLoader(rpc),
+      programAccounts: createProgramAccountsLoader(rpc),
+      transaction: createTransactionLoader(rpc)
     },
     rpc
   };
@@ -350,7 +343,7 @@ function createSolanaGraphQLContext(rpc) {
 
 // src/resolvers/account.ts
 var resolveAccount = (fieldName) => {
-  return (parent, args, context, info) => parent[fieldName] === null ? null : context.accountLoader.load({ ...args, address: parent[fieldName] }, info);
+  return (parent, args, context, info) => parent[fieldName] === null ? null : context.loaders.account.load({ ...args, address: parent[fieldName] }, info);
 };
 
 // src/schema/account.ts
@@ -359,8 +352,8 @@ var accountTypeDefs = (
   `
     # Account interface
     interface Account {
-        address: String
-        encoding: String
+        address: Address
+        encoding: AccountEncoding
         executable: Boolean
         lamports: BigInt
         owner: Account
@@ -369,9 +362,9 @@ var accountTypeDefs = (
 
     # An account with base58 encoded data
     type AccountBase58 implements Account {
-        address: String
-        data: String
-        encoding: String
+        address: Address
+        data: Base58EncodedBytes
+        encoding: AccountEncoding
         executable: Boolean
         lamports: BigInt
         owner: Account
@@ -380,9 +373,9 @@ var accountTypeDefs = (
 
     # An account with base64 encoded data
     type AccountBase64 implements Account {
-        address: String
-        data: String
-        encoding: String
+        address: Address
+        data: Base64EncodedBytes
+        encoding: AccountEncoding
         executable: Boolean
         lamports: BigInt
         owner: Account
@@ -391,9 +384,9 @@ var accountTypeDefs = (
 
     # An account with base64+zstd encoded data
     type AccountBase64Zstd implements Account {
-        address: String
-        data: String
-        encoding: String
+        address: Address
+        data: Base64ZstdEncodedBytes
+        encoding: AccountEncoding
         executable: Boolean
         lamports: BigInt
         owner: Account
@@ -420,9 +413,9 @@ var accountTypeDefs = (
         feeCalculator: NonceAccountFeeCalculator
     }
     type NonceAccount implements Account & AccountJsonParsed {
-        address: String
+        address: Address
         data: NonceAccountData
-        encoding: String
+        encoding: AccountEncoding
         executable: Boolean
         lamports: BigInt
         meta: JsonParsedAccountMeta
@@ -439,9 +432,9 @@ var accountTypeDefs = (
         lastExtendedSlotStartIndex: Int
     }
     type LookupTableAccount implements Account & AccountJsonParsed {
-        address: String
+        address: Address
         data: LookupTableAccountData
-        encoding: String
+        encoding: AccountEncoding
         executable: Boolean
         lamports: BigInt
         meta: JsonParsedAccountMeta
@@ -458,9 +451,9 @@ var accountTypeDefs = (
         supply: String
     }
     type MintAccount implements Account & AccountJsonParsed {
-        address: String
+        address: Address
         data: MintAccountData
-        encoding: String
+        encoding: AccountEncoding
         executable: Boolean
         lamports: BigInt
         meta: JsonParsedAccountMeta
@@ -477,9 +470,9 @@ var accountTypeDefs = (
         tokenAmount: TokenAmount
     }
     type TokenAccount implements Account & AccountJsonParsed {
-        address: String
+        address: Address
         data: TokenAccountData
-        encoding: String
+        encoding: AccountEncoding
         executable: Boolean
         lamports: BigInt
         meta: JsonParsedAccountMeta
@@ -518,9 +511,9 @@ var accountTypeDefs = (
         stake: StakeAccountDataStake
     }
     type StakeAccount implements Account & AccountJsonParsed {
-        address: String
+        address: Address
         data: StakeAccountData
-        encoding: String
+        encoding: AccountEncoding
         executable: Boolean
         lamports: BigInt
         meta: JsonParsedAccountMeta
@@ -558,9 +551,9 @@ var accountTypeDefs = (
         votes: [VoteAccountDataVote]
     }
     type VoteAccount implements Account & AccountJsonParsed {
-        address: String
+        address: Address
         data: VoteAccountData
-        encoding: String
+        encoding: AccountEncoding
         executable: Boolean
         lamports: BigInt
         meta: JsonParsedAccountMeta
@@ -679,7 +672,7 @@ var blockTypeDefs = (
     }
 
     type TransactionDataForAccounts {
-        accountKeys: [String]
+        accountKeys: [Address]
         signatures: [String]
     }
 
@@ -769,26 +762,6 @@ var blockResolvers = {
 var inputTypeDefs = (
   /* GraphQL */
   `
-    enum AccountEncoding {
-        base58
-        base64
-        base64Zstd
-        jsonParsed
-    }
-
-    enum BlockTransactionDetails {
-        accounts
-        full
-        none
-        signatures
-    }
-
-    enum Commitment {
-        confirmed
-        finalized
-        processed
-    }
-
     input DataSlice {
         offset: Int
         length: Int
@@ -797,37 +770,41 @@ var inputTypeDefs = (
     input ProgramAccountsFilter {
         bytes: BigInt
         dataSize: BigInt
-        encoding: String
+        encoding: AccountEncoding
         offset: BigInt
     }
-
-    enum TransactionEncoding {
-        base58
-        base64
-        jsonParsed
-    }
-
-    enum TransactionVersion {
-        legacy
-        zero
-    }
 `
 );
-var inputResolvers = {
-  AccountEncoding: {
-    base64Zstd: "base64+zstd"
-  },
-  TransactionVersion: {
-    zero: 0
-  }
-};
+var inputResolvers = {};
 var scalarTypeDefs = (
   /* GraphQL */
   `
+    scalar Address
+    scalar Base58EncodedBytes
+    scalar Base64EncodedBytes
+    scalar Base64ZstdEncodedBytes
     scalar BigInt
 `
 );
+var stringScalarAlias = {
+  __parseLiteral(ast) {
+    if (ast.kind === graphql.Kind.STRING) {
+      return ast.value.toString();
+    }
+    return null;
+  },
+  __parseValue(value) {
+    return value;
+  },
+  __serialize(value) {
+    return value;
+  }
+};
 var scalarResolvers = {
+  Address: stringScalarAlias,
+  Base58EncodedBytes: stringScalarAlias,
+  Base64EncodedBytes: stringScalarAlias,
+  Base64ZstdEncodedBytes: stringScalarAlias,
   BigInt: {
     __parseLiteral(ast) {
       if (ast.kind === graphql.Kind.STRING) {
@@ -848,16 +825,36 @@ var scalarResolvers = {
 var commonTypeDefs = (
   /* GraphQL */
   `
+    enum AccountEncoding {
+        BASE_58
+        BASE_64
+        BASE_64_ZSTD
+        PARSED
+    }
+
+    enum BlockTransactionDetails {
+        accounts
+        full
+        none
+        signatures
+    }
+
+    enum Commitment {
+        confirmed
+        finalized
+        processed
+    }
+
     type ReturnData {
-        data: String
-        programId: String
+        data: Base64EncodedBytes
+        programId: Address
     }
 
     type Reward {
         commission: Int
         lamports: BigInt
         postBalance: BigInt
-        pubkey: String
+        pubkey: Address
         rewardType: String
     }
 
@@ -872,15 +869,41 @@ var commonTypeDefs = (
         accountIndex: Int
         mint: Account
         owner: Account
-        programId: String
+        programId: Address
         uiTokenAmount: TokenAmount
     }
+
+    enum TransactionEncoding {
+        BASE_58
+        BASE_64
+        PARSED
+    }
+
+    enum TransactionVersion {
+        LEGACY
+        ZERO
+    }
 `
 );
 var commonResolvers = {
+  AccountEncoding: {
+    BASE_58: "base58",
+    BASE_64: "base64",
+    BASE_64_ZSTD: "base64+zstd",
+    PARSED: "jsonParsed"
+  },
   TokenBalance: {
     mint: resolveAccount("mint"),
     owner: resolveAccount("owner")
+  },
+  TransactionEncoding: {
+    BASE_58: "base58",
+    BASE_64: "base64",
+    PARSED: "jsonParsed"
+  },
+  TransactionVersion: {
+    LEGACY: "legacy",
+    ZERO: 0
   }
 };
 
@@ -895,14 +918,14 @@ var instructionTypeDefs = (
 
     # Transaction instruction interface
     interface TransactionInstruction {
-        programId: String
+        programId: Address
     }
 
     # Generic transaction instruction
     type GenericInstruction implements TransactionInstruction {
-        accounts: [String]
-        data: String
-        programId: String
+        accounts: [Address]
+        data: Base64EncodedBytes
+        programId: Address
     }
 
     # AddressLookupTable: CreateLookupTable
@@ -917,21 +940,21 @@ var instructionTypeDefs = (
     type CreateLookupTableInstruction implements TransactionInstruction {
         data: CreateLookupTableInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # AddressLookupTable: ExtendLookupTable
     type ExtendLookupTableInstructionData {
         lookupTableAccount: Account
         lookupTableAuthority: Account
-        newAddresses: [String]
+        newAddresses: [Address]
         payerAccount: Account
         systemProgram: Account
     }
     type ExtendLookupTableInstruction implements TransactionInstruction {
         data: ExtendLookupTableInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # AddressLookupTable: FreezeLookupTable
@@ -942,7 +965,7 @@ var instructionTypeDefs = (
     type FreezeLookupTableInstruction implements TransactionInstruction {
         data: FreezeLookupTableInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # AddressLookupTable: DeactivateLookupTable
@@ -953,7 +976,7 @@ var instructionTypeDefs = (
     type DeactivateLookupTableInstruction implements TransactionInstruction {
         data: DeactivateLookupTableInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # AddressLookupTable: CloseLookupTable
@@ -965,19 +988,19 @@ var instructionTypeDefs = (
     type CloseLookupTableInstruction implements TransactionInstruction {
         data: CloseLookupTableInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # BpfLoader: Write
     type BpfLoaderWriteInstructionData {
         account: Account
-        bytes: String
+        bytes: Base64EncodedBytes
         offset: BigInt # FIXME:*
     }
     type BpfLoaderWriteInstruction implements TransactionInstruction {
         data: BpfLoaderWriteInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # BpfLoader: Finalize
@@ -987,7 +1010,7 @@ var instructionTypeDefs = (
     type BpfLoaderFinalizeInstruction implements TransactionInstruction {
         data: BpfLoaderFinalizeInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # BpfUpgradeableLoader: InitializeBuffer
@@ -997,53 +1020,53 @@ var instructionTypeDefs = (
     type BpfUpgradeableLoaderInitializeBufferInstruction implements TransactionInstruction {
         data: BpfUpgradeableLoaderInitializeBufferInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # BpfUpgradeableLoader: Write
     type BpfUpgradeableLoaderWriteInstructionData {
         account: Account
         authority: Account
-        bytes: String
+        bytes: Base64EncodedBytes
         offset: BigInt # FIXME:*
     }
     type BpfUpgradeableLoaderWriteInstruction implements TransactionInstruction {
         data: BpfUpgradeableLoaderWriteInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # BpfUpgradeableLoader: DeployWithMaxDataLen
     type BpfUpgradeableLoaderDeployWithMaxDataLenInstructionData {
         authority: Account
         bufferAccount: Account
-        clockSysvar: String
+        clockSysvar: Address
         maxDataLen: BigInt
         payerAccount: Account
         programAccount: Account
         programDataAccount: Account
-        rentSysvar: String
+        rentSysvar: Address
     }
     type BpfUpgradeableLoaderDeployWithMaxDataLenInstruction implements TransactionInstruction {
         data: BpfUpgradeableLoaderDeployWithMaxDataLenInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # BpfUpgradeableLoader: Upgrade
     type BpfUpgradeableLoaderUpgradeInstructionData {
         authority: Account
         bufferAccount: Account
-        clockSysvar: String
+        clockSysvar: Address
         programAccount: Account
         programDataAccount: Account
-        rentSysvar: String
+        rentSysvar: Address
         spillAccount: Account
     }
     type BpfUpgradeableLoaderUpgradeInstruction implements TransactionInstruction {
         data: BpfUpgradeableLoaderUpgradeInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # BpfUpgradeableLoader: SetAuthority
@@ -1055,7 +1078,7 @@ var instructionTypeDefs = (
     type BpfUpgradeableLoaderSetAuthorityInstruction implements TransactionInstruction {
         data: BpfUpgradeableLoaderSetAuthorityInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # BpfUpgradeableLoader: SetAuthorityChecked
@@ -1067,7 +1090,7 @@ var instructionTypeDefs = (
     type BpfUpgradeableLoaderSetAuthorityCheckedInstruction implements TransactionInstruction {
         data: BpfUpgradeableLoaderSetAuthorityCheckedInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # BpfUpgradeableLoader: Close
@@ -1080,7 +1103,7 @@ var instructionTypeDefs = (
     type BpfUpgradeableLoaderCloseInstruction implements TransactionInstruction {
         data: BpfUpgradeableLoaderCloseInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # BpfUpgradeableLoader: ExtendProgram
@@ -1094,13 +1117,13 @@ var instructionTypeDefs = (
     type BpfUpgradeableLoaderExtendProgramInstruction implements TransactionInstruction {
         data: BpfUpgradeableLoaderExtendProgramInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # SplAssociatedTokenAccount: Create
     type SplAssociatedTokenCreateInstructionData {
         account: Account
-        mint: String
+        mint: Address
         source: Account
         systemProgram: Account
         tokenProgram: Account
@@ -1109,13 +1132,13 @@ var instructionTypeDefs = (
     type SplAssociatedTokenCreateInstruction implements TransactionInstruction {
         data: SplAssociatedTokenCreateInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # SplAssociatedTokenAccount: CreateIdempotent
     type SplAssociatedTokenCreateIdempotentInstructionData {
         account: Account
-        mint: String
+        mint: Address
         source: Account
         systemProgram: Account
         tokenProgram: Account
@@ -1124,7 +1147,7 @@ var instructionTypeDefs = (
     type SplAssociatedTokenCreateIdempotentInstruction implements TransactionInstruction {
         data: SplAssociatedTokenCreateIdempotentInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # SplAssociatedTokenAccount: RecoverNested
@@ -1140,7 +1163,7 @@ var instructionTypeDefs = (
     type SplAssociatedTokenRecoverNestedInstruction implements TransactionInstruction {
         data: SplAssociatedTokenRecoverNestedInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # SplMemo
@@ -1150,7 +1173,7 @@ var instructionTypeDefs = (
     type SplMemoInstruction implements TransactionInstruction {
         data: SplMemoInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # SplToken: InitializeMint
@@ -1159,12 +1182,12 @@ var instructionTypeDefs = (
         freezeAuthority: Account
         mint: Account
         mintAuthority: Account
-        rentSysvar: String
+        rentSysvar: Address
     }
     type SplTokenInitializeMintInstruction implements TransactionInstruction {
         data: SplTokenInitializeMintInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # SplToken: InitializeMint2
@@ -1177,7 +1200,7 @@ var instructionTypeDefs = (
     type SplTokenInitializeMint2Instruction implements TransactionInstruction {
         data: SplTokenInitializeMint2InstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # SplToken: InitializeAccount
@@ -1185,12 +1208,12 @@ var instructionTypeDefs = (
         account: Account
         mint: Account
         owner: Account
-        rentSysvar: String
+        rentSysvar: Address
     }
     type SplTokenInitializeAccountInstruction implements TransactionInstruction {
         data: SplTokenInitializeAccountInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # SplToken: InitializeAccount2
@@ -1198,12 +1221,12 @@ var instructionTypeDefs = (
         account: Account
         mint: Account
         owner: Account
-        rentSysvar: String
+        rentSysvar: Address
     }
     type SplTokenInitializeAccount2Instruction implements TransactionInstruction {
         data: SplTokenInitializeAccount2InstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # SplToken: InitializeAccount3
@@ -1215,32 +1238,32 @@ var instructionTypeDefs = (
     type SplTokenInitializeAccount3Instruction implements TransactionInstruction {
         data: SplTokenInitializeAccount3InstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # SplToken: InitializeMultisig
     type SplTokenInitializeMultisigInstructionData {
         m: BigInt # FIXME:*
         multisig: Account
-        rentSysvar: String
-        signers: [String]
+        rentSysvar: Address
+        signers: [Address]
     }
     type SplTokenInitializeMultisigInstruction implements TransactionInstruction {
         data: SplTokenInitializeMultisigInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # SplToken: InitializeMultisig2
     type SplTokenInitializeMultisig2InstructionData {
         m: BigInt # FIXME:*
         multisig: Account
-        signers: [String]
+        signers: [Address]
     }
     type SplTokenInitializeMultisig2Instruction implements TransactionInstruction {
         data: SplTokenInitializeMultisig2InstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # SplToken: Transfer
@@ -1254,7 +1277,7 @@ var instructionTypeDefs = (
     type SplTokenTransferInstruction implements TransactionInstruction {
         data: SplTokenTransferInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # SplToken: Approve
@@ -1268,7 +1291,7 @@ var instructionTypeDefs = (
     type SplTokenApproveInstruction implements TransactionInstruction {
         data: SplTokenApproveInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # SplToken: Revoke
@@ -1280,7 +1303,7 @@ var instructionTypeDefs = (
     type SplTokenRevokeInstruction implements TransactionInstruction {
         data: SplTokenRevokeInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # SplToken: SetAuthority
@@ -1293,7 +1316,7 @@ var instructionTypeDefs = (
     type SplTokenSetAuthorityInstruction implements TransactionInstruction {
         data: SplTokenSetAuthorityInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # SplToken: MintTo
@@ -1308,7 +1331,7 @@ var instructionTypeDefs = (
     type SplTokenMintToInstruction implements TransactionInstruction {
         data: SplTokenMintToInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # SplToken: Burn
@@ -1322,7 +1345,7 @@ var instructionTypeDefs = (
     type SplTokenBurnInstruction implements TransactionInstruction {
         data: SplTokenBurnInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # SplToken: CloseAccount
@@ -1335,7 +1358,7 @@ var instructionTypeDefs = (
     type SplTokenCloseAccountInstruction implements TransactionInstruction {
         data: SplTokenCloseAccountInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # SplToken: FreezeAccount
@@ -1348,7 +1371,7 @@ var instructionTypeDefs = (
     type SplTokenFreezeAccountInstruction implements TransactionInstruction {
         data: SplTokenFreezeAccountInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # SplToken: ThawAccount
@@ -1361,7 +1384,7 @@ var instructionTypeDefs = (
     type SplTokenThawAccountInstruction implements TransactionInstruction {
         data: SplTokenThawAccountInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # SplToken: TransferChecked
@@ -1378,7 +1401,7 @@ var instructionTypeDefs = (
     type SplTokenTransferCheckedInstruction implements TransactionInstruction {
         data: SplTokenTransferCheckedInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # SplToken: ApproveChecked
@@ -1393,7 +1416,7 @@ var instructionTypeDefs = (
     type SplTokenApproveCheckedInstruction implements TransactionInstruction {
         data: SplTokenApproveCheckedInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # SplToken: MintToChecked
@@ -1408,7 +1431,7 @@ var instructionTypeDefs = (
     type SplTokenMintToCheckedInstruction implements TransactionInstruction {
         data: SplTokenMintToCheckedInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # SplToken: BurnChecked
@@ -1422,7 +1445,7 @@ var instructionTypeDefs = (
     type SplTokenBurnCheckedInstruction implements TransactionInstruction {
         data: SplTokenBurnCheckedInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # SplToken: SyncNative
@@ -1432,7 +1455,7 @@ var instructionTypeDefs = (
     type SplTokenSyncNativeInstruction implements TransactionInstruction {
         data: SplTokenSyncNativeInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # SplToken: GetAccountDataSize
@@ -1443,7 +1466,7 @@ var instructionTypeDefs = (
     type SplTokenGetAccountDataSizeInstruction implements TransactionInstruction {
         data: SplTokenGetAccountDataSizeInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # SplToken: InitializeImmutableOwner
@@ -1453,7 +1476,7 @@ var instructionTypeDefs = (
     type SplTokenInitializeImmutableOwnerInstruction implements TransactionInstruction {
         data: SplTokenInitializeImmutableOwnerInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # SplToken: AmountToUiAmount
@@ -1464,7 +1487,7 @@ var instructionTypeDefs = (
     type SplTokenAmountToUiAmountInstruction implements TransactionInstruction {
         data: SplTokenAmountToUiAmountInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # SplToken: UiAmountToAmount
@@ -1475,7 +1498,7 @@ var instructionTypeDefs = (
     type SplTokenUiAmountToAmountInstruction implements TransactionInstruction {
         data: SplTokenUiAmountToAmountInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # SplToken: InitializeMintCloseAuthority
@@ -1486,7 +1509,7 @@ var instructionTypeDefs = (
     type SplTokenInitializeMintCloseAuthorityInstruction implements TransactionInstruction {
         data: SplTokenInitializeMintCloseAuthorityInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # TODO: Extensions!
@@ -1519,20 +1542,20 @@ var instructionTypeDefs = (
     type StakeInitializeInstructionData {
         authorized: StakeInitializeInstructionDataAuthorized
         lockup: Lockup
-        rentSysvar: String
+        rentSysvar: Address
         stakeAccount: Account
     }
     type StakeInitializeInstruction implements TransactionInstruction {
         data: StakeInitializeInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # Stake: Authorize
     type StakeAuthorizeInstructionData {
         authority: Account
         authorityType: String
-        clockSysvar: String
+        clockSysvar: Address
         custodian: Account
         newAuthority: Account
         stakeAccount: Account
@@ -1540,22 +1563,22 @@ var instructionTypeDefs = (
     type StakeAuthorizeInstruction implements TransactionInstruction {
         data: StakeAuthorizeInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # Stake: DelegateStake
     type StakeDelegateStakeInstructionData {
-        clockSysvar: String
+        clockSysvar: Address
         stakeAccount: Account
         stakeAuthority: Account
         stakeConfigAccount: Account
-        stakeHistorySysvar: String
+        stakeHistorySysvar: Address
         voteAccount: Account
     }
     type StakeDelegateStakeInstruction implements TransactionInstruction {
         data: StakeDelegateStakeInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # Stake: Split
@@ -1568,12 +1591,12 @@ var instructionTypeDefs = (
     type StakeSplitInstruction implements TransactionInstruction {
         data: StakeSplitInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # Stake: Withdraw
     type StakeWithdrawInstructionData {
-        clockSysvar: String
+        clockSysvar: Address
         destination: Account
         lamports: BigInt
         stakeAccount: Account
@@ -1582,19 +1605,19 @@ var instructionTypeDefs = (
     type StakeWithdrawInstruction implements TransactionInstruction {
         data: StakeWithdrawInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # Stake: Deactivate
     type StakeDeactivateInstructionData {
-        clockSysvar: String
+        clockSysvar: Address
         stakeAccount: Account
         stakeAuthority: Account
     }
     type StakeDeactivateInstruction implements TransactionInstruction {
         data: StakeDeactivateInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # Stake: SetLockup
@@ -1606,21 +1629,21 @@ var instructionTypeDefs = (
     type StakeSetLockupInstruction implements TransactionInstruction {
         data: StakeSetLockupInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # Stake: Merge
     type StakeMergeInstructionData {
-        clockSysvar: String
+        clockSysvar: Address
         destination: Account
         source: Account
         stakeAuthority: Account
-        stakeHistorySysvar: String
+        stakeHistorySysvar: Address
     }
     type StakeMergeInstruction implements TransactionInstruction {
         data: StakeMergeInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # Stake: AuthorizeWithSeed
@@ -1629,7 +1652,7 @@ var instructionTypeDefs = (
         authorityOwner: Account
         authoritySeed: String
         authorityType: String
-        clockSysvar: String
+        clockSysvar: Address
         custodian: Account
         newAuthorized: Account
         stakeAccount: Account
@@ -1637,12 +1660,12 @@ var instructionTypeDefs = (
     type StakeAuthorizeWithSeedInstruction implements TransactionInstruction {
         data: StakeAuthorizeWithSeedInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # Stake: InitializeChecked
     type StakeInitializeCheckedInstructionDataAuthorized {
-        rentSysvar: String
+        rentSysvar: Address
         stakeAccount: Account
         staker: Account
         withdrawer: Account
@@ -1650,14 +1673,14 @@ var instructionTypeDefs = (
     type StakeInitializeCheckedInstruction implements TransactionInstruction {
         data: StakeInitializeCheckedInstructionDataAuthorized
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # Stake: AuthorizeChecked
     type StakeAuthorizeCheckedInstructionData {
         authority: Account
         authorityType: String
-        clockSysvar: String
+        clockSysvar: Address
         custodian: Account
         newAuthority: Account
         stakeAccount: Account
@@ -1665,7 +1688,7 @@ var instructionTypeDefs = (
     type StakeAuthorizeCheckedInstruction implements TransactionInstruction {
         data: StakeAuthorizeCheckedInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # Stake: AuthorizeCheckedWithSeed
@@ -1674,7 +1697,7 @@ var instructionTypeDefs = (
         authorityOwner: Account
         authoritySeed: String
         authorityType: String
-        clockSysvar: String
+        clockSysvar: Address
         custodian: Account
         newAuthorized: Account
         stakeAccount: Account
@@ -1682,7 +1705,7 @@ var instructionTypeDefs = (
     type StakeAuthorizeCheckedWithSeedInstruction implements TransactionInstruction {
         data: StakeAuthorizeCheckedWithSeedInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # Stake: SetLockupChecked
@@ -1694,7 +1717,7 @@ var instructionTypeDefs = (
     type StakeSetLockupCheckedInstruction implements TransactionInstruction {
         data: StakeSetLockupCheckedInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # Stake: DeactivateDelinquent
@@ -1706,7 +1729,7 @@ var instructionTypeDefs = (
     type StakeDeactivateDelinquentInstruction implements TransactionInstruction {
         data: StakeDeactivateDelinquentInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # Stake: Redelegate
@@ -1720,7 +1743,7 @@ var instructionTypeDefs = (
     type StakeRedelegateInstruction implements TransactionInstruction {
         data: StakeRedelegateInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # System: CreateAccount
@@ -1734,7 +1757,7 @@ var instructionTypeDefs = (
     type CreateAccountInstruction implements TransactionInstruction {
         data: CreateAccountInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # System: Assign
@@ -1745,7 +1768,7 @@ var instructionTypeDefs = (
     type AssignInstruction implements TransactionInstruction {
         data: AssignInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # System: Transfer
@@ -1757,7 +1780,7 @@ var instructionTypeDefs = (
     type TransferInstruction implements TransactionInstruction {
         data: TransferInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # System: CreateAccountWithSeed
@@ -1771,19 +1794,19 @@ var instructionTypeDefs = (
     type CreateAccountWithSeedInstruction implements TransactionInstruction {
         data: CreateAccountWithSeedInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # System: AdvanceNonceAccount
     type AdvanceNonceAccountInstructionData {
         nonceAccount: Account
         nonceAuthority: Account
-        recentBlockhashesSysvar: String
+        recentBlockhashesSysvar: Address
     }
     type AdvanceNonceAccountInstruction implements TransactionInstruction {
         data: AdvanceNonceAccountInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # System: WithdrawNonceAccount
@@ -1792,26 +1815,26 @@ var instructionTypeDefs = (
         lamports: BigInt
         nonceAccount: Account
         nonceAuthority: Account
-        recentBlockhashesSysvar: String
-        rentSysvar: String
+        recentBlockhashesSysvar: Address
+        rentSysvar: Address
     }
     type WithdrawNonceAccountInstruction implements TransactionInstruction {
         data: WithdrawNonceAccountInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # System: InitializeNonceAccount
     type InitializeNonceAccountInstructionData {
         nonceAccount: Account
         nonceAuthority: Account
-        recentBlockhashesSysvar: String
-        rentSysvar: String
+        recentBlockhashesSysvar: Address
+        rentSysvar: Address
     }
     type InitializeNonceAccountInstruction implements TransactionInstruction {
         data: InitializeNonceAccountInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # System: AuthorizeNonceAccount
@@ -1823,7 +1846,7 @@ var instructionTypeDefs = (
     type AuthorizeNonceAccountInstruction implements TransactionInstruction {
         data: AuthorizeNonceAccountInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # System: UpgradeNonceAccount
@@ -1834,7 +1857,7 @@ var instructionTypeDefs = (
     type UpgradeNonceAccountInstruction implements TransactionInstruction {
         data: UpgradeNonceAccountInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # System: Allocate
@@ -1845,13 +1868,13 @@ var instructionTypeDefs = (
     type AllocateInstruction implements TransactionInstruction {
         data: AllocateInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # System: AllocateWithSeed
     type AllocateWithSeedInstructionData {
         account: Account
-        base: String
+        base: Address
         owner: Account
         seed: String
         space: BigInt
@@ -1859,20 +1882,20 @@ var instructionTypeDefs = (
     type AllocateWithSeedInstruction implements TransactionInstruction {
         data: AllocateWithSeedInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # System: AssignWithSeed
     type AssignWithSeedInstructionData {
         account: Account
-        base: String
+        base: Address
         owner: Account
         seed: String
     }
     type AssignWithSeedInstruction implements TransactionInstruction {
         data: AssignWithSeedInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # System: TransferWithSeed
@@ -1880,76 +1903,76 @@ var instructionTypeDefs = (
         destination: Account
         lamports: BigInt
         source: Account
-        sourceBase: String
+        sourceBase: Address
         sourceOwner: Account
         sourceSeed: String
     }
     type TransferWithSeedInstruction implements TransactionInstruction {
         data: TransferWithSeedInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # Vote: InitializeAccount
     type VoteInitializeAccountInstructionData {
         authorizedVoter: Account
         authorizedWithdrawer: Account
-        clockSysvar: String
+        clockSysvar: Address
         commission: BigInt # FIXME:*
         node: Account
-        rentSysvar: String
+        rentSysvar: Address
         voteAccount: Account
     }
     type VoteInitializeAccountInstruction implements TransactionInstruction {
         data: VoteInitializeAccountInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # Vote: Authorize
     type VoteAuthorizeInstructionData {
         authority: Account
         authorityType: String
-        clockSysvar: String
+        clockSysvar: Address
         newAuthority: Account
         voteAccount: Account
     }
     type VoteAuthorizeInstruction implements TransactionInstruction {
         data: VoteAuthorizeInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # Vote: AuthorizeWithSeed
     type VoteAuthorizeWithSeedInstructionData {
-        authorityBaseKey: String
+        authorityBaseKey: Address
         authorityOwner: Account
         authoritySeed: String
         authorityType: String
-        clockSysvar: String
+        clockSysvar: Address
         newAuthority: Account
         voteAccount: Account
     }
     type VoteAuthorizeWithSeedInstruction implements TransactionInstruction {
         data: VoteAuthorizeWithSeedInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # Vote: AuthorizeCheckedWithSeed
     type VoteAuthorizeCheckedWithSeedInstructionData {
-        authorityBaseKey: String
+        authorityBaseKey: Address
         authorityOwner: Account
         authoritySeed: String
         authorityType: String
-        clockSysvar: String
+        clockSysvar: Address
         newAuthority: Account
         voteAccount: Account
     }
     type VoteAuthorizeCheckedWithSeedInstruction implements TransactionInstruction {
         data: VoteAuthorizeCheckedWithSeedInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     type Vote {
@@ -1960,8 +1983,8 @@ var instructionTypeDefs = (
 
     # Vote: Vote
     type VoteVoteInstructionData {
-        clockSysvar: String
-        slotHashesSysvar: String
+        clockSysvar: Address
+        slotHashesSysvar: Address
         vote: Vote
         voteAccount: Account
         voteAuthority: Account
@@ -1969,7 +1992,7 @@ var instructionTypeDefs = (
     type VoteVoteInstruction implements TransactionInstruction {
         data: VoteVoteInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     type VoteStateUpdateLockout {
@@ -1993,7 +2016,7 @@ var instructionTypeDefs = (
     type VoteUpdateVoteStateInstruction implements TransactionInstruction {
         data: VoteUpdateVoteStateInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # Vote: UpdateVoteStateSwitch
@@ -2006,7 +2029,7 @@ var instructionTypeDefs = (
     type VoteUpdateVoteStateSwitchInstruction implements TransactionInstruction {
         data: VoteUpdateVoteStateSwitchInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # Vote: CompactUpdateVoteState
@@ -2019,7 +2042,7 @@ var instructionTypeDefs = (
     type VoteCompactUpdateVoteStateInstruction implements TransactionInstruction {
         data: VoteCompactUpdateVoteStateInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # Vote: CompactUpdateVoteStateSwitch
@@ -2032,7 +2055,7 @@ var instructionTypeDefs = (
     type VoteCompactUpdateVoteStateSwitchInstruction implements TransactionInstruction {
         data: VoteCompactUpdateVoteStateSwitchInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # Vote: Withdraw
@@ -2045,7 +2068,7 @@ var instructionTypeDefs = (
     type VoteWithdrawInstruction implements TransactionInstruction {
         data: VoteWithdrawInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # Vote: UpdateValidatorIdentity
@@ -2057,7 +2080,7 @@ var instructionTypeDefs = (
     type VoteUpdateValidatorIdentityInstruction implements TransactionInstruction {
         data: VoteUpdateValidatorIdentityInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # Vote: UpdateCommission
@@ -2069,14 +2092,14 @@ var instructionTypeDefs = (
     type VoteUpdateCommissionInstruction implements TransactionInstruction {
         data: VoteUpdateCommissionInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # Vote: VoteSwitch
     type VoteVoteSwitchInstructionData {
-        clockSysvar: String
+        clockSysvar: Address
         hash: String
-        slotHashesSysvar: String
+        slotHashesSysvar: Address
         vote: Vote
         voteAccount: Account
         voteAuthority: Account
@@ -2084,21 +2107,21 @@ var instructionTypeDefs = (
     type VoteVoteSwitchInstruction implements TransactionInstruction {
         data: VoteVoteSwitchInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 
     # Vote: AuthorizeChecked
     type VoteAuthorizeCheckedInstructionData {
         authority: Account
         authorityType: String
-        clockSysvar: String
+        clockSysvar: Address
         newAuthority: Account
         voteAccount: Account
     }
     type VoteAuthorizeCheckedInstruction implements TransactionInstruction {
         data: VoteAuthorizeCheckedInstructionData
         meta: JsonParsedInstructionMeta
-        programId: String
+        programId: Address
     }
 `
 );
@@ -2858,14 +2881,14 @@ var transactionTypeDefs = (
     }
 
     type TransactionMessageAccountKey {
-        pubkey: String
+        pubkey: Address
         signer: Boolean
         source: String
         writable: Boolean
     }
 
     type TransactionMessageAddressTableLookup {
-        accountKey: String
+        accountKey: Address
         readableIndexes: [Int]
         writableIndexes: [Int]
     }
@@ -2887,7 +2910,7 @@ var transactionTypeDefs = (
     # Transaction interface
     interface Transaction {
         blockTime: String
-        encoding: String
+        encoding: TransactionEncoding
         meta: TransactionMeta
         slot: BigInt
         version: String
@@ -2896,8 +2919,8 @@ var transactionTypeDefs = (
     # A transaction with base58 encoded data
     type TransactionBase58 implements Transaction {
         blockTime: String
-        data: String
-        encoding: String
+        data: Base58EncodedBytes
+        encoding: TransactionEncoding
         meta: TransactionMeta
         slot: BigInt
         version: String
@@ -2906,8 +2929,8 @@ var transactionTypeDefs = (
     # A transaction with base64 encoded data
     type TransactionBase64 implements Transaction {
         blockTime: String
-        data: String
-        encoding: String
+        data: Base64EncodedBytes
+        encoding: TransactionEncoding
         meta: TransactionMeta
         slot: BigInt
         version: String
@@ -2921,7 +2944,7 @@ var transactionTypeDefs = (
     type TransactionParsed implements Transaction {
         blockTime: String
         data: TransactionDataParsed
-        encoding: String
+        encoding: TransactionEncoding
         meta: TransactionMeta
         slot: BigInt
         version: String
@@ -2984,16 +3007,16 @@ var schemaTypeDefs = (
 var schemaResolvers = {
   Query: {
     account(_, args, context, info) {
-      return context.accountLoader.load(args, info);
+      return context.loaders.account.load(args, info);
     },
     block(_, args, context, info) {
-      return context.loadBlock(args, info);
+      return context.loaders.block.load(args, info);
     },
     programAccounts(_, args, context, info) {
-      return context.loadProgramAccounts(args, info);
+      return context.loaders.programAccounts.load(args, info);
     },
     transaction(_, args, context, info) {
-      return context.loadTransaction(args, info);
+      return context.loaders.transaction.load(args, info);
     }
   }
 };
@@ -3029,14 +3052,12 @@ function createRpcGraphQL(rpc) {
   return {
     context,
     async query(source, variableValues) {
-      const result = await graphql.graphql({
+      return graphql.graphql({
         contextValue: this.context,
         schema: this.schema,
         source,
         variableValues
       });
-      this.context.cache.flush();
-      return result;
     },
     schema
   };