Commit b379e0f
fix: don't gate platform port fields behind -deprecatedrpc=service on v23.1.x
The dashpay#7360 backport imported develop's `IsServiceDeprecatedRPCEnabled()` gate
around platformP2PPort/platformHTTPPort in CDeterministicMNStateDiff::ToJson,
and re-added the helper to evo/netinfo.{h,cpp} because it does not exist here.
That gate is dead on this release line. bbcd9d5 ("rpc: remove
-deprecatedrpc=service gating for service") removed gating on 23.x and left the
fields unenforced; upstream only restored it in dashpay#7181 (e50d436), which
targets the v24 line and is not an ancestor of this branch. Nothing on 23.x
passes -deprecatedrpc=service, and every sibling field (service in dmnstate.cpp,
and all of core_write.cpp) is emitted unconditionally here.
So on a default v23.1.8 node the condition was always false and both keys
disappeared entirely from protx diff/listdiff -- a regression against v23.1.7,
which emitted them unconditionally, and a contradiction of this release's own
notes promising they "report the corresponding non-zero values instead of stale
zeroes".
Emit them unconditionally, keeping dashpay#7360's actual fix (report the live port from
netInfo when the diff carries an ExtAddr netInfo). Drop the now-unused helper so
the branch does not carry a gate nothing can turn on.
Reported-by: knst
Co-Authored-By: Claude <noreply@anthropic.com>1 parent bcdb34c commit b379e0f
3 files changed
Lines changed: 21 additions & 27 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
87 | 87 | | |
88 | 88 | | |
89 | 89 | | |
90 | | - | |
91 | | - | |
92 | | - | |
93 | | - | |
94 | | - | |
95 | | - | |
96 | | - | |
97 | | - | |
98 | | - | |
99 | | - | |
100 | | - | |
101 | | - | |
102 | | - | |
103 | | - | |
104 | | - | |
105 | | - | |
106 | | - | |
107 | | - | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
108 | 111 | | |
109 | 112 | | |
110 | 113 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
70 | 70 | | |
71 | 71 | | |
72 | 72 | | |
73 | | - | |
74 | | - | |
75 | | - | |
76 | | - | |
77 | | - | |
78 | | - | |
79 | 73 | | |
80 | 74 | | |
81 | 75 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
97 | 97 | | |
98 | 98 | | |
99 | 99 | | |
100 | | - | |
101 | | - | |
102 | | - | |
103 | 100 | | |
104 | 101 | | |
105 | 102 | | |
| |||
0 commit comments