Properly handle conflicts between ChainLocks and InstantSend - #2904

Merged
UdjinM6 merged 17 commits into
dashpay:developfrom
codablock:pr_is_invalidateblocks
May 7, 2019
Merged

Properly handle conflicts between ChainLocks and InstantSend#2904
UdjinM6 merged 17 commits into
dashpay:developfrom
codablock:pr_is_invalidateblocks

Conversation

@codablock

@codablockcodablock commented May 6, 2019•
edited
Loading

Copy link
Copy Markdown

This PR adds code to handle conflicts between ChainLocks and InstantSend. The probability of such conflicts is practically zero (due to the "safe TXs" concept, as described here), but these should still be handled properly to assure consensus.

This PR lacks tests atm, which I'm working on now. We can either merge this PR first and then later merge the tests, or wait with merging until I'm done with the tests.Update: Added tests

@codablockcodablock added this to the 14.0 milestone May 6, 2019
UdjinM6
UdjinM6 reviewed May 6, 2019
View reviewed changes

@UdjinM6UdjinM6 left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Looks good! 👍

Since this PR touches some consensus critical stuff I think it would make sense to wait and include tests here.

(Also, this can be rebased now to remove eb18e19)

Comment threadsrc/validation.cpp Outdated
@PastaPastaPasta

PastaPastaPasta commented May 6, 2019

Copy link
Copy Markdown
Member

Agree with Udjin on waiting for tests

codablock added 16 commits May 7, 2019 06:37
@codablock
Return ISLOCK instead of conflicting txid in GetConflictingTx/GetConf…
da4950e
…lictingLock
@codablock
Move code to write archived ISLOCKs into its own method
3d40285
We'll need this from another method as well later.
@codablock
Implement GetInstantSendLocksByParent and RemoveChainedInstantSendLocks
0723d74
These allow to easily delete multiple chains (actually trees) of ISLOCKs
in one go.
@codablock
Implement RemoveConflictedTx and call it from RemoveMempoolConflictsF…
d93f699
…orLock
Also add "retryChildren" parameter to RemoveNonLockedTx so that we can
skip retrying of non-locked children TXs.
@codablock
Properly handle/remove conflicted TXs (between mempool and new blocks)
8064cd0
@codablock
Track non-locked TXs by inputs
cd2b26e
@codablock
Implement and call ResolveBlockConflicts
9ec2ff3
@codablock
Also call ResolveBlockConflicts from ConnectBlock
c2be224
But only when a block is known to have a conflict and at the same time is
ChainLocked, which causes the ISLOCK to be pruned.
@codablock
Split out RemoveChainLockConflictingLock from ResolveBlockConflicts
ee6b07f
@codablock
Fix condition for update of nonLockedTxs.pindexMined
76ac065
@codablock
Only add entries to nonLockedTxsByInputs when AddNonLockedTx is calle…
928cfe5
…d for the first time
@codablock
Implement "quorum getrecsig" RPC
977f712
@codablock
Include decoded TX data in result of create_raw_tx
aa0f6bd
@codablock
Implement support for CLSIG in mininode.py
70cf0d9
@codablock
Implement support for ISLOCK in mininode.py
0c1450e
@codablock
Implement tests for ChainLock vs InstantSend lock conflict resolution
0acd8c7
@codablock
codablockforce-pushed the pr_is_invalidateblocks branch from eb18e19 to 0acd8c7CompareMay 7, 2019 04:38
@codablock
Handle review comment
fc43a30
Bail out (continue) early
@codablock

codablock commented May 7, 2019

Copy link
Copy Markdown
Author

Added tests and appropriate fixes to make everything work as expected. Also rebased on develop.

UdjinM6
UdjinM6 approved these changes May 7, 2019
View reviewed changes

@UdjinM6UdjinM6 left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

utACK 👍

Comment threadsrc/llmq/quorums_instantsend.cpp
// TX is not locked, so make sure it is tracked
AddNonLockedTx(MakeTransactionRef(tx));
nonLockedTxs.at(tx.GetHash()).pindexMined = posInBlock == CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK ? pindex : nullptr;
nonLockedTxs.at(tx.GetHash()).pindexMined = posInBlock != CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK ? pindex : nullptr;

@UdjinM6UdjinM6May 7, 2019

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Oh, good catch!

