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.

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

Add preflight checks to sendTransaction RPC method (bp #10338) #10362

Merged
merged 9 commits into from
Jun 2, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 2, 2020

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

Cherry-pick of 9dbf3d5 has failed:

On branch mergify/bp/v1.1/pr-10338
Your branch is ahead of 'origin/v1.1' by 1 commit.
  (use "git push" to publish your local commits)

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

Changes to be committed:

	modified:   core/src/lib.rs
	new file:   core/src/rpc_health.rs

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

	both modified:   core/src/rpc_service.rs

Cherry-pick of 9158479 has failed:

On branch mergify/bp/v1.1/pr-10338
Your branch is ahead of 'origin/v1.1' by 2 commits.
  (use "git push" to publish your local commits)

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

Changes to be committed:

	modified:   core/src/rpc_health.rs

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

	both modified:   core/src/rpc.rs
	both modified:   core/src/rpc_service.rs

Cherry-pick of f1733ab has failed:

On branch mergify/bp/v1.1/pr-10338
Your branch is ahead of 'origin/v1.1' by 3 commits.
  (use "git push" to publish your local commits)

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

Changes to be committed:

	modified:   stake-monitor/src/lib.rs

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

	both modified:   client/src/rpc_client.rs

Cherry-pick of 202512d has failed:

On branch mergify/bp/v1.1/pr-10338
Your branch is ahead of 'origin/v1.1' by 4 commits.
  (use "git push" to publish your local commits)

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

Changes to be committed:

	modified:   cli/src/display.rs

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

	both modified:   cli/src/cli.rs
	both modified:   cli/src/cluster_query.rs
	both modified:   client/src/rpc_client.rs

Cherry-pick of bd1f9d3 has failed:

On branch mergify/bp/v1.1/pr-10338
Your branch is ahead of 'origin/v1.1' by 5 commits.
  (use "git push" to publish your local commits)

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

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

	deleted by us:   tokens/src/thin_client.rs

no changes added to commit (use "git add" and/or "git commit -a")

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/

(cherry picked from commit 9dbf3d5)

# Conflicts:
#	core/src/rpc_service.rs
(cherry picked from commit 9158479)

# Conflicts:
#	core/src/rpc.rs
#	core/src/rpc_service.rs
(cherry picked from commit f1733ab)

# Conflicts:
#	client/src/rpc_client.rs
(cherry picked from commit 202512d)

# Conflicts:
#	cli/src/cli.rs
#	cli/src/cluster_query.rs
#	client/src/rpc_client.rs
(cherry picked from commit bd1f9d3)

# Conflicts:
#	tokens/src/thin_client.rs
@mergify mergify bot added the conflicts label Jun 2, 2020
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jun 2, 2020
@solana-grimes solana-grimes merged commit e023719 into v1.1 Jun 2, 2020
@codecov
Copy link

codecov bot commented Jun 2, 2020

Codecov Report

Merging #10362 into v1.1 will increase coverage by 0.0%.
The diff coverage is 90.8%.

@@           Coverage Diff           @@
##            v1.1   #10362    +/-   ##
=======================================
  Coverage   80.7%    80.7%            
=======================================
  Files        288      289     +1     
  Lines      66714    66881   +167     
=======================================
+ Hits       53859    54018   +159     
- Misses     12855    12863     +8     

@mergify mergify bot deleted the mergify/bp/v1.1/pr-10338 branch June 2, 2020 05:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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