Skip to content

sync master [0.7.2] #544

Merged
ca333 merged 117 commits intomasterfrom
beta
Jun 13, 2022
Merged

sync master [0.7.2] #544
ca333 merged 117 commits intomasterfrom
beta

Conversation

@ca333
Copy link
Copy Markdown

@ca333 ca333 commented Jun 12, 2022

Komodo 0.7.2 [Longpan]

DeckerSU and others added 15 commits May 27, 2022 19:48
to pass two params in a function earlier we used a (void **) to
handle pointers on these 2 params in "array". also there was "hidden"
parameter, this pointer itself, if pointer == 0 -> it before HF time,
if pointer !=0 -> after HF time, and we should extract two params from
array of passed pointers. of course it can be replaced with tuple, or
boost::optional with tuple "inside", but much more simple way is to
pass params (CScript and nLockTime) in komodo_notaryvin same way as they
exits and assume that if passed CScript().size() == 0, it before HF
and if size() > 0 - it after HF.

# Conflicts:
#	src/miner.cpp
"Backport" of bitcoin/bitcoin#10534 to our
codebase.

TODO: consider to use latest prevector implementation from Bitcoin upstream.
HF22 (HFNET) Consensus Changes
s6 mainnet pubkeys and timestamps
bump version (0.7.2), KOMODO_VERSION (0.7.2) and copyright year
@dimxy
Copy link
Copy Markdown
Collaborator

dimxy commented Jun 12, 2022

I went over the code in this PR and did not find any issues (apart from that small issue with libcc mentioned above).
As there is some notarisation-related code refactored in this PR I'd suggest that some existing NN operator would run his server for some time on this code to test it

Copy link
Copy Markdown

@DeckerSU DeckerSU left a comment

Choose a reason for hiding this comment

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

As all changes have been verified on the accepting to the dev branch stage, or within hfnet testing, and passing through dev->beta->master haven't new changes -> LGTM.

p.s. test_block_ser in TestHarakaRemoval tests could be safely deleted.

similar functions:
- isminetype CWallet::IsMine(const CTransaction& tx, uint32_t voutNum) (wallet.cpp)
- isminetype IsMineInner(const CKeyStore& keystore, const CScript& _scriptPubKey, IsMineSigVersion sigversion) (wallet_ismine.cpp)
TODO: sort this out (!)
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Did we "sort this out"?

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

No, we postponed it.

@ca333 ca333 mentioned this pull request Jun 13, 2022
@ca333 ca333 merged commit d456be3 into master Jun 13, 2022
who-biz pushed a commit to who-biz/komodo that referenced this pull request Jul 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants