You can now request `innerInstructions` with simulation #2868

steveluscher · 2024-06-27T21:33:39Z

Closes #2763.

Test Plan

Notice how index and stackHeight are number instead of bigint here.

 const { value } = await rpc
    .simulateTransaction(
        'A8VSjQsioqTM0kyF9hiBLl/D7NlMU69OObLMEALuTzERsr/FJIN4YqOe45SUfkXhH0CI6xClzFEa+/V9/vSiFQoKf75MXBgQPY4gzn6iz86ZzhnydQvNcn5sbJZc6xmS9ey7fj6+v5xkqFshX1b/Mg86WH2DO0xK0kjq7+IWi8YEvD9ZHU0X9fO//akP12jMPJJ67DsoEwgPB630jd5qMFMOMlESOql5YHf9zKBMhJYYx2wZAJMSEQfyVwB3lV0KA4ADAQcNDQ4WRO2tB+MVLamVDMyF3NM9vIycJ5ID5PpIfjp5VnCuCoZk81s1sWU+MG/teETSzT0CK69Xbi9jn/suK3F7CmuzKkWQgpJ5e5NZRWj4wiXXxozEFV8KQyFP9RZQUDVBFHMYdkG3nmJJ/WeMvFrr+E6Ux/obRtql7j1H4ZCkztUBfGU0Be9QIK1utAyLKHqj3w6JeFK9kEohbF/PhFil1VgBR6+Uey25nUP1St50fjufSPx6NYjlxB12FyxZ3PelAwZGb+UhFzL/7K26csOb57yM5bvF9xJrLEObOkAAAAALcGWx49F8RTidUn9rBMPNWLhscxqg/bVJttG8A/gpRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABqfVFxh70WY12tQEVf3CwMEkxo8hVnWl27rLXwgAAAAG3fbh12Whk9nL4UbO63msHLSF7V9bN5E6jPWFfv8AqYyXJY9OJInxuz0QKRSODYMLWhOZ2v8QhASOe9jb6fhZBUpTWpkpIQZNJOhxYNo4fHw1td28kruB5B+oQEEFRI2BRFO9Mxdx1WGvTJ9EjfepI2IH1WujnvFkbak/EULbEQUGAAkDZAAAAAAAAAAGAAUC1TEDAAcJAwQBAgACCAkKqgEqABEAAABNeSBORlQgQ29sbGVjdGlvbgMAAABBQkNMAAAAaHR0cHM6Ly9pcGZzLmZpbGViYXNlLmlvL2lwZnMvUW1RWThpSkNMYTJWS3FRZEs1N2lZVUV1OUpvYXNMRFN6N3lBZ0RWWGhoMzd5eQAAAQEAAABrsypFkIKSeXuTWUVo+MIl18aMxBVfCkMhT/UWUFA1QQFkAAEAAAABAAAAAAAAAAAAAAABAAcPBQIDBAcBAgcACAkKCwcHCysAAQAAAAAAAAAADAAFMGdiaDUA',
        {encoding: 'base64', innerInstructions: true, replaceRecentBlockhash: true},
    )
    .send();
> value.innerInstructions
[ { index: 2, instructions: [ [Object] ] } ]
> value.innerInstructions[0].instructions
[
  {
    parsed: { info: [Object], type: 'transfer' },
    program: 'system',
    programId: '11111111111111111111111111111111',
    stackHeight: 2
  }
]

changeset-bot · 2024-06-27T21:33:43Z

🦋 Changeset detected

Latest commit: 5fa6c60

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 37 packages

