Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions builds/msvc/vs2026/bs/bs.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@
<None Include="..\..\..\..\web\admin_dashboard\src\lib\theme.ts" />
<None Include="..\..\..\..\web\admin_dashboard\src\lib\use-current-time.ts" />
<None Include="..\..\..\..\web\admin_dashboard\src\lib\use-telemetry.ts" />
<None Include="..\..\..\..\web\admin_dashboard\src\lib\wallet-prefixes.ts" />
<None Include="..\..\..\..\web\admin_dashboard\src\lib\worker-metrics-store.ts" />
<None Include="..\..\..\..\web\admin_dashboard\src\main.tsx" />
<None Include="..\..\..\..\web\admin_dashboard\src\themes.css" />
Expand Down
37 changes: 20 additions & 17 deletions builds/msvc/vs2026/bs/bs.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -19,55 +19,55 @@
<Filter Include="web">
<UniqueIdentifier>{F45B7D90-90BC-41EF-0000-000000000003}</UniqueIdentifier>
</Filter>
<Filter Include="web\admin_dashboard">
<Filter Include="web\admin-dashboard">
<UniqueIdentifier>{F45B7D90-90BC-41EF-0000-000000000004}</UniqueIdentifier>
</Filter>
<Filter Include="web\admin_dashboard\src">
<Filter Include="web\admin_dashboard">
<UniqueIdentifier>{F45B7D90-90BC-41EF-0000-000000000005}</UniqueIdentifier>
</Filter>
<Filter Include="web\admin_dashboard\src\app">
<Filter Include="web\admin_dashboard\src">
<UniqueIdentifier>{F45B7D90-90BC-41EF-0000-000000000006}</UniqueIdentifier>
</Filter>
<Filter Include="web\admin_dashboard\src\components">
<Filter Include="web\admin_dashboard\src\app">
<UniqueIdentifier>{F45B7D90-90BC-41EF-0000-000000000007}</UniqueIdentifier>
</Filter>
<Filter Include="web\admin_dashboard\src\lib">
<Filter Include="web\admin_dashboard\src\components">
<UniqueIdentifier>{F45B7D90-90BC-41EF-0000-000000000008}</UniqueIdentifier>
</Filter>
<Filter Include="web\native">
<Filter Include="web\admin_dashboard\src\lib">
<UniqueIdentifier>{F45B7D90-90BC-41EF-0000-000000000009}</UniqueIdentifier>
</Filter>
<Filter Include="web\native\src">
<Filter Include="web\blockexplorer">
<UniqueIdentifier>{F45B7D90-90BC-41EF-0000-00000000000A}</UniqueIdentifier>
</Filter>
<Filter Include="web\native\src\app">
<Filter Include="web\native">
<UniqueIdentifier>{F45B7D90-90BC-41EF-0000-00000000000B}</UniqueIdentifier>
</Filter>
<Filter Include="web\native\src\components">
<Filter Include="web\native\src">
<UniqueIdentifier>{F45B7D90-90BC-41EF-0000-00000000000C}</UniqueIdentifier>
</Filter>
<Filter Include="web\native\src\lib">
<Filter Include="web\native\src\app">
<UniqueIdentifier>{F45B7D90-90BC-41EF-0000-00000000000D}</UniqueIdentifier>
</Filter>
<Filter Include="web\native\src\lib\api">
<Filter Include="web\native\src\components">
<UniqueIdentifier>{F45B7D90-90BC-41EF-0000-00000000000E}</UniqueIdentifier>
</Filter>
<Filter Include="web\native\src\lib\api\providers">
<Filter Include="web\native\src\lib">
<UniqueIdentifier>{F45B7D90-90BC-41EF-0000-00000000000F}</UniqueIdentifier>
</Filter>
<Filter Include="web\native\src\lib\hooks">
<Filter Include="web\native\src\lib\api">
<UniqueIdentifier>{F45B7D90-90BC-41EF-0000-000000000001}</UniqueIdentifier>
</Filter>
<Filter Include="web\native\src\lib\utils">
<Filter Include="web\native\src\lib\api\providers">
<UniqueIdentifier>{F45B7D90-90BC-41EF-0000-000000000002}</UniqueIdentifier>
</Filter>
<Filter Include="web\native\src\routes">
<Filter Include="web\native\src\lib\hooks">
<UniqueIdentifier>{F45B7D90-90BC-41EF-0000-000000000003}</UniqueIdentifier>
</Filter>
<Filter Include="web\native\src\vendor">
<Filter Include="web\native\src\lib\utils">
<UniqueIdentifier>{F45B7D90-90BC-41EF-0000-000000000004}</UniqueIdentifier>
</Filter>
<Filter Include="web\native\src\vendor\mining-pools">
<Filter Include="web\native\src\routes">
<UniqueIdentifier>{F45B7D90-90BC-41EF-0000-000000000005}</UniqueIdentifier>
</Filter>
<Filter Include="web\native\src\vendor">
Expand Down Expand Up @@ -307,6 +307,9 @@
<None Include="..\..\..\..\web\admin_dashboard\src\lib\use-telemetry.ts">
<Filter>web\admin_dashboard\src\lib</Filter>
</None>
<None Include="..\..\..\..\web\admin_dashboard\src\lib\wallet-prefixes.ts">
<Filter>web\admin_dashboard\src\lib</Filter>
</None>
<None Include="..\..\..\..\web\admin_dashboard\src\lib\worker-metrics-store.ts">
<Filter>web\admin_dashboard\src\lib</Filter>
</None>
Expand Down
8 changes: 4 additions & 4 deletions console/embedded/admin_css.cpp

Large diffs are not rendered by default.

218 changes: 109 additions & 109 deletions console/embedded/admin_ecma.cpp

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions console/embedded/native_css.cpp

Large diffs are not rendered by default.

162 changes: 81 additions & 81 deletions console/embedded/native_ecma.cpp

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions src/protocols/native/protocol_native_configuration.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ bool protocol_native::handle_get_configuration(const code& ec,
{ "filter", query.filter_enabled() },
{ "silent", silent },
{ "turbo", database_settings().turbo },
{ "witness", node.require_witness },
{ "pruned", get_pruned_height() }
}
},
Expand All @@ -72,8 +71,7 @@ bool protocol_native::handle_get_configuration(const code& ec,
{ "blocks", node.provide_blocks },
{ "witness", node.provide_witness },
{ "filters", node.provide_filters },
{ "privacy", node.provide_privacy },
{ "fees", peer.enable_relay }
{ "privacy", node.provide_privacy }
}
},
{ "wallet", json::object
Expand Down
6 changes: 2 additions & 4 deletions test/protocols/native/native_configuration.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,21 @@ BC_AUTO_TEST_CASE(native__configuration__json__expected)
BC_REQUIRE_EQUAL(object.size(), 5u);

const auto& store = object.at("store").as_object();
BC_REQUIRE_EQUAL(store.size(), 6u);
BC_REQUIRE_EQUAL(store.size(), 5u);
BC_REQUIRE(store.at("address").as_bool());
BC_REQUIRE(store.at("filter").as_bool());
BC_REQUIRE(store.at("silent").is_null());
BC_REQUIRE(!store.at("turbo").as_bool());
BC_REQUIRE(store.at("witness").as_bool());
BC_REQUIRE_EQUAL(store.at("pruned").as_int64(), 0);

const auto& node = object.at("node").as_object();
BC_REQUIRE_EQUAL(node.size(), 7u);
BC_REQUIRE_EQUAL(node.size(), 6u);
BC_REQUIRE_EQUAL(node.at("network").as_string(), "mainnet");
BC_REQUIRE(!node.at("limited").as_bool());
BC_REQUIRE(node.at("blocks").as_bool());
BC_REQUIRE(node.at("witness").as_bool());
BC_REQUIRE(!node.at("filters").as_bool());
BC_REQUIRE(node.at("privacy").as_bool());
BC_REQUIRE_EQUAL(node.at("fees").as_bool(), config_.network.enable_relay);

const auto& wallet = object.at("wallet").as_object();
BC_REQUIRE_EQUAL(wallet.size(), 7u);
Expand Down
8 changes: 6 additions & 2 deletions web/admin_dashboard/src/app/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { loadLogFilter, saveLogFilter } from '@/lib/log-settings';
import { estimateSyncProgress } from '@/lib/sync-status';
import { useAdminTelemetry, useNativeTelemetry } from '@/lib/use-telemetry';
import { useCurrentTime } from '@/lib/use-current-time';
import { coinOf } from '@/lib/wallet-prefixes';

type DashboardView = 'overview' | 'logs' | 'events';

Expand Down Expand Up @@ -47,6 +48,9 @@ export function App() {
logFilter
);
const native = useNativeTelemetry(endpoints.nativeUrl, metrics, now);
const network = native.configuration
? `${coinOf(native.configuration.forks)} ${native.configuration.node.network}`
: ' ';
const syncEstimate = estimateSyncProgress(native.top, native.topHeader, now);

function updateBrowserNotifications(enabled: boolean) {
Expand All @@ -63,7 +67,7 @@ export function App() {
<div className="bg-background text-textPrimary min-h-screen">
<header className="border-accent/30 bg-surface/90 border-b backdrop-blur">
<div className="mx-auto max-w-7xl px-4 py-4">
<div className="flex flex-wrap items-center gap-4">
<div className="flex flex-wrap items-center gap-x-2 gap-y-4">
<div className="order-1 flex flex-col">
<button
type="button"
Expand All @@ -75,7 +79,7 @@ export function App() {
Libbitcoin Server
</button>
<span className="text-textMuted text-sm">
{native.configuration?.node.network ?? ' '}
{network}
</span>
</div>

Expand Down
92 changes: 67 additions & 25 deletions web/admin_dashboard/src/components/overview.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import type { ReactNode } from 'react';
import { Fragment, type ReactNode } from 'react';
import { coinOf, describePrefix } from '@/lib/wallet-prefixes';
import { getEventDefinition } from '@/lib/admin-contract';
import { toWebSocketUrl, type EndpointConfiguration } from '@/lib/endpoints';
import {
Expand Down Expand Up @@ -36,6 +37,7 @@ const lifecycleEvents: ReadonlyArray<{ event: number; label: string }> = [
export function Overview({ adminStatus, endpoints, metrics, native, syncEstimate }: OverviewProps) {
const activity = detectNodeActivity(metrics, 10);
const configuration = native.configuration;
const coin = coinOf(configuration?.forks ?? []);
const connection = combineStatus(adminStatus, native.status);
const warnings = [
adminStatus.error ? `Admin: ${adminStatus.error}` : null,
Expand Down Expand Up @@ -69,7 +71,7 @@ export function Overview({ adminStatus, endpoints, metrics, native, syncEstimate

<dl aria-label="Node summary" className="grid gap-4 sm:grid-cols-2 xl:grid-cols-4">
<MetricItem
label="Canonical top"
label="Current top"
value={native.top === null ? '—' : formatInteger(native.top)}
detail={
native.transport === 'none'
Expand Down Expand Up @@ -145,29 +147,23 @@ export function Overview({ adminStatus, endpoints, metrics, native, syncEstimate
</header>
{configuration ? (
<div className="space-y-4 p-5 text-sm">
<ConfigGroup title="Store">
<ConfigGroup title="Store configuration">
<Flags
items={[
['Address index', configuration.store.address],
['Client filters', configuration.store.filter],
['Client filters index', configuration.store.filter],
['Silent payments index', configuration.store.silent !== null],
['Turbo', configuration.store.turbo],
['Witness', configuration.store.witness],
]}
/>
<Values
items={[
[
'Silent payments from',
configuration.store.silent === null
? 'Disabled'
? 'Not indexed'
: formatInteger(configuration.store.silent),
],
[
'Pruned below',
configuration.store.pruned > 0
? formatInteger(configuration.store.pruned)
: 'Not pruned',
],
]}
/>
</ConfigGroup>
Expand All @@ -179,7 +175,16 @@ export function Overview({ adminStatus, endpoints, metrics, native, syncEstimate
['Witness', configuration.node.witness],
['Filters', configuration.node.filters],
['Privacy', configuration.node.privacy],
['Fees', configuration.node.fees],
]}
/>
<Values
items={[
[
'Inputs pruned below',
configuration.store.pruned > 0
? formatInteger(configuration.store.pruned)
: 'Not pruned',
],
]}
/>
</ConfigGroup>
Expand Down Expand Up @@ -209,13 +214,41 @@ export function Overview({ adminStatus, endpoints, metrics, native, syncEstimate
<ConfigGroup title="Wallet">
<Values
items={[
['P2PKH version', String(configuration.wallet.p2kh)],
['P2SH version', String(configuration.wallet.p2sh)],
['WIF version', String(configuration.wallet.wif)],
['Witness prefix', configuration.wallet.witness],
['Silent prefix', configuration.wallet.silent],
['HD private', toHex32(configuration.wallet.hd_private)],
['HD public', toHex32(configuration.wallet.hd_public)],
[
'P2PKH version',
String(configuration.wallet.p2kh),
describePrefix(coin, 'p2kh', configuration.wallet.p2kh),
],
[
'P2SH version',
String(configuration.wallet.p2sh),
describePrefix(coin, 'p2sh', configuration.wallet.p2sh),
],
[
'WIF version',
String(configuration.wallet.wif),
describePrefix(coin, 'wif', configuration.wallet.wif),
],
[
'Witness prefix',
configuration.wallet.witness,
describePrefix(coin, 'witness', configuration.wallet.witness),
],
[
'Silent prefix',
configuration.wallet.silent,
describePrefix(coin, 'silent', configuration.wallet.silent),
],
[
'HD private',
toHex32(configuration.wallet.hd_private),
describePrefix(coin, 'hdPrivate', configuration.wallet.hd_private),
],
[
'HD public',
toHex32(configuration.wallet.hd_public),
describePrefix(coin, 'hdPublic', configuration.wallet.hd_public),
],
]}
/>
</ConfigGroup>
Expand Down Expand Up @@ -313,14 +346,23 @@ function Flags({ items }: { items: ReadonlyArray<readonly [string, boolean | und
);
}

function Values({ items }: { items: ReadonlyArray<readonly [string, string]> }) {
function Values({
items,
}: {
items: ReadonlyArray<readonly [string, string] | readonly [string, string, string]>;
}) {
const described = items.some((item) => item.length > 2);
const columns = described
? 'grid-cols-[10rem_max-content_auto]'
: 'grid-cols-[10rem_max-content]';
return (
<dl className="grid gap-x-6 gap-y-1 sm:grid-cols-2">
{items.map(([label, value]) => (
<div key={label} className="flex items-baseline justify-between gap-3">
<dl className={`grid ${columns} items-baseline gap-x-4 gap-y-1`}>
{items.map(([label, value, meaning]) => (
<Fragment key={label}>
<dt className="text-textMuted">{label}</dt>
<dd className="text-textPrimary font-mono">{value}</dd>
</div>
{described && <dd className="text-textMuted">{meaning}</dd>}
</Fragment>
))}
</dl>
);
Expand Down
2 changes: 0 additions & 2 deletions web/admin_dashboard/src/lib/native-contract.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ const nativeConfigurationSchema = z.object({
filter: z.boolean(),
silent: z.number().int().nonnegative().nullable(),
turbo: z.boolean(),
witness: z.boolean(),
pruned: z.number().int().nonnegative(),
}),
node: z.object({
Expand All @@ -16,7 +15,6 @@ const nativeConfigurationSchema = z.object({
witness: z.boolean().optional(),
filters: z.boolean().optional(),
privacy: z.boolean().optional(),
fees: z.boolean().optional(),
}),
wallet: z
.object({
Expand Down
2 changes: 1 addition & 1 deletion web/admin_dashboard/src/lib/signal-catalog.ts
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ const declaredSignals: SignalDefinition[] = [
source: 'native',
sourceId: 'top',
name: 'canonical_top',
label: 'Canonical top',
label: 'Current top',
category: 'native',
payloadKind: 'height',
allowedMeasures: ['payload-latest', 'payload-maximum', 'payload-change-rate'],
Expand Down
Loading
Loading