Reviewing files that changed from the base of the PR and between 7325e06 and db8cfc0.

• src/Makefile.am (1 hunks)
• src/coinjoin/client.cpp (6 hunks)
• src/evo/common.h (1 hunks)
• src/evo/core_write.cpp (2 hunks)
• src/evo/deterministicmns.cpp (15 hunks)
• src/evo/deterministicmns.h (4 hunks)
• src/evo/dmnstate.cpp (2 hunks)
• src/evo/dmnstate.h (7 hunks)
• src/evo/netinfo.cpp (1 hunks)
• src/evo/netinfo.h (5 hunks)
• src/evo/providertx.cpp (5 hunks)
• src/evo/providertx.h (10 hunks)
• src/evo/simplifiedmns.cpp (2 hunks)
• src/evo/simplifiedmns.h (3 hunks)
• src/llmq/utils.cpp (2 hunks)
• src/masternode/node.cpp (2 hunks)
• src/masternode/utils.cpp (1 hunks)
• src/net.cpp (5 hunks)
• src/qt/masternodelist.cpp (1 hunks)
• src/rpc/evo.cpp (3 hunks)
• src/rpc/masternode.cpp (2 hunks)
• src/rpc/quorums.cpp (1 hunks)
• src/test/block_reward_reallocation_tests.cpp (1 hunks)
• src/test/evo_deterministicmns_tests.cpp (7 hunks)
• src/test/evo_netinfo_tests.cpp (1 hunks)
• src/test/evo_simplifiedmns_tests.cpp (1 hunks)
• src/test/evo_trivialvalidation.cpp (4 hunks)
• src/txmempool.cpp (8 hunks)

src/Makefile.am (1)

189-189: LGTM! Proper integration of new header.

The addition of evo/common.h to the core headers is correctly placed and integrates the new ProTx version constants into the build system appropriately.

src/evo/core_write.cpp (2)

117-117: Consistent with the polymorphic netInfo refactor.

The pointer access pattern matches the architectural changes and is consistent with the refactor across the codebase.

---

70-70:

❓ Verification inconclusive

Verify null pointer safety for netInfo access.

The change from object access to pointer dereference is consistent with the polymorphic netInfo refactor. However, ensure that netInfo is always properly initialized before these methods are called to prevent null pointer dereferences.

---

🏁 Script executed:

#!/bin/bash
# Description: Search for netInfo initialization patterns and null checks in provider transaction code.

# Search for MakeNetInfo calls and netInfo assignments
rg -A 3 -B 3 "netInfo.*=" src/evo/

# Search for any null checks on netInfo
rg -A 2 -B 2 "netInfo.*null|!netInfo" src/evo/

# Search for netInfo pointer usage patterns
rg -A 2 "netInfo->" src/evo/

Length of output: 11950

---

Verify netInfo is always initialized before dereference in JSON RPC handlers.

The switch from value to pointer access in core_write.cpp aligns with the polymorphic netInfo refactor, but there are no explicit null‐pointer checks on netInfo in any of the RPC‐serialization paths (e.g. in core_write.cpp, providertx.cpp, simplifiedmns.cpp, dmnstate.cpp, etc.). The NetInfoSerWrapper used in the READWRITE blocks of CProRegTx and CProUpServTx should populate the netInfo pointer during deserialization, but please confirm:

• That NetInfoSerWrapper indeed guarantees netInfo is non‐null for both CProRegTx and CProUpServTx before these JSON helpers are ever called.
• If there exist any code paths where netInfo could remain nullptr (for example, manual instantiation without going through the deserializer), add an explicit null check or assert(netInfo) around

  ret.pushKV("service", netInfo->GetPrimary().ToStringAddrPort());

  in src/evo/core_write.cpp (and similarly in the other JSON routines).

src/rpc/masternode.cpp (2)

568-568: Consistent pointer access pattern for netInfo refactor.

The change from netInfo.GetEntries() to netInfo->GetEntries() is consistent with the polymorphic netInfo architecture. The refactor enables version-dependent network info implementations as described in the PR objectives.

---

615-615: Uniform application of netInfo pointer access.

The pointer dereference pattern is consistently applied across all netInfo method calls, maintaining uniformity with the architectural changes.

src/masternode/utils.cpp (1)

81-81: LGTM: Correct syntax update for pointer-based netInfo.

This change correctly updates the member access from dot to arrow operator, reflecting the refactor where netInfo has been changed from a concrete object to a std::shared_ptr<NetInfoInterface>. The logic remains unchanged.

src/llmq/utils.cpp (2)

827-827: LGTM: Correct syntax update for pointer-based netInfo.

This change correctly updates the member access from dot to arrow operator in the logging statement, reflecting the refactor where netInfo is now a pointer type.

---

876-876: LGTM: Correct syntax update for pointer-based netInfo.

This change correctly updates the member access from dot to arrow operator in the logging statement, reflecting the refactor where netInfo is now a pointer type.

src/qt/masternodelist.cpp (2)

224-224: LGTM: Correct syntax update for pointer-based netInfo.

This change correctly updates the member access from dot to arrow operator when getting the address key, reflecting the refactor where netInfo is now a pointer type.

---

227-227: LGTM: Correct syntax update for pointer-based netInfo.

This change correctly updates the member access from dot to arrow operator when getting the address string for display, reflecting the refactor where netInfo is now a pointer type.

src/masternode/node.cpp (2)

149-149: LGTM: Correct syntax update for pointer-based netInfo.

This change correctly updates the member access from dot to arrow operator when comparing the local service address with the masternode's primary address, reflecting the refactor where netInfo is now a pointer type.

---

204-204: LGTM: Correct syntax update for pointer-based netInfo.

This change correctly updates the member access from dot to arrow operator when comparing primary addresses between old and new masternode states, reflecting the refactor where netInfo is now a pointer type.

src/evo/simplifiedmns.cpp (2)

71-71: LGTM: Correct pointer dereference for netInfo.

The change from netInfo.ToString() to netInfo->ToString() correctly reflects the refactoring of netInfo from a concrete object to a std::shared_ptr<NetInfoInterface> pointer.

---

81-81: LGTM: Correct pointer dereference for netInfo.

The change from netInfo.GetPrimary().ToStringAddrPort() to netInfo->GetPrimary().ToStringAddrPort() correctly reflects the refactoring of netInfo from a concrete object to a std::shared_ptr<NetInfoInterface> pointer.

src/rpc/quorums.cpp (1)

206-206: LGTM: Correct pointer dereference for netInfo.

The change from dmn->pdmnState->netInfo.GetPrimary() to dmn->pdmnState->netInfo->GetPrimary() correctly reflects the refactoring of netInfo from a concrete object to a std::shared_ptr<NetInfoInterface> pointer.

src/test/evo_simplifiedmns_tests.cpp (3)

22-22: LGTM: Correct version initialization for new interface.

The version is properly set using CProRegTx::GetMaxVersion with is_extended_addr=false, which is appropriate for this test case that uses the legacy address scheme.

---

23-23: LGTM: Correct usage of MakeNetInfo factory function.

The MakeNetInfo(smle) call correctly creates a std::shared_ptr<NetInfoInterface> using the entry's version. Since nVersion was set on the previous line, this should satisfy the factory function's assertions.

---

27-27: LGTM: Correct pointer dereference for netInfo.

The change from netInfo.AddEntry() to netInfo->AddEntry() correctly reflects the refactoring of netInfo from a concrete object to a std::shared_ptr<NetInfoInterface> pointer.

src/net.cpp (1)

3676-3682: Consistent pointer-based access to NetInfo now in place
Accessing netInfo via pointer is correct as part of the interface refactor; this aligns with the polymorphic design for NetInfoInterface.