@UdjinM6
UdjinM6 merged commit 66a2cde into dashpay:developMay 7, 2019
@UdjinM6UdjinM6 added the RPC Some notable changes to RPC params/behaviour/descriptions label May 7, 2019
@codablock
codablock deleted the pr_is_invalidateblocks branch May 8, 2019 09:57
MIPPL pushed a commit to biblepay/biblepay that referenced this pull request Jun 16, 2019
MIP
Merge dash commit 0.14.0.1 into develop
6d656c4
* commit '05adda99fe09f9f6d99ce09e22ed89be3ddfcd27': (530 commits)
Update release notes with latest commits (dashpay#2958)
Only require valid collaterals for votes and triggers (dashpay#2947) (dashpay#2957)
[v0.14.0.x] Fix off-by-one error in InstantSend mining info removal when disconnecting blocks (dashpay#2951)
[v0.14.0.x] bump version to 0.14.0.1 and prepare release notes (dashpay#2952)
Update release notes v14 (dashpay#2927)
Set CLIENT_VERSION_IS_RELEASE to true (dashpay#2926)
Update help text via gen-manpages.sh (dashpay#2929)
0.14 release notes draft (dashpay#2896)
Fix duplicate `-instantsendnotify` invocation (dashpay#2925)
Add blocks conflicting with ChainLocks to block index (dashpay#2923)
Skip processing in SyncTransaction when chain is not synced yet (dashpay#2920)
Set DIP0008 mainnet activation params (dashpay#2915)
[0.14] Bump chainparams (dashpay#2910)
Fix db leaks in LLMQ db (dashpay#2914)
Fall back to ReadBlockFromDisk when blockTxs is not filled yet (dashpay#2908)
Bump "keepOldConnections" by one for all LLMQ types (dashpay#2909)
Print inputs on which we voted and quorums used for signing (dashpay#2907)
Implement integration tests for DKG error handling (dashpay#2905)
Implement zmq notifications for chainlocked blocks (dashpay#2899)
Properly handle conflicts between ChainLocks and InstantSend (dashpay#2904)
...
# Conflicts:
#	.travis.yml
#	COPYING
#	README.md
#	biblepay-docs/protocol-documentation.md
#	ci/matrix.sh
#	configure.ac
#	contrib/debian/examples/biblepay.conf
#	contrib/gitian-descriptors/gitian-linux.yml
#	contrib/gitian-descriptors/gitian-osx.yml
#	contrib/gitian-descriptors/gitian-win.yml
#	doc/README.md
#	doc/README_windows.txt
#	doc/dnsseed-policy.md
#	doc/files.md
#	doc/guide-startmany.md
#	doc/man/biblepay-cli.1
#	doc/man/biblepay-qt.1
#	doc/man/biblepay-tx.1
#	doc/man/biblepayd.1
#	doc/masternode-budget.md
#	doc/masternode_conf.md
#	doc/release-notes.md
#	qa/pull-tester/rpc-tests.py
#	qa/rpc-tests/autoix-mempool.py
#	qa/rpc-tests/dip3-deterministicmns.py
#	qa/rpc-tests/fundrawtransaction.py
#	qa/rpc-tests/maxblocksinflight.py
#	qa/rpc-tests/p2p-acceptblock.py
#	qa/rpc-tests/test_framework/comptool.py
#	qa/rpc-tests/test_framework/mininode.py
#	qa/rpc-tests/test_framework/test_framework.py
#	qa/rpc-tests/test_framework/util.py
#	qa/rpc-tests/wallet-hd.py
#	share/setup.nsi.in
#	src/Makefile.am
#	src/Makefile.bench.include
#	src/Makefile.qt.include
#	src/Makefile.qttest.include
#	src/Makefile.test.include
#	src/activemasternode.cpp
#	src/activemasternode.h
#	src/biblepayd.cpp
#	src/cachemap.h
#	src/cachemultimap.h
#	src/chainparams.cpp
#	src/clientversion.h
#	src/dsnotificationinterface.cpp
#	src/evo/deterministicmns.cpp
#	src/evo/providertx.cpp
#	src/evo/simplifiedmns.cpp
#	src/governance-classes.cpp
#	src/governance-classes.h
#	src/governance-object.cpp
#	src/governance-object.h
#	src/governance-vote.cpp
#	src/governance.cpp
#	src/governance.h
#	src/hash.h
#	src/hdchain.cpp
#	src/hdchain.h
#	src/init.cpp
#	src/instantx.cpp
#	src/instantx.h
#	src/keepass.cpp
#	src/keepass.h
#	src/llmq/quorums_blockprocessor.cpp
#	src/llmq/quorums_dummydkg.cpp
#	src/llmq/quorums_dummydkg.h
#	src/llmq/quorums_init.cpp
#	src/llmq/quorums_init.h
#	src/llmq/quorums_utils.cpp
#	src/llmq/quorums_utils.h
#	src/masternode-payments.cpp
#	src/masternode-payments.h
#	src/masternode-sync.cpp
#	src/masternode-sync.h
#	src/masternode.cpp
#	src/masternode.h
#	src/masternodeconfig.cpp
#	src/masternodeconfig.h
#	src/masternodeman.cpp
#	src/masternodeman.h
#	src/messagesigner.cpp
#	src/messagesigner.h
#	src/miner.cpp
#	src/net.cpp
#	src/net_processing.cpp
#	src/netfulfilledman.cpp
#	src/netfulfilledman.h
#	src/privatesend-client.cpp
#	src/privatesend-client.h
#	src/privatesend-server.cpp
#	src/privatesend-server.h
#	src/privatesend.cpp
#	src/privatesend.h
#	src/qt/askpassphrasedialog.cpp
#	src/qt/biblepay.cpp
#	src/qt/bitcoinaddressvalidator.cpp
#	src/qt/bitcoingui.cpp
#	src/qt/bitcoinunits.cpp
#	src/qt/bitcoinunits.h
#	src/qt/clientmodel.cpp
#	src/qt/coincontroldialog.cpp
#	src/qt/dashstrings.cpp
#	src/qt/editaddressdialog.cpp
#	src/qt/forms/intro.ui
#	src/qt/forms/masternodelist.ui
#	src/qt/guiconstants.h
#	src/qt/guiutil.cpp
#	src/qt/intro.cpp
#	src/qt/locale/biblepay_ar.ts
#	src/qt/locale/biblepay_bg.ts
#	src/qt/locale/biblepay_de.ts
#	src/qt/locale/biblepay_en.ts
#	src/qt/locale/biblepay_es.ts
#	src/qt/locale/biblepay_fi.ts
#	src/qt/locale/biblepay_fr.ts
#	src/qt/locale/biblepay_it.ts
#	src/qt/locale/biblepay_ja.ts
#	src/qt/locale/biblepay_ko.ts
#	src/qt/locale/biblepay_nl.ts
#	src/qt/locale/biblepay_pl.ts
#	src/qt/locale/biblepay_pt.ts
#	src/qt/locale/biblepay_ru.ts
#	src/qt/locale/biblepay_sk.ts
#	src/qt/locale/biblepay_th.ts
#	src/qt/locale/biblepay_tr.ts
#	src/qt/locale/biblepay_vi.ts
#	src/qt/locale/biblepay_zh_CN.ts
#	src/qt/locale/biblepay_zh_TW.ts
#	src/qt/networkstyle.h
#	src/qt/openuridialog.cpp
#	src/qt/optionsdialog.cpp
#	src/qt/optionsmodel.cpp
#	src/qt/overviewpage.cpp
#	src/qt/res/images/light/about.png
#	src/qt/res/images/light/drkblue_walletFrame_bg.png
#	src/qt/rpcconsole.cpp
#	src/qt/sendcoinsdialog.cpp
#	src/qt/sendcoinsentry.cpp
#	src/qt/splashscreen.cpp
#	src/qt/transactiondesc.cpp
#	src/qt/transactionrecord.cpp
#	src/qt/utilitydialog.cpp
#	src/qt/walletmodel.cpp
#	src/rpc/blockchain.cpp
#	src/rpc/client.cpp
#	src/rpc/governance.cpp
#	src/rpc/masternode.cpp
#	src/rpc/mining.cpp
#	src/rpc/misc.cpp
#	src/rpc/net.cpp
#	src/rpc/rawtransaction.cpp
#	src/rpc/rpcevo.cpp
#	src/rpc/server.cpp
#	src/spork.cpp
#	src/spork.h
#	src/test/bip39_tests.cpp
#	src/test/cachemap_tests.cpp
#	src/test/cachemultimap_tests.cpp
#	src/test/governance_validators_tests.cpp
#	src/test/miner_tests.cpp
#	src/test/ratecheck_tests.cpp
#	src/test/test_biblepay.h
#	src/uint256.h
#	src/util.cpp
#	src/util.h
#	src/validation.cpp
#	src/validation.h
#	src/version.h
#	src/wallet/rpcdump.cpp
#	src/wallet/rpcwallet.cpp
#	src/wallet/wallet.cpp
#	src/wallet/wallet.h
#	src/wallet/walletdb.cpp
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@UdjinM6UdjinM6UdjinM6 approved these changes

Assignees

No one assigned

Labels

RPCSome notable changes to RPC params/behaviour/descriptions

Projects

None yet

Milestone

14.0

Development

Successfully merging this pull request may close these issues.

3 participants

@codablock@PastaPastaPasta@UdjinM6
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Properly handle conflicts between ChainLocks and InstantSend - #2904
Merged
UdjinM6 merged 17 commits into
dashpay:developfrom 
codablock:pr_is_invalidateblocks
May 7, 2019
Merged
Properly handle conflicts between ChainLocks and InstantSend#2904
UdjinM6 merged 17 commits into
dashpay:developfrom 
codablock:pr_is_invalidateblocks
Conversation
@codablock
@codablockcodablock
commented
May 6, 2019•

edited

Loading

Copy link


Copy Markdown

This PR adds code to handle conflicts between ChainLocks and InstantSend. The probability of such conflicts is practically zero (due to the "safe TXs" concept, as described here), but these should still be handled properly to assure consensus.
This PR lacks tests atm, which I'm working on now. We can either merge this PR first and then later merge the tests, or wait with merging until I'm done with the tests.Update: Added tests
@codablockcodablock
added this to the 14.0 milestone
May 6, 2019
UdjinM6
UdjinM6
reviewed
May 6, 2019
View reviewed changes
@UdjinM6UdjinM6
left a comment


Copy link


Copy Markdown

Choose a reason for hiding this comment

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

Looks good! 👍
Since this PR touches some consensus critical stuff I think it would make sense to wait and include tests here.
(Also, this can be rebased now to remove eb18e19)
Comment threadsrc/validation.cpp
Outdated

@PastaPastaPasta
PastaPastaPasta
commented
May 6, 2019

Copy link


Copy Markdown

Member
Agree with Udjin on waiting for tests
codablock
added 16 commits
May 7, 2019 06:37
@codablock
Return ISLOCK instead of conflicting txid in GetConflictingTx/GetConf…
da4950e
…lictingLock
@codablock
Move code to write archived ISLOCKs into its own method
3d40285
We'll need this from another method as well later.
@codablock
Implement GetInstantSendLocksByParent and RemoveChainedInstantSendLocks
0723d74
These allow to easily delete multiple chains (actually trees) of ISLOCKs
in one go.
@codablock
Implement RemoveConflictedTx and call it from RemoveMempoolConflictsF…
d93f699
…orLock
Also add "retryChildren" parameter to RemoveNonLockedTx so that we can
skip retrying of non-locked children TXs.
@codablock
Properly handle/remove conflicted TXs (between mempool and new blocks)
8064cd0
@codablock
Track non-locked TXs by inputs
cd2b26e
@codablock
Implement and call ResolveBlockConflicts
9ec2ff3
@codablock
Also call ResolveBlockConflicts from ConnectBlock
c2be224
But only when a block is known to have a conflict and at the same time is
ChainLocked, which causes the ISLOCK to be pruned.
@codablock
Split out RemoveChainLockConflictingLock from ResolveBlockConflicts
ee6b07f
@codablock
Fix condition for update of nonLockedTxs.pindexMined
76ac065
@codablock
Only add entries to nonLockedTxsByInputs when AddNonLockedTx is calle…
928cfe5
…d for the first time
@codablock
Implement "quorum getrecsig" RPC
977f712
@codablock
Include decoded TX data in result of create_raw_tx
aa0f6bd
@codablock
Implement support for CLSIG in mininode.py
70cf0d9
@codablock
Implement support for ISLOCK in mininode.py
0c1450e
@codablock
Implement tests for ChainLock vs InstantSend lock conflict resolution
0acd8c7
@codablock
codablockforce-pushed
the
pr_is_invalidateblocks
branch
from
eb18e19 to
0acd8c7CompareMay 7, 2019 04:38
@codablock
Handle review comment
fc43a30
Bail out (continue) early
@codablock
codablock
commented
May 7, 2019

Copy link


Copy Markdown

Author
Added tests and appropriate fixes to make everything work as expected. Also rebased on develop.
UdjinM6
UdjinM6
approved these changes
May 7, 2019
View reviewed changes
@UdjinM6UdjinM6
left a comment


Copy link


Copy Markdown

Choose a reason for hiding this comment

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

utACK 👍
Comment threadsrc/llmq/quorums_instantsend.cpp
 // TX is not locked, so make sure it is tracked
 AddNonLockedTx(MakeTransactionRef(tx));
 nonLockedTxs.at(tx.GetHash()).pindexMined = posInBlock == CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK ? pindex : nullptr;
 nonLockedTxs.at(tx.GetHash()).pindexMined = posInBlock != CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK ? pindex : nullptr;
@UdjinM6UdjinM6May 7, 2019

Copy link


Copy Markdown

Choose a reason for hiding this comment

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

Oh, good catch!
@UdjinM6
UdjinM6
merged commit 66a2cde
into
dashpay:developMay 7, 2019
@UdjinM6UdjinM6
added
the 
RPC
Some notable changes to RPC params/behaviour/descriptions
label
May 7, 2019
@codablock
codablock
deleted the

pr_is_invalidateblocks

branch
May 8, 2019 09:57
MIPPL pushed a commit
to biblepay/biblepay
that referenced
this pull request
Jun 16, 2019
MIP
Merge dash commit 0.14.0.1 into develop
6d656c4
* commit '05adda99fe09f9f6d99ce09e22ed89be3ddfcd27': (530 commits)
Update release notes with latest commits (dashpay#2958)
Only require valid collaterals for votes and triggers (dashpay#2947) (dashpay#2957)
[v0.14.0.x] Fix off-by-one error in InstantSend mining info removal when disconnecting blocks (dashpay#2951)
[v0.14.0.x] bump version to 0.14.0.1 and prepare release notes (dashpay#2952)
Update release notes v14 (dashpay#2927)
Set CLIENT_VERSION_IS_RELEASE to true (dashpay#2926)
Update help text via gen-manpages.sh (dashpay#2929)
0.14 release notes draft (dashpay#2896)
Fix duplicate `-instantsendnotify` invocation (dashpay#2925)
Add blocks conflicting with ChainLocks to block index (dashpay#2923)
Skip processing in SyncTransaction when chain is not synced yet (dashpay#2920)
Set DIP0008 mainnet activation params (dashpay#2915)
[0.14] Bump chainparams (dashpay#2910)
Fix db leaks in LLMQ db (dashpay#2914)
Fall back to ReadBlockFromDisk when blockTxs is not filled yet (dashpay#2908)
Bump "keepOldConnections" by one for all LLMQ types (dashpay#2909)
Print inputs on which we voted and quorums used for signing (dashpay#2907)
Implement integration tests for DKG error handling (dashpay#2905)
Implement zmq notifications for chainlocked blocks (dashpay#2899)
Properly handle conflicts between ChainLocks and InstantSend (dashpay#2904)
...
# Conflicts:
#	.travis.yml
#	COPYING
#	README.md
#	biblepay-docs/protocol-documentation.md
#	ci/matrix.sh
#	configure.ac
#	contrib/debian/examples/biblepay.conf
#	contrib/gitian-descriptors/gitian-linux.yml
#	contrib/gitian-descriptors/gitian-osx.yml
#	contrib/gitian-descriptors/gitian-win.yml
#	doc/README.md
#	doc/README_windows.txt
#	doc/dnsseed-policy.md
#	doc/files.md
#	doc/guide-startmany.md
#	doc/man/biblepay-cli.1
#	doc/man/biblepay-qt.1
#	doc/man/biblepay-tx.1
#	doc/man/biblepayd.1
#	doc/masternode-budget.md
#	doc/masternode_conf.md
#	doc/release-notes.md
#	qa/pull-tester/rpc-tests.py
#	qa/rpc-tests/autoix-mempool.py
#	qa/rpc-tests/dip3-deterministicmns.py
#	qa/rpc-tests/fundrawtransaction.py
#	qa/rpc-tests/maxblocksinflight.py
#	qa/rpc-tests/p2p-acceptblock.py
#	qa/rpc-tests/test_framework/comptool.py
#	qa/rpc-tests/test_framework/mininode.py
#	qa/rpc-tests/test_framework/test_framework.py
#	qa/rpc-tests/test_framework/util.py
#	qa/rpc-tests/wallet-hd.py
#	share/setup.nsi.in
#	src/Makefile.am
#	src/Makefile.bench.include
#	src/Makefile.qt.include
#	src/Makefile.qttest.include
#	src/Makefile.test.include
#	src/activemasternode.cpp
#	src/activemasternode.h
#	src/biblepayd.cpp
#	src/cachemap.h
#	src/cachemultimap.h
#	src/chainparams.cpp
#	src/clientversion.h
#	src/dsnotificationinterface.cpp
#	src/evo/deterministicmns.cpp
#	src/evo/providertx.cpp
#	src/evo/simplifiedmns.cpp
#	src/governance-classes.cpp
#	src/governance-classes.h
#	src/governance-object.cpp
#	src/governance-object.h
#	src/governance-vote.cpp
#	src/governance.cpp
#	src/governance.h
#	src/hash.h
#	src/hdchain.cpp
#	src/hdchain.h
#	src/init.cpp
#	src/instantx.cpp
#	src/instantx.h
#	src/keepass.cpp
#	src/keepass.h
#	src/llmq/quorums_blockprocessor.cpp
#	src/llmq/quorums_dummydkg.cpp
#	src/llmq/quorums_dummydkg.h
#	src/llmq/quorums_init.cpp
#	src/llmq/quorums_init.h
#	src/llmq/quorums_utils.cpp
#	src/llmq/quorums_utils.h
#	src/masternode-payments.cpp
#	src/masternode-payments.h
#	src/masternode-sync.cpp
#	src/masternode-sync.h
#	src/masternode.cpp
#	src/masternode.h
#	src/masternodeconfig.cpp
#	src/masternodeconfig.h
#	src/masternodeman.cpp
#	src/masternodeman.h
#	src/messagesigner.cpp
#	src/messagesigner.h
#	src/miner.cpp
#	src/net.cpp
#	src/net_processing.cpp
#	src/netfulfilledman.cpp
#	src/netfulfilledman.h
#	src/privatesend-client.cpp
#	src/privatesend-client.h
#	src/privatesend-server.cpp
#	src/privatesend-server.h
#	src/privatesend.cpp
#	src/privatesend.h
#	src/qt/askpassphrasedialog.cpp
#	src/qt/biblepay.cpp
#	src/qt/bitcoinaddressvalidator.cpp
#	src/qt/bitcoingui.cpp
#	src/qt/bitcoinunits.cpp
#	src/qt/bitcoinunits.h
#	src/qt/clientmodel.cpp
#	src/qt/coincontroldialog.cpp
#	src/qt/dashstrings.cpp
#	src/qt/editaddressdialog.cpp
#	src/qt/forms/intro.ui
#	src/qt/forms/masternodelist.ui
#	src/qt/guiconstants.h
#	src/qt/guiutil.cpp
#	src/qt/intro.cpp
#	src/qt/locale/biblepay_ar.ts
#	src/qt/locale/biblepay_bg.ts
#	src/qt/locale/biblepay_de.ts
#	src/qt/locale/biblepay_en.ts
#	src/qt/locale/biblepay_es.ts
#	src/qt/locale/biblepay_fi.ts
#	src/qt/locale/biblepay_fr.ts
#	src/qt/locale/biblepay_it.ts
#	src/qt/locale/biblepay_ja.ts
#	src/qt/locale/biblepay_ko.ts
#	src/qt/locale/biblepay_nl.ts
#	src/qt/locale/biblepay_pl.ts
#	src/qt/locale/biblepay_pt.ts
#	src/qt/locale/biblepay_ru.ts
#	src/qt/locale/biblepay_sk.ts
#	src/qt/locale/biblepay_th.ts
#	src/qt/locale/biblepay_tr.ts
#	src/qt/locale/biblepay_vi.ts
#	src/qt/locale/biblepay_zh_CN.ts
#	src/qt/locale/biblepay_zh_TW.ts
#	src/qt/networkstyle.h
#	src/qt/openuridialog.cpp
#	src/qt/optionsdialog.cpp
#	src/qt/optionsmodel.cpp
#	src/qt/overviewpage.cpp
#	src/qt/res/images/light/about.png
#	src/qt/res/images/light/drkblue_walletFrame_bg.png
#	src/qt/rpcconsole.cpp
#	src/qt/sendcoinsdialog.cpp
#	src/qt/sendcoinsentry.cpp
#	src/qt/splashscreen.cpp
#	src/qt/transactiondesc.cpp
#	src/qt/transactionrecord.cpp
#	src/qt/utilitydialog.cpp
#	src/qt/walletmodel.cpp
#	src/rpc/blockchain.cpp
#	src/rpc/client.cpp
#	src/rpc/governance.cpp
#	src/rpc/masternode.cpp
#	src/rpc/mining.cpp
#	src/rpc/misc.cpp
#	src/rpc/net.cpp
#	src/rpc/rawtransaction.cpp
#	src/rpc/rpcevo.cpp
#	src/rpc/server.cpp
#	src/spork.cpp
#	src/spork.h
#	src/test/bip39_tests.cpp
#	src/test/cachemap_tests.cpp
#	src/test/cachemultimap_tests.cpp
#	src/test/governance_validators_tests.cpp
#	src/test/miner_tests.cpp
#	src/test/ratecheck_tests.cpp
#	src/test/test_biblepay.h
#	src/uint256.h
#	src/util.cpp
#	src/util.h
#	src/validation.cpp
#	src/validation.h
#	src/version.h
#	src/wallet/rpcdump.cpp
#	src/wallet/rpcwallet.cpp
#	src/wallet/wallet.cpp
#	src/wallet/wallet.h
#	src/wallet/walletdb.cpp
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@UdjinM6UdjinM6UdjinM6 approved these changes

Assignees


No one assigned


Labels

RPCSome notable changes to RPC params/behaviour/descriptions

Projects


None yet


Milestone

14.0

Development

Successfully merging this pull request may close these issues.

3 participants

@codablock@PastaPastaPasta@UdjinM6

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Properly handle conflicts between ChainLocks and InstantSend - #2904
Merged
UdjinM6 merged 17 commits into
dashpay:developfrom 
codablock:pr_is_invalidateblocks
May 7, 2019
Merged
Properly handle conflicts between ChainLocks and InstantSend#2904
UdjinM6 merged 17 commits into
dashpay:developfrom 
codablock:pr_is_invalidateblocks
Conversation
@codablock
@codablockcodablock
commented
May 6, 2019•

edited

Loading

Copy link


Copy Markdown

This PR adds code to handle conflicts between ChainLocks and InstantSend. The probability of such conflicts is practically zero (due to the "safe TXs" concept, as described here), but these should still be handled properly to assure consensus.
This PR lacks tests atm, which I'm working on now. We can either merge this PR first and then later merge the tests, or wait with merging until I'm done with the tests.Update: Added tests
@codablockcodablock
added this to the 14.0 milestone
May 6, 2019
UdjinM6
UdjinM6
reviewed
May 6, 2019
View reviewed changes
@UdjinM6UdjinM6
left a comment


Copy link


Copy Markdown

Choose a reason for hiding this comment

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

Looks good! 👍
Since this PR touches some consensus critical stuff I think it would make sense to wait and include tests here.
(Also, this can be rebased now to remove eb18e19)
Comment threadsrc/validation.cpp
Outdated

@PastaPastaPasta
PastaPastaPasta
commented
May 6, 2019

Copy link


Copy Markdown

Member
Agree with Udjin on waiting for tests
codablock
added 16 commits
May 7, 2019 06:37
@codablock
Return ISLOCK instead of conflicting txid in GetConflictingTx/GetConf…
da4950e
…lictingLock
@codablock
Move code to write archived ISLOCKs into its own method
3d40285
We'll need this from another method as well later.
@codablock
Implement GetInstantSendLocksByParent and RemoveChainedInstantSendLocks
0723d74
These allow to easily delete multiple chains (actually trees) of ISLOCKs
in one go.
@codablock
Implement RemoveConflictedTx and call it from RemoveMempoolConflictsF…
d93f699
…orLock
Also add "retryChildren" parameter to RemoveNonLockedTx so that we can
skip retrying of non-locked children TXs.
@codablock
Properly handle/remove conflicted TXs (between mempool and new blocks)
8064cd0
@codablock
Track non-locked TXs by inputs
cd2b26e
@codablock
Implement and call ResolveBlockConflicts
9ec2ff3
@codablock
Also call ResolveBlockConflicts from ConnectBlock
c2be224
But only when a block is known to have a conflict and at the same time is
ChainLocked, which causes the ISLOCK to be pruned.
@codablock
Split out RemoveChainLockConflictingLock from ResolveBlockConflicts
ee6b07f
@codablock
Fix condition for update of nonLockedTxs.pindexMined
76ac065
@codablock
Only add entries to nonLockedTxsByInputs when AddNonLockedTx is calle…
928cfe5
…d for the first time
@codablock
Implement "quorum getrecsig" RPC
977f712
@codablock
Include decoded TX data in result of create_raw_tx
aa0f6bd
@codablock
Implement support for CLSIG in mininode.py
70cf0d9
@codablock
Implement support for ISLOCK in mininode.py
0c1450e
@codablock
Implement tests for ChainLock vs InstantSend lock conflict resolution
0acd8c7
@codablock
codablockforce-pushed
the
pr_is_invalidateblocks
branch
from
eb18e19 to
0acd8c7CompareMay 7, 2019 04:38
@codablock
Handle review comment
fc43a30
Bail out (continue) early
@codablock
codablock
commented
May 7, 2019

Copy link


Copy Markdown

Author
Added tests and appropriate fixes to make everything work as expected. Also rebased on develop.
UdjinM6
UdjinM6
approved these changes
May 7, 2019
View reviewed changes
@UdjinM6UdjinM6
left a comment


Copy link


Copy Markdown

Choose a reason for hiding this comment

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

utACK 👍
Comment threadsrc/llmq/quorums_instantsend.cpp
 // TX is not locked, so make sure it is tracked
 AddNonLockedTx(MakeTransactionRef(tx));
 nonLockedTxs.at(tx.GetHash()).pindexMined = posInBlock == CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK ? pindex : nullptr;
 nonLockedTxs.at(tx.GetHash()).pindexMined = posInBlock != CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK ? pindex : nullptr;
@UdjinM6UdjinM6May 7, 2019

Copy link


Copy Markdown

Choose a reason for hiding this comment

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

Oh, good catch!
@UdjinM6
UdjinM6
merged commit 66a2cde
into
dashpay:developMay 7, 2019
@UdjinM6UdjinM6
added
the 
RPC
Some notable changes to RPC params/behaviour/descriptions
label
May 7, 2019
@codablock
codablock
deleted the

pr_is_invalidateblocks

branch
May 8, 2019 09:57
MIPPL pushed a commit
to biblepay/biblepay
that referenced
this pull request
Jun 16, 2019
MIP
Merge dash commit 0.14.0.1 into develop
6d656c4
* commit '05adda99fe09f9f6d99ce09e22ed89be3ddfcd27': (530 commits)
Update release notes with latest commits (dashpay#2958)
Only require valid collaterals for votes and triggers (dashpay#2947) (dashpay#2957)
[v0.14.0.x] Fix off-by-one error in InstantSend mining info removal when disconnecting blocks (dashpay#2951)
[v0.14.0.x] bump version to 0.14.0.1 and prepare release notes (dashpay#2952)
Update release notes v14 (dashpay#2927)
Set CLIENT_VERSION_IS_RELEASE to true (dashpay#2926)
Update help text via gen-manpages.sh (dashpay#2929)
0.14 release notes draft (dashpay#2896)
Fix duplicate `-instantsendnotify` invocation (dashpay#2925)
Add blocks conflicting with ChainLocks to block index (dashpay#2923)
Skip processing in SyncTransaction when chain is not synced yet (dashpay#2920)
Set DIP0008 mainnet activation params (dashpay#2915)
[0.14] Bump chainparams (dashpay#2910)
Fix db leaks in LLMQ db (dashpay#2914)
Fall back to ReadBlockFromDisk when blockTxs is not filled yet (dashpay#2908)
Bump "keepOldConnections" by one for all LLMQ types (dashpay#2909)
Print inputs on which we voted and quorums used for signing (dashpay#2907)
Implement integration tests for DKG error handling (dashpay#2905)
Implement zmq notifications for chainlocked blocks (dashpay#2899)
Properly handle conflicts between ChainLocks and InstantSend (dashpay#2904)
...
# Conflicts:
#	.travis.yml
#	COPYING
#	README.md
#	biblepay-docs/protocol-documentation.md
#	ci/matrix.sh
#	configure.ac
#	contrib/debian/examples/biblepay.conf
#	contrib/gitian-descriptors/gitian-linux.yml
#	contrib/gitian-descriptors/gitian-osx.yml
#	contrib/gitian-descriptors/gitian-win.yml
#	doc/README.md
#	doc/README_windows.txt
#	doc/dnsseed-policy.md
#	doc/files.md
#	doc/guide-startmany.md
#	doc/man/biblepay-cli.1
#	doc/man/biblepay-qt.1
#	doc/man/biblepay-tx.1
#	doc/man/biblepayd.1
#	doc/masternode-budget.md
#	doc/masternode_conf.md
#	doc/release-notes.md
#	qa/pull-tester/rpc-tests.py
#	qa/rpc-tests/autoix-mempool.py
#	qa/rpc-tests/dip3-deterministicmns.py
#	qa/rpc-tests/fundrawtransaction.py
#	qa/rpc-tests/maxblocksinflight.py
#	qa/rpc-tests/p2p-acceptblock.py
#	qa/rpc-tests/test_framework/comptool.py
#	qa/rpc-tests/test_framework/mininode.py
#	qa/rpc-tests/test_framework/test_framework.py
#	qa/rpc-tests/test_framework/util.py
#	qa/rpc-tests/wallet-hd.py
#	share/setup.nsi.in
#	src/Makefile.am
#	src/Makefile.bench.include
#	src/Makefile.qt.include
#	src/Makefile.qttest.include
#	src/Makefile.test.include
#	src/activemasternode.cpp
#	src/activemasternode.h
#	src/biblepayd.cpp
#	src/cachemap.h
#	src/cachemultimap.h
#	src/chainparams.cpp
#	src/clientversion.h
#	src/dsnotificationinterface.cpp
#	src/evo/deterministicmns.cpp
#	src/evo/providertx.cpp
#	src/evo/simplifiedmns.cpp
#	src/governance-classes.cpp
#	src/governance-classes.h
#	src/governance-object.cpp
#	src/governance-object.h
#	src/governance-vote.cpp
#	src/governance.cpp
#	src/governance.h
#	src/hash.h
#	src/hdchain.cpp
#	src/hdchain.h
#	src/init.cpp
#	src/instantx.cpp
#	src/instantx.h
#	src/keepass.cpp
#	src/keepass.h
#	src/llmq/quorums_blockprocessor.cpp
#	src/llmq/quorums_dummydkg.cpp
#	src/llmq/quorums_dummydkg.h
#	src/llmq/quorums_init.cpp
#	src/llmq/quorums_init.h
#	src/llmq/quorums_utils.cpp
#	src/llmq/quorums_utils.h
#	src/masternode-payments.cpp
#	src/masternode-payments.h
#	src/masternode-sync.cpp
#	src/masternode-sync.h
#	src/masternode.cpp
#	src/masternode.h
#	src/masternodeconfig.cpp
#	src/masternodeconfig.h
#	src/masternodeman.cpp
#	src/masternodeman.h
#	src/messagesigner.cpp
#	src/messagesigner.h
#	src/miner.cpp
#	src/net.cpp
#	src/net_processing.cpp
#	src/netfulfilledman.cpp
#	src/netfulfilledman.h
#	src/privatesend-client.cpp
#	src/privatesend-client.h
#	src/privatesend-server.cpp
#	src/privatesend-server.h
#	src/privatesend.cpp
#	src/privatesend.h
#	src/qt/askpassphrasedialog.cpp
#	src/qt/biblepay.cpp
#	src/qt/bitcoinaddressvalidator.cpp
#	src/qt/bitcoingui.cpp
#	src/qt/bitcoinunits.cpp
#	src/qt/bitcoinunits.h
#	src/qt/clientmodel.cpp
#	src/qt/coincontroldialog.cpp
#	src/qt/dashstrings.cpp
#	src/qt/editaddressdialog.cpp
#	src/qt/forms/intro.ui
#	src/qt/forms/masternodelist.ui
#	src/qt/guiconstants.h
#	src/qt/guiutil.cpp
#	src/qt/intro.cpp
#	src/qt/locale/biblepay_ar.ts
#	src/qt/locale/biblepay_bg.ts
#	src/qt/locale/biblepay_de.ts
#	src/qt/locale/biblepay_en.ts
#	src/qt/locale/biblepay_es.ts
#	src/qt/locale/biblepay_fi.ts
#	src/qt/locale/biblepay_fr.ts
#	src/qt/locale/biblepay_it.ts
#	src/qt/locale/biblepay_ja.ts
#	src/qt/locale/biblepay_ko.ts
#	src/qt/locale/biblepay_nl.ts
#	src/qt/locale/biblepay_pl.ts
#	src/qt/locale/biblepay_pt.ts
#	src/qt/locale/biblepay_ru.ts
#	src/qt/locale/biblepay_sk.ts
#	src/qt/locale/biblepay_th.ts
#	src/qt/locale/biblepay_tr.ts
#	src/qt/locale/biblepay_vi.ts
#	src/qt/locale/biblepay_zh_CN.ts
#	src/qt/locale/biblepay_zh_TW.ts
#	src/qt/networkstyle.h
#	src/qt/openuridialog.cpp
#	src/qt/optionsdialog.cpp
#	src/qt/optionsmodel.cpp
#	src/qt/overviewpage.cpp
#	src/qt/res/images/light/about.png
#	src/qt/res/images/light/drkblue_walletFrame_bg.png
#	src/qt/rpcconsole.cpp
#	src/qt/sendcoinsdialog.cpp
#	src/qt/sendcoinsentry.cpp
#	src/qt/splashscreen.cpp
#	src/qt/transactiondesc.cpp
#	src/qt/transactionrecord.cpp
#	src/qt/utilitydialog.cpp
#	src/qt/walletmodel.cpp
#	src/rpc/blockchain.cpp
#	src/rpc/client.cpp
#	src/rpc/governance.cpp
#	src/rpc/masternode.cpp
#	src/rpc/mining.cpp
#	src/rpc/misc.cpp
#	src/rpc/net.cpp
#	src/rpc/rawtransaction.cpp
#	src/rpc/rpcevo.cpp
#	src/rpc/server.cpp
#	src/spork.cpp
#	src/spork.h
#	src/test/bip39_tests.cpp
#	src/test/cachemap_tests.cpp
#	src/test/cachemultimap_tests.cpp
#	src/test/governance_validators_tests.cpp
#	src/test/miner_tests.cpp
#	src/test/ratecheck_tests.cpp
#	src/test/test_biblepay.h
#	src/uint256.h
#	src/util.cpp
#	src/util.h
#	src/validation.cpp
#	src/validation.h
#	src/version.h
#	src/wallet/rpcdump.cpp
#	src/wallet/rpcwallet.cpp
#	src/wallet/wallet.cpp
#	src/wallet/wallet.h
#	src/wallet/walletdb.cpp
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@UdjinM6UdjinM6UdjinM6 approved these changes

Assignees


No one assigned


Labels

RPCSome notable changes to RPC params/behaviour/descriptions

Projects


None yet


Milestone

14.0

Development

Successfully merging this pull request may close these issues.

3 participants

@codablock@PastaPastaPasta@UdjinM6

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Properly handle conflicts between ChainLocks and InstantSend - #2904
Merged
UdjinM6 merged 17 commits into
dashpay:developfrom 
codablock:pr_is_invalidateblocks
May 7, 2019
Merged
Properly handle conflicts between ChainLocks and InstantSend#2904
UdjinM6 merged 17 commits into
dashpay:developfrom 
codablock:pr_is_invalidateblocks
Conversation
@codablock
@codablockcodablock
commented
May 6, 2019•

edited

Loading

Copy link


Copy Markdown

This PR adds code to handle conflicts between ChainLocks and InstantSend. The probability of such conflicts is practically zero (due to the "safe TXs" concept, as described here), but these should still be handled properly to assure consensus.
This PR lacks tests atm, which I'm working on now. We can either merge this PR first and then later merge the tests, or wait with merging until I'm done with the tests.Update: Added tests
@codablockcodablock
added this to the 14.0 milestone
May 6, 2019
UdjinM6
UdjinM6
reviewed
May 6, 2019
View reviewed changes
@UdjinM6UdjinM6
left a comment


Copy link


Copy Markdown

Choose a reason for hiding this comment

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

Looks good! 👍
Since this PR touches some consensus critical stuff I think it would make sense to wait and include tests here.
(Also, this can be rebased now to remove eb18e19)
Comment threadsrc/validation.cpp
Outdated

@PastaPastaPasta
PastaPastaPasta
commented
May 6, 2019

Copy link


Copy Markdown

Member
Agree with Udjin on waiting for tests
codablock
added 16 commits
May 7, 2019 06:37
@codablock
Return ISLOCK instead of conflicting txid in GetConflictingTx/GetConf…
da4950e
…lictingLock
@codablock
Move code to write archived ISLOCKs into its own method
3d40285
We'll need this from another method as well later.
@codablock
Implement GetInstantSendLocksByParent and RemoveChainedInstantSendLocks
0723d74
These allow to easily delete multiple chains (actually trees) of ISLOCKs
in one go.
@codablock
Implement RemoveConflictedTx and call it from RemoveMempoolConflictsF…
d93f699
…orLock
Also add "retryChildren" parameter to RemoveNonLockedTx so that we can
skip retrying of non-locked children TXs.
@codablock
Properly handle/remove conflicted TXs (between mempool and new blocks)
8064cd0
@codablock
Track non-locked TXs by inputs
cd2b26e
@codablock
Implement and call ResolveBlockConflicts
9ec2ff3
@codablock
Also call ResolveBlockConflicts from ConnectBlock
c2be224
But only when a block is known to have a conflict and at the same time is
ChainLocked, which causes the ISLOCK to be pruned.
@codablock
Split out RemoveChainLockConflictingLock from ResolveBlockConflicts
ee6b07f
@codablock
Fix condition for update of nonLockedTxs.pindexMined
76ac065
@codablock
Only add entries to nonLockedTxsByInputs when AddNonLockedTx is calle…
928cfe5
…d for the first time
@codablock
Implement "quorum getrecsig" RPC
977f712
@codablock
Include decoded TX data in result of create_raw_tx
aa0f6bd
@codablock
Implement support for CLSIG in mininode.py
70cf0d9
@codablock
Implement support for ISLOCK in mininode.py
0c1450e
@codablock
Implement tests for ChainLock vs InstantSend lock conflict resolution
0acd8c7
@codablock
codablockforce-pushed
the
pr_is_invalidateblocks
branch
from
eb18e19 to
0acd8c7CompareMay 7, 2019 04:38
@codablock
Handle review comment
fc43a30
Bail out (continue) early
@codablock
codablock
commented
May 7, 2019

Copy link


Copy Markdown

Author
Added tests and appropriate fixes to make everything work as expected. Also rebased on develop.
UdjinM6
UdjinM6
approved these changes
May 7, 2019
View reviewed changes
@UdjinM6UdjinM6
left a comment


Copy link


Copy Markdown

Choose a reason for hiding this comment

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

utACK 👍
Comment threadsrc/llmq/quorums_instantsend.cpp
 // TX is not locked, so make sure it is tracked
 AddNonLockedTx(MakeTransactionRef(tx));
 nonLockedTxs.at(tx.GetHash()).pindexMined = posInBlock == CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK ? pindex : nullptr;
 nonLockedTxs.at(tx.GetHash()).pindexMined = posInBlock != CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK ? pindex : nullptr;
@UdjinM6UdjinM6May 7, 2019

Copy link


Copy Markdown

Choose a reason for hiding this comment

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

Oh, good catch!
@UdjinM6
UdjinM6
merged commit 66a2cde
into
dashpay:developMay 7, 2019
@UdjinM6UdjinM6
added
the 
RPC
Some notable changes to RPC params/behaviour/descriptions
label
May 7, 2019
@codablock
codablock
deleted the

pr_is_invalidateblocks

branch
May 8, 2019 09:57
MIPPL pushed a commit
to biblepay/biblepay
that referenced
this pull request
Jun 16, 2019
MIP
Merge dash commit 0.14.0.1 into develop
6d656c4
* commit '05adda99fe09f9f6d99ce09e22ed89be3ddfcd27': (530 commits)
Update release notes with latest commits (dashpay#2958)
Only require valid collaterals for votes and triggers (dashpay#2947) (dashpay#2957)
[v0.14.0.x] Fix off-by-one error in InstantSend mining info removal when disconnecting blocks (dashpay#2951)
[v0.14.0.x] bump version to 0.14.0.1 and prepare release notes (dashpay#2952)
Update release notes v14 (dashpay#2927)
Set CLIENT_VERSION_IS_RELEASE to true (dashpay#2926)
Update help text via gen-manpages.sh (dashpay#2929)
0.14 release notes draft (dashpay#2896)
Fix duplicate `-instantsendnotify` invocation (dashpay#2925)
Add blocks conflicting with ChainLocks to block index (dashpay#2923)
Skip processing in SyncTransaction when chain is not synced yet (dashpay#2920)
Set DIP0008 mainnet activation params (dashpay#2915)
[0.14] Bump chainparams (dashpay#2910)
Fix db leaks in LLMQ db (dashpay#2914)
Fall back to ReadBlockFromDisk when blockTxs is not filled yet (dashpay#2908)
Bump "keepOldConnections" by one for all LLMQ types (dashpay#2909)
Print inputs on which we voted and quorums used for signing (dashpay#2907)
Implement integration tests for DKG error handling (dashpay#2905)
Implement zmq notifications for chainlocked blocks (dashpay#2899)
Properly handle conflicts between ChainLocks and InstantSend (dashpay#2904)
...
# Conflicts:
#	.travis.yml
#	COPYING
#	README.md
#	biblepay-docs/protocol-documentation.md
#	ci/matrix.sh
#	configure.ac
#	contrib/debian/examples/biblepay.conf
#	contrib/gitian-descriptors/gitian-linux.yml
#	contrib/gitian-descriptors/gitian-osx.yml
#	contrib/gitian-descriptors/gitian-win.yml
#	doc/README.md
#	doc/README_windows.txt
#	doc/dnsseed-policy.md
#	doc/files.md
#	doc/guide-startmany.md
#	doc/man/biblepay-cli.1
#	doc/man/biblepay-qt.1
#	doc/man/biblepay-tx.1
#	doc/man/biblepayd.1
#	doc/masternode-budget.md
#	doc/masternode_conf.md
#	doc/release-notes.md
#	qa/pull-tester/rpc-tests.py
#	qa/rpc-tests/autoix-mempool.py
#	qa/rpc-tests/dip3-deterministicmns.py
#	qa/rpc-tests/fundrawtransaction.py
#	qa/rpc-tests/maxblocksinflight.py
#	qa/rpc-tests/p2p-acceptblock.py
#	qa/rpc-tests/test_framework/comptool.py
#	qa/rpc-tests/test_framework/mininode.py
#	qa/rpc-tests/test_framework/test_framework.py
#	qa/rpc-tests/test_framework/util.py
#	qa/rpc-tests/wallet-hd.py
#	share/setup.nsi.in
#	src/Makefile.am
#	src/Makefile.bench.include
#	src/Makefile.qt.include
#	src/Makefile.qttest.include
#	src/Makefile.test.include
#	src/activemasternode.cpp
#	src/activemasternode.h
#	src/biblepayd.cpp
#	src/cachemap.h
#	src/cachemultimap.h
#	src/chainparams.cpp
#	src/clientversion.h
#	src/dsnotificationinterface.cpp
#	src/evo/deterministicmns.cpp
#	src/evo/providertx.cpp
#	src/evo/simplifiedmns.cpp
#	src/governance-classes.cpp
#	src/governance-classes.h
#	src/governance-object.cpp
#	src/governance-object.h
#	src/governance-vote.cpp
#	src/governance.cpp
#	src/governance.h
#	src/hash.h
#	src/hdchain.cpp
#	src/hdchain.h
#	src/init.cpp
#	src/instantx.cpp
#	src/instantx.h
#	src/keepass.cpp
#	src/keepass.h
#	src/llmq/quorums_blockprocessor.cpp
#	src/llmq/quorums_dummydkg.cpp
#	src/llmq/quorums_dummydkg.h
#	src/llmq/quorums_init.cpp
#	src/llmq/quorums_init.h
#	src/llmq/quorums_utils.cpp
#	src/llmq/quorums_utils.h
#	src/masternode-payments.cpp
#	src/masternode-payments.h
#	src/masternode-sync.cpp
#	src/masternode-sync.h
#	src/masternode.cpp
#	src/masternode.h
#	src/masternodeconfig.cpp
#	src/masternodeconfig.h
#	src/masternodeman.cpp
#	src/masternodeman.h
#	src/messagesigner.cpp
#	src/messagesigner.h
#	src/miner.cpp
#	src/net.cpp
#	src/net_processing.cpp
#	src/netfulfilledman.cpp
#	src/netfulfilledman.h
#	src/privatesend-client.cpp
#	src/privatesend-client.h
#	src/privatesend-server.cpp
#	src/privatesend-server.h
#	src/privatesend.cpp
#	src/privatesend.h
#	src/qt/askpassphrasedialog.cpp
#	src/qt/biblepay.cpp
#	src/qt/bitcoinaddressvalidator.cpp
#	src/qt/bitcoingui.cpp
#	src/qt/bitcoinunits.cpp
#	src/qt/bitcoinunits.h
#	src/qt/clientmodel.cpp
#	src/qt/coincontroldialog.cpp
#	src/qt/dashstrings.cpp
#	src/qt/editaddressdialog.cpp
#	src/qt/forms/intro.ui
#	src/qt/forms/masternodelist.ui
#	src/qt/guiconstants.h
#	src/qt/guiutil.cpp
#	src/qt/intro.cpp
#	src/qt/locale/biblepay_ar.ts
#	src/qt/locale/biblepay_bg.ts
#	src/qt/locale/biblepay_de.ts
#	src/qt/locale/biblepay_en.ts
#	src/qt/locale/biblepay_es.ts
#	src/qt/locale/biblepay_fi.ts
#	src/qt/locale/biblepay_fr.ts
#	src/qt/locale/biblepay_it.ts
#	src/qt/locale/biblepay_ja.ts
#	src/qt/locale/biblepay_ko.ts
#	src/qt/locale/biblepay_nl.ts
#	src/qt/locale/biblepay_pl.ts
#	src/qt/locale/biblepay_pt.ts
#	src/qt/locale/biblepay_ru.ts
#	src/qt/locale/biblepay_sk.ts
#	src/qt/locale/biblepay_th.ts
#	src/qt/locale/biblepay_tr.ts
#	src/qt/locale/biblepay_vi.ts
#	src/qt/locale/biblepay_zh_CN.ts
#	src/qt/locale/biblepay_zh_TW.ts
#	src/qt/networkstyle.h
#	src/qt/openuridialog.cpp
#	src/qt/optionsdialog.cpp
#	src/qt/optionsmodel.cpp
#	src/qt/overviewpage.cpp
#	src/qt/res/images/light/about.png
#	src/qt/res/images/light/drkblue_walletFrame_bg.png
#	src/qt/rpcconsole.cpp
#	src/qt/sendcoinsdialog.cpp
#	src/qt/sendcoinsentry.cpp
#	src/qt/splashscreen.cpp
#	src/qt/transactiondesc.cpp
#	src/qt/transactionrecord.cpp
#	src/qt/utilitydialog.cpp
#	src/qt/walletmodel.cpp
#	src/rpc/blockchain.cpp
#	src/rpc/client.cpp
#	src/rpc/governance.cpp
#	src/rpc/masternode.cpp
#	src/rpc/mining.cpp
#	src/rpc/misc.cpp
#	src/rpc/net.cpp
#	src/rpc/rawtransaction.cpp
#	src/rpc/rpcevo.cpp
#	src/rpc/server.cpp
#	src/spork.cpp
#	src/spork.h
#	src/test/bip39_tests.cpp
#	src/test/cachemap_tests.cpp
#	src/test/cachemultimap_tests.cpp
#	src/test/governance_validators_tests.cpp
#	src/test/miner_tests.cpp
#	src/test/ratecheck_tests.cpp
#	src/test/test_biblepay.h
#	src/uint256.h
#	src/util.cpp
#	src/util.h
#	src/validation.cpp
#	src/validation.h
#	src/version.h
#	src/wallet/rpcdump.cpp
#	src/wallet/rpcwallet.cpp
#	src/wallet/wallet.cpp
#	src/wallet/wallet.h
#	src/wallet/walletdb.cpp
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@UdjinM6UdjinM6UdjinM6 approved these changes

Assignees


No one assigned


Labels

RPCSome notable changes to RPC params/behaviour/descriptions

Projects


None yet


Milestone

14.0

Development

Successfully merging this pull request may close these issues.

3 participants

@codablock@PastaPastaPasta@UdjinM6

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Properly handle conflicts between ChainLocks and InstantSend - #2904
Merged
UdjinM6 merged 17 commits into
dashpay:developfrom 
codablock:pr_is_invalidateblocks
May 7, 2019
Merged
Properly handle conflicts between ChainLocks and InstantSend#2904
UdjinM6 merged 17 commits into
dashpay:developfrom 
codablock:pr_is_invalidateblocks
Conversation
@codablock
@codablockcodablock
commented
May 6, 2019•

edited

Loading

Copy link


Copy Markdown

This PR adds code to handle conflicts between ChainLocks and InstantSend. The probability of such conflicts is practically zero (due to the "safe TXs" concept, as described here), but these should still be handled properly to assure consensus.
This PR lacks tests atm, which I'm working on now. We can either merge this PR first and then later merge the tests, or wait with merging until I'm done with the tests.Update: Added tests
@codablockcodablock
added this to the 14.0 milestone
May 6, 2019
UdjinM6
UdjinM6
reviewed
May 6, 2019
View reviewed changes
@UdjinM6UdjinM6
left a comment


Copy link


Copy Markdown

Choose a reason for hiding this comment

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

Looks good! 👍
Since this PR touches some consensus critical stuff I think it would make sense to wait and include tests here.
(Also, this can be rebased now to remove eb18e19)
Comment threadsrc/validation.cpp
Outdated

@PastaPastaPasta
PastaPastaPasta
commented
May 6, 2019

Copy link


Copy Markdown

Member
Agree with Udjin on waiting for tests
codablock
added 16 commits
May 7, 2019 06:37
@codablock
Return ISLOCK instead of conflicting txid in GetConflictingTx/GetConf…
da4950e
…lictingLock
@codablock
Move code to write archived ISLOCKs into its own method
3d40285
We'll need this from another method as well later.
@codablock
Implement GetInstantSendLocksByParent and RemoveChainedInstantSendLocks
0723d74
These allow to easily delete multiple chains (actually trees) of ISLOCKs
in one go.
@codablock
Implement RemoveConflictedTx and call it from RemoveMempoolConflictsF…
d93f699
…orLock
Also add "retryChildren" parameter to RemoveNonLockedTx so that we can
skip retrying of non-locked children TXs.
@codablock
Properly handle/remove conflicted TXs (between mempool and new blocks)
8064cd0
@codablock
Track non-locked TXs by inputs
cd2b26e
@codablock
Implement and call ResolveBlockConflicts
9ec2ff3
@codablock
Also call ResolveBlockConflicts from ConnectBlock
c2be224
But only when a block is known to have a conflict and at the same time is
ChainLocked, which causes the ISLOCK to be pruned.
@codablock
Split out RemoveChainLockConflictingLock from ResolveBlockConflicts
ee6b07f
@codablock
Fix condition for update of nonLockedTxs.pindexMined
76ac065
@codablock
Only add entries to nonLockedTxsByInputs when AddNonLockedTx is calle…
928cfe5
…d for the first time
@codablock
Implement "quorum getrecsig" RPC
977f712
@codablock
Include decoded TX data in result of create_raw_tx
aa0f6bd
@codablock
Implement support for CLSIG in mininode.py
70cf0d9
@codablock
Implement support for ISLOCK in mininode.py
0c1450e
@codablock
Implement tests for ChainLock vs InstantSend lock conflict resolution
0acd8c7
@codablock
codablockforce-pushed
the
pr_is_invalidateblocks
branch
from
eb18e19 to
0acd8c7CompareMay 7, 2019 04:38
@codablock
Handle review comment
fc43a30
Bail out (continue) early
@codablock
codablock
commented
May 7, 2019

Copy link


Copy Markdown

Author
Added tests and appropriate fixes to make everything work as expected. Also rebased on develop.
UdjinM6
UdjinM6
approved these changes
May 7, 2019
View reviewed changes
@UdjinM6UdjinM6
left a comment


Copy link


Copy Markdown

Choose a reason for hiding this comment

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

utACK 👍
Comment threadsrc/llmq/quorums_instantsend.cpp
 // TX is not locked, so make sure it is tracked
 AddNonLockedTx(MakeTransactionRef(tx));
 nonLockedTxs.at(tx.GetHash()).pindexMined = posInBlock == CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK ? pindex : nullptr;
 nonLockedTxs.at(tx.GetHash()).pindexMined = posInBlock != CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK ? pindex : nullptr;
@UdjinM6UdjinM6May 7, 2019

Copy link


Copy Markdown

Choose a reason for hiding this comment

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

Oh, good catch!
@UdjinM6
UdjinM6
merged commit 66a2cde
into
dashpay:developMay 7, 2019
@UdjinM6UdjinM6
added
the 
RPC
Some notable changes to RPC params/behaviour/descriptions
label
May 7, 2019
@codablock
codablock
deleted the

pr_is_invalidateblocks

branch
May 8, 2019 09:57
MIPPL pushed a commit
to biblepay/biblepay
that referenced
this pull request
Jun 16, 2019
MIP
Merge dash commit 0.14.0.1 into develop
6d656c4
* commit '05adda99fe09f9f6d99ce09e22ed89be3ddfcd27': (530 commits)
Update release notes with latest commits (dashpay#2958)
Only require valid collaterals for votes and triggers (dashpay#2947) (dashpay#2957)
[v0.14.0.x] Fix off-by-one error in InstantSend mining info removal when disconnecting blocks (dashpay#2951)
[v0.14.0.x] bump version to 0.14.0.1 and prepare release notes (dashpay#2952)
Update release notes v14 (dashpay#2927)
Set CLIENT_VERSION_IS_RELEASE to true (dashpay#2926)
Update help text via gen-manpages.sh (dashpay#2929)
0.14 release notes draft (dashpay#2896)
Fix duplicate `-instantsendnotify` invocation (dashpay#2925)
Add blocks conflicting with ChainLocks to block index (dashpay#2923)
Skip processing in SyncTransaction when chain is not synced yet (dashpay#2920)
Set DIP0008 mainnet activation params (dashpay#2915)
[0.14] Bump chainparams (dashpay#2910)
Fix db leaks in LLMQ db (dashpay#2914)
Fall back to ReadBlockFromDisk when blockTxs is not filled yet (dashpay#2908)
Bump "keepOldConnections" by one for all LLMQ types (dashpay#2909)
Print inputs on which we voted and quorums used for signing (dashpay#2907)
Implement integration tests for DKG error handling (dashpay#2905)
Implement zmq notifications for chainlocked blocks (dashpay#2899)
Properly handle conflicts between ChainLocks and InstantSend (dashpay#2904)
...
# Conflicts:
#	.travis.yml
#	COPYING
#	README.md
#	biblepay-docs/protocol-documentation.md
#	ci/matrix.sh
#	configure.ac
#	contrib/debian/examples/biblepay.conf
#	contrib/gitian-descriptors/gitian-linux.yml
#	contrib/gitian-descriptors/gitian-osx.yml
#	contrib/gitian-descriptors/gitian-win.yml
#	doc/README.md
#	doc/README_windows.txt
#	doc/dnsseed-policy.md
#	doc/files.md
#	doc/guide-startmany.md
#	doc/man/biblepay-cli.1
#	doc/man/biblepay-qt.1
#	doc/man/biblepay-tx.1
#	doc/man/biblepayd.1
#	doc/masternode-budget.md
#	doc/masternode_conf.md
#	doc/release-notes.md
#	qa/pull-tester/rpc-tests.py
#	qa/rpc-tests/autoix-mempool.py
#	qa/rpc-tests/dip3-deterministicmns.py
#	qa/rpc-tests/fundrawtransaction.py
#	qa/rpc-tests/maxblocksinflight.py
#	qa/rpc-tests/p2p-acceptblock.py
#	qa/rpc-tests/test_framework/comptool.py
#	qa/rpc-tests/test_framework/mininode.py
#	qa/rpc-tests/test_framework/test_framework.py
#	qa/rpc-tests/test_framework/util.py
#	qa/rpc-tests/wallet-hd.py
#	share/setup.nsi.in
#	src/Makefile.am
#	src/Makefile.bench.include
#	src/Makefile.qt.include
#	src/Makefile.qttest.include
#	src/Makefile.test.include
#	src/activemasternode.cpp
#	src/activemasternode.h
#	src/biblepayd.cpp
#	src/cachemap.h
#	src/cachemultimap.h
#	src/chainparams.cpp
#	src/clientversion.h
#	src/dsnotificationinterface.cpp
#	src/evo/deterministicmns.cpp
#	src/evo/providertx.cpp
#	src/evo/simplifiedmns.cpp
#	src/governance-classes.cpp
#	src/governance-classes.h
#	src/governance-object.cpp
#	src/governance-object.h
#	src/governance-vote.cpp
#	src/governance.cpp
#	src/governance.h
#	src/hash.h
#	src/hdchain.cpp
#	src/hdchain.h
#	src/init.cpp
#	src/instantx.cpp
#	src/instantx.h
#	src/keepass.cpp
#	src/keepass.h
#	src/llmq/quorums_blockprocessor.cpp
#	src/llmq/quorums_dummydkg.cpp
#	src/llmq/quorums_dummydkg.h
#	src/llmq/quorums_init.cpp
#	src/llmq/quorums_init.h
#	src/llmq/quorums_utils.cpp
#	src/llmq/quorums_utils.h
#	src/masternode-payments.cpp
#	src/masternode-payments.h
#	src/masternode-sync.cpp
#	src/masternode-sync.h
#	src/masternode.cpp
#	src/masternode.h
#	src/masternodeconfig.cpp
#	src/masternodeconfig.h
#	src/masternodeman.cpp
#	src/masternodeman.h
#	src/messagesigner.cpp
#	src/messagesigner.h
#	src/miner.cpp
#	src/net.cpp
#	src/net_processing.cpp
#	src/netfulfilledman.cpp
#	src/netfulfilledman.h
#	src/privatesend-client.cpp
#	src/privatesend-client.h
#	src/privatesend-server.cpp
#	src/privatesend-server.h
#	src/privatesend.cpp
#	src/privatesend.h
#	src/qt/askpassphrasedialog.cpp
#	src/qt/biblepay.cpp
#	src/qt/bitcoinaddressvalidator.cpp
#	src/qt/bitcoingui.cpp
#	src/qt/bitcoinunits.cpp
#	src/qt/bitcoinunits.h
#	src/qt/clientmodel.cpp
#	src/qt/coincontroldialog.cpp
#	src/qt/dashstrings.cpp
#	src/qt/editaddressdialog.cpp
#	src/qt/forms/intro.ui
#	src/qt/forms/masternodelist.ui
#	src/qt/guiconstants.h
#	src/qt/guiutil.cpp
#	src/qt/intro.cpp
#	src/qt/locale/biblepay_ar.ts
#	src/qt/locale/biblepay_bg.ts
#	src/qt/locale/biblepay_de.ts
#	src/qt/locale/biblepay_en.ts
#	src/qt/locale/biblepay_es.ts
#	src/qt/locale/biblepay_fi.ts
#	src/qt/locale/biblepay_fr.ts
#	src/qt/locale/biblepay_it.ts
#	src/qt/locale/biblepay_ja.ts
#	src/qt/locale/biblepay_ko.ts
#	src/qt/locale/biblepay_nl.ts
#	src/qt/locale/biblepay_pl.ts
#	src/qt/locale/biblepay_pt.ts
#	src/qt/locale/biblepay_ru.ts
#	src/qt/locale/biblepay_sk.ts
#	src/qt/locale/biblepay_th.ts
#	src/qt/locale/biblepay_tr.ts
#	src/qt/locale/biblepay_vi.ts
#	src/qt/locale/biblepay_zh_CN.ts
#	src/qt/locale/biblepay_zh_TW.ts
#	src/qt/networkstyle.h
#	src/qt/openuridialog.cpp
#	src/qt/optionsdialog.cpp
#	src/qt/optionsmodel.cpp
#	src/qt/overviewpage.cpp
#	src/qt/res/images/light/about.png
#	src/qt/res/images/light/drkblue_walletFrame_bg.png
#	src/qt/rpcconsole.cpp
#	src/qt/sendcoinsdialog.cpp
#	src/qt/sendcoinsentry.cpp
#	src/qt/splashscreen.cpp
#	src/qt/transactiondesc.cpp
#	src/qt/transactionrecord.cpp
#	src/qt/utilitydialog.cpp
#	src/qt/walletmodel.cpp
#	src/rpc/blockchain.cpp
#	src/rpc/client.cpp
#	src/rpc/governance.cpp
#	src/rpc/masternode.cpp
#	src/rpc/mining.cpp
#	src/rpc/misc.cpp
#	src/rpc/net.cpp
#	src/rpc/rawtransaction.cpp
#	src/rpc/rpcevo.cpp
#	src/rpc/server.cpp
#	src/spork.cpp
#	src/spork.h
#	src/test/bip39_tests.cpp
#	src/test/cachemap_tests.cpp
#	src/test/cachemultimap_tests.cpp
#	src/test/governance_validators_tests.cpp
#	src/test/miner_tests.cpp
#	src/test/ratecheck_tests.cpp
#	src/test/test_biblepay.h
#	src/uint256.h
#	src/util.cpp
#	src/util.h
#	src/validation.cpp
#	src/validation.h
#	src/version.h
#	src/wallet/rpcdump.cpp
#	src/wallet/rpcwallet.cpp
#	src/wallet/wallet.cpp
#	src/wallet/wallet.h
#	src/wallet/walletdb.cpp
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@UdjinM6UdjinM6UdjinM6 approved these changes

Assignees


No one assigned


Labels

RPCSome notable changes to RPC params/behaviour/descriptions

Projects


None yet


Milestone

14.0

Development

Successfully merging this pull request may close these issues.

3 participants

@codablock@PastaPastaPasta@UdjinM6

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Properly handle conflicts between ChainLocks and InstantSend - #2904
Merged
UdjinM6 merged 17 commits into
dashpay:developfrom 
codablock:pr_is_invalidateblocks
May 7, 2019
Merged
Properly handle conflicts between ChainLocks and InstantSend#2904
UdjinM6 merged 17 commits into
dashpay:developfrom 
codablock:pr_is_invalidateblocks
Conversation
@codablock
@codablockcodablock
commented
May 6, 2019•

edited

Loading

Copy link


Copy Markdown

This PR adds code to handle conflicts between ChainLocks and InstantSend. The probability of such conflicts is practically zero (due to the "safe TXs" concept, as described here), but these should still be handled properly to assure consensus.
This PR lacks tests atm, which I'm working on now. We can either merge this PR first and then later merge the tests, or wait with merging until I'm done with the tests.Update: Added tests
@codablockcodablock
added this to the 14.0 milestone
May 6, 2019
UdjinM6
UdjinM6
reviewed
May 6, 2019
View reviewed changes
@UdjinM6UdjinM6
left a comment


Copy link


Copy Markdown

Choose a reason for hiding this comment

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

Looks good! 👍
Since this PR touches some consensus critical stuff I think it would make sense to wait and include tests here.
(Also, this can be rebased now to remove eb18e19)
Comment threadsrc/validation.cpp
Outdated

@PastaPastaPasta
PastaPastaPasta
commented
May 6, 2019

Copy link


Copy Markdown

Member
Agree with Udjin on waiting for tests
codablock
added 16 commits
May 7, 2019 06:37
@codablock
Return ISLOCK instead of conflicting txid in GetConflictingTx/GetConf…
da4950e
…lictingLock
@codablock
Move code to write archived ISLOCKs into its own method
3d40285
We'll need this from another method as well later.
@codablock
Implement GetInstantSendLocksByParent and RemoveChainedInstantSendLocks
0723d74
These allow to easily delete multiple chains (actually trees) of ISLOCKs
in one go.
@codablock
Implement RemoveConflictedTx and call it from RemoveMempoolConflictsF…
d93f699
…orLock
Also add "retryChildren" parameter to RemoveNonLockedTx so that we can
skip retrying of non-locked children TXs.
@codablock
Properly handle/remove conflicted TXs (between mempool and new blocks)
8064cd0
@codablock
Track non-locked TXs by inputs
cd2b26e
@codablock
Implement and call ResolveBlockConflicts
9ec2ff3
@codablock
Also call ResolveBlockConflicts from ConnectBlock
c2be224
But only when a block is known to have a conflict and at the same time is
ChainLocked, which causes the ISLOCK to be pruned.
@codablock
Split out RemoveChainLockConflictingLock from ResolveBlockConflicts
ee6b07f
@codablock
Fix condition for update of nonLockedTxs.pindexMined
76ac065
@codablock
Only add entries to nonLockedTxsByInputs when AddNonLockedTx is calle…
928cfe5
…d for the first time
@codablock
Implement "quorum getrecsig" RPC
977f712
@codablock
Include decoded TX data in result of create_raw_tx
aa0f6bd
@codablock
Implement support for CLSIG in mininode.py
70cf0d9
@codablock
Implement support for ISLOCK in mininode.py
0c1450e
@codablock
Implement tests for ChainLock vs InstantSend lock conflict resolution
0acd8c7
@codablock
codablockforce-pushed
the
pr_is_invalidateblocks
branch
from
eb18e19 to
0acd8c7CompareMay 7, 2019 04:38
@codablock
Handle review comment
fc43a30
Bail out (continue) early
@codablock
codablock
commented
May 7, 2019

Copy link


Copy Markdown

Author
Added tests and appropriate fixes to make everything work as expected. Also rebased on develop.
UdjinM6
UdjinM6
approved these changes
May 7, 2019
View reviewed changes
@UdjinM6UdjinM6
left a comment


Copy link


Copy Markdown

Choose a reason for hiding this comment

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

utACK 👍
Comment threadsrc/llmq/quorums_instantsend.cpp
 // TX is not locked, so make sure it is tracked
 AddNonLockedTx(MakeTransactionRef(tx));
 nonLockedTxs.at(tx.GetHash()).pindexMined = posInBlock == CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK ? pindex : nullptr;
 nonLockedTxs.at(tx.GetHash()).pindexMined = posInBlock != CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK ? pindex : nullptr;
@UdjinM6UdjinM6May 7, 2019

Copy link


Copy Markdown

Choose a reason for hiding this comment

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

Oh, good catch!
@UdjinM6
UdjinM6
merged commit 66a2cde
into
dashpay:developMay 7, 2019
@UdjinM6UdjinM6
added
the 
RPC
Some notable changes to RPC params/behaviour/descriptions
label
May 7, 2019
@codablock
codablock
deleted the

pr_is_invalidateblocks

branch
May 8, 2019 09:57
MIPPL pushed a commit
to biblepay/biblepay
that referenced
this pull request
Jun 16, 2019
MIP
Merge dash commit 0.14.0.1 into develop
6d656c4
* commit '05adda99fe09f9f6d99ce09e22ed89be3ddfcd27': (530 commits)
Update release notes with latest commits (dashpay#2958)
Only require valid collaterals for votes and triggers (dashpay#2947) (dashpay#2957)
[v0.14.0.x] Fix off-by-one error in InstantSend mining info removal when disconnecting blocks (dashpay#2951)
[v0.14.0.x] bump version to 0.14.0.1 and prepare release notes (dashpay#2952)
Update release notes v14 (dashpay#2927)
Set CLIENT_VERSION_IS_RELEASE to true (dashpay#2926)
Update help text via gen-manpages.sh (dashpay#2929)
0.14 release notes draft (dashpay#2896)
Fix duplicate `-instantsendnotify` invocation (dashpay#2925)
Add blocks conflicting with ChainLocks to block index (dashpay#2923)
Skip processing in SyncTransaction when chain is not synced yet (dashpay#2920)
Set DIP0008 mainnet activation params (dashpay#2915)
[0.14] Bump chainparams (dashpay#2910)
Fix db leaks in LLMQ db (dashpay#2914)
Fall back to ReadBlockFromDisk when blockTxs is not filled yet (dashpay#2908)
Bump "keepOldConnections" by one for all LLMQ types (dashpay#2909)
Print inputs on which we voted and quorums used for signing (dashpay#2907)
Implement integration tests for DKG error handling (dashpay#2905)
Implement zmq notifications for chainlocked blocks (dashpay#2899)
Properly handle conflicts between ChainLocks and InstantSend (dashpay#2904)
...
# Conflicts:
#	.travis.yml
#	COPYING
#	README.md
#	biblepay-docs/protocol-documentation.md
#	ci/matrix.sh
#	configure.ac
#	contrib/debian/examples/biblepay.conf
#	contrib/gitian-descriptors/gitian-linux.yml
#	contrib/gitian-descriptors/gitian-osx.yml
#	contrib/gitian-descriptors/gitian-win.yml
#	doc/README.md
#	doc/README_windows.txt
#	doc/dnsseed-policy.md
#	doc/files.md
#	doc/guide-startmany.md
#	doc/man/biblepay-cli.1
#	doc/man/biblepay-qt.1
#	doc/man/biblepay-tx.1
#	doc/man/biblepayd.1
#	doc/masternode-budget.md
#	doc/masternode_conf.md
#	doc/release-notes.md
#	qa/pull-tester/rpc-tests.py
#	qa/rpc-tests/autoix-mempool.py
#	qa/rpc-tests/dip3-deterministicmns.py
#	qa/rpc-tests/fundrawtransaction.py
#	qa/rpc-tests/maxblocksinflight.py
#	qa/rpc-tests/p2p-acceptblock.py
#	qa/rpc-tests/test_framework/comptool.py
#	qa/rpc-tests/test_framework/mininode.py
#	qa/rpc-tests/test_framework/test_framework.py
#	qa/rpc-tests/test_framework/util.py
#	qa/rpc-tests/wallet-hd.py
#	share/setup.nsi.in
#	src/Makefile.am
#	src/Makefile.bench.include
#	src/Makefile.qt.include
#	src/Makefile.qttest.include
#	src/Makefile.test.include
#	src/activemasternode.cpp
#	src/activemasternode.h
#	src/biblepayd.cpp
#	src/cachemap.h
#	src/cachemultimap.h
#	src/chainparams.cpp
#	src/clientversion.h
#	src/dsnotificationinterface.cpp
#	src/evo/deterministicmns.cpp
#	src/evo/providertx.cpp
#	src/evo/simplifiedmns.cpp
#	src/governance-classes.cpp
#	src/governance-classes.h
#	src/governance-object.cpp
#	src/governance-object.h
#	src/governance-vote.cpp
#	src/governance.cpp
#	src/governance.h
#	src/hash.h
#	src/hdchain.cpp
#	src/hdchain.h
#	src/init.cpp
#	src/instantx.cpp
#	src/instantx.h
#	src/keepass.cpp
#	src/keepass.h
#	src/llmq/quorums_blockprocessor.cpp
#	src/llmq/quorums_dummydkg.cpp
#	src/llmq/quorums_dummydkg.h
#	src/llmq/quorums_init.cpp
#	src/llmq/quorums_init.h
#	src/llmq/quorums_utils.cpp
#	src/llmq/quorums_utils.h
#	src/masternode-payments.cpp
#	src/masternode-payments.h
#	src/masternode-sync.cpp
#	src/masternode-sync.h
#	src/masternode.cpp
#	src/masternode.h
#	src/masternodeconfig.cpp
#	src/masternodeconfig.h
#	src/masternodeman.cpp
#	src/masternodeman.h
#	src/messagesigner.cpp
#	src/messagesigner.h
#	src/miner.cpp
#	src/net.cpp
#	src/net_processing.cpp
#	src/netfulfilledman.cpp
#	src/netfulfilledman.h
#	src/privatesend-client.cpp
#	src/privatesend-client.h
#	src/privatesend-server.cpp
#	src/privatesend-server.h
#	src/privatesend.cpp
#	src/privatesend.h
#	src/qt/askpassphrasedialog.cpp
#	src/qt/biblepay.cpp
#	src/qt/bitcoinaddressvalidator.cpp
#	src/qt/bitcoingui.cpp
#	src/qt/bitcoinunits.cpp
#	src/qt/bitcoinunits.h
#	src/qt/clientmodel.cpp
#	src/qt/coincontroldialog.cpp
#	src/qt/dashstrings.cpp
#	src/qt/editaddressdialog.cpp
#	src/qt/forms/intro.ui
#	src/qt/forms/masternodelist.ui
#	src/qt/guiconstants.h
#	src/qt/guiutil.cpp
#	src/qt/intro.cpp
#	src/qt/locale/biblepay_ar.ts
#	src/qt/locale/biblepay_bg.ts
#	src/qt/locale/biblepay_de.ts
#	src/qt/locale/biblepay_en.ts
#	src/qt/locale/biblepay_es.ts
#	src/qt/locale/biblepay_fi.ts
#	src/qt/locale/biblepay_fr.ts
#	src/qt/locale/biblepay_it.ts
#	src/qt/locale/biblepay_ja.ts
#	src/qt/locale/biblepay_ko.ts
#	src/qt/locale/biblepay_nl.ts
#	src/qt/locale/biblepay_pl.ts
#	src/qt/locale/biblepay_pt.ts
#	src/qt/locale/biblepay_ru.ts
#	src/qt/locale/biblepay_sk.ts
#	src/qt/locale/biblepay_th.ts
#	src/qt/locale/biblepay_tr.ts
#	src/qt/locale/biblepay_vi.ts
#	src/qt/locale/biblepay_zh_CN.ts
#	src/qt/locale/biblepay_zh_TW.ts
#	src/qt/networkstyle.h
#	src/qt/openuridialog.cpp
#	src/qt/optionsdialog.cpp
#	src/qt/optionsmodel.cpp
#	src/qt/overviewpage.cpp
#	src/qt/res/images/light/about.png
#	src/qt/res/images/light/drkblue_walletFrame_bg.png
#	src/qt/rpcconsole.cpp
#	src/qt/sendcoinsdialog.cpp
#	src/qt/sendcoinsentry.cpp
#	src/qt/splashscreen.cpp
#	src/qt/transactiondesc.cpp
#	src/qt/transactionrecord.cpp
#	src/qt/utilitydialog.cpp
#	src/qt/walletmodel.cpp
#	src/rpc/blockchain.cpp
#	src/rpc/client.cpp
#	src/rpc/governance.cpp
#	src/rpc/masternode.cpp
#	src/rpc/mining.cpp
#	src/rpc/misc.cpp
#	src/rpc/net.cpp
#	src/rpc/rawtransaction.cpp
#	src/rpc/rpcevo.cpp
#	src/rpc/server.cpp
#	src/spork.cpp
#	src/spork.h
#	src/test/bip39_tests.cpp
#	src/test/cachemap_tests.cpp
#	src/test/cachemultimap_tests.cpp
#	src/test/governance_validators_tests.cpp
#	src/test/miner_tests.cpp
#	src/test/ratecheck_tests.cpp
#	src/test/test_biblepay.h
#	src/uint256.h
#	src/util.cpp
#	src/util.h
#	src/validation.cpp
#	src/validation.h
#	src/version.h
#	src/wallet/rpcdump.cpp
#	src/wallet/rpcwallet.cpp
#	src/wallet/wallet.cpp
#	src/wallet/wallet.h
#	src/wallet/walletdb.cpp
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@UdjinM6UdjinM6UdjinM6 approved these changes

Assignees


No one assigned


Labels

RPCSome notable changes to RPC params/behaviour/descriptions

Projects


None yet


Milestone

14.0

Development

Successfully merging this pull request may close these issues.

3 participants

@codablock@PastaPastaPasta@UdjinM6

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Properly handle conflicts between ChainLocks and InstantSend - #2904
Merged
UdjinM6 merged 17 commits into
dashpay:developfrom 
codablock:pr_is_invalidateblocks
May 7, 2019
Merged
Properly handle conflicts between ChainLocks and InstantSend#2904
UdjinM6 merged 17 commits into
dashpay:developfrom 
codablock:pr_is_invalidateblocks
Conversation
@codablock
@codablockcodablock
commented
May 6, 2019•

edited

Loading

Copy link


Copy Markdown

This PR adds code to handle conflicts between ChainLocks and InstantSend. The probability of such conflicts is practically zero (due to the "safe TXs" concept, as described here), but these should still be handled properly to assure consensus.
This PR lacks tests atm, which I'm working on now. We can either merge this PR first and then later merge the tests, or wait with merging until I'm done with the tests.Update: Added tests
@codablockcodablock
added this to the 14.0 milestone
May 6, 2019
UdjinM6
UdjinM6
reviewed
May 6, 2019
View reviewed changes
@UdjinM6UdjinM6
left a comment


Copy link


Copy Markdown

Choose a reason for hiding this comment

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

Looks good! 👍
Since this PR touches some consensus critical stuff I think it would make sense to wait and include tests here.
(Also, this can be rebased now to remove eb18e19)
Comment threadsrc/validation.cpp
Outdated

@PastaPastaPasta
PastaPastaPasta
commented
May 6, 2019

Copy link


Copy Markdown

Member
Agree with Udjin on waiting for tests
codablock
added 16 commits
May 7, 2019 06:37
@codablock
Return ISLOCK instead of conflicting txid in GetConflictingTx/GetConf…
da4950e
…lictingLock
@codablock
Move code to write archived ISLOCKs into its own method
3d40285
We'll need this from another method as well later.
@codablock
Implement GetInstantSendLocksByParent and RemoveChainedInstantSendLocks
0723d74
These allow to easily delete multiple chains (actually trees) of ISLOCKs
in one go.
@codablock
Implement RemoveConflictedTx and call it from RemoveMempoolConflictsF…
d93f699
…orLock
Also add "retryChildren" parameter to RemoveNonLockedTx so that we can
skip retrying of non-locked children TXs.
@codablock
Properly handle/remove conflicted TXs (between mempool and new blocks)
8064cd0
@codablock
Track non-locked TXs by inputs
cd2b26e
@codablock
Implement and call ResolveBlockConflicts
9ec2ff3
@codablock
Also call ResolveBlockConflicts from ConnectBlock
c2be224
But only when a block is known to have a conflict and at the same time is
ChainLocked, which causes the ISLOCK to be pruned.
@codablock
Split out RemoveChainLockConflictingLock from ResolveBlockConflicts
ee6b07f
@codablock
Fix condition for update of nonLockedTxs.pindexMined
76ac065
@codablock
Only add entries to nonLockedTxsByInputs when AddNonLockedTx is calle…
928cfe5
…d for the first time
@codablock
Implement "quorum getrecsig" RPC
977f712
@codablock
Include decoded TX data in result of create_raw_tx
aa0f6bd
@codablock
Implement support for CLSIG in mininode.py
70cf0d9
@codablock
Implement support for ISLOCK in mininode.py
0c1450e
@codablock
Implement tests for ChainLock vs InstantSend lock conflict resolution
0acd8c7
@codablock
codablockforce-pushed
the
pr_is_invalidateblocks
branch
from
eb18e19 to
0acd8c7CompareMay 7, 2019 04:38
@codablock
Handle review comment
fc43a30
Bail out (continue) early
@codablock
codablock
commented
May 7, 2019

Copy link


Copy Markdown

Author
Added tests and appropriate fixes to make everything work as expected. Also rebased on develop.
UdjinM6
UdjinM6
approved these changes
May 7, 2019
View reviewed changes
@UdjinM6UdjinM6
left a comment


Copy link


Copy Markdown

Choose a reason for hiding this comment

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

utACK 👍
Comment threadsrc/llmq/quorums_instantsend.cpp
 // TX is not locked, so make sure it is tracked
 AddNonLockedTx(MakeTransactionRef(tx));
 nonLockedTxs.at(tx.GetHash()).pindexMined = posInBlock == CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK ? pindex : nullptr;
 nonLockedTxs.at(tx.GetHash()).pindexMined = posInBlock != CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK ? pindex : nullptr;
@UdjinM6UdjinM6May 7, 2019

Copy link


Copy Markdown

Choose a reason for hiding this comment

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

Oh, good catch!
@UdjinM6
UdjinM6
merged commit 66a2cde
into
dashpay:developMay 7, 2019
@UdjinM6UdjinM6
added
the 
RPC
Some notable changes to RPC params/behaviour/descriptions
label
May 7, 2019
@codablock
codablock
deleted the

pr_is_invalidateblocks

branch
May 8, 2019 09:57
MIPPL pushed a commit
to biblepay/biblepay
that referenced
this pull request
Jun 16, 2019
MIP
Merge dash commit 0.14.0.1 into develop
6d656c4
* commit '05adda99fe09f9f6d99ce09e22ed89be3ddfcd27': (530 commits)
Update release notes with latest commits (dashpay#2958)
Only require valid collaterals for votes and triggers (dashpay#2947) (dashpay#2957)
[v0.14.0.x] Fix off-by-one error in InstantSend mining info removal when disconnecting blocks (dashpay#2951)
[v0.14.0.x] bump version to 0.14.0.1 and prepare release notes (dashpay#2952)
Update release notes v14 (dashpay#2927)
Set CLIENT_VERSION_IS_RELEASE to true (dashpay#2926)
Update help text via gen-manpages.sh (dashpay#2929)
0.14 release notes draft (dashpay#2896)
Fix duplicate `-instantsendnotify` invocation (dashpay#2925)
Add blocks conflicting with ChainLocks to block index (dashpay#2923)
Skip processing in SyncTransaction when chain is not synced yet (dashpay#2920)
Set DIP0008 mainnet activation params (dashpay#2915)
[0.14] Bump chainparams (dashpay#2910)
Fix db leaks in LLMQ db (dashpay#2914)
Fall back to ReadBlockFromDisk when blockTxs is not filled yet (dashpay#2908)
Bump "keepOldConnections" by one for all LLMQ types (dashpay#2909)
Print inputs on which we voted and quorums used for signing (dashpay#2907)
Implement integration tests for DKG error handling (dashpay#2905)
Implement zmq notifications for chainlocked blocks (dashpay#2899)
Properly handle conflicts between ChainLocks and InstantSend (dashpay#2904)
...
# Conflicts:
#	.travis.yml
#	COPYING
#	README.md
#	biblepay-docs/protocol-documentation.md
#	ci/matrix.sh
#	configure.ac
#	contrib/debian/examples/biblepay.conf
#	contrib/gitian-descriptors/gitian-linux.yml
#	contrib/gitian-descriptors/gitian-osx.yml
#	contrib/gitian-descriptors/gitian-win.yml
#	doc/README.md
#	doc/README_windows.txt
#	doc/dnsseed-policy.md
#	doc/files.md
#	doc/guide-startmany.md
#	doc/man/biblepay-cli.1
#	doc/man/biblepay-qt.1
#	doc/man/biblepay-tx.1
#	doc/man/biblepayd.1
#	doc/masternode-budget.md
#	doc/masternode_conf.md
#	doc/release-notes.md
#	qa/pull-tester/rpc-tests.py
#	qa/rpc-tests/autoix-mempool.py
#	qa/rpc-tests/dip3-deterministicmns.py
#	qa/rpc-tests/fundrawtransaction.py
#	qa/rpc-tests/maxblocksinflight.py
#	qa/rpc-tests/p2p-acceptblock.py
#	qa/rpc-tests/test_framework/comptool.py
#	qa/rpc-tests/test_framework/mininode.py
#	qa/rpc-tests/test_framework/test_framework.py
#	qa/rpc-tests/test_framework/util.py
#	qa/rpc-tests/wallet-hd.py
#	share/setup.nsi.in
#	src/Makefile.am
#	src/Makefile.bench.include
#	src/Makefile.qt.include
#	src/Makefile.qttest.include
#	src/Makefile.test.include
#	src/activemasternode.cpp
#	src/activemasternode.h
#	src/biblepayd.cpp
#	src/cachemap.h
#	src/cachemultimap.h
#	src/chainparams.cpp
#	src/clientversion.h
#	src/dsnotificationinterface.cpp
#	src/evo/deterministicmns.cpp
#	src/evo/providertx.cpp
#	src/evo/simplifiedmns.cpp
#	src/governance-classes.cpp
#	src/governance-classes.h
#	src/governance-object.cpp
#	src/governance-object.h
#	src/governance-vote.cpp
#	src/governance.cpp
#	src/governance.h
#	src/hash.h
#	src/hdchain.cpp
#	src/hdchain.h
#	src/init.cpp
#	src/instantx.cpp
#	src/instantx.h
#	src/keepass.cpp
#	src/keepass.h
#	src/llmq/quorums_blockprocessor.cpp
#	src/llmq/quorums_dummydkg.cpp
#	src/llmq/quorums_dummydkg.h
#	src/llmq/quorums_init.cpp
#	src/llmq/quorums_init.h
#	src/llmq/quorums_utils.cpp
#	src/llmq/quorums_utils.h
#	src/masternode-payments.cpp
#	src/masternode-payments.h
#	src/masternode-sync.cpp
#	src/masternode-sync.h
#	src/masternode.cpp
#	src/masternode.h
#	src/masternodeconfig.cpp
#	src/masternodeconfig.h
#	src/masternodeman.cpp
#	src/masternodeman.h
#	src/messagesigner.cpp
#	src/messagesigner.h
#	src/miner.cpp
#	src/net.cpp
#	src/net_processing.cpp
#	src/netfulfilledman.cpp
#	src/netfulfilledman.h
#	src/privatesend-client.cpp
#	src/privatesend-client.h
#	src/privatesend-server.cpp
#	src/privatesend-server.h
#	src/privatesend.cpp
#	src/privatesend.h
#	src/qt/askpassphrasedialog.cpp
#	src/qt/biblepay.cpp
#	src/qt/bitcoinaddressvalidator.cpp
#	src/qt/bitcoingui.cpp
#	src/qt/bitcoinunits.cpp
#	src/qt/bitcoinunits.h
#	src/qt/clientmodel.cpp
#	src/qt/coincontroldialog.cpp
#	src/qt/dashstrings.cpp
#	src/qt/editaddressdialog.cpp
#	src/qt/forms/intro.ui
#	src/qt/forms/masternodelist.ui
#	src/qt/guiconstants.h
#	src/qt/guiutil.cpp
#	src/qt/intro.cpp
#	src/qt/locale/biblepay_ar.ts
#	src/qt/locale/biblepay_bg.ts
#	src/qt/locale/biblepay_de.ts
#	src/qt/locale/biblepay_en.ts
#	src/qt/locale/biblepay_es.ts
#	src/qt/locale/biblepay_fi.ts
#	src/qt/locale/biblepay_fr.ts
#	src/qt/locale/biblepay_it.ts
#	src/qt/locale/biblepay_ja.ts
#	src/qt/locale/biblepay_ko.ts
#	src/qt/locale/biblepay_nl.ts
#	src/qt/locale/biblepay_pl.ts
#	src/qt/locale/biblepay_pt.ts
#	src/qt/locale/biblepay_ru.ts
#	src/qt/locale/biblepay_sk.ts
#	src/qt/locale/biblepay_th.ts
#	src/qt/locale/biblepay_tr.ts
#	src/qt/locale/biblepay_vi.ts
#	src/qt/locale/biblepay_zh_CN.ts
#	src/qt/locale/biblepay_zh_TW.ts
#	src/qt/networkstyle.h
#	src/qt/openuridialog.cpp
#	src/qt/optionsdialog.cpp
#	src/qt/optionsmodel.cpp
#	src/qt/overviewpage.cpp
#	src/qt/res/images/light/about.png
#	src/qt/res/images/light/drkblue_walletFrame_bg.png
#	src/qt/rpcconsole.cpp
#	src/qt/sendcoinsdialog.cpp
#	src/qt/sendcoinsentry.cpp
#	src/qt/splashscreen.cpp
#	src/qt/transactiondesc.cpp
#	src/qt/transactionrecord.cpp
#	src/qt/utilitydialog.cpp
#	src/qt/walletmodel.cpp
#	src/rpc/blockchain.cpp
#	src/rpc/client.cpp
#	src/rpc/governance.cpp
#	src/rpc/masternode.cpp
#	src/rpc/mining.cpp
#	src/rpc/misc.cpp
#	src/rpc/net.cpp
#	src/rpc/rawtransaction.cpp
#	src/rpc/rpcevo.cpp
#	src/rpc/server.cpp
#	src/spork.cpp
#	src/spork.h
#	src/test/bip39_tests.cpp
#	src/test/cachemap_tests.cpp
#	src/test/cachemultimap_tests.cpp
#	src/test/governance_validators_tests.cpp
#	src/test/miner_tests.cpp
#	src/test/ratecheck_tests.cpp
#	src/test/test_biblepay.h
#	src/uint256.h
#	src/util.cpp
#	src/util.h
#	src/validation.cpp
#	src/validation.h
#	src/version.h
#	src/wallet/rpcdump.cpp
#	src/wallet/rpcwallet.cpp
#	src/wallet/wallet.cpp
#	src/wallet/wallet.h
#	src/wallet/walletdb.cpp
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@UdjinM6UdjinM6UdjinM6 approved these changes

Assignees


No one assigned


Labels

RPCSome notable changes to RPC params/behaviour/descriptions

Projects


None yet


Milestone

14.0

Development

Successfully merging this pull request may close these issues.

3 participants

@codablock@PastaPastaPasta@UdjinM6

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Properly handle conflicts between ChainLocks and InstantSend - #2904
Merged
UdjinM6 merged 17 commits into
dashpay:developfrom 
codablock:pr_is_invalidateblocks
May 7, 2019
Merged
Properly handle conflicts between ChainLocks and InstantSend#2904
UdjinM6 merged 17 commits into
dashpay:developfrom 
codablock:pr_is_invalidateblocks
Conversation
@codablock
@codablockcodablock
commented
May 6, 2019•

edited

Loading

Copy link


Copy Markdown

This PR adds code to handle conflicts between ChainLocks and InstantSend. The probability of such conflicts is practically zero (due to the "safe TXs" concept, as described here), but these should still be handled properly to assure consensus.
This PR lacks tests atm, which I'm working on now. We can either merge this PR first and then later merge the tests, or wait with merging until I'm done with the tests.Update: Added tests
@codablockcodablock
added this to the 14.0 milestone
May 6, 2019
UdjinM6
UdjinM6
reviewed
May 6, 2019
View reviewed changes
@UdjinM6UdjinM6
left a comment


Copy link


Copy Markdown

Choose a reason for hiding this comment

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

Looks good! 👍
Since this PR touches some consensus critical stuff I think it would make sense to wait and include tests here.
(Also, this can be rebased now to remove eb18e19)
Comment threadsrc/validation.cpp
Outdated

@PastaPastaPasta
PastaPastaPasta
commented
May 6, 2019

Copy link


Copy Markdown

Member
Agree with Udjin on waiting for tests
codablock
added 16 commits
May 7, 2019 06:37
@codablock
Return ISLOCK instead of conflicting txid in GetConflictingTx/GetConf…
da4950e
…lictingLock
@codablock
Move code to write archived ISLOCKs into its own method
3d40285
We'll need this from another method as well later.
@codablock
Implement GetInstantSendLocksByParent and RemoveChainedInstantSendLocks
0723d74
These allow to easily delete multiple chains (actually trees) of ISLOCKs
in one go.
@codablock
Implement RemoveConflictedTx and call it from RemoveMempoolConflictsF…
d93f699
…orLock
Also add "retryChildren" parameter to RemoveNonLockedTx so that we can
skip retrying of non-locked children TXs.
@codablock
Properly handle/remove conflicted TXs (between mempool and new blocks)
8064cd0
@codablock
Track non-locked TXs by inputs
cd2b26e
@codablock
Implement and call ResolveBlockConflicts
9ec2ff3
@codablock
Also call ResolveBlockConflicts from ConnectBlock
c2be224
But only when a block is known to have a conflict and at the same time is
ChainLocked, which causes the ISLOCK to be pruned.
@codablock
Split out RemoveChainLockConflictingLock from ResolveBlockConflicts
ee6b07f
@codablock
Fix condition for update of nonLockedTxs.pindexMined
76ac065
@codablock
Only add entries to nonLockedTxsByInputs when AddNonLockedTx is calle…
928cfe5
…d for the first time
@codablock
Implement "quorum getrecsig" RPC
977f712
@codablock
Include decoded TX data in result of create_raw_tx
aa0f6bd
@codablock
Implement support for CLSIG in mininode.py
70cf0d9
@codablock
Implement support for ISLOCK in mininode.py
0c1450e
@codablock
Implement tests for ChainLock vs InstantSend lock conflict resolution
0acd8c7
@codablock
codablockforce-pushed
the
pr_is_invalidateblocks
branch
from
eb18e19 to
0acd8c7CompareMay 7, 2019 04:38
@codablock
Handle review comment
fc43a30
Bail out (continue) early
@codablock
codablock
commented
May 7, 2019

Copy link


Copy Markdown

Author
Added tests and appropriate fixes to make everything work as expected. Also rebased on develop.
UdjinM6
UdjinM6
approved these changes
May 7, 2019
View reviewed changes
@UdjinM6UdjinM6
left a comment


Copy link


Copy Markdown

Choose a reason for hiding this comment

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

utACK 👍
Comment threadsrc/llmq/quorums_instantsend.cpp
 // TX is not locked, so make sure it is tracked
 AddNonLockedTx(MakeTransactionRef(tx));
 nonLockedTxs.at(tx.GetHash()).pindexMined = posInBlock == CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK ? pindex : nullptr;
 nonLockedTxs.at(tx.GetHash()).pindexMined = posInBlock != CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK ? pindex : nullptr;
@UdjinM6UdjinM6May 7, 2019

Copy link


Copy Markdown

Choose a reason for hiding this comment

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

Oh, good catch!
@UdjinM6
UdjinM6
merged commit 66a2cde
into
dashpay:developMay 7, 2019
@UdjinM6UdjinM6
added
the 
RPC
Some notable changes to RPC params/behaviour/descriptions
label
May 7, 2019
@codablock
codablock
deleted the

pr_is_invalidateblocks

branch
May 8, 2019 09:57
MIPPL pushed a commit
to biblepay/biblepay
that referenced
this pull request
Jun 16, 2019
MIP
Merge dash commit 0.14.0.1 into develop
6d656c4
* commit '05adda99fe09f9f6d99ce09e22ed89be3ddfcd27': (530 commits)
Update release notes with latest commits (dashpay#2958)
Only require valid collaterals for votes and triggers (dashpay#2947) (dashpay#2957)
[v0.14.0.x] Fix off-by-one error in InstantSend mining info removal when disconnecting blocks (dashpay#2951)
[v0.14.0.x] bump version to 0.14.0.1 and prepare release notes (dashpay#2952)
Update release notes v14 (dashpay#2927)
Set CLIENT_VERSION_IS_RELEASE to true (dashpay#2926)
Update help text via gen-manpages.sh (dashpay#2929)
0.14 release notes draft (dashpay#2896)
Fix duplicate `-instantsendnotify` invocation (dashpay#2925)
Add blocks conflicting with ChainLocks to block index (dashpay#2923)
Skip processing in SyncTransaction when chain is not synced yet (dashpay#2920)
Set DIP0008 mainnet activation params (dashpay#2915)
[0.14] Bump chainparams (dashpay#2910)
Fix db leaks in LLMQ db (dashpay#2914)
Fall back to ReadBlockFromDisk when blockTxs is not filled yet (dashpay#2908)
Bump "keepOldConnections" by one for all LLMQ types (dashpay#2909)
Print inputs on which we voted and quorums used for signing (dashpay#2907)
Implement integration tests for DKG error handling (dashpay#2905)
Implement zmq notifications for chainlocked blocks (dashpay#2899)
Properly handle conflicts between ChainLocks and InstantSend (dashpay#2904)
...
# Conflicts:
#	.travis.yml
#	COPYING
#	README.md
#	biblepay-docs/protocol-documentation.md
#	ci/matrix.sh
#	configure.ac
#	contrib/debian/examples/biblepay.conf
#	contrib/gitian-descriptors/gitian-linux.yml
#	contrib/gitian-descriptors/gitian-osx.yml
#	contrib/gitian-descriptors/gitian-win.yml
#	doc/README.md
#	doc/README_windows.txt
#	doc/dnsseed-policy.md
#	doc/files.md
#	doc/guide-startmany.md
#	doc/man/biblepay-cli.1
#	doc/man/biblepay-qt.1
#	doc/man/biblepay-tx.1
#	doc/man/biblepayd.1
#	doc/masternode-budget.md
#	doc/masternode_conf.md
#	doc/release-notes.md
#	qa/pull-tester/rpc-tests.py
#	qa/rpc-tests/autoix-mempool.py
#	qa/rpc-tests/dip3-deterministicmns.py
#	qa/rpc-tests/fundrawtransaction.py
#	qa/rpc-tests/maxblocksinflight.py
#	qa/rpc-tests/p2p-acceptblock.py
#	qa/rpc-tests/test_framework/comptool.py
#	qa/rpc-tests/test_framework/mininode.py
#	qa/rpc-tests/test_framework/test_framework.py
#	qa/rpc-tests/test_framework/util.py
#	qa/rpc-tests/wallet-hd.py
#	share/setup.nsi.in
#	src/Makefile.am
#	src/Makefile.bench.include
#	src/Makefile.qt.include
#	src/Makefile.qttest.include
#	src/Makefile.test.include
#	src/activemasternode.cpp
#	src/activemasternode.h
#	src/biblepayd.cpp
#	src/cachemap.h
#	src/cachemultimap.h
#	src/chainparams.cpp
#	src/clientversion.h
#	src/dsnotificationinterface.cpp
#	src/evo/deterministicmns.cpp
#	src/evo/providertx.cpp
#	src/evo/simplifiedmns.cpp
#	src/governance-classes.cpp
#	src/governance-classes.h
#	src/governance-object.cpp
#	src/governance-object.h
#	src/governance-vote.cpp
#	src/governance.cpp
#	src/governance.h
#	src/hash.h
#	src/hdchain.cpp
#	src/hdchain.h
#	src/init.cpp
#	src/instantx.cpp
#	src/instantx.h
#	src/keepass.cpp
#	src/keepass.h
#	src/llmq/quorums_blockprocessor.cpp
#	src/llmq/quorums_dummydkg.cpp
#	src/llmq/quorums_dummydkg.h
#	src/llmq/quorums_init.cpp
#	src/llmq/quorums_init.h
#	src/llmq/quorums_utils.cpp
#	src/llmq/quorums_utils.h
#	src/masternode-payments.cpp
#	src/masternode-payments.h
#	src/masternode-sync.cpp
#	src/masternode-sync.h
#	src/masternode.cpp
#	src/masternode.h
#	src/masternodeconfig.cpp
#	src/masternodeconfig.h
#	src/masternodeman.cpp
#	src/masternodeman.h
#	src/messagesigner.cpp
#	src/messagesigner.h
#	src/miner.cpp
#	src/net.cpp
#	src/net_processing.cpp
#	src/netfulfilledman.cpp
#	src/netfulfilledman.h
#	src/privatesend-client.cpp
#	src/privatesend-client.h
#	src/privatesend-server.cpp
#	src/privatesend-server.h
#	src/privatesend.cpp
#	src/privatesend.h
#	src/qt/askpassphrasedialog.cpp
#	src/qt/biblepay.cpp
#	src/qt/bitcoinaddressvalidator.cpp
#	src/qt/bitcoingui.cpp
#	src/qt/bitcoinunits.cpp
#	src/qt/bitcoinunits.h
#	src/qt/clientmodel.cpp
#	src/qt/coincontroldialog.cpp
#	src/qt/dashstrings.cpp
#	src/qt/editaddressdialog.cpp
#	src/qt/forms/intro.ui
#	src/qt/forms/masternodelist.ui
#	src/qt/guiconstants.h
#	src/qt/guiutil.cpp
#	src/qt/intro.cpp
#	src/qt/locale/biblepay_ar.ts
#	src/qt/locale/biblepay_bg.ts
#	src/qt/locale/biblepay_de.ts
#	src/qt/locale/biblepay_en.ts
#	src/qt/locale/biblepay_es.ts
#	src/qt/locale/biblepay_fi.ts
#	src/qt/locale/biblepay_fr.ts
#	src/qt/locale/biblepay_it.ts
#	src/qt/locale/biblepay_ja.ts
#	src/qt/locale/biblepay_ko.ts
#	src/qt/locale/biblepay_nl.ts
#	src/qt/locale/biblepay_pl.ts
#	src/qt/locale/biblepay_pt.ts
#	src/qt/locale/biblepay_ru.ts
#	src/qt/locale/biblepay_sk.ts
#	src/qt/locale/biblepay_th.ts
#	src/qt/locale/biblepay_tr.ts
#	src/qt/locale/biblepay_vi.ts
#	src/qt/locale/biblepay_zh_CN.ts
#	src/qt/locale/biblepay_zh_TW.ts
#	src/qt/networkstyle.h
#	src/qt/openuridialog.cpp
#	src/qt/optionsdialog.cpp
#	src/qt/optionsmodel.cpp
#	src/qt/overviewpage.cpp
#	src/qt/res/images/light/about.png
#	src/qt/res/images/light/drkblue_walletFrame_bg.png
#	src/qt/rpcconsole.cpp
#	src/qt/sendcoinsdialog.cpp
#	src/qt/sendcoinsentry.cpp
#	src/qt/splashscreen.cpp
#	src/qt/transactiondesc.cpp
#	src/qt/transactionrecord.cpp
#	src/qt/utilitydialog.cpp
#	src/qt/walletmodel.cpp
#	src/rpc/blockchain.cpp
#	src/rpc/client.cpp
#	src/rpc/governance.cpp
#	src/rpc/masternode.cpp
#	src/rpc/mining.cpp
#	src/rpc/misc.cpp
#	src/rpc/net.cpp
#	src/rpc/rawtransaction.cpp
#	src/rpc/rpcevo.cpp
#	src/rpc/server.cpp
#	src/spork.cpp
#	src/spork.h
#	src/test/bip39_tests.cpp
#	src/test/cachemap_tests.cpp
#	src/test/cachemultimap_tests.cpp
#	src/test/governance_validators_tests.cpp
#	src/test/miner_tests.cpp
#	src/test/ratecheck_tests.cpp
#	src/test/test_biblepay.h
#	src/uint256.h
#	src/util.cpp
#	src/util.h
#	src/validation.cpp
#	src/validation.h
#	src/version.h
#	src/wallet/rpcdump.cpp
#	src/wallet/rpcwallet.cpp
#	src/wallet/wallet.cpp
#	src/wallet/wallet.h
#	src/wallet/walletdb.cpp
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@UdjinM6UdjinM6UdjinM6 approved these changes

Assignees


No one assigned


Labels

RPCSome notable changes to RPC params/behaviour/descriptions

Projects


None yet


Milestone

14.0

Development

Successfully merging this pull request may close these issues.

3 participants

@codablock@PastaPastaPasta@UdjinM6