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

Adjust RPC simulateTransaction endpoint to match v1.2 (bp #10432) #10443

Merged
merged 1 commit into from
Jun 7, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 6, 2020

This is an automated backport of pull request #10432 done by Mergify

Cherry-pick of 7e2651c has failed:

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

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

Changes to be committed:

	modified:   client/src/rpc_client.rs
	modified:   client/src/rpc_response.rs
	modified:   core/src/banking_stage.rs
	modified:   core/src/rpc.rs
	modified:   docs/src/apps/jsonrpc-api.md
	modified:   runtime/src/lib.rs
	new file:   runtime/src/log_collector.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   programs/bpf/benches/bpf_loader.rs
	both modified:   programs/bpf_loader/src/lib.rs
	both modified:   programs/bpf_loader/src/syscalls.rs
	both modified:   runtime/src/bank.rs
	both modified:   runtime/src/message_processor.rs
	both modified:   sdk/src/entrypoint_native.rs

To fixup this pull request, you can check out it 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 simulator.

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

@mergify mergify bot added the conflicts label Jun 6, 2020
@mvines mvines force-pushed the mergify/bp/v1.1/pr-10432 branch from 01c8ade to 29aeca8 Compare June 6, 2020 17:30
@mvines mvines changed the title RPC simulateTransaction endpoint now returns program log output (bp #10432) Adjust RPC simulateTransaction endpoint to match v1.2 (bp #10432) Jun 6, 2020
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jun 6, 2020
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Jun 6, 2020
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to CI failure

@mvines mvines force-pushed the mergify/bp/v1.1/pr-10432 branch from 29aeca8 to 2e6c9c7 Compare June 6, 2020 17:50
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jun 6, 2020
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to CI failure

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Jun 6, 2020
@codecov
Copy link

codecov bot commented Jun 7, 2020

Codecov Report

Merging #10443 into v1.1 will decrease coverage by 0.0%.
The diff coverage is 76.9%.

@@           Coverage Diff            @@
##            v1.1   #10443     +/-   ##
========================================
- Coverage   80.9%    80.9%   -0.1%     
========================================
  Files        291      291             
  Lines      67858    67863      +5     
========================================
  Hits       54951    54951             
- Misses     12907    12912      +5     

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jun 7, 2020
@solana-grimes solana-grimes merged commit 09f0624 into v1.1 Jun 7, 2020
@mergify mergify bot deleted the mergify/bp/v1.1/pr-10432 branch June 7, 2020 04:09
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.

2 participants