You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Found while cleaning up CodeRabbit follow-up commits from #7379. The backmerge PR should stay as a pure merge from master into develop, so this needs to be handled separately on develop if confirmed.
Problem
At #7379's merge-back commit (22a3321aab8d41e2b0be913fdb55345cec62e12d), CTxMemPool::mapProTxPlatformNodeIDs stores a single uint256 value for a platform node ID.
For ProRegTx, that value is the ProTx hash because the transaction hash is the provider hash.
For ProUpServTx, addUnchecked() stores the update-service transaction hash:
For update-service transactions, the mempool txid and owner proTxHash are different identifiers. That means a second pending ProUpServTx for the same masternode can be rejected as protx-dup when it keeps the same platformNodeID, even though it belongs to the same provider.
The removal path still needs the mempool transaction hash:
changed the title [-]fix: ProUpServTx platformNodeID mempool conflict compares txid to ProTx hash[/-][+]Investigate ProUpServTx platformNodeID mempool conflict comparing txid to ProTx hash[/+]on Jun 26, 2026
I have confirmed the source-level mismatch, but I have not yet run a reproducing functional/unit test.
The precise case is narrower than "any second ProUpServTx". mapProTxAddresses has a similar txid-vs-ProTx comparison, so a second pending update that keeps the same netInfo would likely already be rejected by the address path. The platformNodeID-specific concern is a same-provider second pending ProUpServTx that changes netInfo enough to avoid mapProTxAddresses, but keeps the same platformNodeID.
Source path at #7379's pure merge-back commit (22a3321...):
addUncheckedProTx() stores mapProTxPlatformNodeIDs[platformNodeID] = tx_hash for ProUpServTx.
existsProviderTxConflict() checks it->second != opt_proTx->proTxHash for a ProUpServTx using that platformNodeID.
There is no broad mapProTxRefs rejection for all same-provider service updates; mapProTxRefs is used for collateral/key-change conflict paths.
removeProTxConflicts() needs the mempool txid for recursive removal, so a correct fix probably has to preserve both identifiers rather than simply changing the map value.
So this should be treated as an investigate/fix follow-up with a regression test, not as something already runtime-proven.
changed the title [-]Investigate ProUpServTx platformNodeID mempool conflict comparing txid to ProTx hash[/-][+]Fix ProUpServTx platformNodeID mempool conflict comparing txid to ProTx hash[/+]on Jun 26, 2026
Activity
[-]fix: ProUpServTx platformNodeID mempool conflict compares txid to ProTx hash[/-][+]Investigate ProUpServTx platformNodeID mempool conflict comparing txid to ProTx hash[/+]thepastaclaw commentedon Jun 26, 2026
Validation note after a second source pass:
I have confirmed the source-level mismatch, but I have not yet run a reproducing functional/unit test.
The precise case is narrower than "any second ProUpServTx".
mapProTxAddresseshas a similar txid-vs-ProTx comparison, so a second pending update that keeps the same netInfo would likely already be rejected by the address path. The platformNodeID-specific concern is a same-provider second pendingProUpServTxthat changes netInfo enough to avoidmapProTxAddresses, but keeps the sameplatformNodeID.Source path at #7379's pure merge-back commit (
22a3321...):addUncheckedProTx()storesmapProTxPlatformNodeIDs[platformNodeID] = tx_hashforProUpServTx.existsProviderTxConflict()checksit->second != opt_proTx->proTxHashfor aProUpServTxusing that platformNodeID.mapProTxRefsrejection for all same-provider service updates;mapProTxRefsis used for collateral/key-change conflict paths.removeProTxConflicts()needs the mempool txid for recursive removal, so a correct fix probably has to preserve both identifiers rather than simply changing the map value.So this should be treated as an investigate/fix follow-up with a regression test, not as something already runtime-proven.
[-]Investigate ProUpServTx platformNodeID mempool conflict comparing txid to ProTx hash[/-][+]Fix ProUpServTx platformNodeID mempool conflict comparing txid to ProTx hash[/+]thepastaclaw commentedon Jun 26, 2026
Runtime validation update: reproduced on #7379's pure merge-back commit
22a3321aab8d41e2b0be913fdb55345cec62e12d.I added a local-only regression assertion to
test/functional/rpc_netinfo.py::test_uniquenessthat:ProUpServTxfor one Evo provider with a freshplatformNodeIDand changed service addresses;ProUpServTxfor the same provider with different service addresses but the sameplatformNodeID;testmempoolacceptfor the second update.Expected: allowed, because it is the same provider reusing its own platform node ID.
Actual: rejected as
protx-dup.Command run:
Failure:
So this is now runtime-confirmed, not just source-inspection.