Skip to content

fix(types): remove @ts-ignore with proper type annotations #260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix(types): remove @ts-ignore with proper type annotations #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53637ab
fix(types): remove @ts-ignore with proper type annotations
lalitcap23 Sep 13, 2025
29509f1
fix: simplify factory type interfaces to resolve TS errors
lalitcap23 Sep 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added packages/gill/src/anchor-node/index.ts
View file
Open in desktop
Empty file.
Empty file added packages/gill/src/anchor-node/program.ts
View file
Open in desktop
Empty file.
Empty file added packages/gill/src/anchor-node/types.ts
View file
Open in desktop
Empty file.
Empty file added packages/gill/src/anchor-node/utils.ts
View file
Open in desktop
Empty file.
3 changes: 0 additions & 3 deletions packages/gill/src/core/create-solana-client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,9 @@ export function createSolanaClient<TCluster extends ModifiedClusterUrl>({
rpc,
rpcSubscriptions,
sendAndConfirmTransaction: sendAndConfirmTransactionWithSignersFactory({
// @ts-ignore - TODO(FIXME:nick)
rpc,
// @ts-ignore - TODO(FIXME:nick)
rpcSubscriptions,
}),
// @ts-ignore
simulateTransaction: simulateTransactionFactory({ rpc }),
};
}
36 changes: 8 additions & 28 deletions packages/gill/src/core/send-and-confirm-transaction-with-signers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,39 +56,19 @@ export type SendAndConfirmTransactionWithSignersFunction = (
>,
) => Promise<Signature>;

type SendAndConfirmTransactionWithSignersFactoryConfig<TCluster> = {
rpc: Rpc<GetEpochInfoApi & GetSignatureStatusesApi & SendTransactionApi & GetLatestBlockhashApi> & {
"~cluster"?: TCluster;
};
rpcSubscriptions: RpcSubscriptions<SignatureNotificationsApi & SlotNotificationsApi> & {
"~cluster"?: TCluster;
};
type SendAndConfirmTransactionWithSignersFactoryConfig = {
rpc: Rpc<GetEpochInfoApi & GetSignatureStatusesApi & SendTransactionApi & GetLatestBlockhashApi>;
rpcSubscriptions: RpcSubscriptions<SignatureNotificationsApi & SlotNotificationsApi>;
};

export function sendAndConfirmTransactionWithSignersFactory({
rpc,
rpcSubscriptions,
}: SendAndConfirmTransactionWithSignersFactoryConfig<"devnet">): SendAndConfirmTransactionWithSignersFunction;
export function sendAndConfirmTransactionWithSignersFactory({
rpc,
rpcSubscriptions,
}: SendAndConfirmTransactionWithSignersFactoryConfig<"testnet">): SendAndConfirmTransactionWithSignersFunction;
export function sendAndConfirmTransactionWithSignersFactory({
rpc,
rpcSubscriptions,
}: SendAndConfirmTransactionWithSignersFactoryConfig<"mainnet">): SendAndConfirmTransactionWithSignersFunction;
export function sendAndConfirmTransactionWithSignersFactory({
rpc,
rpcSubscriptions,
}: SendAndConfirmTransactionWithSignersFactoryConfig<"localnet">): SendAndConfirmTransactionWithSignersFunction;
export function sendAndConfirmTransactionWithSignersFactory<
TCluster extends "devnet" | "mainnet" | "testnet" | "localnet" | undefined = undefined,
>({
rpc,
rpcSubscriptions,
}: SendAndConfirmTransactionWithSignersFactoryConfig<TCluster>): SendAndConfirmTransactionWithSignersFunction {
// @ts-ignore - TODO(FIXME)
const sendAndConfirmTransaction = sendAndConfirmTransactionFactory({ rpc, rpcSubscriptions });
}: SendAndConfirmTransactionWithSignersFactoryConfig): SendAndConfirmTransactionWithSignersFunction {
const sendAndConfirmTransaction = sendAndConfirmTransactionFactory({
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

curious on your thought process here? does this make it possible to pass a devnet rpc with mainnet subscriptions etc?

Copy link
Author

@lalitcap23 lalitcap23 Sep 17, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@catmcgee you're right that this technically allows network mismatches. However, the previous code had the same issue - the @ts-ignore comments were bypassing all type checking including network validation. i will fix it and enforce that RPC and RpcSubscriptions must use the same network type . Anything else i should do .

rpc,
rpcSubscriptions,
});
return async function sendAndConfirmTransactionWithSigners(transaction, config = { commitment: "confirmed" }) {
if ("messageBytes" in transaction == false) {
if ("lifetimeConstraint" in transaction === false) {
Expand Down
22 changes: 3 additions & 19 deletions packages/gill/src/core/simulate-transaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,11 @@ export type SimulateTransactionFunction = (
config?: Simplify<Omit<Parameters<SimulateTransactionApi["simulateTransaction"]>[1], "encoding" | "sigVerify">>,
) => Promise<ReturnType<SimulateTransactionApi["simulateTransaction"]>>;

type SimulateTransactionFactoryConfig<TCluster> = {
rpc: Rpc<SimulateTransactionApi> & {
"~cluster"?: TCluster;
};
type SimulateTransactionFactoryConfig = {
rpc: Rpc<SimulateTransactionApi>;
};

export function simulateTransactionFactory({
rpc,
}: SimulateTransactionFactoryConfig<"devnet">): SimulateTransactionFunction;
export function simulateTransactionFactory({
rpc,
}: SimulateTransactionFactoryConfig<"testnet">): SimulateTransactionFunction;
export function simulateTransactionFactory({
rpc,
}: SimulateTransactionFactoryConfig<"mainnet">): SimulateTransactionFunction;
export function simulateTransactionFactory({
rpc,
}: SimulateTransactionFactoryConfig<"localnet">): SimulateTransactionFunction;
export function simulateTransactionFactory<
TCluster extends "devnet" | "mainnet" | "testnet" | "localnet" | void = void,
>({ rpc }: SimulateTransactionFactoryConfig<TCluster>): SimulateTransactionFunction {
export function simulateTransactionFactory({ rpc }: SimulateTransactionFactoryConfig): SimulateTransactionFunction {
return async function simulateTransaction(transaction, config) {
if ("messageBytes" in transaction == false) {
transaction = await partiallySignTransactionMessageWithSigners(transaction);
Expand Down