src/evo/netinfo.cpp (1)

150-171: Well-implemented polymorphic equality comparison.

The IsEqual static method correctly handles all necessary cases for comparing NetInfoInterface shared pointers:

• Pointer identity and null checks for optimization
• Type-safe dynamic casting to concrete implementations
• Deep comparison using the concrete type's operator==
• Proper fallback for differing derived types

This implementation aligns perfectly with the interface-based refactoring described in the PR objectives.

src/test/block_reward_reallocation_tests.cpp (1)

118-121: Correctly updated to use new netInfo interface pattern.

The changes properly implement the refactored netInfo handling:

• Version initialization includes the new is_extended_addr parameter
• MakeNetInfo(proTx) correctly initializes the polymorphic netInfo pointer
• Access pattern updated from direct member to pointer dereference

The sequence ensures nVersion is set before calling MakeNetInfo(), preventing potential null pointer issues as mentioned in the PR objectives.

src/evo/dmnstate.cpp (3)

35-35: Correctly updated netInfo access pattern.

The change from netInfo.ToString() to netInfo->ToString() properly reflects the refactoring from concrete object to shared pointer.

---

42-42: Correctly updated netInfo access pattern.

The change from netInfo.GetPrimary() to netInfo->GetPrimary() properly reflects the refactoring from concrete object to shared pointer.

---

76-76: Correctly updated netInfo access pattern.

The change from netInfo.GetPrimary() to netInfo->GetPrimary() properly reflects the refactoring from concrete object to shared pointer.

src/coinjoin/client.cpp (6)

189-189: Correctly updated netInfo access pattern.

The change to use pointer dereference (netInfo->GetPrimary()) properly reflects the refactoring from concrete object to shared pointer.

---

1109-1109: Correctly updated netInfo access pattern.

The change to use pointer dereference (netInfo->GetPrimary()) properly reflects the refactoring from concrete object to shared pointer.

---

1181-1181: Correctly updated netInfo access pattern.

The change to use pointer dereference (netInfo->GetPrimary()) properly reflects the refactoring from concrete object to shared pointer.

---

1221-1221: Correctly updated netInfo access pattern.

The change to use pointer dereference (netInfo->GetPrimary()) properly reflects the refactoring from concrete object to shared pointer.

---

1823-1823: Correctly updated netInfo access pattern.

The change to use pointer dereference (netInfo->GetPrimary()) properly reflects the refactoring from concrete object to shared pointer.

---

1879-1879: Correctly updated netInfo access pattern.

The change to use pointer dereference (netInfo->GetPrimary()) properly reflects the refactoring from concrete object to shared pointer.

src/test/evo_netinfo_tests.cpp (1)

217-236: Excellent test coverage for the new interface equality logic.

This test case thoroughly validates the NetInfoInterface::IsEqual static method across all relevant scenarios:

• Uninitialized pointers (both null)
• Unequal initialization status (one null, one initialized)
• Equal initialization with same content (both empty)
• Equal initialization with different content

The test correctly uses MnNetInfo as the concrete implementation and verifies that the equality detection properly handles both pointer comparison and deep content comparison.

src/txmempool.cpp (8)

664-664: LGTM: Correct update for polymorphic netInfo access.

The change from proTx.netInfo.GetEntries() to proTx.netInfo->GetEntries() is consistent with the refactor to use std::shared_ptr<NetInfoInterface> instead of a concrete MnNetInfo object.

---

677-677: LGTM: Consistent pointer dereference for netInfo.

Properly updated to use pointer dereference syntax for the polymorphic netInfo interface.

---

768-768: LGTM: Correct pointer access in removal logic.

The change maintains the same logic while properly accessing the polymorphic netInfo through pointer dereference.

---

778-778: LGTM: Consistent with polymorphic netInfo design.

Correct update to use pointer dereference for accessing netInfo entries.

---