Name	Type
@solana/rpc-api	Patch
@solana/rpc	Patch
@solana/sysvars	Patch
@solana/web3.js-experimental	Patch
@solana/rpc-graphql	Patch
@solana/transaction-confirmation	Patch
@solana/accounts	Patch
@solana/addresses	Patch
@solana/assertions	Patch
@solana/codecs-core	Patch
@solana/codecs-data-structures	Patch
@solana/codecs-numbers	Patch
@solana/codecs-strings	Patch
@solana/codecs	Patch
@solana/compat	Patch
@solana/errors	Patch
@solana/fast-stable-stringify	Patch
@solana/functional	Patch
@solana/instructions	Patch
@solana/keys	Patch
@solana/options	Patch
@solana/programs	Patch
@solana/react	Patch
@solana/rpc-parsed-types	Patch
@solana/rpc-spec-types	Patch
@solana/rpc-spec	Patch
@solana/rpc-subscriptions-api	Patch
@solana/rpc-subscriptions-spec	Patch
@solana/rpc-subscriptions-transport-websocket	Patch
@solana/rpc-subscriptions	Patch
@solana/rpc-transformers	Patch
@solana/rpc-transport-http	Patch
@solana/rpc-types	Patch
@solana/signers	Patch
@solana/transaction-messages	Patch
@solana/transactions	Patch
@solana/webcrypto-ed25519-polyfill	Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

steveluscher · 2024-06-27T21:33:44Z

This stack of pull requests is managed by Graphite. Learn more about stacking.

Join @steveluscher and the rest of your teammates on Graphite

steveluscher · 2024-06-27T21:44:11Z

packages/rpc-api/src/simulateTransaction.ts

+    TransactionForFullMetaInnerInstructionsParsed | TransactionForFullMetaInnerInstructionsUnparsed
+>;
+
 export interface SimulateTransactionApi extends RpcApiMethods {


I had to double the number of overloads here, to be able to express ‘inner instructions on’ and ‘inner instructions off’ :(

This still keeps us under the (current) max of 24, but as soon as we want to add replacedBlockhash to the response, we're hosed.

Ahh crap that's rough.

steveluscher · 2024-06-27T21:44:46Z

packages/rpc-types/src/transaction.ts

 }>;

-type TransactionForFullMetaInnerInstructionsUnparsed = Readonly<{
+export type TransactionForFullMetaInnerInstructionsUnparsed = Readonly<{


@mcintyre94, is there a reason we don't use these in getTransaction? They're copy/pasted in, and I feel like there was a reason for that?

I'm not sure, but my guess would be that it was before we untangled the rpc packages and it would have caused a circular dependency mess. Probably can be changed now!

steveluscher · 2024-06-27T22:16:54Z

cc/ @0xIchigo

buffalojoec

Lgtm, but I'm also curious why we weren't using those types.

buffalojoec · 2024-06-28T00:27:36Z

packages/rpc-api/src/simulateTransaction.ts

+    TransactionForFullMetaInnerInstructionsParsed | TransactionForFullMetaInnerInstructionsUnparsed
+>;
+
 export interface SimulateTransactionApi extends RpcApiMethods {


Ahh crap that's rough.

buffalojoec · 2024-06-28T00:29:26Z

packages/rpc-api/src/simulateTransaction.ts

+type SimulateTransactionApiResponseWithInnerInstructions = SolanaRpcResponse<
+    TransactionForFullMetaInnerInstructionsParsed | TransactionForFullMetaInnerInstructionsUnparsed
+>;
+


Starting to regret what I might have signed up for with this comment....

steveluscher · 2024-06-28T00:34:00Z

Merge activity

Jun 27, 5:34 PM PDT: @steveluscher started a stack merge that includes this pull request via Graphite.
Jun 27, 5:38 PM PDT: Graphite rebased this pull request as part of a merge.
Jun 27, 5:39 PM PDT: @steveluscher merged this pull request with Graphite.

github-actions · 2024-06-29T04:51:54Z

🎉 This PR is included in version 1.94.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

github-actions · 2024-07-16T08:02:58Z

Because there has been no activity on this PR for 14 days since it was merged, it has been automatically locked. Please open a new issue if it requires a follow up.

This was referenced Jun 27, 2024

Correct the return type of simulateTransaction when accounts are not loaded #2865

Merged

Add stackHeight to the instruction type #2866

Merged

steveluscher mentioned this pull request Jun 27, 2024

Correct the type of innerInstructions in JSON RPC errors #2867

Merged

steveluscher requested review from buffalojoec, lorisleiva and mcintyre94 and removed request for buffalojoec and lorisleiva June 27, 2024 21:37

steveluscher force-pushed the 06-27-correct_the_type_of_innerinstructions_in_json_rpc_errors branch from e40a06c to e06c2fd Compare June 27, 2024 21:41

steveluscher force-pushed the 06-27-you_can_now_request_innerinstructions_with_simulation branch 2 times, most recently from 84924be to 7c30ca8 Compare June 27, 2024 21:42

steveluscher commented Jun 27, 2024

View reviewed changes

This was referenced Jun 27, 2024

Only include replacementBlockhash in the simulation result type when replaceRecentBlockhash is true anza-xyz/kit#21

Closed

Add replacementBlockhash to the simulation return type, in preparation for Agave 2.0 #2870

Merged

steveluscher force-pushed the 06-27-correct_the_type_of_innerinstructions_in_json_rpc_errors branch from e06c2fd to fd7152b Compare June 28, 2024 00:20

steveluscher force-pushed the 06-27-you_can_now_request_innerinstructions_with_simulation branch from 7c30ca8 to 8cc8346 Compare June 28, 2024 00:20

buffalojoec approved these changes Jun 28, 2024

View reviewed changes

steveluscher force-pushed the 06-27-correct_the_type_of_innerinstructions_in_json_rpc_errors branch from fd7152b to 1d55a13 Compare June 28, 2024 00:35

Base automatically changed from 06-27-correct_the_type_of_innerinstructions_in_json_rpc_errors to master June 28, 2024 00:37

You can now request innerInstructions with simulation

5fa6c60

steveluscher force-pushed the 06-27-you_can_now_request_innerinstructions_with_simulation branch from 8cc8346 to 5fa6c60 Compare June 28, 2024 00:37

steveluscher merged commit 91fb1f3 into master Jun 28, 2024

steveluscher deleted the 06-27-you_can_now_request_innerinstructions_with_simulation branch June 28, 2024 00:39

github-actions bot mentioned this pull request Jun 28, 2024

Version Packages (preview) #2574

Merged

github-actions bot added the released label Jun 29, 2024

github-actions bot mentioned this pull request Jul 1, 2024

Version Packages (preview) lukecaan/solana-web3.js#1

Closed

github-actions bot locked as resolved and limited conversation to collaborators Jul 16, 2024

You can now request innerInstructions with simulation #2868

You can now request innerInstructions with simulation #2868

Uh oh!

Conversation

steveluscher commented Jun 27, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Test Plan

Uh oh!

changeset-bot bot commented Jun 27, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🦋 Changeset detected

Uh oh!

steveluscher commented Jun 27, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

steveluscher Jun 27, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

buffalojoec Jun 28, 2024

Choose a reason for hiding this comment

Uh oh!

steveluscher Jun 27, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mcintyre94 Jul 1, 2024

Choose a reason for hiding this comment

Uh oh!

steveluscher commented Jun 27, 2024

Uh oh!

buffalojoec left a comment

Choose a reason for hiding this comment

Uh oh!

buffalojoec Jun 28, 2024

Choose a reason for hiding this comment

Uh oh!

buffalojoec Jun 28, 2024

Choose a reason for hiding this comment

Uh oh!

steveluscher commented Jun 28, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Merge activity

Uh oh!

github-actions bot commented Jun 29, 2024

Uh oh!

github-actions bot commented Jul 16, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

You can now request `innerInstructions` with simulation #2868

You can now request `innerInstructions` with simulation #2868

steveluscher commented Jun 27, 2024 •

edited

Loading

changeset-bot bot commented Jun 27, 2024 •

edited

Loading

steveluscher commented Jun 27, 2024 •

edited

Loading

steveluscher Jun 27, 2024 •

edited

Loading

steveluscher Jun 27, 2024 •

edited

Loading

steveluscher commented Jun 28, 2024 •

edited

Loading