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.

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

Jump to bottom

[Core] Only include undo.h from main.cpp #1746

Merged
merged 4 commits into from
Jul 16, 2020
Merged

[Core] Only include undo.h from main.cpp #1746

merged 4 commits into from
Jul 16, 2020

Conversation

random-zebra
Copy link

Backport bitcoin#5111

Original description:

Built on top of bitcoin#5100.
coins.o doesn't need to depend on undo.h (Decouple CCoins from CTxInUndo)
miner.o neither (Decouple miner.o from CTxUndo)
Finally, CBlockUndo can be moved from main.h to undo.h if it is first decoupled from CDiskBlockPos.

@random-zebra random-zebra added this to the 5.0.0 milestone Jul 13, 2020
@random-zebra random-zebra self-assigned this Jul 13, 2020
@random-zebra
Copy link
Author

Note: this includes (last commit, move-only) the changes of #1739. So it can either replace it, or it will be rebased after #1739 merge.

@furszy
Copy link

furszy commented Jul 13, 2020

Closing 1739, liking more your PR.

@furszy furszy mentioned this pull request Jul 13, 2020
Closed
Fuzzbawls
Fuzzbawls previously approved these changes Jul 15, 2020
View reviewed changes
Copy link
Collaborator

@Fuzzbawls Fuzzbawls left a comment

Choose a reason for hiding this comment

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

utACK aac4ded

furszy
furszy reviewed Jul 15, 2020
View reviewed changes
src/txmempool.cpp Outdated Show resolved Hide resolved
furszy
furszy approved these changes Jul 15, 2020
View reviewed changes
Copy link

@furszy furszy left a comment

Choose a reason for hiding this comment

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

utACK 9670a84

Fuzzbawls
Fuzzbawls approved these changes Jul 16, 2020
View reviewed changes
Copy link
Collaborator

@Fuzzbawls Fuzzbawls left a comment

Choose a reason for hiding this comment

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

re-utACK 9670a84

@furszy furszy merged commit 128978d into PIVX-Project:master Jul 16, 2020
@furszy furszy mentioned this pull request Jul 22, 2020
Merged
Fuzzbawls pushed a commit to Fuzzbawls/PIVX that referenced this pull request Aug 13, 2020
@Fuzzbawls
Decouple CCoins from CTxInUndo
9419228 
Github-Pull: PIVX-Project#1746
Rebased-From: cdc8cdc
Fuzzbawls pushed a commit to Fuzzbawls/PIVX that referenced this pull request Aug 13, 2020
@random-zebra @Fuzzbawls
Decouple miner.o and txmempool.o from CTxUndo
671143c 
[backports bitcoin/bitcoin@d7621cc]
Github-Pull: PIVX-Project#1746
Rebased-From: 9703b0e
Fuzzbawls pushed a commit to Fuzzbawls/PIVX that referenced this pull request Aug 13, 2020
@Fuzzbawls
Decouple CBlockUndo from CDiskBlockPos
de5a405 
Github-Pull: PIVX-Project#1746
Rebased-From: 4fe609f
Fuzzbawls pushed a commit to Fuzzbawls/PIVX that referenced this pull request Aug 13, 2020
@random-zebra @Fuzzbawls
Move UndoWriteToDisk() and UndoReadFromDisk() to anon namespace
a7cbc46 
[backports bitcoin/bitcoin@87fb310]
Github-Pull: PIVX-Project#1746
Rebased-From: 9670a84
@Fuzzbawls Fuzzbawls mentioned this pull request Aug 13, 2020
Merged
furszy added a commit that referenced this pull request Aug 18, 2020
@furszy
Merge #1807: [Backport] 4.2.1 backports
70afd43 
dc0ed71 [BUG][GUI] Don't append cold-stake records twice (random-zebra)
91adcd7 masternode: CalculateScore and GetBlockHash accessing to chainActive without cs_main fix. (furszy)
eeb112f GetMasternodeInputAge: Missing cs_main lock (furszy)
52ec12d refactor: decouple decompose coinstake from TransactionRecord::decomposeTransaction. (furszy)
51a8389 [BUG] Properly copy fCoinStake memeber between CTxInUndo and CCoins Github-Pull: #1796 Rebased-From: acf757b (random-zebra)
5c3caa4 lock cs_main for Misbehaving (furszy)
5c629d8 openssl.org dependency download link changed (CryptoDev-Project)
11aa63c Do not try to resend transactions if the node is importing or in IBD. (furszy)
c59b62e [Core] Remove BIP30 check (random-zebra)
3f05eba include missing atomic to make CMake linux happy. (furszy)
f0cfd88 Make the cs_sendProcessing a LOCK instead of a TRY_LOCK (Matt Corallo)
d38e28c Split CNode::cs_vSend: message processing and message sending (Matt Corallo)
7561b18 Remove double brackets in addrman (Matt Corallo)
63c629b Fix AddrMan locking (Matt Corallo)
f78cec4 Make fDisconnect an std::atomic (Matt Corallo)
ec56cf5 net: fix a few cases where messages were sent rather than dropped upon disconnection (furszy)
7697085 Acquire cs_main lock before cs_wallet during wallet initialization (random-zebra)
c796593 Remove bogus assert on number of oubound connections. (Matt Corallo)
7521065 wallet: Ignore MarkConflict if block hash is not known (random-zebra)
72042ac Move disconnectBlocks logging to use __func__ instead of hardcoded method name. (furszy)
0f66764 Simplify DisconnectBlock arguments/return value (furszy)
cca4a8c Split logic to undo txin's off DisconnectBlock (furszy)
0f883e6 Cleaner disconnectBlock flow for coinbase and zerocoin txs. (furszy)
a7cbc46 Move UndoWriteToDisk() and UndoReadFromDisk() to anon namespace (random-zebra)
de5a405 Decouple CBlockUndo from CDiskBlockPos (jtimon)
671143c Decouple miner.o and txmempool.o from CTxUndo (random-zebra)
9419228 Decouple CCoins from CTxInUndo (jtimon)

Pull request description:

  Backports the following PRs to the `4.2` branch:

  #1746
  #1735
  #1767
  #1769
  #1781
  #1780
  #1775
  #1783
  #1750
  #1785
  #1796
  #1776
  #1791

ACKs for top commit:
  furszy:
    Added #1805. utACK dc0ed71.
  random-zebra:
    utACK dc0ed71

Tree-SHA512: 0e59c9e751597b1b6f9a419e117946cec468dffdb921c882a44e5770ecb1a36b7d3d25f8c7f97d48bb3d59f136492842c08969901512d957a17bfaec6aece449
@random-zebra random-zebra removed this from the 5.0.0 milestone Sep 10, 2020
@random-zebra random-zebra modified the milestones: 4.3.0, 4.2.0 Sep 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Fuzzbawls Fuzzbawls Fuzzbawls approved these changes

@furszy furszy furszy approved these changes

Assignees

@random-zebra random-zebra

Labels
Refactoring Upstream
Projects
None yet
Milestone
4.3.0
Development

Successfully merging this pull request may close these issues.
3 participants
@random-zebra @furszy @Fuzzbawls