1007-1007: LGTM: Proper polymorphic access in conflict detection.

The change correctly updates the access pattern while maintaining the same conflict detection logic.

---

1029-1029: LGTM: Consistent pointer dereference pattern.

Properly updated to use the new polymorphic netInfo interface.

---

1367-1367: LGTM: Correct update in provider transaction conflict check.

The change maintains the same conflict detection logic while using the new pointer-based netInfo access.

---

1392-1392: LGTM: Final consistent update for polymorphic netInfo.

All netInfo access patterns have been properly updated to use pointer dereference for the polymorphic interface.

src/test/evo_trivialvalidation.cpp (4)

20-22: Good addition of extended address parameter for future support.

The addition of the is_extended_addr parameter to TestTxHelper properly prepares the test infrastructure for extended address validation while maintaining backward compatibility.

---

32-32: Correct parameter forwarding to validation method.

The is_extended_addr parameter is properly passed to the IsTriviallyValid method, enabling version-specific validation logic.

---

55-55: Appropriate placeholder for future extended address testing.

The TODO comment and hardcoded false value is a reasonable approach for the current phase, allowing the infrastructure to be in place while extended address test vectors are developed.

---

72-91: Consistent parameter updates across all provider transaction types.

All test cases for provider transactions (CProRegTx, CProUpServTx, CProUpRegTx, CProUpRevTx) have been properly updated to pass the is_extended_addr parameter.

src/evo/simplifiedmns.h (1)

38-38: Correct transition to polymorphic netInfo interface.

The change from MnNetInfo netInfo to std::shared_ptr<NetInfoInterface> netInfo{nullptr} properly implements the polymorphic design while ensuring safe initialization.

src/rpc/evo.cpp (2)

656-662: LGTM! Correct implementation of the new netInfo interface.

The changes properly implement the new polymorphic NetInfoInterface:

• Correctly checks for V23 deployment to determine extended address support
• Properly initializes netInfo using the factory function
• Consistently uses pointer dereference syntax for member access

Also applies to: 688-688

---

980-980: LGTM! Consistent implementation with the register wrapper.

The changes correctly apply the same pattern as in protx_register_common_wrapper.

Also applies to: 982-982

src/test/evo_deterministicmns_tests.cpp (1)

107-110: LGTM! Test updates correctly implement the new netInfo interface.

All test functions have been consistently updated to:

• Use MakeNetInfo factory for initialization
• Pass is_extended_addr=false to maintain existing test behavior
• Use pointer dereference syntax (->) for member access

The test coverage appropriately validates the refactored interface.

Also applies to: 130-133, 524-524, 582-582, 641-643, 717-719, 786-788

src/evo/dmnstate.h (2)

218-229: LGTM! Correct handling of polymorphic netInfo comparison.

The use of NetInfoInterface::IsEqual for comparing shared pointers to polymorphic types is the right approach, as virtual operators are not feasible.

---

255-260: Clarify the TODO comment and verify the is_extended parameter.

The TODO comment on line 258 states "Implement this", but there is already an implementation using NetInfoSerWrapper. This is confusing and needs clarification.

Additionally, the is_extended parameter is hardcoded to false. Please verify if this is intentional for backward compatibility or if it should be determined dynamically based on the version.

src/evo/providertx.h (1)

29-33: LGTM! Version logic is properly implemented.

The GetMaxVersion method correctly returns ProTxVersion::ExtAddr when extended addresses are enabled, with proper fallback to BasicBLS or LegacyBLS versions.

src/evo/providertx.cpp (2)

15-63: Proper implementation of extended address validation.

The function correctly validates the ProTx version against the extended address flag and properly accesses netInfo via pointer dereference.

---

108-126: Consistent implementation with pointer-based netInfo access.

The function properly handles the extended address parameter and correctly uses pointer dereference for netInfo.

src/evo/deterministicmns.cpp (5)

460-473: Proper handling of netInfo entries in AddMN.

