refactor: don't hardcode the transaction version by panleone · Pull Request #5864 · dashpay/dash

panleone · 2024-02-08T17:49:27Z

Issue being fixed or feature implemented

Refactor extracted from #5860. Even if that PR should not need anymore this commit (since it has been found a better way to activate dip143), I think It's still a worthy refactor

What was done?

Introduce tx.IsSpecialTxVersion() in place of tx.nVersion == 3, tx.nVersion >= 3
and tx.HasExtraPayloadField() in place of tx.nVersion == 3 && tx.nType != TRANSACTION_NORMAL

How Has This Been Tested?

Breaking Changes

Checklist:

Go over all the following points, and put an x in all the boxes that apply.

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 · 2024-02-08T18:52:27Z

+
+ bool IsSpecialTxVersion() const
+ {
+ return nVersion >= 3;


NOTE: it's safe to go from == 3 to >=3 because the latter is used in ContextualCheckTransaction

knst · 2024-02-09T10:49:36Z

wallet_multiwallet.py --usecli | ✖ Failed | 23 s

I tried to re-start CI; everytime this test fails, maybe there's some newly introduced issue? I will try to re-start one more time

The last failure: https://gitlab.com/dashpay/dash/-/jobs/6135684689

panleone · 2024-02-09T12:29:26Z

wallet_multiwallet.py --usecli | ✖ Failed | 23 s
I tried to re-start CI; everytime this test fails, maybe there's some newly introduced issue? I will try to re-start one more time
The last failure: https://gitlab.com/dashpay/dash/-/jobs/6135684689

I don't know why it fails, but I have seen it failing in every PR I opened (always in the same job linux64_tsan-test)

UdjinM6 · 2024-02-11T16:36:48Z

CI failure is unrelated, should be fixed by #5867

PastaPastaPasta · 2024-03-04T05:42:20Z

Hi @panleone; do you intend for this PR to move forward? I would see this likely merged soon with review addressed

panleone · 2024-03-04T20:36:00Z

Hi @panleone; do you intend for this PR to move forward? I would see this likely merged soon with review addressed

Completely forgot about this PR... reviews tackled but I do not have the time to make the history clean so I left 4 extra commits where I applied knst's patches

knst

LGTM, seems as all my suggestions are included

UdjinM6

utACK

github-actions · 2024-03-06T18:09:57Z

This pull request has conflicts, please rebase.

PastaPastaPasta · 2024-03-22T15:21:23Z

Hi @panleone; Sorry, but this PR needs to be rebased, it has conflicts with develop.

Instead of hardcoding the tx version

…ossible

panleone · 2024-03-24T08:23:00Z

Hi @panleone; Sorry, but this PR needs to be rebased, it has conflicts with develop.

should be good now

knst

utACK 8b6c96d

UdjinM6

LGTM, utACK

knst requested changes Feb 8, 2024
View reviewed changes

Comment threadsrc/script/interpreter.cpp Outdated
Comment threadsrc/primitives/transaction.h Outdated
Comment threadsrc/primitives/transaction.h Outdated
Comment threadsrc/primitives/transaction.h Outdated

UdjinM6 requested changes Feb 8, 2024
View reviewed changes

panleone force-pushed the dont_hardcode_tx_version branch 2 times, most recently from 70f4f2c to 5d7fd89Compare March 4, 2024 20:33

UdjinM6 added this to the 21 milestone Mar 5, 2024

knst previously approved these changes Mar 5, 2024
View reviewed changes

UdjinM6 previously approved these changes Mar 6, 2024
View reviewed changes

github-actionsBot added the needs rebase label Mar 6, 2024

panleone dismissed stale reviews from UdjinM6 and knst via fda6803March 24, 2024 08:13

panleone force-pushed the dont_hardcode_tx_version branch from 5d7fd89 to fda6803Compare March 24, 2024 08:13

github-actionsBot removed the needs rebase label Mar 24, 2024

panleone force-pushed the dont_hardcode_tx_version branch from fda6803 to 8b6c96dCompare March 24, 2024 08:21

panleone added 6 commits March 24, 2024 09:21

refactor: introduce IsSpecialTxVersion()
72d2008
Instead of hardcoding the tx version

refactor: introduce HasExtraPayloadField()
ca0fe8c

refactor: use CTransaction for immutable tx in evo_assetlocks_tests
d9f0e93

refactor: simplify vExtra using in wallet and add const
b2bb097

refactor: drop functions from struct which supposed to be simple as p…
9d429f4
…ossible

refactor: a new constant with Tx Version
8b6c96d

knst approved these changes Mar 24, 2024
View reviewed changes

knst requested review from PastaPastaPasta and UdjinM6 March 24, 2024 18:10

UdjinM6 approved these changes Mar 25, 2024
View reviewed changes

PastaPastaPasta merged commit 938cc70 into dashpay:developApr 2, 2024

UdjinM6 mentioned this pull request Jul 24, 2024
docs: release notes for v21.0.0 #6144
Merged
5 tasks

Uh oh!

Conversation

panleone commented Feb 8, 2024

Issue being fixed or feature implemented

What was done?

How Has This Been Tested?

Breaking Changes

Checklist:

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

UdjinM6Feb 8, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

knst commented Feb 9, 2024• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

panleone commented Feb 9, 2024

Uh oh!

UdjinM6 commented Feb 11, 2024• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

PastaPastaPasta commented Mar 4, 2024

Uh oh!

panleone commented Mar 4, 2024

Uh oh!

knst left a comment

Choose a reason for hiding this comment

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

github-actionsBot commented Mar 6, 2024

Uh oh!

PastaPastaPasta commented Mar 22, 2024

Uh oh!

panleone commented Mar 24, 2024

Uh oh!

knst left a comment

Choose a reason for hiding this comment

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

knst commented Feb 9, 2024•
edited
Loading

UdjinM6 commented Feb 11, 2024•
edited
Loading