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

fix: multiple 5403 followups #5424

Merged
merged 10 commits into from
Jun 11, 2023
Merged

fix: multiple 5403 followups #5424

merged 10 commits into from
Jun 11, 2023

Conversation

UdjinM6
Copy link

@UdjinM6 UdjinM6 commented Jun 9, 2023

Issue being fixed or feature implemented

  • CBLSLazyWrapper is doing to much and not enough at the same time
  • nVersion assignment in CDeterministicMNState(Diff) is incomplete
  • pubKeyOperator deserialization needs nVersion but nVersion is deser-ed much later
  • protx rpcs are implicitly converting pubKeyOperator (by forcing nVersion=2), they shouldn't do that

What was done?

pls see individual commits

How Has This Been Tested?

  • run tests locally
  • reindex on testnet:
    • with and without --assumevalid=0 to the tip
    • with 19.1 almost to the forkpoint, then with this version
  • reindex on mainnet:
    • with and without --assumevalid=0 to the tip
    • with 19.1 to height 1100000+, then with this version

Breaking Changes

might need reindexing if you were running develop on testnet already

Checklist:

  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated relevant unit/integration/functional/e2e tests
  • I have made corresponding changes to the documentation
  • I have assigned this pull request to a milestone (for repository code-owners and collaborators only)

@UdjinM6 UdjinM6 added this to the 19.2 milestone Jun 9, 2023
@UdjinM6 UdjinM6 marked this pull request as ready for review June 10, 2023 07:46
@PastaPastaPasta
Copy link
Member

Concept ACK; reindexing main net and testnet to ensure all works as expected

Copy link
Member

@PastaPastaPasta PastaPastaPasta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK for squash merge; reindexes succeeded.

@UdjinM6 UdjinM6 merged commit cc2479a into dashpay:develop Jun 11, 2023
@UdjinM6 UdjinM6 deleted the 5403_followup branch June 11, 2023 07:00
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Jun 11, 2023
- CBLSLazyWrapper is doing to much and not enough at the same time
- nVersion assignment in CDeterministicMNState(Diff) is incomplete
- pubKeyOperator deserialization needs nVersion but nVersion is deser-ed
much later
- protx rpcs are implicitly converting pubKeyOperator (by forcing
nVersion=2), they shouldn't do that

pls see individual commits

- [x] run tests locally
- [x] reindex on testnet:
  - [x] with and without `--assumevalid=0` to the tip
  - [x] with 19.1 almost to the forkpoint, then with this version
- [x] reindex on mainnet:
  - [x] with and without `--assumevalid=0` to the tip
  - [x] with 19.1 to height 1100000+, then with this version

might need reindexing if you were running develop on testnet already

- [x] I have performed a self-review of my own code
- [x] I have commented my code, particularly in hard-to-understand areas
- [ ] I have added or updated relevant unit/integration/functional/e2e
tests
- [ ] I have made corresponding changes to the documentation
- [x] I have assigned this pull request to a milestone _(for repository
code-owners and collaborators only)_
@UdjinM6 UdjinM6 mentioned this pull request Jun 11, 2023
5 tasks
@thephez thephez added the RPC Some notable changes to RPC params/behaviour/descriptions label Jun 12, 2023
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Jun 12, 2023
- CBLSLazyWrapper is doing to much and not enough at the same time
- nVersion assignment in CDeterministicMNState(Diff) is incomplete
- pubKeyOperator deserialization needs nVersion but nVersion is deser-ed
much later
- protx rpcs are implicitly converting pubKeyOperator (by forcing
nVersion=2), they shouldn't do that

pls see individual commits

- [x] run tests locally
- [x] reindex on testnet:
  - [x] with and without `--assumevalid=0` to the tip
  - [x] with 19.1 almost to the forkpoint, then with this version
- [x] reindex on mainnet:
  - [x] with and without `--assumevalid=0` to the tip
  - [x] with 19.1 to height 1100000+, then with this version

might need reindexing if you were running develop on testnet already

- [x] I have performed a self-review of my own code
- [x] I have commented my code, particularly in hard-to-understand areas
- [ ] I have added or updated relevant unit/integration/functional/e2e
tests
- [ ] I have made corresponding changes to the documentation
- [x] I have assigned this pull request to a milestone _(for repository
code-owners and collaborators only)_
PastaPastaPasta pushed a commit that referenced this pull request Jun 17, 2023
…implifiedMNListDiff (#5434)

## Issue being fixed or feature implemented
Should fix
#5424 (comment) and
make `CSimplifiedMNListEntry`'s json a bit more human-friendly (imo) by
having `nVersion` and `nType` at the top of it.

Move `nVersion` up for `CSimplifiedMNListDiff` too.

NOTE: `nVersion` wasn't actually duplicated in rpc results, it was
simply assigned twice inside. still not nice though.

Thanks @thephez ! 👍 

## What was done?

## How Has This Been Tested?


## Breaking Changes
n/a

## Checklist:
- [x] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have added or updated relevant unit/integration/functional/e2e
tests
- [ ] I have made corresponding changes to the documentation
- [x] I have assigned this pull request to a milestone _(for repository
code-owners and collaborators only)_
UdjinM6 added a commit to UdjinM6/dash that referenced this pull request Jun 17, 2023
…implifiedMNListDiff (dashpay#5434)

## Issue being fixed or feature implemented
Should fix
dashpay#5424 (comment) and
make `CSimplifiedMNListEntry`'s json a bit more human-friendly (imo) by
having `nVersion` and `nType` at the top of it.

Move `nVersion` up for `CSimplifiedMNListDiff` too.

NOTE: `nVersion` wasn't actually duplicated in rpc results, it was
simply assigned twice inside. still not nice though.

Thanks @thephez ! 👍 

## What was done?

## How Has This Been Tested?


## Breaking Changes
n/a

## Checklist:
- [x] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have added or updated relevant unit/integration/functional/e2e
tests
- [ ] I have made corresponding changes to the documentation
- [x] I have assigned this pull request to a milestone _(for repository
code-owners and collaborators only)_
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
RPC Some notable changes to RPC params/behaviour/descriptions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants