Skip to content
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

feat(simulated_transaction): Add Inner Instructions #2756

Merged
merged 8 commits into from
Jun 29, 2024
Merged

feat(simulated_transaction): Add Inner Instructions #2756

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ae2c82f
Add Inner Instructions to Simulated Transaction
0xIchigo May 31, 2024
c3ab701
Formatting
0xIchigo May 31, 2024
877f4ae
Nit: Change 'response' to 'simulation'
0xIchigo May 31, 2024
4b72d7d
Update Types and Structs
0xIchigo May 31, 2024
46d2ee9
Start Addressing Feedback
0xIchigo Jun 19, 2024
736815e
Stop Overthinking and Reuse Types lol
0xIchigo Jun 20, 2024
e419a45
Format source code
steveluscher Jun 24, 2024
8c9ee5f
Don't widen the type of `parsed` to `any` when parsing the server res…
steveluscher Jun 28, 2024
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
46 changes: 46 additions & 0 deletions packages/library-legacy/src/connection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -952,6 +952,8 @@ export type SimulateTransactionConfig = {
};
/** Optional parameter used to specify the minimum block slot that can be used for simulation */
minContextSlot?: number;
/** Optional parameter used to include inner instructions in the simulation */
innerInstructions?: boolean;
};

export type SimulatedTransactionResponse = {
Expand All @@ -960,7 +962,20 @@ export type SimulatedTransactionResponse = {
accounts?: (SimulatedTransactionAccountInfo | null)[] | null;
unitsConsumed?: number;
returnData?: TransactionReturnData | null;
innerInstructions?: ParsedInnerInstruction[] | null;
};
const ParsedInstructionStruct = pick({
program: string(),
programId: PublicKeyFromString,
parsed: unknown(),
});
0xIchigo marked this conversation as resolved.
Show resolved Hide resolved

const PartiallyDecodedInstructionStruct = pick({
programId: PublicKeyFromString,
0xIchigo marked this conversation as resolved.
Show resolved Hide resolved
accounts: array(PublicKeyFromString),
0xIchigo marked this conversation as resolved.
Show resolved Hide resolved
data: string(),
});

const SimulatedTransactionResponseStruct = jsonRpcResultAndContext(
pick({
err: nullable(union([pick({}), string()])),
Expand Down Expand Up @@ -989,6 +1004,21 @@ const SimulatedTransactionResponseStruct = jsonRpcResultAndContext(
}),
),
),
innerInstructions: optional(
nullable(
array(
pick({
index: number(),
instructions: array(
union([
ParsedInstructionStruct,
PartiallyDecodedInstructionStruct,
]),
),
}),
),
),
),
}),
);

Expand Down Expand Up @@ -5712,6 +5742,14 @@ export class Connection {
config.commitment = this.commitment;
}

if (
configOrSigners &&
typeof configOrSigners === 'object' &&
'innerInstructions' in configOrSigners
) {
config.innerInstructions = configOrSigners.innerInstructions;
}

const args = [encodedTransaction, config];
const unsafeRes = await this._rpcRequest('simulateTransaction', args);
const res = create(unsafeRes, SimulatedTransactionResponseStruct);
Expand Down Expand Up @@ -5802,6 +5840,14 @@ export class Connection {
config.sigVerify = true;
}

if (
configOrSigners &&
typeof configOrSigners === 'object' &&
'innerInstructions' in configOrSigners
) {
config.innerInstructions = configOrSigners.innerInstructions;
}

const args = [encodedTransaction, config];
const unsafeRes = await this._rpcRequest('simulateTransaction', args);
const res = create(unsafeRes, SimulatedTransactionResponseStruct);
Expand Down