Skip to content

fix: preserve the original order of fields in CDeterministicMNStateDiff #5139

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.

Sign up for GitHub

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

Merged
PastaPastaPasta merged 1 commit into from
Jan 10, 2023
Merged

fix: preserve the original order of fields in CDeterministicMNStateDiff #5139

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions src/evo/dmnstate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ class CDeterministicMNStateDiff
Field_scriptOperatorPayout = 0x2000,
};

#define DMN_STATE_DIFF_ALL_FIELDS_BUT_PUBKEY \
#define DMN_STATE_DIFF_ALL_FIELDS \
DMN_STATE_DIFF_LINE(nRegisteredHeight) \
DMN_STATE_DIFF_LINE(nLastPaidHeight) \
DMN_STATE_DIFF_LINE(nPoSePenalty) \
Expand All @@ -159,15 +159,12 @@ class CDeterministicMNStateDiff
DMN_STATE_DIFF_LINE(confirmedHash) \
DMN_STATE_DIFF_LINE(confirmedHashWithProRegTxHash) \
DMN_STATE_DIFF_LINE(keyIDOwner) \
DMN_STATE_DIFF_LINE(pubKeyOperator) \
DMN_STATE_DIFF_LINE(keyIDVoting) \
DMN_STATE_DIFF_LINE(addr) \
DMN_STATE_DIFF_LINE(scriptPayout) \
DMN_STATE_DIFF_LINE(scriptOperatorPayout)

#define DMN_STATE_DIFF_ALL_FIELDS \
DMN_STATE_DIFF_ALL_FIELDS_BUT_PUBKEY \
DMN_STATE_DIFF_LINE(pubKeyOperator) \

public:
uint32_t fields{0};
// we reuse the state class, but only the members as noted by fields are valid
Expand All @@ -185,13 +182,14 @@ class CDeterministicMNStateDiff
SERIALIZE_METHODS(CDeterministicMNStateDiff, obj)
{
READWRITE(VARINT(obj.fields));
#define DMN_STATE_DIFF_LINE(f) if (obj.fields & Field_##f) READWRITE(obj.state.f);
DMN_STATE_DIFF_ALL_FIELDS_BUT_PUBKEY
#define DMN_STATE_DIFF_LINE(f) \
if (obj.fields & Field_pubKeyOperator) {\
/* TODO: implement migration to Basic BLS after the fork */ \
READWRITE(CBLSLazyPublicKeyVersionWrapper(const_cast<CBLSLazyPublicKey&>(obj.state.pubKeyOperator), true)); \
} else if (obj.fields & Field_##f) READWRITE(obj.state.f);

DMN_STATE_DIFF_ALL_FIELDS
#undef DMN_STATE_DIFF_LINE
if (obj.fields & Field_pubKeyOperator) {
// TODO: implement migration to Basic BLS after the fork
READWRITE(CBLSLazyPublicKeyVersionWrapper(const_cast<CBLSLazyPublicKey&>(obj.state.pubKeyOperator), true));
}
}

void ApplyToState(CDeterministicMNState& target) const
Expand Down