Skip to content
This repository has been archived by the owner on Jan 22, 2025. It is now read-only.

simulateTransaction RPC method can now return accounts modified by the simulation (backport #17499) #17526

Merged
merged 2 commits into from
May 27, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 26, 2021

This is an automatic backport of pull request #17499 done by Mergify.
Cherry-pick of cbce440 has failed:

On branch mergify/bp/v1.6/pr-17499
Your branch is up to date with 'origin/v1.6'.

You are currently cherry-picking commit cbce440af.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   account-decoder/src/lib.rs
	modified:   cli/src/cli.rs
	modified:   client/src/blockhash_query.rs
	modified:   client/src/rpc_config.rs
	modified:   client/src/rpc_response.rs
	modified:   core/src/rpc.rs
	modified:   core/src/rpc_subscriptions.rs
	modified:   docs/src/developing/clients/jsonrpc-api.md
	modified:   runtime/src/bank.rs
	modified:   runtime/src/transaction_batch.rs

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   rpc/src/parsed_token_accounts.rs

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

(cherry picked from commit cbce440)

# Conflicts:
#	rpc/src/parsed_token_accounts.rs
@mergify mergify bot added the conflicts label May 26, 2021
@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels May 26, 2021
@mergify
Copy link
Contributor Author

mergify bot commented May 26, 2021

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label May 26, 2021
@mvines
Copy link
Contributor

mvines commented May 26, 2021

C'mon local-cluster!

Rando failures at:

  • test_cluster_partition_1_1_1
  • test_no_optimistic_confirmation_violation_with_tower

Let's give it a retry...

@codecov
Copy link

codecov bot commented May 27, 2021

Codecov Report

Merging #17526 (3909f22) into v1.6 (f4cf7d2) will increase coverage by 0.0%.
The diff coverage is 92.6%.

@@           Coverage Diff           @@
##             v1.6   #17526   +/-   ##
=======================================
  Coverage    82.6%    82.6%           
=======================================
  Files         423      423           
  Lines      116532   116566   +34     
=======================================
+ Hits        96304    96344   +40     
+ Misses      20228    20222    -6     

@mergify mergify bot merged commit 3b22f5b into v1.6 May 27, 2021
@mergify mergify bot deleted the mergify/bp/v1.6/pr-17499 branch May 27, 2021 00:06
@brooksprumo brooksprumo mentioned this pull request Aug 23, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant