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

Rpc: enable getConfirmedSignaturesForAddress2 to return confirmed (not yet finalized) data (bp #16281) #16293

Merged
merged 1 commit into from
Apr 1, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 1, 2021

This is an automatic backport of pull request #16281 done by Mergify.

Cherry-pick of da27aca has failed:

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

You are currently cherry-picking commit da27acabc.
  (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:   cli/src/cluster_query.rs
	modified:   client/src/rpc_client.rs
	modified:   client/src/rpc_config.rs
	modified:   client/src/rpc_response.rs
	modified:   core/src/rpc.rs
	modified:   docs/src/developing/clients/jsonrpc-api.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ledger/src/blockstore.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 config editor.

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

@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Apr 1, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Apr 1, 2021

automerge label removed due to a CI failure

@CriesofCarrots
Copy link
Contributor

@Mergifyio rebase

@mergify
Copy link
Contributor Author

mergify bot commented Apr 1, 2021

Command rebase: failure

Base branch update has failed
Git reported the following error:

First, rewinding head to replay your work on top of it...
Applying: Rpc: enable getConfirmedSignaturesForAddress2 to return confirmed (not yet finalized) data (#16281)
Using index info to reconstruct a base tree...
M	core/src/rpc.rs
M	ledger/src/blockstore.rs
Falling back to patching base and 3-way merge...
Auto-merging ledger/src/blockstore.rs
CONFLICT (content): Merge conflict in ledger/src/blockstore.rs
Auto-merging core/src/rpc.rs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Rpc: enable getConfirmedSignaturesForAddress2 to return confirmed (not yet finalized) data (#16281)
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

err-code: 5EA9E

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Apr 1, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Apr 1, 2021

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Apr 1, 2021
…t yet finalized) data (#16281)

* Update blockstore method to allow return of unfinalized signature

* Support confirmed sigs in getConfirmedSignaturesForAddress2

* Add deprecated comments

* Update docs

* Enable confirmed transaction-history in cli

* Return real confirmation_status; fill in not-yet-finalized block time if possible

(cherry picked from commit da27aca)
@CriesofCarrots CriesofCarrots force-pushed the mergify/bp/v1.6/pr-16281 branch from 4bf233d to 802f269 Compare April 1, 2021 05:42
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Apr 1, 2021
@codecov
Copy link

codecov bot commented Apr 1, 2021

Codecov Report

Merging #16293 (802f269) into v1.6 (9fb749d) will increase coverage by 0.1%.
The diff coverage is 87.1%.

@@            Coverage Diff            @@
##             v1.6   #16293     +/-   ##
=========================================
+ Coverage    79.8%    80.0%   +0.1%     
=========================================
  Files         409      409             
  Lines      107963   109260   +1297     
=========================================
+ Hits        86246    87449   +1203     
- Misses      21717    21811     +94     

@mergify mergify bot merged commit a0c4b4e into v1.6 Apr 1, 2021
@mergify mergify bot deleted the mergify/bp/v1.6/pr-16281 branch April 1, 2021 06:30
@CriesofCarrots
Copy link
Contributor

Hmm, stable CI job didn't start, and mergify understood that as all 🟢

@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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant