Skip to content

Commit 3e8ba24

Browse files
committed
partial bitcoin-core/gui#206: Display fRelayTxes and bip152_highbandwidth_{to, from} in peer details
excludes: - 142807a
1 parent e109c00 commit 3e8ba24

File tree

2 files changed

+53
-26
lines changed

2 files changed

+53
-26
lines changed

src/qt/forms/debugwindow.ui

Lines changed: 52 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1121,13 +1121,39 @@
11211121
</widget>
11221122
</item>
11231123
<item row="8" column="0">
1124+
<widget class="QLabel" name="peerRelayTxesLabel">
1125+
<property name="toolTip">
1126+
<string>Whether the peer requested us to relay transactions.</string>
1127+
</property>
1128+
<property name="text">
1129+
<string>Wants Tx Relay</string>
1130+
</property>
1131+
</widget>
1132+
</item>
1133+
<item row="8" column="2">
1134+
<widget class="QLabel" name="peerRelayTxes">
1135+
<property name="cursor">
1136+
<cursorShape>IBeamCursor</cursorShape>
1137+
</property>
1138+
<property name="text">
1139+
<string>N/A</string>
1140+
</property>
1141+
<property name="textFormat">
1142+
<enum>Qt::PlainText</enum>
1143+
</property>
1144+
<property name="textInteractionFlags">
1145+
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
1146+
</property>
1147+
</widget>
1148+
</item>
1149+
<item row="9" column="0">
11241150
<widget class="QLabel" name="label_29">
11251151
<property name="text">
11261152
<string>Starting Block</string>
11271153
</property>
11281154
</widget>
11291155
</item>
1130-
<item row="8" column="2">
1156+
<item row="9" column="2">
11311157
<widget class="QLabel" name="peerHeight">
11321158
<property name="cursor">
11331159
<cursorShape>IBeamCursor</cursorShape>
@@ -1143,14 +1169,14 @@
11431169
</property>
11441170
</widget>
11451171
</item>
1146-
<item row="9" column="0">
1172+
<item row="10" column="0">
11471173
<widget class="QLabel" name="label_27">
11481174
<property name="text">
11491175
<string>Synced Headers</string>
11501176
</property>
11511177
</widget>
11521178
</item>
1153-
<item row="9" column="2">
1179+
<item row="10" column="2">
11541180
<widget class="QLabel" name="peerSyncHeight">
11551181
<property name="cursor">
11561182
<cursorShape>IBeamCursor</cursorShape>
@@ -1166,14 +1192,14 @@
11661192
</property>
11671193
</widget>
11681194
</item>
1169-
<item row="10" column="0">
1195+
<item row="11" column="0">
11701196
<widget class="QLabel" name="label_25">
11711197
<property name="text">
11721198
<string>Synced Blocks</string>
11731199
</property>
11741200
</widget>
11751201
</item>
1176-
<item row="10" column="2">
1202+
<item row="11" column="2">
11771203
<widget class="QLabel" name="peerCommonHeight">
11781204
<property name="cursor">
11791205
<cursorShape>IBeamCursor</cursorShape>
@@ -1189,14 +1215,14 @@
11891215
</property>
11901216
</widget>
11911217
</item>
1192-
<item row="11" column="0">
1218+
<item row="12" column="0">
11931219
<widget class="QLabel" name="label_22">
11941220
<property name="text">
11951221
<string>Connection Time</string>
11961222
</property>
11971223
</widget>
11981224
</item>
1199-
<item row="11" column="2">
1225+
<item row="12" column="2">
12001226
<widget class="QLabel" name="peerConnTime">
12011227
<property name="cursor">
12021228
<cursorShape>IBeamCursor</cursorShape>
@@ -1212,14 +1238,14 @@
12121238
</property>
12131239
</widget>
12141240
</item>
1215-
<item row="12" column="0">
1241+
<item row="13" column="0">
12161242
<widget class="QLabel" name="label_15">
12171243
<property name="text">
12181244
<string>Last Send</string>
12191245
</property>
12201246
</widget>
12211247
</item>
1222-
<item row="12" column="2">
1248+
<item row="13" column="2">
12231249
<widget class="QLabel" name="peerLastSend">
12241250
<property name="cursor">
12251251
<cursorShape>IBeamCursor</cursorShape>
@@ -1235,14 +1261,14 @@
12351261
</property>
12361262
</widget>
12371263
</item>
1238-
<item row="13" column="0">
1264+
<item row="14" column="0">
12391265
<widget class="QLabel" name="label_19">
12401266
<property name="text">
12411267
<string>Last Receive</string>
12421268
</property>
12431269
</widget>
12441270
</item>
1245-
<item row="13" column="2">
1271+
<item row="14" column="2">
12461272
<widget class="QLabel" name="peerLastRecv">
12471273
<property name="cursor">
12481274
<cursorShape>IBeamCursor</cursorShape>
@@ -1258,14 +1284,14 @@
12581284
</property>
12591285
</widget>
12601286
</item>
1261-
<item row="14" column="0">
1287+
<item row="15" column="0">
12621288
<widget class="QLabel" name="label_18">
12631289
<property name="text">
12641290
<string>Sent</string>
12651291
</property>
12661292
</widget>
12671293
</item>
1268-
<item row="14" column="2">
1294+
<item row="15" column="2">
12691295
<widget class="QLabel" name="peerBytesSent">
12701296
<property name="cursor">
12711297
<cursorShape>IBeamCursor</cursorShape>
@@ -1281,14 +1307,14 @@
12811307
</property>
12821308
</widget>
12831309
</item>
1284-
<item row="15" column="0">
1310+
<item row="16" column="0">
12851311
<widget class="QLabel" name="label_20">
12861312
<property name="text">
12871313
<string>Received</string>
12881314
</property>
12891315
</widget>
12901316
</item>
1291-
<item row="15" column="2">
1317+
<item row="16" column="2">
12921318
<widget class="QLabel" name="peerBytesRecv">
12931319
<property name="cursor">
12941320
<cursorShape>IBeamCursor</cursorShape>
@@ -1304,14 +1330,14 @@
13041330
</property>
13051331
</widget>
13061332
</item>
1307-
<item row="16" column="0">
1333+
<item row="17" column="0">
13081334
<widget class="QLabel" name="label_26">
13091335
<property name="text">
13101336
<string>Ping Time</string>
13111337
</property>
13121338
</widget>
13131339
</item>
1314-
<item row="16" column="2">
1340+
<item row="17" column="2">
13151341
<widget class="QLabel" name="peerPingTime">
13161342
<property name="cursor">
13171343
<cursorShape>IBeamCursor</cursorShape>
@@ -1327,7 +1353,7 @@
13271353
</property>
13281354
</widget>
13291355
</item>
1330-
<item row="17" column="0">
1356+
<item row="18" column="0">
13311357
<widget class="QLabel" name="peerPingWaitLabel">
13321358
<property name="toolTip">
13331359
<string>The duration of a currently outstanding ping.</string>
@@ -1337,7 +1363,7 @@
13371363
</property>
13381364
</widget>
13391365
</item>
1340-
<item row="17" column="2">
1366+
<item row="18" column="2">
13411367
<widget class="QLabel" name="peerPingWait">
13421368
<property name="cursor">
13431369
<cursorShape>IBeamCursor</cursorShape>
@@ -1353,14 +1379,14 @@
13531379
</property>
13541380
</widget>
13551381
</item>
1356-
<item row="18" column="0">
1382+
<item row="19" column="0">
13571383
<widget class="QLabel" name="peerMinPingLabel">
13581384
<property name="text">
13591385
<string>Min Ping</string>
13601386
</property>
13611387
</widget>
13621388
</item>
1363-
<item row="18" column="2">
1389+
<item row="19" column="2">
13641390
<widget class="QLabel" name="peerMinPing">
13651391
<property name="cursor">
13661392
<cursorShape>IBeamCursor</cursorShape>
@@ -1376,14 +1402,14 @@
13761402
</property>
13771403
</widget>
13781404
</item>
1379-
<item row="19" column="0">
1405+
<item row="20" column="0">
13801406
<widget class="QLabel" name="label_timeoffset">
13811407
<property name="text">
13821408
<string>Time Offset</string>
13831409
</property>
13841410
</widget>
13851411
</item>
1386-
<item row="19" column="2">
1412+
<item row="20" column="2">
13871413
<widget class="QLabel" name="timeoffset">
13881414
<property name="cursor">
13891415
<cursorShape>IBeamCursor</cursorShape>
@@ -1399,7 +1425,7 @@
13991425
</property>
14001426
</widget>
14011427
</item>
1402-
<item row="20" column="0">
1428+
<item row="21" column="0">
14031429
<widget class="QLabel" name="peerMappedASLabel">
14041430
<property name="toolTip">
14051431
<string>The mapped Autonomous System used for diversifying peer selection.</string>
@@ -1409,7 +1435,7 @@
14091435
</property>
14101436
</widget>
14111437
</item>
1412-
<item row="20" column="2">
1438+
<item row="21" column="2">
14131439
<widget class="QLabel" name="peerMappedAS">
14141440
<property name="cursor">
14151441
<cursorShape>IBeamCursor</cursorShape>
@@ -1425,7 +1451,7 @@
14251451
</property>
14261452
</widget>
14271453
</item>
1428-
<item row="21" column="0">
1454+
<item row="22" column="0">
14291455
<spacer name="verticalSpacer_3">
14301456
<property name="orientation">
14311457
<enum>Qt::Vertical</enum>

src/qt/rpcconsole.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1243,6 +1243,7 @@ void RPCConsole::updateNodeDetail(const CNodeCombinedStats *stats)
12431243
peerAddrDetails += "<br />" + tr("via %1").arg(QString::fromStdString(stats->nodeStats.addrLocal));
12441244
ui->peerHeading->setText(peerAddrDetails);
12451245
ui->peerServices->setText(GUIUtil::formatServicesStr(stats->nodeStats.nServices));
1246+
ui->peerRelayTxes->setText(stats->nodeStats.fRelayTxes ? "Yes" : "No");
12461247
ui->peerLastSend->setText(stats->nodeStats.nLastSend ? GUIUtil::formatDurationStr(GetSystemTimeInSeconds() - stats->nodeStats.nLastSend) : tr("never"));
12471248
ui->peerLastRecv->setText(stats->nodeStats.nLastRecv ? GUIUtil::formatDurationStr(GetSystemTimeInSeconds() - stats->nodeStats.nLastRecv) : tr("never"));
12481249
ui->peerBytesSent->setText(GUIUtil::formatBytes(stats->nodeStats.nSendBytes));

0 commit comments

Comments
 (0)