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

Rpc: Add getStakeActivation endpoint (bp #10902)#11185

Merged
CriesofCarrots merged 2 commits intov1.1from
mergify/bp/v1.1/pr-10902
Jul 23, 2020
Merged

Rpc: Add getStakeActivation endpoint (bp #10902)#11185
CriesofCarrots merged 2 commits intov1.1from
mergify/bp/v1.1/pr-10902

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Jul 23, 2020

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

Cherry-pick of 4de0713 has failed:

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

You are currently cherry-picking commit 4de0713aa.
  (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_config.rs
	modified:   client/src/rpc_response.rs

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

	both modified:   core/src/rpc.rs
	both modified:   docs/src/apps/jsonrpc-api.md

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/

* Add getStakeActivation endpoint

* Add docs

* Update docs/src/apps/jsonrpc-api.md

Co-authored-by: Michael Vines <mvines@gmail.com>

* Rework return type

* Update docs

* Rebase

Co-authored-by: Michael Vines <mvines@gmail.com>
(cherry picked from commit 4de0713)

# Conflicts:
#	core/src/rpc.rs
#	docs/src/apps/jsonrpc-api.md
@mergify mergify Bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Jul 23, 2020
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Jul 23, 2020

automerge label removed due to a CI failure

@mergify mergify Bot removed the automerge Merge this Pull Request automatically once CI passes label Jul 23, 2020
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Jul 23, 2020
@codecov
Copy link
Copy Markdown

codecov Bot commented Jul 23, 2020

Codecov Report

Merging #11185 into v1.1 will increase coverage by 0.0%.
The diff coverage is 1.9%.

@@          Coverage Diff           @@
##            v1.1   #11185   +/-   ##
======================================
  Coverage   81.1%    81.1%           
======================================
  Files        292      292           
  Lines      68947    68997   +50     
======================================
+ Hits       55965    56008   +43     
- Misses     12982    12989    +7     

@CriesofCarrots CriesofCarrots merged commit a5b9152 into v1.1 Jul 23, 2020
@mergify mergify Bot deleted the mergify/bp/v1.1/pr-10902 branch July 23, 2020 20:51
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant