@solana/rpc-core - npm Package Compare versions

Comparing version 2.0.0-experimental.762ff13 to 2.0.0-experimental.76ad167

dist/index.browser.js

@@ -1,31 +0,186 @@
-// src/params-patcher.ts
-function visitNode(value, keyPath, onIntegerOverflow) {
-  if (Array.isArray(value)) {
-    return value.map(
-      (element, ii) => visitNode(element, [...keyPath, ii], onIntegerOverflow)
-    );
-  } else if (typeof value === "object" && value !== null) {
-    const out = {};
-    for (const propName in value) {
-      if (Object.prototype.hasOwnProperty.call(value, propName)) {
-        out[propName] = visitNode(value[propName], [...keyPath, propName], onIntegerOverflow);
+import { createJsonRpcApi, createJsonRpcSubscriptionsApi } from '@solana/rpc-transport';
+
+// src/rpc-methods/index.ts
+
+// src/default-commitment.ts
+function applyDefaultCommitment({
+  commitmentPropertyName,
+  params,
+  optionsObjectPositionInParams,
+  overrideCommitment
+}) {
+  const paramInTargetPosition = params[optionsObjectPositionInParams];
+  if (
+    // There's no config.
+    paramInTargetPosition === void 0 || // There is a config object.
+    paramInTargetPosition && typeof paramInTargetPosition === "object" && !Array.isArray(paramInTargetPosition)
+  ) {
+    if (
+      // The config object already has a commitment set.
+      paramInTargetPosition && commitmentPropertyName in paramInTargetPosition
+    ) {
+      if (!paramInTargetPosition[commitmentPropertyName] || paramInTargetPosition[commitmentPropertyName] === "finalized") {
+        const nextParams = [...params];
+        const {
+          [commitmentPropertyName]: _,
+          // eslint-disable-line @typescript-eslint/no-unused-vars
+          ...rest
+        } = paramInTargetPosition;
+        if (Object.keys(rest).length > 0) {
+          nextParams[optionsObjectPositionInParams] = rest;
+        } else {
+          if (optionsObjectPositionInParams === nextParams.length - 1) {
+            nextParams.length--;
+          } else {
+            nextParams[optionsObjectPositionInParams] = void 0;
+          }
+        }
+        return nextParams;
       }
+    } else if (overrideCommitment !== "finalized") {
+      const nextParams = [...params];
+      nextParams[optionsObjectPositionInParams] = {
+        ...paramInTargetPosition,
+        [commitmentPropertyName]: overrideCommitment
+      };
+      return nextParams;
     }
-    return out;
-  } else if (typeof value === "bigint") {
-    if (onIntegerOverflow && (value > Number.MAX_SAFE_INTEGER || value < -Number.MAX_SAFE_INTEGER)) {
-      onIntegerOverflow(keyPath, value);
-    }
-    return Number(value);
-  } else {
-    return value;
   }
+  return params;
 }
-function patchParamsForSolanaLabsRpc(params, onIntegerOverflow) {
-  return visitNode(params, [], onIntegerOverflow);
+
+// src/params-patcher-bigint-downcast.ts
+function downcastNodeToNumberIfBigint(value) {
+  return typeof value === "bigint" ? (
+    // FIXME(solana-labs/solana/issues/30341) Create a data type to represent u64 in the Solana
+    // JSON RPC implementation so that we can throw away this entire patcher instead of unsafely
+    // downcasting `bigints` to `numbers`.
+    Number(value)
+  ) : value;
 }
 
-// src/response-patcher-types.ts
+// src/params-patcher-integer-overflow.ts
+function getIntegerOverflowNodeVisitor(onIntegerOverflow) {
+  return (value, { keyPath }) => {
+    if (typeof value === "bigint") {
+      if (onIntegerOverflow && (value > Number.MAX_SAFE_INTEGER || value < -Number.MAX_SAFE_INTEGER)) {
+        onIntegerOverflow(keyPath, value);
+      }
+    }
+    return value;
+  };
+}
+
+// src/params-patcher-options-object-position-config.ts
+var OPTIONS_OBJECT_POSITION_BY_METHOD = {
+  accountNotifications: 1,
+  blockNotifications: 1,
+  getAccountInfo: 1,
+  getBalance: 1,
+  getBlock: 1,
+  getBlockHeight: 0,
+  getBlockProduction: 0,
+  getBlocks: 2,
+  getBlocksWithLimit: 2,
+  getConfirmedBlock: 1,
+  getConfirmedBlocks: 1,
+  getConfirmedBlocksWithLimit: 2,
+  getConfirmedSignaturesForAddress2: 1,
+  getConfirmedTransaction: 1,
+  getEpochInfo: 0,
+  getFeeCalculatorForBlockhash: 1,
+  getFeeForMessage: 1,
+  getFees: 1,
+  getInflationGovernor: 0,
+  getInflationReward: 1,
+  getLargestAccounts: 0,
+  getLatestBlockhash: 0,
+  getLeaderSchedule: 1,
+  getMinimumBalanceForRentExemption: 1,
+  getMultipleAccounts: 1,
+  getProgramAccounts: 1,
+  getRecentBlockhash: 1,
+  getSignaturesForAddress: 1,
+  getSlot: 0,
+  getSlotLeader: 0,
+  getStakeActivation: 1,
+  getStakeMinimumDelegation: 0,
+  getSupply: 0,
+  getTokenAccountBalance: 1,
+  getTokenAccountsByDelegate: 2,
+  getTokenAccountsByOwner: 2,
+  getTokenLargestAccounts: 1,
+  getTokenSupply: 1,
+  getTransaction: 1,
+  getTransactionCount: 0,
+  getVoteAccounts: 0,
+  isBlockhashValid: 1,
+  logsNotifications: 1,
+  programNotifications: 1,
+  requestAirdrop: 2,
+  sendTransaction: 1,
+  signatureNotifications: 1,
+  simulateTransaction: 1
+};
+
+// src/tree-traversal.ts
 var KEYPATH_WILDCARD = {};
+function getTreeWalker(visitors) {
+  return function traverse(node, state) {
+    if (Array.isArray(node)) {
+      return node.map((element, ii) => {
+        const nextState = {
+          ...state,
+          keyPath: [...state.keyPath, ii]
+        };
+        return traverse(element, nextState);
+      });
+    } else if (typeof node === "object" && node !== null) {
+      const out = {};
+      for (const propName in node) {
+        if (!Object.prototype.hasOwnProperty.call(node, propName)) {
+          continue;
+        }
+        const nextState = {
+          ...state,
+          keyPath: [...state.keyPath, propName]
+        };
+        out[propName] = traverse(node[propName], nextState);
+      }
+      return out;
+    } else {
+      return visitors.reduce((acc, visitNode) => visitNode(acc, state), node);
+    }
+  };
+}
 
+// src/params-patcher.ts
+function getParamsPatcherForSolanaLabsRpc(config) {
+  const defaultCommitment = config?.defaultCommitment;
+  const handleIntegerOverflow = config?.onIntegerOverflow;
+  return (rawParams, methodName) => {
+    const traverse = getTreeWalker([
+      ...handleIntegerOverflow ? [getIntegerOverflowNodeVisitor((...args) => handleIntegerOverflow(methodName, ...args))] : [],
+      downcastNodeToNumberIfBigint
+    ]);
+    const initialState = {
+      keyPath: []
+    };
+    const patchedParams = traverse(rawParams, initialState);
+    if (!Array.isArray(patchedParams)) {
+      return patchedParams;
+    }
+    const optionsObjectPositionInParams = OPTIONS_OBJECT_POSITION_BY_METHOD[methodName];
+    if (optionsObjectPositionInParams == null) {
+      return patchedParams;
+    }
+    return applyDefaultCommitment({
+      commitmentPropertyName: methodName === "sendTransaction" ? "preflightCommitment" : "commitment",
+      optionsObjectPositionInParams,
+      overrideCommitment: defaultCommitment,
+      params: patchedParams
+    });
+  };
+}
+
 // src/response-patcher-allowed-numeric-values.ts
@@ -420,35 +575,44 @@ var jsonParsedTokenAccountsConfigs = [
 
-// src/response-patcher.ts
-function getNextAllowedKeypaths(keyPaths, property) {
-  return keyPaths.filter((keyPath) => keyPath[0] === KEYPATH_WILDCARD && typeof property === "number" || keyPath[0] === property).map((keyPath) => keyPath.slice(1));
+// src/response-patcher-bigint-upcast.ts
+function keyPathIsAllowedToBeNumeric(keyPath, allowedNumericKeyPaths) {
+  return allowedNumericKeyPaths.some((prohibitedKeyPath) => {
+    if (prohibitedKeyPath.length !== keyPath.length) {
+      return false;
+    }
+    for (let ii = keyPath.length - 1; ii >= 0; ii--) {
+      const keyPathPart = keyPath[ii];
+      const prohibitedKeyPathPart = prohibitedKeyPath[ii];
+      if (prohibitedKeyPathPart !== keyPathPart && (prohibitedKeyPathPart !== KEYPATH_WILDCARD || typeof keyPathPart !== "number")) {
+        return false;
+      }
+    }
+    return true;
+  });
 }
-function visitNode2(value, allowedKeypaths) {
-  if (Array.isArray(value)) {
-    return value.map((element, ii) => {
-      const nextAllowedKeypaths = getNextAllowedKeypaths(allowedKeypaths, ii);
-      return visitNode2(element, nextAllowedKeypaths);
-    });
-  } else if (typeof value === "object" && value !== null) {
-    const out = {};
-    for (const [propName, innerValue] of Object.entries(value)) {
-      const nextAllowedKeypaths = getNextAllowedKeypaths(allowedKeypaths, propName);
-      out[propName] = visitNode2(innerValue, nextAllowedKeypaths);
+function getBigIntUpcastVisitor(allowedNumericKeyPaths) {
+  return function upcastNodeToBigIntIfNumber(value, { keyPath }) {
+    if (typeof value === "number" && Number.isInteger(value) && !keyPathIsAllowedToBeNumeric(keyPath, allowedNumericKeyPaths)) {
+      return BigInt(value);
+    } else {
+      return value;
     }
-    return out;
-  } else if (typeof value === "number" && // The presence of an allowed keypath on the route to this value implies it's allowlisted;
-  // Upcast the value to `bigint` unless an allowed keypath is present.
-  allowedKeypaths.length === 0 && // Only try to upcast an Integer to `bigint`
-  Number.isInteger(value)) {
-    return BigInt(value);
-  } else {
-    return value;
-  }
+  };
 }
+
+// src/response-patcher.ts
 function patchResponseForSolanaLabsRpc(rawResponse, methodName) {
-  const allowedKeypaths = methodName ? getAllowedNumericKeypathsForResponse()[methodName] : void 0;
-  return visitNode2(rawResponse, allowedKeypaths ?? []);
+  const allowedNumericKeyPaths = methodName ? getAllowedNumericKeypathsForResponse()[methodName] : void 0;
+  const traverse = getTreeWalker([getBigIntUpcastVisitor(allowedNumericKeyPaths ?? [])]);
+  const initialState = {
+    keyPath: []
+  };
+  return traverse(rawResponse, initialState);
 }
-function patchResponseForSolanaLabsRpcSubscriptions(rawResponse, methodName) {
-  const allowedKeypaths = methodName ? getAllowedNumericKeypathsForNotification()[methodName] : void 0;
-  return visitNode2(rawResponse, allowedKeypaths ?? []);
+function patchResponseForSolanaLabsRpcSubscriptions(rawResponse, notificationName) {
+  const allowedNumericKeyPaths = notificationName ? getAllowedNumericKeypathsForNotification()[notificationName] : void 0;
+  const traverse = getTreeWalker([getBigIntUpcastVisitor(allowedNumericKeyPaths ?? [])]);
+  const initialState = {
+    keyPath: []
+  };
+  return traverse(rawResponse, initialState);
 }
@@ -458,62 +622,24 @@
 function createSolanaRpcApi(config) {
-  return new Proxy({}, {
-    defineProperty() {
-      return false;
-    },
-    deleteProperty() {
-      return false;
-    },
-    get(...args) {
-      const [_, p] = args;
-      const methodName = p.toString();
-      return function(...rawParams) {
-        const handleIntegerOverflow = config?.onIntegerOverflow;
-        const params = patchParamsForSolanaLabsRpc(
-          rawParams,
-          handleIntegerOverflow ? (keyPath, value) => handleIntegerOverflow(methodName, keyPath, value) : void 0
-        );
-        return {
-          methodName,
-          params,
-          responseProcessor: (rawResponse) => patchResponseForSolanaLabsRpc(rawResponse, methodName)
-        };
-      };
-    }
+  return createJsonRpcApi({
+    parametersTransformer: getParamsPatcherForSolanaLabsRpc(config),
+    responseTransformer: patchResponseForSolanaLabsRpc
   });
 }
-
-// src/rpc-subscriptions/index.ts
-function createSolanaRpcSubscriptionsApi(config) {
-  return new Proxy({}, {
-    defineProperty() {
-      return false;
-    },
-    deleteProperty() {
-      return false;
-    },
-    get(...args) {
-      const [_, p] = args;
-      const notificationName = p.toString();
-      return function(...rawParams) {
-        const handleIntegerOverflow = config?.onIntegerOverflow;
-        const params = patchParamsForSolanaLabsRpc(
-          rawParams,
-          handleIntegerOverflow ? (keyPath, value) => handleIntegerOverflow(notificationName, keyPath, value) : void 0
-        );
-        return {
-          params,
-          responseProcessor: (rawResponse) => patchResponseForSolanaLabsRpcSubscriptions(rawResponse, notificationName),
-          subscribeMethodName: notificationName.replace(/Notifications$/, "Subscribe"),
-          unsubscribeMethodName: notificationName.replace(/Notifications$/, "Unsubscribe")
-        };
-      };
-    }
+function createSolanaRpcSubscriptionsApi_INTERNAL(config) {
+  return createJsonRpcSubscriptionsApi({
+    parametersTransformer: getParamsPatcherForSolanaLabsRpc(config),
+    responseTransformer: patchResponseForSolanaLabsRpcSubscriptions,
+    subscribeNotificationNameTransformer: (notificationName) => notificationName.replace(/Notifications$/, "Subscribe"),
+    unsubscribeNotificationNameTransformer: (notificationName) => notificationName.replace(/Notifications$/, "Unsubscribe")
   });
 }
+function createSolanaRpcSubscriptionsApi(config) {
+  return createSolanaRpcSubscriptionsApi_INTERNAL(config);
+}
 function createSolanaRpcSubscriptionsApi_UNSTABLE(config) {
-  return createSolanaRpcSubscriptionsApi(config);
+  return createSolanaRpcSubscriptionsApi_INTERNAL(config);
 }
 
-export { createSolanaRpcApi, createSolanaRpcSubscriptionsApi, createSolanaRpcSubscriptionsApi_UNSTABLE };
+export { createSolanaRpcApi, createSolanaRpcSubscriptionsApi, createSolanaRpcSubscriptionsApi_INTERNAL, createSolanaRpcSubscriptionsApi_UNSTABLE };
 //# sourceMappingURL=out.js.map
 //# sourceMappingURL=index.browser.js.map

dist/index.native.js

@@ -1,31 +0,186 @@
-// src/params-patcher.ts
-function visitNode(value, keyPath, onIntegerOverflow) {
-  if (Array.isArray(value)) {
-    return value.map(
-      (element, ii) => visitNode(element, [...keyPath, ii], onIntegerOverflow)
-    );
-  } else if (typeof value === "object" && value !== null) {
-    const out = {};
-    for (const propName in value) {
-      if (Object.prototype.hasOwnProperty.call(value, propName)) {
-        out[propName] = visitNode(value[propName], [...keyPath, propName], onIntegerOverflow);
+import { createJsonRpcApi, createJsonRpcSubscriptionsApi } from '@solana/rpc-transport';
+
+// src/rpc-methods/index.ts
+
+// src/default-commitment.ts
+function applyDefaultCommitment({
+  commitmentPropertyName,
+  params,
+  optionsObjectPositionInParams,
+  overrideCommitment
+}) {
+  const paramInTargetPosition = params[optionsObjectPositionInParams];
+  if (
+    // There's no config.
+    paramInTargetPosition === void 0 || // There is a config object.
+    paramInTargetPosition && typeof paramInTargetPosition === "object" && !Array.isArray(paramInTargetPosition)
+  ) {
+    if (
+      // The config object already has a commitment set.
+      paramInTargetPosition && commitmentPropertyName in paramInTargetPosition
+    ) {
+      if (!paramInTargetPosition[commitmentPropertyName] || paramInTargetPosition[commitmentPropertyName] === "finalized") {
+        const nextParams = [...params];
+        const {
+          [commitmentPropertyName]: _,
+          // eslint-disable-line @typescript-eslint/no-unused-vars
+          ...rest
+        } = paramInTargetPosition;
+        if (Object.keys(rest).length > 0) {
+          nextParams[optionsObjectPositionInParams] = rest;
+        } else {
+          if (optionsObjectPositionInParams === nextParams.length - 1) {
+            nextParams.length--;
+          } else {
+            nextParams[optionsObjectPositionInParams] = void 0;
+          }
+        }
+        return nextParams;
       }
+    } else if (overrideCommitment !== "finalized") {
+      const nextParams = [...params];
+      nextParams[optionsObjectPositionInParams] = {
+        ...paramInTargetPosition,
+        [commitmentPropertyName]: overrideCommitment
+      };
+      return nextParams;
     }
-    return out;
-  } else if (typeof value === "bigint") {
-    if (onIntegerOverflow && (value > Number.MAX_SAFE_INTEGER || value < -Number.MAX_SAFE_INTEGER)) {
-      onIntegerOverflow(keyPath, value);
-    }
-    return Number(value);
-  } else {
-    return value;
   }
+  return params;
 }
-function patchParamsForSolanaLabsRpc(params, onIntegerOverflow) {
-  return visitNode(params, [], onIntegerOverflow);
+
+// src/params-patcher-bigint-downcast.ts
+function downcastNodeToNumberIfBigint(value) {
+  return typeof value === "bigint" ? (
+    // FIXME(solana-labs/solana/issues/30341) Create a data type to represent u64 in the Solana
+    // JSON RPC implementation so that we can throw away this entire patcher instead of unsafely
+    // downcasting `bigints` to `numbers`.
+    Number(value)
+  ) : value;
 }
 
-// src/response-patcher-types.ts
+// src/params-patcher-integer-overflow.ts
+function getIntegerOverflowNodeVisitor(onIntegerOverflow) {
+  return (value, { keyPath }) => {
+    if (typeof value === "bigint") {
+      if (onIntegerOverflow && (value > Number.MAX_SAFE_INTEGER || value < -Number.MAX_SAFE_INTEGER)) {
+        onIntegerOverflow(keyPath, value);
+      }
+    }
+    return value;
+  };
+}
+
+// src/params-patcher-options-object-position-config.ts
+var OPTIONS_OBJECT_POSITION_BY_METHOD = {
+  accountNotifications: 1,
+  blockNotifications: 1,
+  getAccountInfo: 1,
+  getBalance: 1,
+  getBlock: 1,
+  getBlockHeight: 0,
+  getBlockProduction: 0,
+  getBlocks: 2,
+  getBlocksWithLimit: 2,
+  getConfirmedBlock: 1,
+  getConfirmedBlocks: 1,
+  getConfirmedBlocksWithLimit: 2,
+  getConfirmedSignaturesForAddress2: 1,
+  getConfirmedTransaction: 1,
+  getEpochInfo: 0,
+  getFeeCalculatorForBlockhash: 1,
+  getFeeForMessage: 1,
+  getFees: 1,
+  getInflationGovernor: 0,
+  getInflationReward: 1,
+  getLargestAccounts: 0,
+  getLatestBlockhash: 0,
+  getLeaderSchedule: 1,
+  getMinimumBalanceForRentExemption: 1,
+  getMultipleAccounts: 1,
+  getProgramAccounts: 1,
+  getRecentBlockhash: 1,
+  getSignaturesForAddress: 1,
+  getSlot: 0,
+  getSlotLeader: 0,
+  getStakeActivation: 1,
+  getStakeMinimumDelegation: 0,
+  getSupply: 0,
+  getTokenAccountBalance: 1,
+  getTokenAccountsByDelegate: 2,
+  getTokenAccountsByOwner: 2,
+  getTokenLargestAccounts: 1,
+  getTokenSupply: 1,
+  getTransaction: 1,
+  getTransactionCount: 0,
+  getVoteAccounts: 0,
+  isBlockhashValid: 1,
+  logsNotifications: 1,
+  programNotifications: 1,
+  requestAirdrop: 2,
+  sendTransaction: 1,
+  signatureNotifications: 1,
+  simulateTransaction: 1
+};
+
+// src/tree-traversal.ts
 var KEYPATH_WILDCARD = {};
+function getTreeWalker(visitors) {
+  return function traverse(node, state) {
+    if (Array.isArray(node)) {
+      return node.map((element, ii) => {
+        const nextState = {
+          ...state,
+          keyPath: [...state.keyPath, ii]
+        };
+        return traverse(element, nextState);
+      });
+    } else if (typeof node === "object" && node !== null) {
+      const out = {};
+      for (const propName in node) {
+        if (!Object.prototype.hasOwnProperty.call(node, propName)) {
+          continue;
+        }
+        const nextState = {
+          ...state,
+          keyPath: [...state.keyPath, propName]
+        };
+        out[propName] = traverse(node[propName], nextState);
+      }
+      return out;
+    } else {
+      return visitors.reduce((acc, visitNode) => visitNode(acc, state), node);
+    }
+  };
+}
 
+// src/params-patcher.ts
+function getParamsPatcherForSolanaLabsRpc(config) {
+  const defaultCommitment = config?.defaultCommitment;
+  const handleIntegerOverflow = config?.onIntegerOverflow;
+  return (rawParams, methodName) => {
+    const traverse = getTreeWalker([
+      ...handleIntegerOverflow ? [getIntegerOverflowNodeVisitor((...args) => handleIntegerOverflow(methodName, ...args))] : [],
+      downcastNodeToNumberIfBigint
+    ]);
+    const initialState = {
+      keyPath: []
+    };
+    const patchedParams = traverse(rawParams, initialState);
+    if (!Array.isArray(patchedParams)) {
+      return patchedParams;
+    }
+    const optionsObjectPositionInParams = OPTIONS_OBJECT_POSITION_BY_METHOD[methodName];
+    if (optionsObjectPositionInParams == null) {
+      return patchedParams;
+    }
+    return applyDefaultCommitment({
+      commitmentPropertyName: methodName === "sendTransaction" ? "preflightCommitment" : "commitment",
+      optionsObjectPositionInParams,
+      overrideCommitment: defaultCommitment,
+      params: patchedParams
+    });
+  };
+}
+
 // src/response-patcher-allowed-numeric-values.ts
@@ -420,35 +575,44 @@ var jsonParsedTokenAccountsConfigs = [
 
-// src/response-patcher.ts
-function getNextAllowedKeypaths(keyPaths, property) {
-  return keyPaths.filter((keyPath) => keyPath[0] === KEYPATH_WILDCARD && typeof property === "number" || keyPath[0] === property).map((keyPath) => keyPath.slice(1));
+// src/response-patcher-bigint-upcast.ts
+function keyPathIsAllowedToBeNumeric(keyPath, allowedNumericKeyPaths) {
+  return allowedNumericKeyPaths.some((prohibitedKeyPath) => {
+    if (prohibitedKeyPath.length !== keyPath.length) {
+      return false;
+    }
+    for (let ii = keyPath.length - 1; ii >= 0; ii--) {
+      const keyPathPart = keyPath[ii];
+      const prohibitedKeyPathPart = prohibitedKeyPath[ii];
+      if (prohibitedKeyPathPart !== keyPathPart && (prohibitedKeyPathPart !== KEYPATH_WILDCARD || typeof keyPathPart !== "number")) {
+        return false;
+      }
+    }
+    return true;
+  });
 }
-function visitNode2(value, allowedKeypaths) {
-  if (Array.isArray(value)) {
-    return value.map((element, ii) => {
-      const nextAllowedKeypaths = getNextAllowedKeypaths(allowedKeypaths, ii);
-      return visitNode2(element, nextAllowedKeypaths);
-    });
-  } else if (typeof value === "object" && value !== null) {
-    const out = {};
-    for (const [propName, innerValue] of Object.entries(value)) {
-      const nextAllowedKeypaths = getNextAllowedKeypaths(allowedKeypaths, propName);
-      out[propName] = visitNode2(innerValue, nextAllowedKeypaths);
+function getBigIntUpcastVisitor(allowedNumericKeyPaths) {
+  return function upcastNodeToBigIntIfNumber(value, { keyPath }) {
+    if (typeof value === "number" && Number.isInteger(value) && !keyPathIsAllowedToBeNumeric(keyPath, allowedNumericKeyPaths)) {
+      return BigInt(value);
+    } else {
+      return value;
     }
-    return out;
-  } else if (typeof value === "number" && // The presence of an allowed keypath on the route to this value implies it's allowlisted;
-  // Upcast the value to `bigint` unless an allowed keypath is present.
-  allowedKeypaths.length === 0 && // Only try to upcast an Integer to `bigint`
-  Number.isInteger(value)) {
-    return BigInt(value);
-  } else {
-    return value;
-  }
+  };
 }
+
+// src/response-patcher.ts
 function patchResponseForSolanaLabsRpc(rawResponse, methodName) {
-  const allowedKeypaths = methodName ? getAllowedNumericKeypathsForResponse()[methodName] : void 0;
-  return visitNode2(rawResponse, allowedKeypaths ?? []);
+  const allowedNumericKeyPaths = methodName ? getAllowedNumericKeypathsForResponse()[methodName] : void 0;
+  const traverse = getTreeWalker([getBigIntUpcastVisitor(allowedNumericKeyPaths ?? [])]);
+  const initialState = {
+    keyPath: []
+  };
+  return traverse(rawResponse, initialState);
 }
-function patchResponseForSolanaLabsRpcSubscriptions(rawResponse, methodName) {
-  const allowedKeypaths = methodName ? getAllowedNumericKeypathsForNotification()[methodName] : void 0;
-  return visitNode2(rawResponse, allowedKeypaths ?? []);
+function patchResponseForSolanaLabsRpcSubscriptions(rawResponse, notificationName) {
+  const allowedNumericKeyPaths = notificationName ? getAllowedNumericKeypathsForNotification()[notificationName] : void 0;
+  const traverse = getTreeWalker([getBigIntUpcastVisitor(allowedNumericKeyPaths ?? [])]);
+  const initialState = {
+    keyPath: []
+  };
+  return traverse(rawResponse, initialState);
 }
@@ -458,62 +622,24 @@
 function createSolanaRpcApi(config) {
-  return new Proxy({}, {
-    defineProperty() {
-      return false;
-    },
-    deleteProperty() {
-      return false;
-    },
-    get(...args) {
-      const [_, p] = args;
-      const methodName = p.toString();
-      return function(...rawParams) {
-        const handleIntegerOverflow = config?.onIntegerOverflow;
-        const params = patchParamsForSolanaLabsRpc(
-          rawParams,
-          handleIntegerOverflow ? (keyPath, value) => handleIntegerOverflow(methodName, keyPath, value) : void 0
-        );
-        return {
-          methodName,
-          params,
-          responseProcessor: (rawResponse) => patchResponseForSolanaLabsRpc(rawResponse, methodName)
-        };
-      };
-    }
+  return createJsonRpcApi({
+    parametersTransformer: getParamsPatcherForSolanaLabsRpc(config),
+    responseTransformer: patchResponseForSolanaLabsRpc
   });
 }
-
-// src/rpc-subscriptions/index.ts
-function createSolanaRpcSubscriptionsApi(config) {
-  return new Proxy({}, {
-    defineProperty() {
-      return false;
-    },
-    deleteProperty() {
-      return false;
-    },
-    get(...args) {
-      const [_, p] = args;
-      const notificationName = p.toString();
-      return function(...rawParams) {
-        const handleIntegerOverflow = config?.onIntegerOverflow;
-        const params = patchParamsForSolanaLabsRpc(
-          rawParams,
-          handleIntegerOverflow ? (keyPath, value) => handleIntegerOverflow(notificationName, keyPath, value) : void 0
-        );
-        return {
-          params,
-          responseProcessor: (rawResponse) => patchResponseForSolanaLabsRpcSubscriptions(rawResponse, notificationName),
-          subscribeMethodName: notificationName.replace(/Notifications$/, "Subscribe"),
-          unsubscribeMethodName: notificationName.replace(/Notifications$/, "Unsubscribe")
-        };
-      };
-    }
+function createSolanaRpcSubscriptionsApi_INTERNAL(config) {
+  return createJsonRpcSubscriptionsApi({
+    parametersTransformer: getParamsPatcherForSolanaLabsRpc(config),
+    responseTransformer: patchResponseForSolanaLabsRpcSubscriptions,
+    subscribeNotificationNameTransformer: (notificationName) => notificationName.replace(/Notifications$/, "Subscribe"),
+    unsubscribeNotificationNameTransformer: (notificationName) => notificationName.replace(/Notifications$/, "Unsubscribe")
   });
 }
+function createSolanaRpcSubscriptionsApi(config) {
+  return createSolanaRpcSubscriptionsApi_INTERNAL(config);
+}
 function createSolanaRpcSubscriptionsApi_UNSTABLE(config) {
-  return createSolanaRpcSubscriptionsApi(config);
+  return createSolanaRpcSubscriptionsApi_INTERNAL(config);
 }
 
-export { createSolanaRpcApi, createSolanaRpcSubscriptionsApi, createSolanaRpcSubscriptionsApi_UNSTABLE };
+export { createSolanaRpcApi, createSolanaRpcSubscriptionsApi, createSolanaRpcSubscriptionsApi_INTERNAL, createSolanaRpcSubscriptionsApi_UNSTABLE };
 //# sourceMappingURL=out.js.map
 //# sourceMappingURL=index.native.js.map

dist/index.node.js

@@ -1,31 +0,186 @@
-// src/params-patcher.ts
-function visitNode(value, keyPath, onIntegerOverflow) {
-  if (Array.isArray(value)) {
-    return value.map(
-      (element, ii) => visitNode(element, [...keyPath, ii], onIntegerOverflow)
-    );
-  } else if (typeof value === "object" && value !== null) {
-    const out = {};
-    for (const propName in value) {
-      if (Object.prototype.hasOwnProperty.call(value, propName)) {
-        out[propName] = visitNode(value[propName], [...keyPath, propName], onIntegerOverflow);
+import { createJsonRpcApi, createJsonRpcSubscriptionsApi } from '@solana/rpc-transport';
+
+// src/rpc-methods/index.ts
+
+// src/default-commitment.ts
+function applyDefaultCommitment({
+  commitmentPropertyName,
+  params,
+  optionsObjectPositionInParams,
+  overrideCommitment
+}) {
+  const paramInTargetPosition = params[optionsObjectPositionInParams];
+  if (
+    // There's no config.
+    paramInTargetPosition === void 0 || // There is a config object.
+    paramInTargetPosition && typeof paramInTargetPosition === "object" && !Array.isArray(paramInTargetPosition)
+  ) {
+    if (
+      // The config object already has a commitment set.
+      paramInTargetPosition && commitmentPropertyName in paramInTargetPosition
+    ) {
+      if (!paramInTargetPosition[commitmentPropertyName] || paramInTargetPosition[commitmentPropertyName] === "finalized") {
+        const nextParams = [...params];
+        const {
+          [commitmentPropertyName]: _,
+          // eslint-disable-line @typescript-eslint/no-unused-vars
+          ...rest
+        } = paramInTargetPosition;
+        if (Object.keys(rest).length > 0) {
+          nextParams[optionsObjectPositionInParams] = rest;
+        } else {
+          if (optionsObjectPositionInParams === nextParams.length - 1) {
+            nextParams.length--;
+          } else {
+            nextParams[optionsObjectPositionInParams] = void 0;
+          }
+        }
+        return nextParams;
       }
+    } else if (overrideCommitment !== "finalized") {
+      const nextParams = [...params];
+      nextParams[optionsObjectPositionInParams] = {
+        ...paramInTargetPosition,
+        [commitmentPropertyName]: overrideCommitment
+      };
+      return nextParams;
     }
-    return out;
-  } else if (typeof value === "bigint") {
-    if (onIntegerOverflow && (value > Number.MAX_SAFE_INTEGER || value < -Number.MAX_SAFE_INTEGER)) {
-      onIntegerOverflow(keyPath, value);
-    }
-    return Number(value);
-  } else {
-    return value;
   }
+  return params;
 }
-function patchParamsForSolanaLabsRpc(params, onIntegerOverflow) {
-  return visitNode(params, [], onIntegerOverflow);
+
+// src/params-patcher-bigint-downcast.ts
+function downcastNodeToNumberIfBigint(value) {
+  return typeof value === "bigint" ? (
+    // FIXME(solana-labs/solana/issues/30341) Create a data type to represent u64 in the Solana
+    // JSON RPC implementation so that we can throw away this entire patcher instead of unsafely
+    // downcasting `bigints` to `numbers`.
+    Number(value)
+  ) : value;
 }
 
-// src/response-patcher-types.ts
+// src/params-patcher-integer-overflow.ts
+function getIntegerOverflowNodeVisitor(onIntegerOverflow) {
+  return (value, { keyPath }) => {
+    if (typeof value === "bigint") {
+      if (onIntegerOverflow && (value > Number.MAX_SAFE_INTEGER || value < -Number.MAX_SAFE_INTEGER)) {
+        onIntegerOverflow(keyPath, value);
+      }
+    }
+    return value;
+  };
+}
+
+// src/params-patcher-options-object-position-config.ts
+var OPTIONS_OBJECT_POSITION_BY_METHOD = {
+  accountNotifications: 1,
+  blockNotifications: 1,
+  getAccountInfo: 1,
+  getBalance: 1,
+  getBlock: 1,
+  getBlockHeight: 0,
+  getBlockProduction: 0,
+  getBlocks: 2,
+  getBlocksWithLimit: 2,
+  getConfirmedBlock: 1,
+  getConfirmedBlocks: 1,
+  getConfirmedBlocksWithLimit: 2,
+  getConfirmedSignaturesForAddress2: 1,
+  getConfirmedTransaction: 1,
+  getEpochInfo: 0,
+  getFeeCalculatorForBlockhash: 1,
+  getFeeForMessage: 1,
+  getFees: 1,
+  getInflationGovernor: 0,
+  getInflationReward: 1,
+  getLargestAccounts: 0,
+  getLatestBlockhash: 0,
+  getLeaderSchedule: 1,
+  getMinimumBalanceForRentExemption: 1,
+  getMultipleAccounts: 1,
+  getProgramAccounts: 1,
+  getRecentBlockhash: 1,
+  getSignaturesForAddress: 1,
+  getSlot: 0,
+  getSlotLeader: 0,
+  getStakeActivation: 1,
+  getStakeMinimumDelegation: 0,
+  getSupply: 0,
+  getTokenAccountBalance: 1,
+  getTokenAccountsByDelegate: 2,
+  getTokenAccountsByOwner: 2,
+  getTokenLargestAccounts: 1,
+  getTokenSupply: 1,
+  getTransaction: 1,
+  getTransactionCount: 0,
+  getVoteAccounts: 0,
+  isBlockhashValid: 1,
+  logsNotifications: 1,
+  programNotifications: 1,
+  requestAirdrop: 2,
+  sendTransaction: 1,
+  signatureNotifications: 1,
+  simulateTransaction: 1
+};
+
+// src/tree-traversal.ts
 var KEYPATH_WILDCARD = {};
+function getTreeWalker(visitors) {
+  return function traverse(node, state) {
+    if (Array.isArray(node)) {
+      return node.map((element, ii) => {
+        const nextState = {
+          ...state,
+          keyPath: [...state.keyPath, ii]
+        };
+        return traverse(element, nextState);
+      });
+    } else if (typeof node === "object" && node !== null) {
+      const out = {};
+      for (const propName in node) {
+        if (!Object.prototype.hasOwnProperty.call(node, propName)) {
+          continue;
+        }
+        const nextState = {
+          ...state,
+          keyPath: [...state.keyPath, propName]
+        };
+        out[propName] = traverse(node[propName], nextState);
+      }
+      return out;
+    } else {
+      return visitors.reduce((acc, visitNode) => visitNode(acc, state), node);
+    }
+  };
+}
 
+// src/params-patcher.ts
+function getParamsPatcherForSolanaLabsRpc(config) {
+  const defaultCommitment = config?.defaultCommitment;
+  const handleIntegerOverflow = config?.onIntegerOverflow;
+  return (rawParams, methodName) => {
+    const traverse = getTreeWalker([
+      ...handleIntegerOverflow ? [getIntegerOverflowNodeVisitor((...args) => handleIntegerOverflow(methodName, ...args))] : [],
+      downcastNodeToNumberIfBigint
+    ]);
+    const initialState = {
+      keyPath: []
+    };
+    const patchedParams = traverse(rawParams, initialState);
+    if (!Array.isArray(patchedParams)) {
+      return patchedParams;
+    }
+    const optionsObjectPositionInParams = OPTIONS_OBJECT_POSITION_BY_METHOD[methodName];
+    if (optionsObjectPositionInParams == null) {
+      return patchedParams;
+    }
+    return applyDefaultCommitment({
+      commitmentPropertyName: methodName === "sendTransaction" ? "preflightCommitment" : "commitment",
+      optionsObjectPositionInParams,
+      overrideCommitment: defaultCommitment,
+      params: patchedParams
+    });
+  };
+}
+
 // src/response-patcher-allowed-numeric-values.ts
@@ -420,35 +575,44 @@ var jsonParsedTokenAccountsConfigs = [
 
-// src/response-patcher.ts
-function getNextAllowedKeypaths(keyPaths, property) {
-  return keyPaths.filter((keyPath) => keyPath[0] === KEYPATH_WILDCARD && typeof property === "number" || keyPath[0] === property).map((keyPath) => keyPath.slice(1));
+// src/response-patcher-bigint-upcast.ts
+function keyPathIsAllowedToBeNumeric(keyPath, allowedNumericKeyPaths) {
+  return allowedNumericKeyPaths.some((prohibitedKeyPath) => {
+    if (prohibitedKeyPath.length !== keyPath.length) {
+      return false;
+    }
+    for (let ii = keyPath.length - 1; ii >= 0; ii--) {
+      const keyPathPart = keyPath[ii];
+      const prohibitedKeyPathPart = prohibitedKeyPath[ii];
+      if (prohibitedKeyPathPart !== keyPathPart && (prohibitedKeyPathPart !== KEYPATH_WILDCARD || typeof keyPathPart !== "number")) {
+        return false;
+      }
+    }
+    return true;
+  });
 }
-function visitNode2(value, allowedKeypaths) {
-  if (Array.isArray(value)) {
-    return value.map((element, ii) => {
-      const nextAllowedKeypaths = getNextAllowedKeypaths(allowedKeypaths, ii);
-      return visitNode2(element, nextAllowedKeypaths);
-    });
-  } else if (typeof value === "object" && value !== null) {
-    const out = {};
-    for (const [propName, innerValue] of Object.entries(value)) {
-      const nextAllowedKeypaths = getNextAllowedKeypaths(allowedKeypaths, propName);
-      out[propName] = visitNode2(innerValue, nextAllowedKeypaths);
+function getBigIntUpcastVisitor(allowedNumericKeyPaths) {
+  return function upcastNodeToBigIntIfNumber(value, { keyPath }) {
+    if (typeof value === "number" && Number.isInteger(value) && !keyPathIsAllowedToBeNumeric(keyPath, allowedNumericKeyPaths)) {
+      return BigInt(value);
+    } else {
+      return value;
     }
-    return out;
-  } else if (typeof value === "number" && // The presence of an allowed keypath on the route to this value implies it's allowlisted;
-  // Upcast the value to `bigint` unless an allowed keypath is present.
-  allowedKeypaths.length === 0 && // Only try to upcast an Integer to `bigint`
-  Number.isInteger(value)) {
-    return BigInt(value);
-  } else {
-    return value;
-  }
+  };
 }
+
+// src/response-patcher.ts
 function patchResponseForSolanaLabsRpc(rawResponse, methodName) {
-  const allowedKeypaths = methodName ? getAllowedNumericKeypathsForResponse()[methodName] : void 0;
-  return visitNode2(rawResponse, allowedKeypaths ?? []);
+  const allowedNumericKeyPaths = methodName ? getAllowedNumericKeypathsForResponse()[methodName] : void 0;
+  const traverse = getTreeWalker([getBigIntUpcastVisitor(allowedNumericKeyPaths ?? [])]);
+  const initialState = {
+    keyPath: []
+  };
+  return traverse(rawResponse, initialState);
 }
-function patchResponseForSolanaLabsRpcSubscriptions(rawResponse, methodName) {
-  const allowedKeypaths = methodName ? getAllowedNumericKeypathsForNotification()[methodName] : void 0;
-  return visitNode2(rawResponse, allowedKeypaths ?? []);
+function patchResponseForSolanaLabsRpcSubscriptions(rawResponse, notificationName) {
+  const allowedNumericKeyPaths = notificationName ? getAllowedNumericKeypathsForNotification()[notificationName] : void 0;
+  const traverse = getTreeWalker([getBigIntUpcastVisitor(allowedNumericKeyPaths ?? [])]);
+  const initialState = {
+    keyPath: []
+  };
+  return traverse(rawResponse, initialState);
 }
@@ -458,62 +622,24 @@
 function createSolanaRpcApi(config) {
-  return new Proxy({}, {
-    defineProperty() {
-      return false;
-    },
-    deleteProperty() {
-      return false;
-    },
-    get(...args) {
-      const [_, p] = args;
-      const methodName = p.toString();
-      return function(...rawParams) {
-        const handleIntegerOverflow = config?.onIntegerOverflow;
-        const params = patchParamsForSolanaLabsRpc(
-          rawParams,
-          handleIntegerOverflow ? (keyPath, value) => handleIntegerOverflow(methodName, keyPath, value) : void 0
-        );
-        return {
-          methodName,
-          params,
-          responseProcessor: (rawResponse) => patchResponseForSolanaLabsRpc(rawResponse, methodName)
-        };
-      };
-    }
+  return createJsonRpcApi({
+    parametersTransformer: getParamsPatcherForSolanaLabsRpc(config),
+    responseTransformer: patchResponseForSolanaLabsRpc
   });
 }
-
-// src/rpc-subscriptions/index.ts
-function createSolanaRpcSubscriptionsApi(config) {
-  return new Proxy({}, {
-    defineProperty() {
-      return false;
-    },
-    deleteProperty() {
-      return false;
-    },
-    get(...args) {
-      const [_, p] = args;
-      const notificationName = p.toString();
-      return function(...rawParams) {
-        const handleIntegerOverflow = config?.onIntegerOverflow;
-        const params = patchParamsForSolanaLabsRpc(
-          rawParams,
-          handleIntegerOverflow ? (keyPath, value) => handleIntegerOverflow(notificationName, keyPath, value) : void 0
-        );
-        return {
-          params,
-          responseProcessor: (rawResponse) => patchResponseForSolanaLabsRpcSubscriptions(rawResponse, notificationName),
-          subscribeMethodName: notificationName.replace(/Notifications$/, "Subscribe"),
-          unsubscribeMethodName: notificationName.replace(/Notifications$/, "Unsubscribe")
-        };
-      };
-    }
+function createSolanaRpcSubscriptionsApi_INTERNAL(config) {
+  return createJsonRpcSubscriptionsApi({
+    parametersTransformer: getParamsPatcherForSolanaLabsRpc(config),
+    responseTransformer: patchResponseForSolanaLabsRpcSubscriptions,
+    subscribeNotificationNameTransformer: (notificationName) => notificationName.replace(/Notifications$/, "Subscribe"),
+    unsubscribeNotificationNameTransformer: (notificationName) => notificationName.replace(/Notifications$/, "Unsubscribe")
   });
 }
+function createSolanaRpcSubscriptionsApi(config) {
+  return createSolanaRpcSubscriptionsApi_INTERNAL(config);
+}
 function createSolanaRpcSubscriptionsApi_UNSTABLE(config) {
-  return createSolanaRpcSubscriptionsApi(config);
+  return createSolanaRpcSubscriptionsApi_INTERNAL(config);
 }
 
-export { createSolanaRpcApi, createSolanaRpcSubscriptionsApi, createSolanaRpcSubscriptionsApi_UNSTABLE };
+export { createSolanaRpcApi, createSolanaRpcSubscriptionsApi, createSolanaRpcSubscriptionsApi_INTERNAL, createSolanaRpcSubscriptionsApi_UNSTABLE };
 //# sourceMappingURL=out.js.map
 //# sourceMappingURL=index.node.js.map

dist/types/index.d.ts

@@ -1,3 +0,4 @@
-export * from './rpc-methods';
-export * from './rpc-subscriptions';
+export * from './rpc-methods/index.js';
+export * from './rpc-subscriptions/index.js';
+export * from './transaction-error.js';
 //# sourceMappingURL=index.d.ts.map

dist/types/params-patcher.d.ts

@@ -1,7 +0,8 @@
-type IntegerOverflowHandler = (keyPath: (number | string)[], value: bigint) => void;
-type Patched<T> = T extends object ? {
-    [Property in keyof T]: Patched<T[Property]>;
-} : T extends bigint ? number : T;
-export declare function patchParamsForSolanaLabsRpc<T>(params: T, onIntegerOverflow?: IntegerOverflowHandler): Patched<T>;
-export {};
+import { Commitment } from '@solana/rpc-types';
+import { KeyPath } from './tree-traversal.js';
+export type ParamsPatcherConfig = Readonly<{
+    defaultCommitment?: Commitment;
+    onIntegerOverflow?: (methodName: string, keyPath: KeyPath, value: bigint) => void;
+}>;
+export declare function getParamsPatcherForSolanaLabsRpc(config?: ParamsPatcherConfig): <T>(rawParams: T, methodName: string) => unknown;
 //# sourceMappingURL=params-patcher.d.ts.map

dist/types/response-patcher-allowed-numeric-values.d.ts

@@ -1,5 +0,5 @@
-import { IRpcSubscriptionsApi } from '@solana/rpc-transport/dist/types/json-rpc-types';
-import { KeyPath } from './response-patcher';
-import { createSolanaRpcApi } from './rpc-methods';
-import { SolanaRpcSubscriptions, SolanaRpcSubscriptionsUnstable } from './rpc-subscriptions';
+import type { IRpcSubscriptionsApi } from '@solana/rpc-types';
+import { createSolanaRpcApi } from './rpc-methods/index.js';
+import { SolanaRpcSubscriptions, SolanaRpcSubscriptionsUnstable } from './rpc-subscriptions/index.js';
+import { KeyPath } from './tree-traversal.js';
 type AllowedNumericKeypaths<TApi> = Partial<Record<keyof TApi, readonly KeyPath[]>>;
@@ -6,0 +6,0 @@ /**

dist/types/response-patcher.d.ts

@@ -1,7 +0,5 @@
-import { KeyPathWildcard } from './response-patcher-types';
-import { createSolanaRpcApi } from './rpc-methods';
-import { createSolanaRpcSubscriptionsApi } from './rpc-subscriptions';
-export type KeyPath = ReadonlyArray<KeyPathWildcard | number | string | KeyPath>;
+import { createSolanaRpcApi } from './rpc-methods/index.js';
+import { createSolanaRpcSubscriptionsApi } from './rpc-subscriptions/index.js';
 export declare function patchResponseForSolanaLabsRpc<T>(rawResponse: unknown, methodName?: keyof ReturnType<typeof createSolanaRpcApi>): T;
-export declare function patchResponseForSolanaLabsRpcSubscriptions<T>(rawResponse: unknown, methodName?: keyof ReturnType<typeof createSolanaRpcSubscriptionsApi>): T;
+export declare function patchResponseForSolanaLabsRpcSubscriptions<T>(rawResponse: unknown, notificationName?: keyof ReturnType<typeof createSolanaRpcSubscriptionsApi>): T;
 //# sourceMappingURL=response-patcher.d.ts.map

dist/types/rpc-methods/common-transactions.d.ts

@@ -1,9 +0,9 @@
-import { Base58EncodedAddress } from '@solana/addresses';
-import { LamportsUnsafeBeyond2Pow53Minus1 } from '@solana/rpc-types';
-import { Blockhash, TransactionVersion } from '@solana/transactions';
-import { TransactionError } from '../transaction-error';
-import { Base58EncodedBytes, Base58EncodedDataResponse, Base64EncodedDataResponse, SignedLamportsAsI64Unsafe, TokenBalance, U64UnsafeBeyond2Pow53Minus1 } from './common';
+import { Address } from '@solana/addresses';
+import { Base58EncodedBytes, Base58EncodedDataResponse, Base64EncodedDataResponse, Blockhash, LamportsUnsafeBeyond2Pow53Minus1, U64UnsafeBeyond2Pow53Minus1 } from '@solana/rpc-types';
+import { TransactionVersion } from '@solana/transactions';
+import { TransactionError } from '../transaction-error.js';
+import { SignedLamportsAsI64Unsafe, TokenBalance } from './common.js';
 type AddressTableLookup = Readonly<{
     /** public key for an address lookup table account. */
-    accountKey: Base58EncodedAddress;
+    accountKey: Address;
     /** List of indices used to load addresses of writable accounts from a lookup table. */
@@ -16,16 +16,16 @@ writableIndexes: readonly number[];
     parsed: {
+        info?: object;
         type: string;
-        info?: object;
     };
     program: string;
-    programId: Base58EncodedAddress;
+    programId: Address;
 }>;
 type PartiallyDecodedTransactionInstruction = Readonly<{
-    accounts: readonly Base58EncodedAddress[];
+    accounts: readonly Address[];
     data: Base58EncodedBytes;
-    programId: Base58EncodedAddress;
+    programId: Address;
 }>;
 type ReturnData = {
     /** the program that generated the return data */
-    programId: Base58EncodedAddress;
+    programId: Address;
     /** the return data itself */
@@ -40,3 +40,3 @@ data: Base64EncodedDataResponse;
 type TransactionParsedAccountLegacy = Readonly<{
-    pubkey: Base58EncodedAddress;
+    pubkey: Address;
     signer: boolean;
@@ -47,3 +47,3 @@ source: 'transaction';
 type TransactionParsedAccountVersioned = Readonly<{
-    pubkey: Base58EncodedAddress;
+    pubkey: Address;
     signer: boolean;
@@ -141,4 +141,4 @@ source: 'lookupTable' | 'transaction';
     loadedAddresses: {
-        writable: readonly Base58EncodedAddress[];
-        readonly: readonly Base58EncodedAddress[];
+        writable: readonly Address[];
+        readonly: readonly Address[];
     };
@@ -207,3 +207,3 @@ }>;
     message: {
-        accountKeys: readonly Base58EncodedAddress[];
+        accountKeys: readonly Address[];
         header: {
@@ -229,3 +229,3 @@ numReadonlySignedAccounts: number;
     /** The public key of the account that received the reward */
-    pubkey: Base58EncodedAddress;
+    pubkey: Address;
     /** number of reward lamports credited or debited by the account */
@@ -232,0 +232,0 @@ lamports: SignedLamportsAsI64Unsafe;

dist/types/rpc-methods/common.d.ts

@@ -1,3 +0,3 @@
-import { Base58EncodedAddress } from '@solana/addresses';
-import { LamportsUnsafeBeyond2Pow53Minus1, StringifiedBigInt, StringifiedNumber } from '@solana/rpc-types';
+import { Address } from '@solana/addresses';
+import type { Base58EncodedBytes, Base58EncodedDataResponse, Base64EncodedDataResponse, Base64EncodedZStdCompressedDataResponse, LamportsUnsafeBeyond2Pow53Minus1, TokenAmount, U64UnsafeBeyond2Pow53Minus1 } from '@solana/rpc-types';
 export type DataSlice = Readonly<{
@@ -10,27 +10,4 @@ offset: number;
 };
-export type Slot = U64UnsafeBeyond2Pow53Minus1;
-export type U64UnsafeBeyond2Pow53Minus1 = bigint;
 export type SignedLamportsAsI64Unsafe = bigint;
 export type F64UnsafeSeeDocumentation = number;
-export type RpcResponse<TValue> = Readonly<{
-    context: Readonly<{
-        slot: Slot;
-    }>;
-    value: TValue;
-}>;
-export type Base58EncodedBytes = string & {
-    readonly __brand: unique symbol;
-};
-export type Base64EncodedBytes = string & {
-    readonly __brand: unique symbol;
-};
-export type Base64EncodedZStdCompressedBytes = string & {
-    readonly __brand: unique symbol;
-};
-export type Base58EncodedDataResponse = [Base58EncodedBytes, 'base58'];
-export type Base64EncodedDataResponse = [Base64EncodedBytes, 'base64'];
-export type Base64EncodedZStdCompressedDataResponse = [Base64EncodedZStdCompressedBytes, 'base64+zstd'];
-export type Base58EncodedTransactionSignature = string & {
-    readonly __brand: unique symbol;
-};
 export type AccountInfoBase = Readonly<{
@@ -42,3 +19,3 @@ /** indicates if the account contains a program (and is strictly read-only) */
     /** pubkey of the program this account has been assigned to */
-    owner: Base58EncodedAddress;
+    owner: Address;
     /** the epoch at which this account will next owe rent */
@@ -64,3 +41,6 @@ rentEpoch: U64UnsafeBeyond2Pow53Minus1;
         program: string;
-        parsed: unknown;
+        parsed: {
+            info?: object;
+            type: string;
+        };
         space: U64UnsafeBeyond2Pow53Minus1;
@@ -71,10 +51,4 @@ }> | Base64EncodedDataResponse;
     account: TAccount;
-    pubkey: Base58EncodedAddress;
+    pubkey: Address;
 }>;
-export type TokenAmount = Readonly<{
-    amount: StringifiedBigInt;
-    decimals: number;
-    uiAmount: number | null;
-    uiAmountString: StringifiedNumber;
-}>;
 export type TokenBalance = Readonly<{
@@ -84,22 +58,9 @@ /** Index of the account in which the token balance is provided for. */
     /** Pubkey of the token's mint. */
-    mint: Base58EncodedAddress;
+    mint: Address;
     /** Pubkey of token balance's owner. */
-    owner?: Base58EncodedAddress;
+    owner?: Address;
     /** Pubkey of the Token program that owns the account. */
-    programId?: Base58EncodedAddress;
+    programId?: Address;
     uiTokenAmount: TokenAmount;
 }>;
-type TokenAccountState = 'initialized' | 'uninitialized' | 'frozen';
-export type TokenAccount = Readonly<{
-    mint: Base58EncodedAddress;
-    owner: Base58EncodedAddress;
-    tokenAmount: TokenAmount;
-    delegate?: Base58EncodedAddress;
-    state: TokenAccountState;
-    isNative: boolean;
-    rentExemptReserve?: TokenAmount;
-    delegatedAmount?: TokenAmount;
-    closeAuthority?: Base58EncodedAddress;
-    extensions?: unknown[];
-}>;
 export type GetProgramAccountsMemcmpFilter = Readonly<{
@@ -113,3 +74,2 @@ offset: U64UnsafeBeyond2Pow53Minus1;
 }>;
-export {};
 //# sourceMappingURL=common.d.ts.map

dist/types/rpc-methods/getAccountInfo.d.ts

@@ -1,4 +0,4 @@
-import { Base58EncodedAddress } from '@solana/addresses';
-import { Commitment } from '@solana/rpc-types';
-import { AccountInfoBase, AccountInfoWithBase58Bytes, AccountInfoWithBase58EncodedData, AccountInfoWithBase64EncodedData, AccountInfoWithBase64EncodedZStdCompressedData, AccountInfoWithJsonData, DataSlice, RpcResponse, Slot } from './common';
+import { Address } from '@solana/addresses';
+import type { Commitment, IRpcApiMethods, RpcResponse, Slot } from '@solana/rpc-types';
+import { AccountInfoBase, AccountInfoWithBase58Bytes, AccountInfoWithBase58EncodedData, AccountInfoWithBase64EncodedData, AccountInfoWithBase64EncodedZStdCompressedData, AccountInfoWithJsonData, DataSlice } from './common.js';
 type GetAccountInfoApiResponseBase = RpcResponse<AccountInfoBase | null>;
@@ -15,21 +15,21 @@ type NestInRpcResponseOrNull<T> = Readonly<{
 }>;
-export interface GetAccountInfoApi {
+export interface GetAccountInfoApi extends IRpcApiMethods {
     /**
      * Returns all information associated with the account of provided public key
      */
-    getAccountInfo(address: Base58EncodedAddress, config: GetAccountInfoApiCommonConfig & GetAccountInfoApiSliceableCommonConfig & Readonly<{
+    getAccountInfo(address: Address, config: GetAccountInfoApiCommonConfig & GetAccountInfoApiSliceableCommonConfig & Readonly<{
         encoding: 'base64';
     }>): GetAccountInfoApiResponseBase & NestInRpcResponseOrNull<AccountInfoWithBase64EncodedData>;
-    getAccountInfo(address: Base58EncodedAddress, config: GetAccountInfoApiCommonConfig & GetAccountInfoApiSliceableCommonConfig & Readonly<{
+    getAccountInfo(address: Address, config: GetAccountInfoApiCommonConfig & GetAccountInfoApiSliceableCommonConfig & Readonly<{
         encoding: 'base64+zstd';
     }>): GetAccountInfoApiResponseBase & NestInRpcResponseOrNull<AccountInfoWithBase64EncodedZStdCompressedData>;
-    getAccountInfo(address: Base58EncodedAddress, config: GetAccountInfoApiCommonConfig & Readonly<{
+    getAccountInfo(address: Address, config: GetAccountInfoApiCommonConfig & Readonly<{
         encoding: 'jsonParsed';
     }>): GetAccountInfoApiResponseBase & NestInRpcResponseOrNull<AccountInfoWithJsonData>;
-    getAccountInfo(address: Base58EncodedAddress, config: GetAccountInfoApiCommonConfig & GetAccountInfoApiSliceableCommonConfig & Readonly<{
+    getAccountInfo(address: Address, config: GetAccountInfoApiCommonConfig & GetAccountInfoApiSliceableCommonConfig & Readonly<{
         encoding: 'base58';
     }>): GetAccountInfoApiResponseBase & NestInRpcResponseOrNull<AccountInfoWithBase58EncodedData>;
-    getAccountInfo(address: Base58EncodedAddress, config?: GetAccountInfoApiCommonConfig): GetAccountInfoApiResponseBase & NestInRpcResponseOrNull<AccountInfoWithBase58Bytes>;
+    getAccountInfo(address: Address, config?: GetAccountInfoApiCommonConfig): GetAccountInfoApiResponseBase & NestInRpcResponseOrNull<AccountInfoWithBase58Bytes>;
 }
 export {};
 //# sourceMappingURL=getAccountInfo.d.ts.map

dist/types/rpc-methods/getBalance.d.ts

@@ -1,10 +0,9 @@
-import { Base58EncodedAddress } from '@solana/addresses';
-import { Commitment, LamportsUnsafeBeyond2Pow53Minus1 } from '@solana/rpc-types';
-import { RpcResponse, Slot } from './common';
+import { Address } from '@solana/addresses';
+import type { Commitment, IRpcApiMethods, LamportsUnsafeBeyond2Pow53Minus1, RpcResponse, Slot } from '@solana/rpc-types';
 type GetBalanceApiResponse = RpcResponse<LamportsUnsafeBeyond2Pow53Minus1>;
-export interface GetBalanceApi {
+export interface GetBalanceApi extends IRpcApiMethods {
     /**
      * Returns the balance of the account of provided Pubkey
      */
-    getBalance(address: Base58EncodedAddress, config?: Readonly<{
+    getBalance(address: Address, config?: Readonly<{
         commitment?: Commitment;
@@ -11,0 +10,0 @@ minContextSlot?: Slot;

dist/types/rpc-methods/getBlock.d.ts

@@ -1,5 +0,4 @@
-import { Commitment, UnixTimestamp } from '@solana/rpc-types';
-import { Blockhash, TransactionVersion } from '@solana/transactions';
-import { Base58EncodedBytes, Slot, U64UnsafeBeyond2Pow53Minus1 } from './common';
-import { Reward, TransactionForAccounts, TransactionForFullBase58, TransactionForFullBase64, TransactionForFullJson, TransactionForFullJsonParsed } from './common-transactions';
+import type { Base58EncodedBytes, Blockhash, Commitment, IRpcApiMethods, Slot, U64UnsafeBeyond2Pow53Minus1, UnixTimestamp } from '@solana/rpc-types';
+import { TransactionVersion } from '@solana/transactions';
+import { Reward, TransactionForAccounts, TransactionForFullBase58, TransactionForFullBase64, TransactionForFullJson, TransactionForFullJsonParsed } from './common-transactions.js';
 type GetBlockApiResponseBase = Readonly<{
@@ -34,3 +33,3 @@ /** the blockhash of this block */
 type GetBlockMaxSupportedTransactionVersion = Exclude<TransactionVersion, 'legacy'>;
-export interface GetBlockApi {
+export interface GetBlockApi extends IRpcApiMethods {
     /**
@@ -37,0 +36,0 @@ * Returns identity and transaction information about a confirmed block in the ledger

dist/types/rpc-methods/getBlockCommitment.d.ts

@@ -1,3 +0,2 @@
-import { LamportsUnsafeBeyond2Pow53Minus1 } from '@solana/rpc-types';
-import { Slot } from './common';
+import type { IRpcApiMethods, LamportsUnsafeBeyond2Pow53Minus1, Slot } from '@solana/rpc-types';
 type GetBlockCommitmentApiResponse = Readonly<{
@@ -7,3 +6,3 @@ commitment: LamportsUnsafeBeyond2Pow53Minus1[] | null;
 }>;
-export interface GetBlockCommitmentApi {
+export interface GetBlockCommitmentApi extends IRpcApiMethods {
     /**
@@ -10,0 +9,0 @@ * Returns the amount of cluster stake in lamports that has voted on

dist/types/rpc-methods/getBlockHeight.d.ts

@@ -1,5 +0,4 @@
-import { Commitment } from '@solana/rpc-types';
-import { Slot, U64UnsafeBeyond2Pow53Minus1 } from './common';
+import type { Commitment, IRpcApiMethods, Slot, U64UnsafeBeyond2Pow53Minus1 } from '@solana/rpc-types';
 type GetBlockHeightApiResponse = U64UnsafeBeyond2Pow53Minus1;
-export interface GetBlockHeightApi {
+export interface GetBlockHeightApi extends IRpcApiMethods {
     /**
@@ -6,0 +5,0 @@ * Returns the current block height of the node

dist/types/rpc-methods/getBlockProduction.d.ts

@@ -1,4 +0,3 @@
-import { Base58EncodedAddress } from '@solana/addresses';
-import { Commitment } from '@solana/rpc-types';
-import { RpcResponse, Slot, U64UnsafeBeyond2Pow53Minus1 } from './common';
+import { Address } from '@solana/addresses';
+import type { Commitment, IRpcApiMethods, RpcResponse, Slot, U64UnsafeBeyond2Pow53Minus1 } from '@solana/rpc-types';
 type NumberOfLeaderSlots = U64UnsafeBeyond2Pow53Minus1;
@@ -19,3 +18,3 @@ type NumberOfBlocksProduced = U64UnsafeBeyond2Pow53Minus1;
     value: Readonly<{
-        byIdentity: Record<Base58EncodedAddress, [NumberOfLeaderSlots, NumberOfBlocksProduced]>;
+        byIdentity: Record<Address, [NumberOfLeaderSlots, NumberOfBlocksProduced]>;
     }>;
@@ -30,7 +29,7 @@ }>;
 }>;
-export interface GetBlockProductionApi {
+export interface GetBlockProductionApi extends IRpcApiMethods {
     /**
      * Returns recent block production information from the current or previous epoch.
      */
-    getBlockProduction<TIdentity extends Base58EncodedAddress>(config: GetBlockProductionApiConfigBase & Readonly<{
+    getBlockProduction<TIdentity extends Address>(config: GetBlockProductionApiConfigBase & Readonly<{
         identity: TIdentity;
@@ -37,0 +36,0 @@ }>): GetBlockProductionApiResponseBase & GetBlockProductionApiResponseWithSingleIdentity<TIdentity>;

dist/types/rpc-methods/getBlocks.d.ts

@@ -1,5 +0,4 @@
-import { Commitment } from '@solana/rpc-types';
-import { Slot } from './common';
+import type { Commitment, IRpcApiMethods, Slot } from '@solana/rpc-types';
 type GetBlocksApiResponse = Slot[];
-export interface GetBlocksApi {
+export interface GetBlocksApi extends IRpcApiMethods {
     /**
@@ -6,0 +5,0 @@ * Returns a list of confirmed blocks between two slots

dist/types/rpc-methods/getBlocksWithLimit.d.ts

@@ -1,5 +0,4 @@
-import { Commitment } from '@solana/rpc-types';
-import { Slot } from './common';
+import type { Commitment, IRpcApiMethods, Slot } from '@solana/rpc-types';
 type GetBlocksWithLimitApiResponse = Slot[];
-export interface GetBlocksWithLimitApi {
+export interface GetBlocksWithLimitApi extends IRpcApiMethods {
     /**
@@ -6,0 +5,0 @@ * Returns a list of confirmed blocks starting at the given slot

dist/types/rpc-methods/getBlockTime.d.ts

@@ -1,6 +0,5 @@
-import { UnixTimestamp } from '@solana/rpc-types';
-import { Slot } from './common';
+import type { IRpcApiMethods, Slot, UnixTimestamp } from '@solana/rpc-types';
 /** Estimated production time, as Unix timestamp (seconds since the Unix epoch) */
 type GetBlockTimeApiResponse = UnixTimestamp;
-export interface GetBlockTimeApi {
+export interface GetBlockTimeApi extends IRpcApiMethods {
     /**
@@ -7,0 +6,0 @@ * Returns the estimated production time of a block.

dist/types/rpc-methods/getClusterNodes.d.ts

@@ -1,2 +0,3 @@
-import { Base58EncodedAddress } from '@solana/addresses';
+import { Address } from '@solana/addresses';
+import type { IRpcApiMethods } from '@solana/rpc-types';
 type GetClusterNodesNode = Readonly<{
@@ -8,3 +9,3 @@ /** The unique identifier of the node's feature set */
     /** Node public key, as base-58 encoded string */
-    pubkey: Base58EncodedAddress;
+    pubkey: Address;
     /**
@@ -26,3 +27,3 @@ * JSON RPC network address for the node,
 type GetClusterNodesApiResponse = readonly GetClusterNodesNode[];
-export interface GetClusterNodesApi {
+export interface GetClusterNodesApi extends IRpcApiMethods {
     /**
@@ -29,0 +30,0 @@ * Returns information about all the nodes participating in the cluster

dist/types/rpc-methods/getEpochInfo.d.ts

@@ -1,3 +0,2 @@
-import { Commitment } from '@solana/rpc-types';
-import { Slot, U64UnsafeBeyond2Pow53Minus1 } from './common';
+import type { Commitment, IRpcApiMethods, Slot, U64UnsafeBeyond2Pow53Minus1 } from '@solana/rpc-types';
 type GetEpochInfoApiResponse = Readonly<{
@@ -17,3 +16,3 @@ /** the current slot */
 }>;
-export interface GetEpochInfoApi {
+export interface GetEpochInfoApi extends IRpcApiMethods {
     /**
@@ -20,0 +19,0 @@ * Returns the balance of the account of provided Pubkey

dist/types/rpc-methods/getEpochSchedule.d.ts

@@ -1,2 +0,2 @@
-import { U64UnsafeBeyond2Pow53Minus1 } from './common';
+import type { IRpcApiMethods, U64UnsafeBeyond2Pow53Minus1 } from '@solana/rpc-types';
 type GetEpochScheduleApiResponse = Readonly<{
@@ -14,3 +14,3 @@ /** the maximum number of slots in each epoch */
 }>;
-export interface GetEpochScheduleApi {
+export interface GetEpochScheduleApi extends IRpcApiMethods {
     /**
@@ -17,0 +17,0 @@ * Returns the epoch schedule information from this cluster's genesis config

dist/types/rpc-methods/getFeeForMessage.d.ts

@@ -1,7 +0,6 @@
-import { Commitment } from '@solana/rpc-types';
+import type { Commitment, IRpcApiMethods, RpcResponse, Slot, U64UnsafeBeyond2Pow53Minus1 } from '@solana/rpc-types';
 import { SerializedMessageBytesBase64 } from '@solana/transactions';
-import { RpcResponse, Slot, U64UnsafeBeyond2Pow53Minus1 } from './common';
 /** Fee corresponding to the message at the specified blockhash */
 type GetFeeForMessageApiResponse = RpcResponse<U64UnsafeBeyond2Pow53Minus1 | null>;
-export interface GetFeeForMessageApi {
+export interface GetFeeForMessageApi extends IRpcApiMethods {
     /**
@@ -8,0 +7,0 @@ * Returns the fee the network will charge for a particular Message

dist/types/rpc-methods/getFirstAvailableBlock.d.ts

@@ -1,4 +0,4 @@
-import { Slot } from './common';
+import type { IRpcApiMethods, Slot } from '@solana/rpc-types';
 type GetFirstAvailableBlockApiResponse = Slot;
-export interface GetFirstAvailableBlockApi {
+export interface GetFirstAvailableBlockApi extends IRpcApiMethods {
     /**
@@ -5,0 +5,0 @@ * Returns the slot of the lowest confirmed block that has not been purged from the ledger

dist/types/rpc-methods/getGenesisHash.d.ts

@@ -1,4 +0,4 @@
-import { Blockhash } from '@solana/transactions';
+import type { Blockhash, IRpcApiMethods } from '@solana/rpc-types';
 type GetGenesisHashApiResponse = Blockhash;
-export interface GetGenesisHashApi {
+export interface GetGenesisHashApi extends IRpcApiMethods {
     /**
@@ -5,0 +5,0 @@ * Returns the genesis hash

dist/types/rpc-methods/getHealth.d.ts

@@ -0,3 +1,4 @@
+import type { IRpcApiMethods } from '@solana/rpc-types';
 type GetHealthApiResponse = 'ok';
-export interface GetHealthApi {
+export interface GetHealthApi extends IRpcApiMethods {
     /**
@@ -4,0 +5,0 @@ * Returns the health status of the node ("ok" if healthy).

dist/types/rpc-methods/getHighestSnapshotSlot.d.ts

@@ -1,2 +0,2 @@
-import { Slot } from './common';
+import type { IRpcApiMethods, Slot } from '@solana/rpc-types';
 type GetHighestSnapshotSlotApiResponse = Readonly<{
@@ -6,3 +6,3 @@ full: Slot;
 }>;
-export interface GetHighestSnapshotSlotApi {
+export interface GetHighestSnapshotSlotApi extends IRpcApiMethods {
     /**
@@ -9,0 +9,0 @@ * Returns the highest slot information that the node has snapshots for.

dist/types/rpc-methods/getIdentity.d.ts

@@ -1,6 +0,7 @@
-import { Base58EncodedAddress } from '@solana/addresses';
+import type { Address } from '@solana/addresses';
+import type { IRpcApiMethods } from '@solana/rpc-types';
 type GetIdentityApiResponse = Readonly<{
-    identity: Base58EncodedAddress;
+    identity: Address;
 }>;
-export interface GetIdentityApi {
+export interface GetIdentityApi extends IRpcApiMethods {
     /**
@@ -7,0 +8,0 @@ * Returns the identity pubkey for the current node

dist/types/rpc-methods/getInflationGovernor.d.ts

@@ -1,3 +0,3 @@
-import { Commitment } from '@solana/rpc-types';
-import { F64UnsafeSeeDocumentation } from './common';
+import type { Commitment, IRpcApiMethods } from '@solana/rpc-types';
+import { F64UnsafeSeeDocumentation } from './common.js';
 type GetInflationGovernorApiResponse = Readonly<{
@@ -19,3 +19,3 @@ /** The initial inflation percentage from time 0 */
 }>;
-export interface GetInflationGovernorApi {
+export interface GetInflationGovernorApi extends IRpcApiMethods {
     /**
@@ -22,0 +22,0 @@ * Returns the current inflation governor

dist/types/rpc-methods/getInflationRate.d.ts

@@ -1,2 +0,3 @@
-import { F64UnsafeSeeDocumentation, U64UnsafeBeyond2Pow53Minus1 } from './common';
+import type { IRpcApiMethods, U64UnsafeBeyond2Pow53Minus1 } from '@solana/rpc-types';
+import { F64UnsafeSeeDocumentation } from './common.js';
 type GetInflationRateApiResponse = Readonly<{
@@ -12,3 +13,3 @@ /** Epoch for which these values are valid */
 }>;
-export interface GetInflationRateApi {
+export interface GetInflationRateApi extends IRpcApiMethods {
     /**
@@ -15,0 +16,0 @@ * Returns the current block height of the node

dist/types/rpc-methods/getInflationReward.d.ts

@@ -1,4 +0,3 @@
-import { Base58EncodedAddress } from '@solana/addresses';
-import { Commitment, LamportsUnsafeBeyond2Pow53Minus1 } from '@solana/rpc-types';
-import { Slot, U64UnsafeBeyond2Pow53Minus1 } from './common';
+import { Address } from '@solana/addresses';
+import type { Commitment, IRpcApiMethods, LamportsUnsafeBeyond2Pow53Minus1, Slot, U64UnsafeBeyond2Pow53Minus1 } from '@solana/rpc-types';
 type GetInflationRewardApiResponse = Readonly<{
@@ -11,7 +10,7 @@ amount: LamportsUnsafeBeyond2Pow53Minus1;
 }>;
-export interface GetInflationRewardApi {
+export interface GetInflationRewardApi extends IRpcApiMethods {
     /**
      * Returns the current block height of the node
      */
-    getInflationReward(addresses: Base58EncodedAddress[], config?: Readonly<{
+    getInflationReward(addresses: Address[], config?: Readonly<{
         commitment?: Commitment;
@@ -18,0 +17,0 @@ epoch?: U64UnsafeBeyond2Pow53Minus1;

dist/types/rpc-methods/getLargestAccounts.d.ts

@@ -1,7 +0,6 @@
-import { Base58EncodedAddress } from '@solana/addresses';
-import { Commitment, LamportsUnsafeBeyond2Pow53Minus1 } from '@solana/rpc-types';
-import { RpcResponse } from './common';
+import { Address } from '@solana/addresses';
+import type { Commitment, IRpcApiMethods, LamportsUnsafeBeyond2Pow53Minus1, RpcResponse } from '@solana/rpc-types';
 type GetLargestAccountsResponseItem = Readonly<{
     /** Base-58 encoded address of the account */
-    address: Base58EncodedAddress;
+    address: Address;
     /** Number of lamports in the account */
@@ -11,3 +10,3 @@ lamports: LamportsUnsafeBeyond2Pow53Minus1;
 type GetLargestAccountsApiResponse = RpcResponse<GetLargestAccountsResponseItem[]>;
-export interface GetLargestAccountsApi {
+export interface GetLargestAccountsApi extends IRpcApiMethods {
     /**
@@ -14,0 +13,0 @@ * Returns the 20 largest accounts, by lamport balance

dist/types/rpc-methods/getLatestBlockhash.d.ts

@@ -1,4 +0,2 @@
-import { Commitment } from '@solana/rpc-types';
-import { Blockhash } from '@solana/transactions';
-import { RpcResponse, Slot, U64UnsafeBeyond2Pow53Minus1 } from './common';
+import type { Blockhash, Commitment, IRpcApiMethods, RpcResponse, Slot, U64UnsafeBeyond2Pow53Minus1 } from '@solana/rpc-types';
 type GetLatestBlockhashApiResponse = RpcResponse<{
@@ -10,3 +8,3 @@ /** a Hash as base-58 encoded string */
 }>;
-export interface GetLatestBlockhashApi {
+export interface GetLatestBlockhashApi extends IRpcApiMethods {
     /**
@@ -13,0 +11,0 @@ * Returns the latest blockhash

dist/types/rpc-methods/getLeaderSchedule.d.ts

@@ -1,4 +0,3 @@
-import { Base58EncodedAddress } from '@solana/addresses';
-import { Commitment } from '@solana/rpc-types';
-import { Slot } from './common';
+import type { Address } from '@solana/addresses';
+import type { Commitment, IRpcApiMethods, Slot } from '@solana/rpc-types';
 /**
@@ -21,5 +20,5 @@ * This return type is a dictionary of validator identities, as base-58 encoded
 type GetLeaderScheduleApiResponseBase = Readonly<{
-    [key: Base58EncodedAddress]: Slot[];
+    [key: Address]: Slot[];
 }>;
-export interface GetLeaderScheduleApi {
+export interface GetLeaderScheduleApi extends IRpcApiMethods {
     /**
@@ -36,3 +35,3 @@ * Fetch the leader schedule for the epoch that corresponds to the provided slot.
         /** Only return results for this validator identity (base58 encoded address) */
-        identity?: Base58EncodedAddress;
+        identity?: Address;
     }>): GetLeaderScheduleApiResponseBase | null;
@@ -42,3 +41,3 @@ getLeaderSchedule(config?: Readonly<{
         /** Only return results for this validator identity (base58 encoded address) */
-        identity?: Base58EncodedAddress;
+        identity?: Address;
     }>): GetLeaderScheduleApiResponseBase;
@@ -45,0 +44,0 @@ }

dist/types/rpc-methods/getMaxRetransmitSlot.d.ts

@@ -1,4 +0,4 @@
-import { Slot } from './common';
+import type { IRpcApiMethods, Slot } from '@solana/rpc-types';
 type GetMaxRetransmitSlotApiResponse = Slot;
-export interface GetMaxRetransmitSlotApi {
+export interface GetMaxRetransmitSlotApi extends IRpcApiMethods {
     /**
@@ -5,0 +5,0 @@ * Get the max slot seen from retransmit stage.

dist/types/rpc-methods/getMaxShredInsertSlot.d.ts

@@ -1,4 +0,4 @@
-import { Slot } from './common';
+import type { IRpcApiMethods, Slot } from '@solana/rpc-types';
 type GetMaxShredInsertSlotApiResponse = Slot;
-export interface GetMaxShredInsertSlotApi {
+export interface GetMaxShredInsertSlotApi extends IRpcApiMethods {
     /**
@@ -5,0 +5,0 @@ * Get the max slot seen from after shred insert.

dist/types/rpc-methods/getMinimumBalanceForRentExemption.d.ts

@@ -1,5 +0,4 @@
-import { Commitment, LamportsUnsafeBeyond2Pow53Minus1 } from '@solana/rpc-types';
-import { U64UnsafeBeyond2Pow53Minus1 } from './common';
+import type { Commitment, IRpcApiMethods, LamportsUnsafeBeyond2Pow53Minus1, U64UnsafeBeyond2Pow53Minus1 } from '@solana/rpc-types';
 type GetMinimumBalanceForRentExemptionApiResponse = LamportsUnsafeBeyond2Pow53Minus1;
-export interface GetMinimumBalanceForRentExemptionApi {
+export interface GetMinimumBalanceForRentExemptionApi extends IRpcApiMethods {
     /**
@@ -6,0 +5,0 @@ * Returns the minimum balance to exempt an account of a certain size from rent

dist/types/rpc-methods/getMultipleAccounts.d.ts

@@ -1,4 +0,4 @@
-import { Base58EncodedAddress } from '@solana/addresses';
-import { Commitment } from '@solana/rpc-types';
-import { AccountInfoBase, AccountInfoWithBase58EncodedData, AccountInfoWithBase64EncodedData, AccountInfoWithBase64EncodedZStdCompressedData, AccountInfoWithJsonData, DataSlice, RpcResponse, Slot } from './common';
+import type { Address } from '@solana/addresses';
+import type { Commitment, IRpcApiMethods, RpcResponse, Slot } from '@solana/rpc-types';
+import { AccountInfoBase, AccountInfoWithBase58EncodedData, AccountInfoWithBase64EncodedData, AccountInfoWithBase64EncodedZStdCompressedData, AccountInfoWithJsonData, DataSlice } from './common.js';
 type GetMultipleAccountsApiResponseBase = AccountInfoBase | null;
@@ -15,3 +15,3 @@ type GetMultipleAccountsApiCommonConfig = Readonly<{
 }>;
-export interface GetMultipleAccountsApi {
+export interface GetMultipleAccountsApi extends IRpcApiMethods {
     /**
@@ -22,3 +22,3 @@ * Returns the account information for a list of Pubkeys.
     /** An array of up to 100 Pubkeys to query */
-    addresses: Base58EncodedAddress[], config: GetMultipleAccountsApiCommonConfig & GetMultipleAccountsApiSliceableCommonConfig & Readonly<{
+    addresses: Address[], config: GetMultipleAccountsApiCommonConfig & GetMultipleAccountsApiSliceableCommonConfig & Readonly<{
         encoding: 'base64';
@@ -28,3 +28,3 @@ }>): RpcResponse<(GetMultipleAccountsApiResponseBase & (AccountInfoWithBase64EncodedData | null))[]>;
     /** An array of up to 100 Pubkeys to query */
-    addresses: Base58EncodedAddress[], config: GetMultipleAccountsApiCommonConfig & GetMultipleAccountsApiSliceableCommonConfig & Readonly<{
+    addresses: Address[], config: GetMultipleAccountsApiCommonConfig & GetMultipleAccountsApiSliceableCommonConfig & Readonly<{
         encoding: 'base64+zstd';
@@ -34,3 +34,3 @@ }>): RpcResponse<(GetMultipleAccountsApiResponseBase & (AccountInfoWithBase64EncodedZStdCompressedData | null))[]>;
     /** An array of up to 100 Pubkeys to query */
-    addresses: Base58EncodedAddress[], config: GetMultipleAccountsApiCommonConfig & Readonly<{
+    addresses: Address[], config: GetMultipleAccountsApiCommonConfig & Readonly<{
         encoding: 'jsonParsed';
@@ -40,3 +40,3 @@ }>): RpcResponse<(GetMultipleAccountsApiResponseBase & (AccountInfoWithJsonData | null))[]>;
     /** An array of up to 100 Pubkeys to query */
-    addresses: Base58EncodedAddress[], config: GetMultipleAccountsApiCommonConfig & GetMultipleAccountsApiSliceableCommonConfig & Readonly<{
+    addresses: Address[], config: GetMultipleAccountsApiCommonConfig & GetMultipleAccountsApiSliceableCommonConfig & Readonly<{
         encoding: 'base58';
@@ -46,5 +46,5 @@ }>): RpcResponse<(GetMultipleAccountsApiResponseBase & (AccountInfoWithBase58EncodedData | null))[]>;
     /** An array of up to 100 Pubkeys to query */
-    addresses: Base58EncodedAddress[], config?: GetMultipleAccountsApiCommonConfig): RpcResponse<(GetMultipleAccountsApiResponseBase & (AccountInfoWithBase64EncodedData | null))[]>;
+    addresses: Address[], config?: GetMultipleAccountsApiCommonConfig): RpcResponse<(GetMultipleAccountsApiResponseBase & (AccountInfoWithBase64EncodedData | null))[]>;
 }
 export {};
 //# sourceMappingURL=getMultipleAccounts.d.ts.map

dist/types/rpc-methods/getProgramAccounts.d.ts

@@ -1,4 +0,4 @@
-import { Base58EncodedAddress } from '@solana/addresses';
-import { Commitment } from '@solana/rpc-types';
-import { AccountInfoBase, AccountInfoWithBase58Bytes, AccountInfoWithBase58EncodedData, AccountInfoWithBase64EncodedData, AccountInfoWithBase64EncodedZStdCompressedData, AccountInfoWithJsonData, AccountInfoWithPubkey, DataSlice, GetProgramAccountsDatasizeFilter, GetProgramAccountsMemcmpFilter, RpcResponse, Slot } from './common';
+import type { Address } from '@solana/addresses';
+import type { Commitment, IRpcApiMethods, RpcResponse, Slot } from '@solana/rpc-types';
+import { AccountInfoBase, AccountInfoWithBase58Bytes, AccountInfoWithBase58EncodedData, AccountInfoWithBase64EncodedData, AccountInfoWithBase64EncodedZStdCompressedData, AccountInfoWithJsonData, AccountInfoWithPubkey, DataSlice, GetProgramAccountsDatasizeFilter, GetProgramAccountsMemcmpFilter } from './common.js';
 type GetProgramAccountsApiCommonConfig = Readonly<{
@@ -16,42 +16,42 @@ /** @defaultValue "finalized" */
 }>;
-export interface GetProgramAccountsApi {
+export interface GetProgramAccountsApi extends IRpcApiMethods {
     /**
      * Returns the account information for a list of Pubkeys.
      */
-    getProgramAccounts(program: Base58EncodedAddress, config: GetProgramAccountsApiCommonConfig & GetProgramAccountsApiSliceableCommonConfig & Readonly<{
+    getProgramAccounts(program: Address, config: GetProgramAccountsApiCommonConfig & GetProgramAccountsApiSliceableCommonConfig & Readonly<{
         encoding: 'base64';
         withContext: true;
     }>): RpcResponse<AccountInfoWithPubkey<AccountInfoBase & AccountInfoWithBase64EncodedData>[]>;
-    getProgramAccounts(program: Base58EncodedAddress, config: GetProgramAccountsApiCommonConfig & GetProgramAccountsApiSliceableCommonConfig & Readonly<{
+    getProgramAccounts(program: Address, config: GetProgramAccountsApiCommonConfig & GetProgramAccountsApiSliceableCommonConfig & Readonly<{
         encoding: 'base64';
         withContext?: boolean;
     }>): AccountInfoWithPubkey<AccountInfoBase & AccountInfoWithBase64EncodedData>[];
-    getProgramAccounts(program: Base58EncodedAddress, config: GetProgramAccountsApiCommonConfig & GetProgramAccountsApiSliceableCommonConfig & Readonly<{
+    getProgramAccounts(program: Address, config: GetProgramAccountsApiCommonConfig & GetProgramAccountsApiSliceableCommonConfig & Readonly<{
         encoding: 'base64+zstd';
         withContext: true;
     }>): RpcResponse<AccountInfoWithPubkey<AccountInfoBase & AccountInfoWithBase64EncodedZStdCompressedData>[]>;
-    getProgramAccounts(program: Base58EncodedAddress, config: GetProgramAccountsApiCommonConfig & GetProgramAccountsApiSliceableCommonConfig & Readonly<{
+    getProgramAccounts(program: Address, config: GetProgramAccountsApiCommonConfig & GetProgramAccountsApiSliceableCommonConfig & Readonly<{
         encoding: 'base64+zstd';
         withContext?: boolean;
     }>): AccountInfoWithPubkey<AccountInfoBase & AccountInfoWithBase64EncodedZStdCompressedData>[];
-    getProgramAccounts(program: Base58EncodedAddress, config: GetProgramAccountsApiCommonConfig & Readonly<{
+    getProgramAccounts(program: Address, config: GetProgramAccountsApiCommonConfig & Readonly<{
         encoding: 'jsonParsed';
         withContext: true;
     }>): RpcResponse<AccountInfoWithPubkey<AccountInfoBase & AccountInfoWithJsonData>[]>;
-    getProgramAccounts(program: Base58EncodedAddress, config: GetProgramAccountsApiCommonConfig & Readonly<{
+    getProgramAccounts(program: Address, config: GetProgramAccountsApiCommonConfig & Readonly<{
         encoding: 'jsonParsed';
         withContext?: boolean;
     }>): AccountInfoWithPubkey<AccountInfoBase & AccountInfoWithJsonData>[];
-    getProgramAccounts(program: Base58EncodedAddress, config: GetProgramAccountsApiCommonConfig & GetProgramAccountsApiSliceableCommonConfig & Readonly<{
+    getProgramAccounts(program: Address, config: GetProgramAccountsApiCommonConfig & GetProgramAccountsApiSliceableCommonConfig & Readonly<{
         encoding: 'base58';
         withContext: true;
     }>): RpcResponse<AccountInfoWithPubkey<AccountInfoBase & AccountInfoWithBase58EncodedData>[]>;
-    getProgramAccounts(program: Base58EncodedAddress, config: GetProgramAccountsApiCommonConfig & GetProgramAccountsApiSliceableCommonConfig & Readonly<{
+    getProgramAccounts(program: Address, config: GetProgramAccountsApiCommonConfig & GetProgramAccountsApiSliceableCommonConfig & Readonly<{
         encoding: 'base58';
         withContext?: boolean;
     }>): AccountInfoWithPubkey<AccountInfoBase & AccountInfoWithBase58EncodedData>[];
-    getProgramAccounts(program: Base58EncodedAddress, config: GetProgramAccountsApiCommonConfig & GetProgramAccountsApiSliceableCommonConfig & Readonly<{
+    getProgramAccounts(program: Address, config: GetProgramAccountsApiCommonConfig & GetProgramAccountsApiSliceableCommonConfig & Readonly<{
         withContext: true;
     }>): RpcResponse<AccountInfoWithPubkey<AccountInfoBase & AccountInfoWithBase58Bytes>[]>;
-    getProgramAccounts(program: Base58EncodedAddress, config?: GetProgramAccountsApiCommonConfig & GetProgramAccountsApiSliceableCommonConfig & Readonly<{
+    getProgramAccounts(program: Address, config?: GetProgramAccountsApiCommonConfig & GetProgramAccountsApiSliceableCommonConfig & Readonly<{
         withContext?: boolean;
@@ -58,0 +58,0 @@ }>): AccountInfoWithPubkey<AccountInfoBase & AccountInfoWithBase58Bytes>[];

dist/types/rpc-methods/getRecentPerformanceSamples.d.ts

@@ -1,2 +0,2 @@
-import { Slot, U64UnsafeBeyond2Pow53Minus1 } from './common';
+import type { IRpcApiMethods, Slot, U64UnsafeBeyond2Pow53Minus1 } from '@solana/rpc-types';
 type PerformanceSample = Readonly<{
@@ -15,3 +15,3 @@ /** Slot in which sample was taken at */
 type GetRecentPerformanceSamplesApiResponse = readonly PerformanceSample[];
-export interface GetRecentPerformanceSamplesApi {
+export interface GetRecentPerformanceSamplesApi extends IRpcApiMethods {
     /**
@@ -18,0 +18,0 @@ * Returns a list of recent performance samples, in reverse slot order. Performance samples are taken every 60 seconds and include the number of transactions and slots that occur in a given time window.

dist/types/rpc-methods/getRecentPrioritizationFees.d.ts

@@ -1,3 +0,4 @@
-import { Base58EncodedAddress } from '@solana/addresses';
-import { MicroLamportsUnsafeBeyond2Pow53Minus1, Slot } from './common';
+import type { Address } from '@solana/addresses';
+import type { IRpcApiMethods, Slot } from '@solana/rpc-types';
+import { MicroLamportsUnsafeBeyond2Pow53Minus1 } from './common.js';
 type GetRecentPrioritizationFeesApiResponse = Readonly<{
@@ -13,3 +14,3 @@ /**
 }>[];
-export interface GetRecentPrioritizationFeesApi {
+export interface GetRecentPrioritizationFeesApi extends IRpcApiMethods {
     /**
@@ -27,5 +28,5 @@ * Returns the balance of the account of provided Pubkey
      */
-    addresses?: Base58EncodedAddress[]): GetRecentPrioritizationFeesApiResponse;
+    addresses?: Address[]): GetRecentPrioritizationFeesApiResponse;
 }
 export {};
 //# sourceMappingURL=getRecentPrioritizationFees.d.ts.map

dist/types/rpc-methods/getSignaturesForAddress.d.ts

@@ -1,9 +0,8 @@
-import { Base58EncodedAddress } from '@solana/addresses';
-import { Commitment, UnixTimestamp } from '@solana/rpc-types';
-import { TransactionSignature } from '@solana/transactions';
-import { TransactionError } from '../transaction-error';
-import { RpcResponse, Slot } from './common';
-type GetSignaturesForAddressTransaction = RpcResponse<{
+import type { Address } from '@solana/addresses';
+import type { Signature } from '@solana/keys';
+import type { Commitment, IRpcApiMethods, Slot, UnixTimestamp } from '@solana/rpc-types';
+import { TransactionError } from '../transaction-error.js';
+type GetSignaturesForAddressTransaction = Readonly<{
     /** transaction signature as base-58 encoded string */
-    signature: TransactionSignature;
+    signature: Signature;
     /** The slot that contains the block with the transaction */
@@ -29,7 +28,7 @@ slot: Slot;
     /** start searching backwards from this transaction signature. If not provided the search starts from the top of the highest max confirmed block. */
-    before?: TransactionSignature;
+    before?: Signature;
     /** search until this transaction signature, if found before limit reached */
-    until?: TransactionSignature;
+    until?: Signature;
 }>;
-export interface GetSignaturesForAddressApi {
+export interface GetSignaturesForAddressApi extends IRpcApiMethods {
     /**
@@ -39,5 +38,5 @@ * Returns signatures for confirmed transactions that include the given address in their accountKeys list.
      */
-    getSignaturesForAddress(address: Base58EncodedAddress, config?: GetSignaturesForAddressConfig): GetSignaturesForAddressApiResponse;
+    getSignaturesForAddress(address: Address, config?: GetSignaturesForAddressConfig): GetSignaturesForAddressApiResponse;
 }
 export {};
 //# sourceMappingURL=getSignaturesForAddress.d.ts.map

dist/types/rpc-methods/getSignatureStatuses.d.ts

@@ -1,5 +0,4 @@
-import { Commitment } from '@solana/rpc-types';
-import { TransactionSignature } from '@solana/transactions';
-import { TransactionError } from '../transaction-error';
-import { RpcResponse, Slot, U64UnsafeBeyond2Pow53Minus1 } from './common';
+import type { Signature } from '@solana/keys';
+import type { Commitment, IRpcApiMethods, RpcResponse, Slot, U64UnsafeBeyond2Pow53Minus1 } from '@solana/rpc-types';
+import { TransactionError } from '../transaction-error.js';
 /** @deprecated */
@@ -35,3 +34,3 @@ type TransactionStatusOk = Readonly<{
 type GetSignatureStatusesApiResponse = RpcResponse<GetSignatureStatusesBase>;
-export interface GetSignatureStatusesApi {
+export interface GetSignatureStatusesApi extends IRpcApiMethods {
     /**
@@ -51,3 +50,3 @@ * Returns the statuses of a list of signatures.
      */
-    signatures: TransactionSignature[], config?: Readonly<{
+    signatures: Signature[], config?: Readonly<{
         /**
@@ -54,0 +53,0 @@ * if `true` - a Solana node will search its ledger cache for any

dist/types/rpc-methods/getSlot.d.ts

@@ -1,5 +0,4 @@
-import { Commitment } from '@solana/rpc-types';
-import { Slot } from './common';
+import type { Commitment, IRpcApiMethods, Slot } from '@solana/rpc-types';
 type GetSlotApiResponse = Slot;
-export interface GetSlotApi {
+export interface GetSlotApi extends IRpcApiMethods {
     /**
@@ -6,0 +5,0 @@ * Returns the slot that has reached the given or default commitment level

dist/types/rpc-methods/getSlotLeader.d.ts

@@ -1,5 +0,4 @@
-import { Base58EncodedAddress } from '@solana/addresses';
-import { Commitment } from '@solana/rpc-types';
-import { Slot } from './common';
-export interface GetSlotLeaderApi {
+import type { Address } from '@solana/addresses';
+import type { Commitment, IRpcApiMethods, Slot } from '@solana/rpc-types';
+export interface GetSlotLeaderApi extends IRpcApiMethods {
     /**
@@ -11,4 +10,4 @@ * Returns the current slot leader
         minContextSlot?: Slot;
-    }>): Base58EncodedAddress;
+    }>): Address;
 }
 //# sourceMappingURL=getSlotLeader.d.ts.map

dist/types/rpc-methods/getSlotLeaders.d.ts

@@ -1,6 +0,6 @@
-import { Base58EncodedAddress } from '@solana/addresses';
-import { Slot } from './common';
+import type { Address } from '@solana/addresses';
+import type { IRpcApiMethods, Slot } from '@solana/rpc-types';
 /** array of Node identity public keys as base-58 encoded strings */
-type GetSlotLeadersApiResponse = Base58EncodedAddress[];
-export interface GetSlotLeadersApi {
+type GetSlotLeadersApiResponse = Address[];
+export interface GetSlotLeadersApi extends IRpcApiMethods {
     /**
@@ -7,0 +7,0 @@ * Returns the slot leaders for a given slot range

dist/types/rpc-methods/getStakeActivation.d.ts

@@ -1,4 +0,3 @@
-import { Base58EncodedAddress } from '@solana/addresses';
-import { Commitment } from '@solana/rpc-types';
-import { Slot, U64UnsafeBeyond2Pow53Minus1 } from './common';
+import type { Address } from '@solana/addresses';
+import type { Commitment, IRpcApiMethods, Slot, U64UnsafeBeyond2Pow53Minus1 } from '@solana/rpc-types';
 type GetStakeActivationApiResponse = Readonly<{
@@ -12,7 +11,7 @@ /** Stake active during the epoch */
 }>;
-export interface GetStakeActivationApi {
+export interface GetStakeActivationApi extends IRpcApiMethods {
     /**
      * Returns epoch activation information for a stake account
      */
-    getStakeActivation(address: Base58EncodedAddress, config?: Readonly<{
+    getStakeActivation(address: Address, config?: Readonly<{
         commitment?: Commitment;
@@ -19,0 +18,0 @@ minContextSlot?: Slot;

dist/types/rpc-methods/getStakeMinimumDelegation.d.ts

@@ -1,5 +0,4 @@
-import { Commitment, LamportsUnsafeBeyond2Pow53Minus1 } from '@solana/rpc-types';
-import { RpcResponse } from './common';
+import type { Commitment, IRpcApiMethods, LamportsUnsafeBeyond2Pow53Minus1, RpcResponse } from '@solana/rpc-types';
 type GetStakeMinimumDelegationApiResponse = RpcResponse<LamportsUnsafeBeyond2Pow53Minus1>;
-export interface GetStakeMinimumDelegationApi {
+export interface GetStakeMinimumDelegationApi extends IRpcApiMethods {
     /**
@@ -6,0 +5,0 @@ * Returns the stake minimum delegation, in lamports.

dist/types/rpc-methods/getSupply.d.ts

@@ -1,4 +0,3 @@
-import { Base58EncodedAddress } from '@solana/addresses';
-import { Commitment, LamportsUnsafeBeyond2Pow53Minus1 } from '@solana/rpc-types';
-import { RpcResponse } from './common';
+import type { Address } from '@solana/addresses';
+import type { Commitment, IRpcApiMethods, LamportsUnsafeBeyond2Pow53Minus1, RpcResponse } from '@solana/rpc-types';
 type GetSupplyConfig = Readonly<{
@@ -19,3 +18,3 @@ commitment?: Commitment;
         /** an array of account addresses of non-circulating accounts */
-        nonCirculatingAccounts: [Base58EncodedAddress];
+        nonCirculatingAccounts: [Address];
     }>;
@@ -28,3 +27,3 @@ }>;
 }>;
-export interface GetSupplyApi {
+export interface GetSupplyApi extends IRpcApiMethods {
     /**
@@ -31,0 +30,0 @@ * Returns information about the current supply.

dist/types/rpc-methods/getTokenAccountBalance.d.ts

@@ -1,6 +0,5 @@
-import { Base58EncodedAddress } from '@solana/addresses';
-import { Commitment } from '@solana/rpc-types';
-import { RpcResponse, TokenAmount } from './common';
+import type { Address } from '@solana/addresses';
+import type { Commitment, IRpcApiMethods, RpcResponse, TokenAmount } from '@solana/rpc-types';
 type GetTokenAccountBalanceApiResponse = RpcResponse<TokenAmount>;
-export interface GetTokenAccountBalanceApi {
+export interface GetTokenAccountBalanceApi extends IRpcApiMethods {
     /**
@@ -11,3 +10,3 @@ * Returns the token balance of an SPL Token account
     /** Pubkey of Token account to query, as base-58 encoded string */
-    address: Base58EncodedAddress, config?: Readonly<{
+    address: Address, config?: Readonly<{
         commitment?: Commitment;
@@ -14,0 +13,0 @@ }>): GetTokenAccountBalanceApiResponse;

dist/types/rpc-methods/getTokenAccountsByDelegate.d.ts

@@ -1,12 +0,13 @@
-import { Base58EncodedAddress } from '@solana/addresses';
-import { Commitment } from '@solana/rpc-types';
-import { AccountInfoBase, AccountInfoWithBase58Bytes, AccountInfoWithBase58EncodedData, AccountInfoWithBase64EncodedData, AccountInfoWithBase64EncodedZStdCompressedData, AccountInfoWithPubkey, DataSlice, RpcResponse, Slot, TokenAccount, U64UnsafeBeyond2Pow53Minus1 } from './common';
+import type { Address } from '@solana/addresses';
+import type { JsonParsedTokenAccount } from '@solana/rpc-parsed-types';
+import type { Commitment, IRpcApiMethods, RpcResponse, Slot, U64UnsafeBeyond2Pow53Minus1 } from '@solana/rpc-types';
+import { AccountInfoBase, AccountInfoWithBase58Bytes, AccountInfoWithBase58EncodedData, AccountInfoWithBase64EncodedData, AccountInfoWithBase64EncodedZStdCompressedData, AccountInfoWithPubkey, DataSlice } from './common.js';
 type TokenAccountInfoWithJsonData = Readonly<{
     data: Readonly<{
         /** Name of the program that owns this account. */
-        program: {
-            info: TokenAccount;
+        program: Address;
+        parsed: {
+            info: JsonParsedTokenAccount;
             type: 'account';
         };
-        parsed: unknown;
         space: U64UnsafeBeyond2Pow53Minus1;
@@ -17,7 +18,7 @@ }>;
     /** Pubkey of the specific token Mint to limit accounts to */
-    mint: Base58EncodedAddress;
+    mint: Address;
 }>;
 type ProgramIdFilter = Readonly<{
     /** Pubkey of the Token program that owns the accounts */
-    programId: Base58EncodedAddress;
+    programId: Address;
 }>;
@@ -35,21 +36,21 @@ type AccountsFilter = MintFilter | ProgramIdFilter;
 }>;
-export interface GetTokenAccountsByDelegateApi {
+export interface GetTokenAccountsByDelegateApi extends IRpcApiMethods {
     /**
      * Returns all SPL Token accounts by approved Delegate.
      */
-    getTokenAccountsByDelegate(program: Base58EncodedAddress, filter: AccountsFilter, config: GetTokenAccountsByDelegateApiCommonConfig & GetTokenAccountsByDelegateApiSliceableCommonConfig & Readonly<{
+    getTokenAccountsByDelegate(program: Address, filter: AccountsFilter, config: GetTokenAccountsByDelegateApiCommonConfig & GetTokenAccountsByDelegateApiSliceableCommonConfig & Readonly<{
         encoding: 'base64';
     }>): RpcResponse<AccountInfoWithPubkey<AccountInfoBase & AccountInfoWithBase64EncodedData>[]>;
-    getTokenAccountsByDelegate(program: Base58EncodedAddress, filter: AccountsFilter, config: GetTokenAccountsByDelegateApiCommonConfig & GetTokenAccountsByDelegateApiSliceableCommonConfig & Readonly<{
+    getTokenAccountsByDelegate(program: Address, filter: AccountsFilter, config: GetTokenAccountsByDelegateApiCommonConfig & GetTokenAccountsByDelegateApiSliceableCommonConfig & Readonly<{
         encoding: 'base64+zstd';
     }>): RpcResponse<AccountInfoWithPubkey<AccountInfoBase & AccountInfoWithBase64EncodedZStdCompressedData>[]>;
-    getTokenAccountsByDelegate(program: Base58EncodedAddress, filter: AccountsFilter, config: GetTokenAccountsByDelegateApiCommonConfig & Readonly<{
+    getTokenAccountsByDelegate(program: Address, filter: AccountsFilter, config: GetTokenAccountsByDelegateApiCommonConfig & Readonly<{
         encoding: 'jsonParsed';
     }>): RpcResponse<AccountInfoWithPubkey<AccountInfoBase & TokenAccountInfoWithJsonData>[]>;
-    getTokenAccountsByDelegate(program: Base58EncodedAddress, filter: AccountsFilter, config: GetTokenAccountsByDelegateApiCommonConfig & GetTokenAccountsByDelegateApiSliceableCommonConfig & Readonly<{
+    getTokenAccountsByDelegate(program: Address, filter: AccountsFilter, config: GetTokenAccountsByDelegateApiCommonConfig & GetTokenAccountsByDelegateApiSliceableCommonConfig & Readonly<{
         encoding: 'base58';
     }>): RpcResponse<AccountInfoWithPubkey<AccountInfoBase & AccountInfoWithBase58EncodedData>[]>;
-    getTokenAccountsByDelegate(program: Base58EncodedAddress, filter: AccountsFilter, config?: GetTokenAccountsByDelegateApiCommonConfig & GetTokenAccountsByDelegateApiSliceableCommonConfig): RpcResponse<AccountInfoWithPubkey<AccountInfoBase & AccountInfoWithBase58Bytes>[]>;
+    getTokenAccountsByDelegate(program: Address, filter: AccountsFilter, config?: GetTokenAccountsByDelegateApiCommonConfig & GetTokenAccountsByDelegateApiSliceableCommonConfig): RpcResponse<AccountInfoWithPubkey<AccountInfoBase & AccountInfoWithBase58Bytes>[]>;
 }
 export {};
 //# sourceMappingURL=getTokenAccountsByDelegate.d.ts.map

dist/types/rpc-methods/getTokenAccountsByOwner.d.ts

@@ -1,12 +0,13 @@
-import { Base58EncodedAddress } from '@solana/addresses';
-import { Commitment } from '@solana/rpc-types';
-import { AccountInfoBase, AccountInfoWithBase58Bytes, AccountInfoWithBase58EncodedData, AccountInfoWithBase64EncodedData, AccountInfoWithBase64EncodedZStdCompressedData, AccountInfoWithPubkey, DataSlice, RpcResponse, Slot, TokenAccount, U64UnsafeBeyond2Pow53Minus1 } from './common';
+import type { Address } from '@solana/addresses';
+import type { JsonParsedTokenAccount } from '@solana/rpc-parsed-types';
+import type { Commitment, IRpcApiMethods, RpcResponse, Slot, U64UnsafeBeyond2Pow53Minus1 } from '@solana/rpc-types';
+import { AccountInfoBase, AccountInfoWithBase58Bytes, AccountInfoWithBase58EncodedData, AccountInfoWithBase64EncodedData, AccountInfoWithBase64EncodedZStdCompressedData, AccountInfoWithPubkey, DataSlice } from './common.js';
 type TokenAccountInfoWithJsonData = Readonly<{
     data: Readonly<{
         /** Name of the program that owns this account. */
-        program: {
-            info: TokenAccount;
+        program: Address;
+        parsed: {
+            info: JsonParsedTokenAccount;
             type: 'account';
         };
-        parsed: unknown;
         space: U64UnsafeBeyond2Pow53Minus1;
@@ -17,7 +18,7 @@ }>;
     /** Pubkey of the specific token Mint to limit accounts to */
-    mint: Base58EncodedAddress;
+    mint: Address;
 }>;
 type ProgramIdFilter = Readonly<{
     /** Pubkey of the Token program that owns the accounts */
-    programId: Base58EncodedAddress;
+    programId: Address;
 }>;
@@ -35,21 +36,21 @@ type AccountsFilter = MintFilter | ProgramIdFilter;
 }>;
-export interface GetTokenAccountsByOwnerApi {
+export interface GetTokenAccountsByOwnerApi extends IRpcApiMethods {
     /**
      * Returns all SPL Token accounts by token owner.
      */
-    getTokenAccountsByOwner(program: Base58EncodedAddress, filter: AccountsFilter, config: GetTokenAccountsByOwnerApiCommonConfig & GetTokenAccountsByOwnerApiSliceableCommonConfig & Readonly<{
+    getTokenAccountsByOwner(owner: Address, filter: AccountsFilter, config: GetTokenAccountsByOwnerApiCommonConfig & GetTokenAccountsByOwnerApiSliceableCommonConfig & Readonly<{
         encoding: 'base64';
     }>): RpcResponse<AccountInfoWithPubkey<AccountInfoBase & AccountInfoWithBase64EncodedData>[]>;
-    getTokenAccountsByOwner(program: Base58EncodedAddress, filter: AccountsFilter, config: GetTokenAccountsByOwnerApiCommonConfig & GetTokenAccountsByOwnerApiSliceableCommonConfig & Readonly<{
+    getTokenAccountsByOwner(owner: Address, filter: AccountsFilter, config: GetTokenAccountsByOwnerApiCommonConfig & GetTokenAccountsByOwnerApiSliceableCommonConfig & Readonly<{
         encoding: 'base64+zstd';
     }>): RpcResponse<AccountInfoWithPubkey<AccountInfoBase & AccountInfoWithBase64EncodedZStdCompressedData>[]>;
-    getTokenAccountsByOwner(program: Base58EncodedAddress, filter: AccountsFilter, config: GetTokenAccountsByOwnerApiCommonConfig & Readonly<{
+    getTokenAccountsByOwner(owner: Address, filter: AccountsFilter, config: GetTokenAccountsByOwnerApiCommonConfig & Readonly<{
         encoding: 'jsonParsed';
     }>): RpcResponse<AccountInfoWithPubkey<AccountInfoBase & TokenAccountInfoWithJsonData>[]>;
-    getTokenAccountsByOwner(program: Base58EncodedAddress, filter: AccountsFilter, config: GetTokenAccountsByOwnerApiCommonConfig & GetTokenAccountsByOwnerApiSliceableCommonConfig & Readonly<{
+    getTokenAccountsByOwner(owner: Address, filter: AccountsFilter, config: GetTokenAccountsByOwnerApiCommonConfig & GetTokenAccountsByOwnerApiSliceableCommonConfig & Readonly<{
         encoding: 'base58';
     }>): RpcResponse<AccountInfoWithPubkey<AccountInfoBase & AccountInfoWithBase58EncodedData>[]>;
-    getTokenAccountsByOwner(program: Base58EncodedAddress, filter: AccountsFilter, config?: GetTokenAccountsByOwnerApiCommonConfig & GetTokenAccountsByOwnerApiSliceableCommonConfig): RpcResponse<AccountInfoWithPubkey<AccountInfoBase & AccountInfoWithBase58Bytes>[]>;
+    getTokenAccountsByOwner(owner: Address, filter: AccountsFilter, config?: GetTokenAccountsByOwnerApiCommonConfig & GetTokenAccountsByOwnerApiSliceableCommonConfig): RpcResponse<AccountInfoWithPubkey<AccountInfoBase & AccountInfoWithBase58Bytes>[]>;
 }
 export {};
 //# sourceMappingURL=getTokenAccountsByOwner.d.ts.map

dist/types/rpc-methods/getTokenLargestAccounts.d.ts

@@ -1,12 +0,11 @@
-import { Base58EncodedAddress } from '@solana/addresses';
-import { Commitment } from '@solana/rpc-types';
-import { RpcResponse, TokenAmount } from './common';
+import { Address } from '@solana/addresses';
+import type { Commitment, IRpcApiMethods, RpcResponse, TokenAmount } from '@solana/rpc-types';
 type GetTokenLargestAccountsApiResponse = RpcResponse<TokenAmount & {
-    address: Base58EncodedAddress;
+    address: Address;
 }[]>;
-export interface GetTokenLargestAccountsApi {
+export interface GetTokenLargestAccountsApi extends IRpcApiMethods {
     /**
      * Returns the 20 largest accounts of a particular SPL Token type.
      */
-    getTokenLargestAccounts(tokenMint: Base58EncodedAddress, config?: Readonly<{
+    getTokenLargestAccounts(tokenMint: Address, config?: Readonly<{
         commitment?: Commitment;
@@ -13,0 +12,0 @@ }>): GetTokenLargestAccountsApiResponse;

dist/types/rpc-methods/getTokenSupply.d.ts

@@ -1,6 +0,5 @@
-import { Base58EncodedAddress } from '@solana/addresses';
-import { Commitment } from '@solana/rpc-types';
-import { RpcResponse, TokenAmount } from './common';
+import type { Address } from '@solana/addresses';
+import type { Commitment, IRpcApiMethods, RpcResponse, TokenAmount } from '@solana/rpc-types';
 type GetTokenSupplyApiResponse = RpcResponse<TokenAmount>;
-export interface GetTokenSupplyApi {
+export interface GetTokenSupplyApi extends IRpcApiMethods {
     /**
@@ -11,3 +10,3 @@ * Returns the total supply of an SPL Token mint
     /** Pubkey of the token Mint to query, as base-58 encoded string */
-    address: Base58EncodedAddress, config?: Readonly<{
+    address: Address, config?: Readonly<{
         commitment?: Commitment;
@@ -14,0 +13,0 @@ }>): GetTokenSupplyApiResponse;

dist/types/rpc-methods/getTransaction.d.ts

@@ -1,11 +0,12 @@
-import { Base58EncodedAddress } from '@solana/addresses';
-import { Commitment, LamportsUnsafeBeyond2Pow53Minus1, UnixTimestamp } from '@solana/rpc-types';
-import { Blockhash, TransactionVersion } from '@solana/transactions';
-import { TransactionSignature } from '@solana/transactions';
-import { TransactionError } from '../transaction-error';
-import { Base58EncodedBytes, Base58EncodedDataResponse, Base64EncodedDataResponse, Slot, TokenBalance, U64UnsafeBeyond2Pow53Minus1 } from './common';
-import { Reward, TransactionStatus } from './common-transactions';
+import { Address } from '@solana/addresses';
+import { Signature } from '@solana/keys';
+import type { IRpcApiMethods } from '@solana/rpc-types';
+import { Base58EncodedBytes, Base58EncodedDataResponse, Base64EncodedDataResponse, Blockhash, Commitment, LamportsUnsafeBeyond2Pow53Minus1, Slot, U64UnsafeBeyond2Pow53Minus1, UnixTimestamp } from '@solana/rpc-types';
+import { TransactionVersion } from '@solana/transactions';
+import { TransactionError } from '../transaction-error.js';
+import { TokenBalance } from './common.js';
+import { Reward, TransactionStatus } from './common-transactions.js';
 type ReturnData = {
     /** the program that generated the return data */
-    programId: Base58EncodedAddress;
+    programId: Address;
     /** the return data itself */
@@ -43,3 +44,3 @@ data: Base64EncodedDataResponse;
     /** public key for an address lookup table account. */
-    accountKey: Base58EncodedAddress;
+    accountKey: Address;
     /** List of indices used to load addresses of writable accounts from a lookup table. */
@@ -63,3 +64,3 @@ writableIndexes: readonly number[];
     message: {
-        accountKeys: readonly Base58EncodedAddress[];
+        accountKeys: readonly Address[];
         header: {
@@ -74,5 +75,5 @@ numReadonlySignedAccounts: number;
 type PartiallyDecodedTransactionInstruction = Readonly<{
-    accounts: readonly Base58EncodedAddress[];
+    accounts: readonly Address[];
     data: Base58EncodedBytes;
-    programId: Base58EncodedAddress;
+    programId: Address;
 }>;
@@ -85,3 +86,3 @@ type ParsedTransactionInstruction = Readonly<{
     program: string;
-    programId: Base58EncodedAddress;
+    programId: Address;
 }>;
@@ -92,3 +93,3 @@ type TransactionJsonParsed = TransactionBase & Readonly<{
             {
-                pubkey: Base58EncodedAddress;
+                pubkey: Address;
                 signer: boolean;
@@ -114,4 +115,4 @@ source: string;
     loadedAddresses: {
-        writable: readonly Base58EncodedAddress[];
-        readonly: readonly Base58EncodedAddress[];
+        writable: readonly Address[];
+        readonly: readonly Address[];
     };
@@ -134,7 +135,7 @@ }>;
 }>;
-export interface GetTransactionApi {
+export interface GetTransactionApi extends IRpcApiMethods {
     /**
      * Returns transaction details for a confirmed transaction
      */
-    getTransaction<TMaxSupportedTransactionVersion extends TransactionVersion | void = void>(signature: TransactionSignature, config: GetTransactionCommonConfig<TMaxSupportedTransactionVersion> & Readonly<{
+    getTransaction<TMaxSupportedTransactionVersion extends TransactionVersion | void = void>(signature: Signature, config: GetTransactionCommonConfig<TMaxSupportedTransactionVersion> & Readonly<{
         encoding: 'jsonParsed';
@@ -147,3 +148,3 @@ }>): (GetTransactionApiResponseBase & (TMaxSupportedTransactionVersion extends void ? Record<string, never> : {
     }) | null;
-    getTransaction<TMaxSupportedTransactionVersion extends TransactionVersion | void = void>(signature: TransactionSignature, config: GetTransactionCommonConfig<TMaxSupportedTransactionVersion> & Readonly<{
+    getTransaction<TMaxSupportedTransactionVersion extends TransactionVersion | void = void>(signature: Signature, config: GetTransactionCommonConfig<TMaxSupportedTransactionVersion> & Readonly<{
         encoding: 'base64';
@@ -156,3 +157,3 @@ }>): (GetTransactionApiResponseBase & (TMaxSupportedTransactionVersion extends void ? Record<string, never> : {
     }) | null;
-    getTransaction<TMaxSupportedTransactionVersion extends TransactionVersion | void = void>(signature: TransactionSignature, config: GetTransactionCommonConfig<TMaxSupportedTransactionVersion> & Readonly<{
+    getTransaction<TMaxSupportedTransactionVersion extends TransactionVersion | void = void>(signature: Signature, config: GetTransactionCommonConfig<TMaxSupportedTransactionVersion> & Readonly<{
         encoding: 'base58';
@@ -165,3 +166,3 @@ }>): (GetTransactionApiResponseBase & (TMaxSupportedTransactionVersion extends void ? Record<string, never> : {
     }) | null;
-    getTransaction<TMaxSupportedTransactionVersion extends TransactionVersion | void = void>(signature: TransactionSignature, config?: GetTransactionCommonConfig<TMaxSupportedTransactionVersion> & Readonly<{
+    getTransaction<TMaxSupportedTransactionVersion extends TransactionVersion | void = void>(signature: Signature, config?: GetTransactionCommonConfig<TMaxSupportedTransactionVersion> & Readonly<{
         encoding?: 'json';
@@ -168,0 +169,0 @@ }>): (GetTransactionApiResponseBase & (TMaxSupportedTransactionVersion extends void ? Record<string, never> : {

dist/types/rpc-methods/getTransactionCount.d.ts

@@ -1,5 +0,4 @@
-import { Commitment } from '@solana/rpc-types';
-import { Slot, U64UnsafeBeyond2Pow53Minus1 } from './common';
+import type { Commitment, IRpcApiMethods, Slot, U64UnsafeBeyond2Pow53Minus1 } from '@solana/rpc-types';
 type GetTransactionCountApiResponse = U64UnsafeBeyond2Pow53Minus1;
-export interface GetTransactionCountApi {
+export interface GetTransactionCountApi extends IRpcApiMethods {
     /**
@@ -6,0 +5,0 @@ * Returns the current Transaction count from the ledger

dist/types/rpc-methods/getVersion.d.ts

@@ -0,1 +1,2 @@
+import type { IRpcApiMethods } from '@solana/rpc-types';
 type GetVersionApiResponse = Readonly<{
@@ -7,3 +8,3 @@ /** Unique identifier of the current software's feature set */
 }>;
-export interface GetVersionApi {
+export interface GetVersionApi extends IRpcApiMethods {
     /**
@@ -10,0 +11,0 @@ * Returns the current Solana version running on the node

dist/types/rpc-methods/getVoteAccounts.d.ts

@@ -1,4 +0,3 @@
-import { Base58EncodedAddress } from '@solana/addresses';
-import { Commitment } from '@solana/rpc-types';
-import { Slot, U64UnsafeBeyond2Pow53Minus1 } from './common';
+import type { Address } from '@solana/addresses';
+import type { Commitment, IRpcApiMethods, Slot, U64UnsafeBeyond2Pow53Minus1 } from '@solana/rpc-types';
 type Epoch = U64UnsafeBeyond2Pow53Minus1;
@@ -8,7 +7,7 @@ type Credits = U64UnsafeBeyond2Pow53Minus1;
 type EpochCredit = [Epoch, Credits, PreviousCredits];
-type VoteAccount<TVotePubkey extends Base58EncodedAddress> = Readonly<{
+type VoteAccount<TVotePubkey extends Address> = Readonly<{
     /** Vote account address */
     votePubkey: TVotePubkey;
     /** Validator identity */
-    nodePubkey: Base58EncodedAddress;
+    nodePubkey: Address;
     /** the stake, in lamports, delegated to this vote account and active in this epoch */
@@ -27,7 +26,7 @@ activatedStake: U64UnsafeBeyond2Pow53Minus1;
 }>;
-type GetVoteAccountsApiResponse<TVotePubkey extends Base58EncodedAddress> = Readonly<{
+type GetVoteAccountsApiResponse<TVotePubkey extends Address> = Readonly<{
     current: readonly VoteAccount<TVotePubkey>[];
     delinquent: readonly VoteAccount<TVotePubkey>[];
 }>;
-type GetVoteAccountsConfig<TVotePubkey extends Base58EncodedAddress> = Readonly<{
+type GetVoteAccountsConfig<TVotePubkey extends Address> = Readonly<{
     commitment?: Commitment;
@@ -41,7 +40,7 @@ /** Only return results for this validator vote address */
 }>;
-export interface GetVoteAccountsApi {
+export interface GetVoteAccountsApi extends IRpcApiMethods {
     /** Returns the account info and associated stake for all the voting accounts in the current bank. */
-    getVoteAccounts<TVoteAccount extends Base58EncodedAddress>(config?: GetVoteAccountsConfig<TVoteAccount>): GetVoteAccountsApiResponse<TVoteAccount>;
+    getVoteAccounts<TVoteAccount extends Address>(config?: GetVoteAccountsConfig<TVoteAccount>): GetVoteAccountsApiResponse<TVoteAccount>;
 }
 export {};
 //# sourceMappingURL=getVoteAccounts.d.ts.map

dist/types/rpc-methods/index.d.ts

@@ -1,61 +0,61 @@
-import { IRpcApi } from '@solana/rpc-transport/dist/types/json-rpc-types';
-import { GetAccountInfoApi } from './getAccountInfo';
-import { GetBalanceApi } from './getBalance';
-import { GetBlockApi } from './getBlock';
-import { GetBlockCommitmentApi } from './getBlockCommitment';
-import { GetBlockHeightApi } from './getBlockHeight';
-import { GetBlockProductionApi } from './getBlockProduction';
-import { GetBlocksApi } from './getBlocks';
-import { GetBlocksWithLimitApi } from './getBlocksWithLimit';
-import { GetBlockTimeApi } from './getBlockTime';
-import { GetClusterNodesApi } from './getClusterNodes';
-import { GetEpochInfoApi } from './getEpochInfo';
-import { GetEpochScheduleApi } from './getEpochSchedule';
-import { GetFeeForMessageApi } from './getFeeForMessage';
-import { GetFirstAvailableBlockApi } from './getFirstAvailableBlock';
-import { GetGenesisHashApi } from './getGenesisHash';
-import { GetHealthApi } from './getHealth';
-import { GetHighestSnapshotSlotApi } from './getHighestSnapshotSlot';
-import { GetIdentityApi } from './getIdentity';
-import { GetInflationGovernorApi } from './getInflationGovernor';
-import { GetInflationRateApi } from './getInflationRate';
-import { GetInflationRewardApi } from './getInflationReward';
-import { GetLargestAccountsApi } from './getLargestAccounts';
-import { GetLatestBlockhashApi } from './getLatestBlockhash';
-import { GetLeaderScheduleApi } from './getLeaderSchedule';
-import { GetMaxRetransmitSlotApi } from './getMaxRetransmitSlot';
-import { GetMaxShredInsertSlotApi } from './getMaxShredInsertSlot';
-import { GetMinimumBalanceForRentExemptionApi } from './getMinimumBalanceForRentExemption';
-import { GetMultipleAccountsApi } from './getMultipleAccounts';
-import { GetProgramAccountsApi } from './getProgramAccounts';
-import { GetRecentPerformanceSamplesApi } from './getRecentPerformanceSamples';
-import { GetRecentPrioritizationFeesApi } from './getRecentPrioritizationFees';
-import { GetSignaturesForAddressApi } from './getSignaturesForAddress';
-import { GetSignatureStatusesApi } from './getSignatureStatuses';
-import { GetSlotApi } from './getSlot';
-import { GetSlotLeaderApi } from './getSlotLeader';
-import { GetSlotLeadersApi } from './getSlotLeaders';
-import { GetStakeActivationApi } from './getStakeActivation';
-import { GetStakeMinimumDelegationApi } from './getStakeMinimumDelegation';
-import { GetSupplyApi } from './getSupply';
-import { GetTokenAccountBalanceApi } from './getTokenAccountBalance';
-import { GetTokenAccountsByDelegateApi } from './getTokenAccountsByDelegate';
-import { GetTokenAccountsByOwnerApi } from './getTokenAccountsByOwner';
-import { GetTokenLargestAccountsApi } from './getTokenLargestAccounts';
-import { GetTokenSupplyApi } from './getTokenSupply';
-import { GetTransactionApi } from './getTransaction';
-import { GetTransactionCountApi } from './getTransactionCount';
-import { GetVersionApi } from './getVersion';
-import { GetVoteAccountsApi } from './getVoteAccounts';
-import { IsBlockhashValidApi } from './isBlockhashValid';
-import { MinimumLedgerSlotApi } from './minimumLedgerSlot';
-import { RequestAirdropApi } from './requestAirdrop';
-import { SendTransactionApi } from './sendTransaction';
-import { SimulateTransactionApi } from './simulateTransaction';
-type Config = Readonly<{
-    onIntegerOverflow?: (methodName: string, keyPath: (number | string)[], value: bigint) => void;
-}>;
+import { IRpcApi } from '@solana/rpc-types';
+import { ParamsPatcherConfig } from '../params-patcher.js';
+import { GetAccountInfoApi } from './getAccountInfo.js';
+import { GetBalanceApi } from './getBalance.js';
+import { GetBlockApi } from './getBlock.js';
+import { GetBlockCommitmentApi } from './getBlockCommitment.js';
+import { GetBlockHeightApi } from './getBlockHeight.js';
+import { GetBlockProductionApi } from './getBlockProduction.js';
+import { GetBlocksApi } from './getBlocks.js';
+import { GetBlocksWithLimitApi } from './getBlocksWithLimit.js';
+import { GetBlockTimeApi } from './getBlockTime.js';
+import { GetClusterNodesApi } from './getClusterNodes.js';
+import { GetEpochInfoApi } from './getEpochInfo.js';
+import { GetEpochScheduleApi } from './getEpochSchedule.js';
+import { GetFeeForMessageApi } from './getFeeForMessage.js';
+import { GetFirstAvailableBlockApi } from './getFirstAvailableBlock.js';
+import { GetGenesisHashApi } from './getGenesisHash.js';
+import { GetHealthApi } from './getHealth.js';
+import { GetHighestSnapshotSlotApi } from './getHighestSnapshotSlot.js';
+import { GetIdentityApi } from './getIdentity.js';
+import { GetInflationGovernorApi } from './getInflationGovernor.js';
+import { GetInflationRateApi } from './getInflationRate.js';
+import { GetInflationRewardApi } from './getInflationReward.js';
+import { GetLargestAccountsApi } from './getLargestAccounts.js';
+import { GetLatestBlockhashApi } from './getLatestBlockhash.js';
+import { GetLeaderScheduleApi } from './getLeaderSchedule.js';
+import { GetMaxRetransmitSlotApi } from './getMaxRetransmitSlot.js';
+import { GetMaxShredInsertSlotApi } from './getMaxShredInsertSlot.js';
+import { GetMinimumBalanceForRentExemptionApi } from './getMinimumBalanceForRentExemption.js';
+import { GetMultipleAccountsApi } from './getMultipleAccounts.js';
+import { GetProgramAccountsApi } from './getProgramAccounts.js';
+import { GetRecentPerformanceSamplesApi } from './getRecentPerformanceSamples.js';
+import { GetRecentPrioritizationFeesApi } from './getRecentPrioritizationFees.js';
+import { GetSignaturesForAddressApi } from './getSignaturesForAddress.js';
+import { GetSignatureStatusesApi } from './getSignatureStatuses.js';
+import { GetSlotApi } from './getSlot.js';
+import { GetSlotLeaderApi } from './getSlotLeader.js';
+import { GetSlotLeadersApi } from './getSlotLeaders.js';
+import { GetStakeActivationApi } from './getStakeActivation.js';
+import { GetStakeMinimumDelegationApi } from './getStakeMinimumDelegation.js';
+import { GetSupplyApi } from './getSupply.js';
+import { GetTokenAccountBalanceApi } from './getTokenAccountBalance.js';
+import { GetTokenAccountsByDelegateApi } from './getTokenAccountsByDelegate.js';
+import { GetTokenAccountsByOwnerApi } from './getTokenAccountsByOwner.js';
+import { GetTokenLargestAccountsApi } from './getTokenLargestAccounts.js';
+import { GetTokenSupplyApi } from './getTokenSupply.js';
+import { GetTransactionApi } from './getTransaction.js';
+import { GetTransactionCountApi } from './getTransactionCount.js';
+import { GetVersionApi } from './getVersion.js';
+import { GetVoteAccountsApi } from './getVoteAccounts.js';
+import { IsBlockhashValidApi } from './isBlockhashValid.js';
+import { MinimumLedgerSlotApi } from './minimumLedgerSlot.js';
+import { RequestAirdropApi } from './requestAirdrop.js';
+import { SendTransactionApi } from './sendTransaction.js';
+import { SimulateTransactionApi } from './simulateTransaction.js';
+type Config = ParamsPatcherConfig;
 export type SolanaRpcMethods = GetAccountInfoApi & GetBalanceApi & GetBlockApi & GetBlockCommitmentApi & GetBlockHeightApi & GetBlockProductionApi & GetBlocksApi & GetBlocksWithLimitApi & GetBlockTimeApi & GetClusterNodesApi & GetEpochInfoApi & GetEpochScheduleApi & GetFeeForMessageApi & GetFirstAvailableBlockApi & GetGenesisHashApi & GetHealthApi & GetHighestSnapshotSlotApi & GetIdentityApi & GetInflationGovernorApi & GetInflationRateApi & GetInflationRewardApi & GetLargestAccountsApi & GetLatestBlockhashApi & GetLeaderScheduleApi & GetMaxRetransmitSlotApi & GetMaxShredInsertSlotApi & GetMinimumBalanceForRentExemptionApi & GetMultipleAccountsApi & GetProgramAccountsApi & GetRecentPerformanceSamplesApi & GetRecentPrioritizationFeesApi & GetSignaturesForAddressApi & GetSignatureStatusesApi & GetSlotApi & GetSlotLeaderApi & GetSlotLeadersApi & GetStakeActivationApi & GetStakeMinimumDelegationApi & GetSupplyApi & GetTokenAccountBalanceApi & GetTokenAccountsByDelegateApi & GetTokenAccountsByOwnerApi & GetTokenLargestAccountsApi & GetTokenSupplyApi & GetTransactionApi & GetTransactionCountApi & GetVersionApi & GetVoteAccountsApi & IsBlockhashValidApi & MinimumLedgerSlotApi & RequestAirdropApi & SendTransactionApi & SimulateTransactionApi;
 export declare function createSolanaRpcApi(config?: Config): IRpcApi<SolanaRpcMethods>;
-export {};
+export type { GetAccountInfoApi, GetBalanceApi, GetBlockApi, GetBlockCommitmentApi, GetBlockHeightApi, GetBlockProductionApi, GetBlocksApi, GetBlocksWithLimitApi, GetBlockTimeApi, GetClusterNodesApi, GetEpochInfoApi, GetEpochScheduleApi, GetFeeForMessageApi, GetFirstAvailableBlockApi, GetGenesisHashApi, GetHealthApi, GetHighestSnapshotSlotApi, GetIdentityApi, GetInflationGovernorApi, GetInflationRateApi, GetInflationRewardApi, GetLargestAccountsApi, GetLatestBlockhashApi, GetLeaderScheduleApi, GetMaxRetransmitSlotApi, GetMaxShredInsertSlotApi, GetMinimumBalanceForRentExemptionApi, GetMultipleAccountsApi, GetProgramAccountsApi, GetRecentPerformanceSamplesApi, GetRecentPrioritizationFeesApi, GetSignaturesForAddressApi, GetSignatureStatusesApi, GetSlotApi, GetSlotLeaderApi, GetSlotLeadersApi, GetStakeActivationApi, GetStakeMinimumDelegationApi, GetSupplyApi, GetTokenAccountBalanceApi, GetTokenAccountsByDelegateApi, GetTokenAccountsByOwnerApi, GetTokenLargestAccountsApi, GetTokenSupplyApi, GetTransactionApi, GetTransactionCountApi, GetVersionApi, GetVoteAccountsApi, IsBlockhashValidApi, MinimumLedgerSlotApi, RequestAirdropApi, SendTransactionApi, SimulateTransactionApi, };
+export type { DataSlice, GetProgramAccountsDatasizeFilter, GetProgramAccountsMemcmpFilter } from './common.js';
 //# sourceMappingURL=index.d.ts.map

dist/types/rpc-methods/isBlockhashValid.d.ts

@@ -1,6 +0,4 @@
-import { Commitment } from '@solana/rpc-types';
-import { Blockhash } from '@solana/transactions';
-import { RpcResponse, Slot } from './common';
+import type { Blockhash, Commitment, IRpcApiMethods, RpcResponse, Slot } from '@solana/rpc-types';
 type IsBlockhashValidApiResponse = RpcResponse<boolean>;
-export interface IsBlockhashValidApi {
+export interface IsBlockhashValidApi extends IRpcApiMethods {
     /**
@@ -7,0 +5,0 @@ * Returns whether a blockhash is still valid or not

dist/types/rpc-methods/minimumLedgerSlot.d.ts

@@ -1,4 +0,4 @@
-import { Slot } from './common';
+import type { IRpcApiMethods, Slot } from '@solana/rpc-types';
 type MinimumLedgerSlotApiResponse = Slot;
-export interface MinimumLedgerSlotApi {
+export interface MinimumLedgerSlotApi extends IRpcApiMethods {
     /**
@@ -5,0 +5,0 @@ * Returns the lowest slot that the node has information about in its ledger.

dist/types/rpc-methods/requestAirdrop.d.ts

@@ -1,15 +0,15 @@
-import { Base58EncodedAddress } from '@solana/addresses';
-import { Commitment, LamportsUnsafeBeyond2Pow53Minus1 } from '@solana/rpc-types';
-import { Base58EncodedTransactionSignature } from './common';
+import type { Address } from '@solana/addresses';
+import type { Signature } from '@solana/keys';
+import type { Commitment, IRpcApiMethods, LamportsUnsafeBeyond2Pow53Minus1 } from '@solana/rpc-types';
 type RequestAirdropConfig = Readonly<{
     commitment?: Commitment;
 }>;
-type RequestAirdropResponse = Base58EncodedTransactionSignature;
-export interface RequestAirdropApi {
+type RequestAirdropResponse = Signature;
+export interface RequestAirdropApi extends IRpcApiMethods {
     /**
      * Requests an airdrop of lamports to a Pubkey
      */
-    requestAirdrop(recipientAccount: Base58EncodedAddress, lamports: LamportsUnsafeBeyond2Pow53Minus1, config?: RequestAirdropConfig): RequestAirdropResponse;
+    requestAirdrop(recipientAccount: Address, lamports: LamportsUnsafeBeyond2Pow53Minus1, config?: RequestAirdropConfig): RequestAirdropResponse;
 }
 export {};
 //# sourceMappingURL=requestAirdrop.d.ts.map

dist/types/rpc-methods/sendTransaction.d.ts

@@ -1,4 +0,4 @@
-import { Commitment } from '@solana/rpc-types';
-import { Base64EncodedWireTransaction } from '@solana/transactions';
-import { Base58EncodedTransactionSignature, Slot } from './common';
+import type { Signature } from '@solana/keys';
+import type { Commitment, IRpcApiMethods, Slot } from '@solana/rpc-types';
+import type { Base64EncodedWireTransaction } from '@solana/transactions';
 type SendTransactionConfig = Readonly<{
@@ -10,4 +10,4 @@ skipPreflight?: boolean;
 }>;
-type SendTransactionResponse = Base58EncodedTransactionSignature;
-export interface SendTransactionApi {
+type SendTransactionResponse = Signature;
+export interface SendTransactionApi extends IRpcApiMethods {
     /** @deprecated Set `encoding` to `'base64'` when calling this method */
@@ -14,0 +14,0 @@ sendTransaction(base64EncodedWireTransaction: Base64EncodedWireTransaction, config?: SendTransactionConfig & {

dist/types/rpc-methods/simulateTransaction.d.ts

@@ -1,6 +0,6 @@
-import { Base58EncodedAddress } from '@solana/addresses';
-import { Commitment } from '@solana/rpc-types';
-import { Base64EncodedWireTransaction } from '@solana/transactions';
-import { TransactionError } from '../transaction-error';
-import { AccountInfoBase, AccountInfoWithBase64EncodedData, AccountInfoWithBase64EncodedZStdCompressedData, AccountInfoWithJsonData, Base58EncodedBytes, Base64EncodedDataResponse, RpcResponse, Slot, U64UnsafeBeyond2Pow53Minus1 } from './common';
+import type { Address } from '@solana/addresses';
+import type { Base58EncodedBytes, Base64EncodedDataResponse, Commitment, IRpcApiMethods, RpcResponse, Slot, U64UnsafeBeyond2Pow53Minus1 } from '@solana/rpc-types';
+import type { Base64EncodedWireTransaction } from '@solana/transactions';
+import { TransactionError } from '../transaction-error.js';
+import { AccountInfoBase, AccountInfoWithBase64EncodedData, AccountInfoWithBase64EncodedZStdCompressedData, AccountInfoWithJsonData } from './common.js';
 type SimulateTransactionConfigBase = Readonly<{
@@ -34,3 +34,3 @@ /**
         /** An `array` of accounts to return */
-        addresses: Base58EncodedAddress[];
+        addresses: Address[];
         /** Encoding for returned Account data */
@@ -43,3 +43,3 @@ encoding: 'base64+zstd';
         /** An `array` of accounts to return */
-        addresses: Base58EncodedAddress[];
+        addresses: Address[];
         /** Encoding for returned Account data */
@@ -52,3 +52,3 @@ encoding: 'jsonParsed';
         /** An `array` of accounts to return */
-        addresses: Base58EncodedAddress[];
+        addresses: Address[];
         /** Encoding for returned Account data */
@@ -68,3 +68,3 @@ encoding?: 'base64';
         /** The program that generated the return data */
-        programId: Base58EncodedAddress;
+        programId: Address;
         /** The return data itself, as base-64 encoded binary data */
@@ -78,3 +78,3 @@ data: Base64EncodedDataResponse;
 }>;
-export interface SimulateTransactionApi {
+export interface SimulateTransactionApi extends IRpcApiMethods {
     /** @deprecated Set `encoding` to `'base64'` when calling this method */
@@ -81,0 +81,0 @@ simulateTransaction(base58EncodedWireTransaction: Base58EncodedBytes, config: SimulateTransactionConfigBase & SigVerifyAndReplaceRecentBlockhashConfig & AccountsConfigWithBase64Encoding): SimulateTransactionApiResponseBase & SimulateTransactionApiResponseWithAccounts<AccountInfoBase & AccountInfoWithBase64EncodedData>;

dist/types/rpc-subscriptions/account-notifications.d.ts

@@ -1,8 +0,8 @@
-import { Base58EncodedAddress } from '@solana/addresses';
-import { Commitment } from '@solana/rpc-types';
-import { AccountInfoBase, AccountInfoWithBase58Bytes, AccountInfoWithBase58EncodedData, AccountInfoWithBase64EncodedData, AccountInfoWithBase64EncodedZStdCompressedData, AccountInfoWithJsonData, RpcResponse } from '../rpc-methods/common';
+import { Address } from '@solana/addresses';
+import type { Commitment, IRpcApiSubscriptions, RpcResponse } from '@solana/rpc-types';
+import { AccountInfoBase, AccountInfoWithBase58Bytes, AccountInfoWithBase58EncodedData, AccountInfoWithBase64EncodedData, AccountInfoWithBase64EncodedZStdCompressedData, AccountInfoWithJsonData } from '../rpc-methods/common.js';
 type AccountNotificationsApiCommonConfig = Readonly<{
     commitment?: Commitment;
 }>;
-export interface AccountNotificationsApi {
+export interface AccountNotificationsApi extends IRpcApiSubscriptions {
     /**
@@ -15,17 +15,17 @@ * Subscribe to an account to receive notifications when the lamports or data for
      */
-    accountNotifications(address: Base58EncodedAddress, config: AccountNotificationsApiCommonConfig & Readonly<{
+    accountNotifications(address: Address, config: AccountNotificationsApiCommonConfig & Readonly<{
         encoding: 'base64';
     }>): RpcResponse<AccountInfoBase & AccountInfoWithBase64EncodedData>;
-    accountNotifications(address: Base58EncodedAddress, config: AccountNotificationsApiCommonConfig & Readonly<{
+    accountNotifications(address: Address, config: AccountNotificationsApiCommonConfig & Readonly<{
         encoding: 'base64+zstd';
     }>): RpcResponse<AccountInfoBase & AccountInfoWithBase64EncodedZStdCompressedData>;
-    accountNotifications(address: Base58EncodedAddress, config: AccountNotificationsApiCommonConfig & Readonly<{
+    accountNotifications(address: Address, config: AccountNotificationsApiCommonConfig & Readonly<{
         encoding: 'jsonParsed';
     }>): RpcResponse<AccountInfoBase & AccountInfoWithJsonData>;
-    accountNotifications(address: Base58EncodedAddress, config: AccountNotificationsApiCommonConfig & Readonly<{
+    accountNotifications(address: Address, config: AccountNotificationsApiCommonConfig & Readonly<{
         encoding: 'base58';
     }>): RpcResponse<AccountInfoBase & AccountInfoWithBase58EncodedData>;
-    accountNotifications(address: Base58EncodedAddress, config?: AccountNotificationsApiCommonConfig): RpcResponse<AccountInfoBase & AccountInfoWithBase58Bytes>;
+    accountNotifications(address: Address, config?: AccountNotificationsApiCommonConfig): RpcResponse<AccountInfoBase & AccountInfoWithBase58Bytes>;
 }
 export {};
 //# sourceMappingURL=account-notifications.d.ts.map

dist/types/rpc-subscriptions/block-notifications.d.ts

@@ -1,5 +0,4 @@
-import { Commitment, UnixTimestamp } from '@solana/rpc-types';
-import { Blockhash, TransactionVersion } from '@solana/transactions';
-import { Base58EncodedBytes, RpcResponse, Slot, U64UnsafeBeyond2Pow53Minus1 } from '../rpc-methods/common';
-import { Reward, TransactionForAccounts, TransactionForFullBase58, TransactionForFullBase64, TransactionForFullJson, TransactionForFullJsonParsed } from '../rpc-methods/common-transactions';
+import type { Base58EncodedBytes, Blockhash, Commitment, IRpcApiSubscriptions, RpcResponse, Slot, U64UnsafeBeyond2Pow53Minus1, UnixTimestamp } from '@solana/rpc-types';
+import { TransactionVersion } from '@solana/transactions';
+import { Reward, TransactionForAccounts, TransactionForFullBase58, TransactionForFullBase64, TransactionForFullJson, TransactionForFullJsonParsed } from '../rpc-methods/common-transactions.js';
 type BlockNotificationsNotificationBase = Readonly<{
@@ -47,3 +46,3 @@ /**
 type BlockNotificationsMaxSupportedTransactionVersion = Exclude<TransactionVersion, 'legacy'>;
-export interface BlockNotificationsApi {
+export interface BlockNotificationsApi extends IRpcApiSubscriptions {
     /**
@@ -50,0 +49,0 @@ * Subscribe to receive notification anytime a new block is Confirmed or Finalized.

dist/types/rpc-subscriptions/index.d.ts

@@ -1,19 +0,19 @@
-import { IRpcSubscriptionsApi } from '@solana/rpc-transport/dist/types/json-rpc-types';
-import { AccountNotificationsApi } from './account-notifications';
-import { BlockNotificationsApi } from './block-notifications';
-import { LogsNotificationsApi } from './logs-notifications';
-import { ProgramNotificationsApi } from './program-notifications';
-import { RootNotificationsApi } from './root-notifications';
-import { SignatureNotificationsApi } from './signature-notifications';
-import { SlotNotificationsApi } from './slot-notifications';
-import { SlotsUpdatesNotificationsApi } from './slots-updates-notifications';
-import { VoteNotificationsApi } from './vote-notifications';
-type Config = Readonly<{
-    onIntegerOverflow?: (methodName: string, keyPath: (number | string)[], value: bigint) => void;
-}>;
+import { IRpcSubscriptionsApi } from '@solana/rpc-types';
+import { ParamsPatcherConfig } from '../params-patcher.js';
+import { AccountNotificationsApi } from './account-notifications.js';
+import { BlockNotificationsApi } from './block-notifications.js';
+import { LogsNotificationsApi } from './logs-notifications.js';
+import { ProgramNotificationsApi } from './program-notifications.js';
+import { RootNotificationsApi } from './root-notifications.js';
+import { SignatureNotificationsApi } from './signature-notifications.js';
+import { SlotNotificationsApi } from './slot-notifications.js';
+import { SlotsUpdatesNotificationsApi } from './slots-updates-notifications.js';
+import { VoteNotificationsApi } from './vote-notifications.js';
+type Config = ParamsPatcherConfig;
 export type SolanaRpcSubscriptions = AccountNotificationsApi & BlockNotificationsApi & LogsNotificationsApi & ProgramNotificationsApi & RootNotificationsApi & SignatureNotificationsApi & SlotNotificationsApi;
 export type SolanaRpcSubscriptionsUnstable = SlotsUpdatesNotificationsApi & VoteNotificationsApi;
-export declare function createSolanaRpcSubscriptionsApi(config?: Config): IRpcSubscriptionsApi<SolanaRpcSubscriptions & SolanaRpcSubscriptionsUnstable>;
+export declare function createSolanaRpcSubscriptionsApi_INTERNAL(config?: Config): IRpcSubscriptionsApi<SolanaRpcSubscriptions & SolanaRpcSubscriptionsUnstable>;
+export declare function createSolanaRpcSubscriptionsApi(config?: Config): IRpcSubscriptionsApi<SolanaRpcSubscriptions>;
 export declare function createSolanaRpcSubscriptionsApi_UNSTABLE(config?: Config): IRpcSubscriptionsApi<SolanaRpcSubscriptions & SolanaRpcSubscriptionsUnstable>;
-export {};
+export type { AccountNotificationsApi, BlockNotificationsApi, LogsNotificationsApi, ProgramNotificationsApi, RootNotificationsApi, SignatureNotificationsApi, SlotNotificationsApi, SlotsUpdatesNotificationsApi, VoteNotificationsApi, };
 //# sourceMappingURL=index.d.ts.map

dist/types/rpc-subscriptions/logs-notifications.d.ts

@@ -1,13 +0,12 @@
-import { Base58EncodedAddress } from '@solana/addresses';
-import { Commitment } from '@solana/rpc-types';
-import { TransactionSignature } from '@solana/transactions';
-import { RpcResponse } from '../rpc-methods/common';
-import { TransactionError } from '../transaction-error';
+import { Address } from '@solana/addresses';
+import { Signature } from '@solana/keys';
+import type { Commitment, IRpcApiSubscriptions, RpcResponse } from '@solana/rpc-types';
+import { TransactionError } from '../transaction-error.js';
 type LogsNotificationsApiNotification = RpcResponse<Readonly<{
     err: TransactionError | null;
     logs: readonly string[] | null;
-    signature: TransactionSignature;
+    signature: Signature;
 }>>;
 type LogsNotificationsApiFilter = 'all' | 'allWithVotes' | {
-    mentions: [Base58EncodedAddress];
+    mentions: [Address];
 };
@@ -17,3 +16,3 @@ type LogsNotificationsApiConfig = Readonly<{
 }>;
-export interface LogsNotificationsApi {
+export interface LogsNotificationsApi extends IRpcApiSubscriptions {
     /**
@@ -20,0 +19,0 @@ * Subscribe to a transaction logs to receive notification when a given transaction is committed.

dist/types/rpc-subscriptions/program-notifications.d.ts

@@ -1,4 +0,4 @@
-import { Base58EncodedAddress } from '@solana/addresses';
-import { Commitment } from '@solana/rpc-types';
-import { AccountInfoBase, AccountInfoWithBase58Bytes, AccountInfoWithBase58EncodedData, AccountInfoWithBase64EncodedData, AccountInfoWithBase64EncodedZStdCompressedData, AccountInfoWithJsonData, Base58EncodedBytes, Base64EncodedBytes, RpcResponse, U64UnsafeBeyond2Pow53Minus1 } from '../rpc-methods/common';
+import { Address } from '@solana/addresses';
+import type { Base58EncodedBytes, Base64EncodedBytes, Commitment, IRpcApiSubscriptions, RpcResponse, U64UnsafeBeyond2Pow53Minus1 } from '@solana/rpc-types';
+import { AccountInfoBase, AccountInfoWithBase58Bytes, AccountInfoWithBase58EncodedData, AccountInfoWithBase64EncodedData, AccountInfoWithBase64EncodedZStdCompressedData, AccountInfoWithJsonData } from '../rpc-methods/common.js';
 type ProgramNotificationsMemcmpFilterBase58 = Readonly<{
@@ -18,3 +18,3 @@ offset: U64UnsafeBeyond2Pow53Minus1;
 type ProgramNotificationsApiNotificationBase<TData> = RpcResponse<Readonly<{
-    pubkey: Base58EncodedAddress;
+    pubkey: Address;
     account: AccountInfoBase & TData;
@@ -26,3 +26,3 @@ }>>;
 }>;
-export interface ProgramNotificationsApi {
+export interface ProgramNotificationsApi extends IRpcApiSubscriptions {
     /**
@@ -32,17 +32,17 @@ * Subscribe to a program to receive notifications when the lamports or data for an account
      */
-    programNotifications(programId: Base58EncodedAddress, config: ProgramNotificationsApiCommonConfig & Readonly<{
+    programNotifications(programId: Address, config: ProgramNotificationsApiCommonConfig & Readonly<{
         encoding: 'base64';
     }>): ProgramNotificationsApiNotificationBase<AccountInfoWithBase64EncodedData>;
-    programNotifications(programId: Base58EncodedAddress, config: ProgramNotificationsApiCommonConfig & Readonly<{
+    programNotifications(programId: Address, config: ProgramNotificationsApiCommonConfig & Readonly<{
         encoding: 'base64+zstd';
     }>): ProgramNotificationsApiNotificationBase<AccountInfoWithBase64EncodedZStdCompressedData>;
-    programNotifications(programId: Base58EncodedAddress, config: ProgramNotificationsApiCommonConfig & Readonly<{
+    programNotifications(programId: Address, config: ProgramNotificationsApiCommonConfig & Readonly<{
         encoding: 'jsonParsed';
     }>): ProgramNotificationsApiNotificationBase<AccountInfoWithJsonData>;
-    programNotifications(programId: Base58EncodedAddress, config: ProgramNotificationsApiCommonConfig & Readonly<{
+    programNotifications(programId: Address, config: ProgramNotificationsApiCommonConfig & Readonly<{
         encoding: 'base58';
     }>): ProgramNotificationsApiNotificationBase<AccountInfoWithBase58EncodedData>;
-    programNotifications(programId: Base58EncodedAddress, config?: ProgramNotificationsApiCommonConfig): ProgramNotificationsApiNotificationBase<AccountInfoWithBase58Bytes>;
+    programNotifications(programId: Address, config?: ProgramNotificationsApiCommonConfig): ProgramNotificationsApiNotificationBase<AccountInfoWithBase58Bytes>;
 }
 export {};
 //# sourceMappingURL=program-notifications.d.ts.map

dist/types/rpc-subscriptions/root-notifications.d.ts

@@ -1,4 +0,4 @@
-import { Slot } from '../rpc-methods/common';
+import type { IRpcApiSubscriptions, Slot } from '@solana/rpc-types';
 type RootNotificationsApiNotification = Slot;
-export interface RootNotificationsApi {
+export interface RootNotificationsApi extends IRpcApiSubscriptions {
     /**
@@ -5,0 +5,0 @@ * Subscribe to receive notification anytime a new root is set by the validator

dist/types/rpc-subscriptions/signature-notifications.d.ts

@@ -1,5 +0,4 @@
-import { Commitment } from '@solana/rpc-types';
-import { TransactionSignature } from '@solana/transactions';
-import { RpcResponse } from '../rpc-methods/common';
-import { TransactionError } from '../transaction-error';
+import { Signature } from '@solana/keys';
+import type { Commitment, IRpcApiSubscriptions, RpcResponse } from '@solana/rpc-types';
+import { TransactionError } from '../transaction-error.js';
 type SignatureNotificationsApiNotificationReceived = RpcResponse<Readonly<string>>;
@@ -12,3 +11,3 @@ type SignatureNotificationsApiNotificationProcessed = RpcResponse<Readonly<{
 }>;
-export interface SignatureNotificationsApi {
+export interface SignatureNotificationsApi extends IRpcApiSubscriptions {
     /**
@@ -19,6 +18,6 @@ * Subscribe to a transaction signature to receive notification when a given transaction is committed.
      */
-    signatureNotifications(signature: TransactionSignature, config: SignatureNotificationsApiConfigBase & Readonly<{
+    signatureNotifications(signature: Signature, config: SignatureNotificationsApiConfigBase & Readonly<{
         enableReceivedNotification: true;
     }>): SignatureNotificationsApiNotificationReceived | SignatureNotificationsApiNotificationProcessed;
-    signatureNotifications(signature: TransactionSignature, config?: SignatureNotificationsApiConfigBase & Readonly<{
+    signatureNotifications(signature: Signature, config?: SignatureNotificationsApiConfigBase & Readonly<{
         enableReceivedNotification?: false;
@@ -25,0 +24,0 @@ }>): SignatureNotificationsApiNotificationProcessed;

dist/types/rpc-subscriptions/slot-notifications.d.ts

@@ -1,2 +0,2 @@
-import { Slot } from '../rpc-methods/common';
+import type { IRpcApiSubscriptions, Slot } from '@solana/rpc-types';
 type SlotNotificationsApiNotification = Readonly<{
@@ -7,3 +7,3 @@ parent: Slot;
 }>;
-export interface SlotNotificationsApi {
+export interface SlotNotificationsApi extends IRpcApiSubscriptions {
     /**
@@ -10,0 +10,0 @@ * Subscribe to receive notification anytime a slot is processed by the validator

dist/types/rpc-subscriptions/slots-updates-notifications.d.ts

@@ -1,2 +0,2 @@
-import { Slot, U64UnsafeBeyond2Pow53Minus1 } from '../rpc-methods/common';
+import type { Slot, U64UnsafeBeyond2Pow53Minus1 } from '@solana/rpc-types';
 type SlotsUpdatesNotificationsApiNotificationBase = Readonly<{
@@ -3,0 +3,0 @@ slot: Slot;

dist/types/rpc-subscriptions/vote-notifications.d.ts

@@ -1,12 +0,10 @@
-import { Base58EncodedAddress } from '@solana/addresses';
-import { UnixTimestamp } from '@solana/rpc-types';
-import { Blockhash } from '@solana/transactions';
-import { TransactionSignature } from '@solana/transactions';
-import { Slot } from '../rpc-methods/common';
+import { Address } from '@solana/addresses';
+import { Signature } from '@solana/keys';
+import type { Blockhash, Slot, UnixTimestamp } from '@solana/rpc-types';
 type VoteNotificationsApiNotification = Readonly<{
     hash: Blockhash;
-    signature: TransactionSignature;
+    signature: Signature;
     slots: readonly Slot[];
     timestamp: UnixTimestamp | null;
-    votePubkey: Base58EncodedAddress;
+    votePubkey: Address;
 }>;
@@ -13,0 +11,0 @@ export interface VoteNotificationsApi {

package.json

 {
   "name": "@solana/rpc-core",
-  "version": "2.0.0-experimental.762ff13",
+  "version": "2.0.0-experimental.76ad167",
   "description": "A library for making calls to the Solana JSON RPC API",
@@ -48,7 +48,17 @@ "exports": {
   ],
+  "dependencies": {
+    "@solana/addresses": "2.0.0-experimental.76ad167",
+    "@solana/codecs-core": "2.0.0-experimental.76ad167",
+    "@solana/codecs-strings": "2.0.0-experimental.76ad167",
+    "@solana/keys": "2.0.0-experimental.76ad167",
+    "@solana/rpc-parsed-types": "2.0.0-experimental.76ad167",
+    "@solana/rpc-transport": "2.0.0-experimental.76ad167",
+    "@solana/rpc-types": "2.0.0-experimental.76ad167",
+    "@solana/transactions": "2.0.0-experimental.76ad167"
+  },
   "devDependencies": {
     "@solana/eslint-config-solana": "^1.0.2",
     "@swc/jest": "^0.2.29",
-    "@types/jest": "^29.5.6",
-    "@typescript-eslint/eslint-plugin": "^6.7.0",
+    "@types/jest": "^29.5.11",
+    "@typescript-eslint/eslint-plugin": "^6.13.2",
     "@typescript-eslint/parser": "^6.3.0",
@@ -64,15 +74,9 @@ "agadoo": "^3.0.0",
     "jest-runner-prettier": "^1.0.0",
-    "prettier": "^2.8",
-    "tsup": "7.2.0",
+    "prettier": "^3.1",
+    "tsup": "^8.0.1",
     "typescript": "^5.2.2",
     "version-from-git": "^1.1.1",
-    "@solana/codecs-core": "2.0.0-experimental.762ff13",
-    "@solana/codecs-strings": "2.0.0-experimental.762ff13",
-    "@solana/rpc-transport": "2.0.0-experimental.762ff13",
-    "@solana/rpc-types": "2.0.0-experimental.762ff13",
-    "@solana/transactions": "2.0.0-experimental.762ff13",
     "build-scripts": "0.0.0",
     "test-config": "0.0.0",
-    "tsconfig": "0.0.0",
-    "@solana/addresses": "2.0.0-experimental.762ff13"
+    "tsconfig": "0.0.0"
   },
@@ -89,3 +93,3 @@ "bundlewatch": {
     "compile:js": "tsup --config build-scripts/tsup.config.package.ts",
-    "compile:typedefs": "tsc -p ./tsconfig.declarations.json",
+    "compile:typedefs": "tsc -p ./tsconfig.declarations.json && node node_modules/build-scripts/add-js-extension-to-types.mjs",
     "dev": "jest -c node_modules/test-config/jest-dev.config.ts --globalSetup test-config/test-validator-setup.js --globalTeardown test-config/test-validator-teardown.js --rootDir . --watch",
@@ -92,0 +96,0 @@ "publish-packages": "pnpm publish --tag experimental --access public --no-git-checks",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

601311

increased by34.84%

Dev dependency count

21

decreased by-22.22%

Number of package files

168

increased by95.35%

Lines of code

6278

increased by12.23%

Number of medium supply chain risk alerts

0

decreased by-100%

Worsened metrics

Dependency count

8

increased byInfinity%

Dependency changes

• + Added@solana/addresses@2.0.0-experimental.76ad167

• + Added@solana/codecs-core@2.0.0-experimental.76ad167

• + Added@solana/codecs-strings@2.0.0-experimental.76ad167

• + Added@solana/keys@2.0.0-experimental.76ad167

• + Added@solana/rpc-parsed-types@2.0.0-experimental.76ad167

• + Added@solana/rpc-transport@2.0.0-experimental.76ad167

• + Added@solana/rpc-types@2.0.0-experimental.76ad167

• + Added@solana/transactions@2.0.0-experimental.76ad167

• + Added@solana/addresses@2.0.0-experimental.76ad167(transitive)

• + Added@solana/assertions@2.0.0-experimental.76ad167(transitive)

• + Added@solana/codecs-core@2.0.0-experimental.76ad167(transitive)

• + Added@solana/codecs-data-structures@2.0.0-experimental.76ad167(transitive)

• + Added@solana/codecs-numbers@2.0.0-experimental.76ad167(transitive)

• + Added@solana/codecs-strings@2.0.0-experimental.76ad167(transitive)

• + Added@solana/functional@2.0.0-experimental.76ad167(transitive)

• + Added@solana/keys@2.0.0-experimental.76ad167(transitive)

• + Added@solana/rpc-parsed-types@2.0.0-experimental.76ad167(transitive)

• + Added@solana/rpc-transport@2.0.0-experimental.76ad167(transitive)

• + Added@solana/rpc-types@2.0.0-experimental.76ad167(transitive)

• + Added@solana/transactions@2.0.0-experimental.76ad167(transitive)

• + Addedfastestsmallesttextencoderdecoder@1.0.22(transitive)

• + Addedws@8.18.0(transitive)