The function correctly iterates through netInfo entries via pointer dereference and maintains proper error handling for invalid addresses.

---

510-544: Excellent implementation of netInfo update logic.

The use of NetInfoInterface::IsEqual for comparison and the atomic update pattern with rollback capability ensures data consistency. The lambda properly handles the transition from old to new netInfo entries.

---

888-890: Good: Maintaining version consistency.

Setting nVersion from the ProTx version ensures the state properly reflects the transaction version, which is important for the polymorphic netInfo handling.

---

929-931: Correct netInfo reset after operator key change.

The call to MakeNetInfo(*newState) properly reconstructs the network info after updating the operator key, ensuring consistency with the new state.

---

1329-1335: Proper deployment-based extended address flag.

The code correctly determines is_extended_addr based on V23 deployment status and passes it to validation, aligning with the PR's extended address support objectives.

src/evo/netinfo.h (4)

8-8: New dependency added for common types.

The inclusion of evo/common.h is appropriate for accessing the ProTxVersion enum used in the MakeNetInfo template function.

---

130-147: Well-designed polymorphic interface for network info.

The NetInfoInterface provides a clean abstraction with appropriate virtual methods. The static IsEqual method is a good solution for comparing shared pointers since operator overloading in virtual classes is not feasible.

---

149-199: MnNetInfo correctly implements the interface.

The refactoring of MnNetInfo to inherit from NetInfoInterface is well-implemented. All virtual methods are properly overridden with the override keyword.

---

201-207:

✅ Verification successful

Verify version range assertion logic.

The factory function asserts that obj.nVersion is greater than 0 and less than ProTxVersion::ExtAddr. Ensure that this version checking logic aligns with the actual version values defined in evo/common.h.

---

🏁 Script executed:

#!/bin/bash
# Description: Verify ProTxVersion enum values and version checking logic
# Expected: ProTxVersion::ExtAddr should be defined and have appropriate value

# Find the ProTxVersion enum definition
ast-grep --pattern 'enum $_ ProTxVersion $_'

Length of output: 46

---

Let’s locate the ProTxVersion enum and confirm the value of ExtAddr:

---

🏁 Script executed:

#!/bin/bash
# Find where ProTxVersion is defined and its members
rg -n "enum .*ProTxVersion" -C3
# Confirm the numeric value (or surrounding context) of ExtAddr
rg -n "ExtAddr" -C3

Length of output: 4482

---

Assertion logic confirmed against enum definitions

ProTxVersion in src/evo/common.h is defined as:

• LegacyBLS = 1
• BasicBLS = 2
• ExtAddr = 3

The factory’s

assert(obj.nVersion > 0 && obj.nVersion < ProTxVersion::ExtAddr);

therefore enforces obj.nVersion ∈ {1,2}—exactly LegacyBLS and BasicBLS. No change is needed unless you plan to handle ExtAddr (3) or higher here with a different NetInfoInterface implementation.

src/evo/deterministicmns.h (5)

68-83: SERIALIZE_METHODS refactor looks correct.

The migration to the SERIALIZE_METHODS macro simplifies the serialization code while maintaining backward compatibility with version checks for the nType field.

---

176-195: Improved serialization with structured bindings.

The use of structured bindings (const auto& [_, dmn]) and uniform initialization improves code readability. The new Clear() method call before deserialization is a good practice.

---

197-202: Clear() method provides proper state reset.

The Clear() method properly resets all internal maps using default constructors, which is essential for safe deserialization.

---

393-394: Template static assertions updated for new interface types.

The additions correctly exclude the new NetInfoInterface and std::shared_ptr<NetInfoInterface> types from the GetUniquePropertyHash template method, maintaining type safety.

---

477-520: Serialization improvements with structured bindings.

The changes improve code clarity with structured bindings and uniform initialization. The comment about CDeterministicMNStateDiff migration logic is helpful context.