Skip to content

Remove suffix from Node Aliases #106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 5, 2025
Merged

Remove suffix from Node Aliases #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions apps/frontend/src/components/bookkeeper/Volume/VolumeGraph/VolumeGraph.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ const VolumeGraphTooltip = ({ active, payload, label, unit }: any) => {
if (!forward) return null;
return (
<div className='bkpr-tooltip p-3'>
<p><strong>Inbound Channel SCID:</strong>{forward.in_channel_scid}</p>
<p><strong>Inbound Peer Alias:</strong>{forward.in_channel_peer_alias}</p>
<p><strong>Inbound Channel SCID: </strong>{forward.in_channel_scid}</p>
<p><strong>Inbound Peer Alias: </strong>{forward.in_channel_peer_alias}</p>
{forward.out_channel_scid && (
<>
<p><strong>Outbout Channel SCID:</strong>{forward.out_channel_scid}</p>
<p><strong>Outbout Peer Alias:</strong>{forward.out_channel_peer_alias}</p>
<p><strong>Outbout Channel SCID: </strong>{forward.out_channel_scid}</p>
<p><strong>Outbout Peer Alias: </strong>{forward.out_channel_peer_alias}</p>
</>
)}
<hr />
Expand Down
4 changes: 2 additions & 2 deletions apps/frontend/src/components/ui/Header/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ const Header = (props) => {
>
<span className='d-inline-block mx-3 dot bg-success'></span>
</OverlayTrigger>
<span className='fs-7'>{nodeInfo.alias + ' (' + nodeInfo.version + ')'}</span>
<span className='fs-7'>{nodeInfo.alias?.replace(/--\d+-.*$/, '') + ' (' + nodeInfo.version + ')'}</span>
</>
}
</Col>
Expand Down Expand Up @@ -177,7 +177,7 @@ const Header = (props) => {
>
<span className='d-inline-block me-3 dot bg-success'></span>
</OverlayTrigger>
<span className='fs-7'>{nodeInfo.alias + ' (' + nodeInfo.version + ')'}</span>
<span className='fs-7'>{nodeInfo.alias?.replace(/--\d+-.*$/, '') + ' (' + nodeInfo.version + ')'}</span>
</>
}
</Col>
Expand Down
14 changes: 7 additions & 7 deletions apps/frontend/src/services/data-transform.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,15 +248,15 @@ export function transformVolumeData(sqlResultSet: VolumeRow[]): {volume: VolumeD
if (highestForwardIndex != null) {
most_traffic_route = {
channel_scids: sqlResultSet[highestForwardIndex].in_channel_scid + ' -> ' + sqlResultSet[highestForwardIndex].out_channel_scid,
channel_aliases: sqlResultSet[highestForwardIndex].in_channel_peer_alias + ' -> ' + sqlResultSet[highestForwardIndex].out_channel_peer_alias,
channel_aliases: sqlResultSet[highestForwardIndex].in_channel_peer_alias?.replace(/-\d+-.*$/, '') + ' -> ' + sqlResultSet[highestForwardIndex].out_channel_peer_alias?.replace(/-\d+-.*$/, ''),
fee_msat: sqlResultSet[highestForwardIndex].fee_msat,
};
}
let least_traffic_route: SummaryRoute = { channel_scids: '', channel_aliases: '', fee_msat: 0 };
if (lowestForwardIndex != null) {
least_traffic_route = {
channel_scids: sqlResultSet[lowestForwardIndex].in_channel_scid + ' -> ' + sqlResultSet[lowestForwardIndex].out_channel_scid,
channel_aliases: sqlResultSet[lowestForwardIndex].in_channel_peer_alias + ' -> ' + sqlResultSet[lowestForwardIndex].out_channel_peer_alias,
channel_aliases: sqlResultSet[lowestForwardIndex].in_channel_peer_alias?.replace(/-\d+-.*$/, '') + ' -> ' + sqlResultSet[lowestForwardIndex].out_channel_peer_alias?.replace(/-\d+-.*$/, ''),
fee_msat: sqlResultSet[lowestForwardIndex].fee_msat,
};
}
Expand Down Expand Up @@ -316,10 +316,10 @@ export function transformVolumeGraphData(forwards: VolumeRow[]) {
found.in_msat += curr.in_msat;
} else {
acc.push({
name: curr.in_channel_peer_alias,
name: curr.in_channel_peer_alias?.replace(/-\d+-.*$/, ''),
in_channel_scid: curr.in_channel_scid,
in_channel_peer_id: curr.in_channel_peer_id,
in_channel_peer_alias: curr.in_channel_peer_alias,
in_channel_peer_alias: curr.in_channel_peer_alias?.replace(/-\d+-.*$/, ''),
in_msat: curr.in_msat,
out_msat: curr.out_msat,
fee_msat: curr.fee_msat
Expand All @@ -333,15 +333,15 @@ export function transformVolumeGraphData(forwards: VolumeRow[]) {
forwards
.filter(f => f.in_channel_scid === inForward.in_channel_scid)
.map(forward => ({
name: forward.out_channel_peer_alias,
name: forward.out_channel_peer_alias?.replace(/-\d+-.*$/, ''),
out_channel_scid: forward.out_channel_scid,
out_channel_peer_id: forward.out_channel_peer_id,
out_channel_peer_alias: forward.out_channel_peer_alias,
out_channel_peer_alias: forward.out_channel_peer_alias?.replace(/-\d+-.*$/, ''),
in_msat: forward.in_msat,
out_msat: forward.out_msat,
fee_msat: forward.fee_msat,
in_channel_scid: inForward.in_channel_scid,
in_channel_peer_alias: inForward.in_channel_peer_alias
in_channel_peer_alias: inForward.in_channel_peer_alias?.replace(/-\d+-.*$/, '')
}))
);

Expand Down
2 changes: 1 addition & 1 deletion apps/frontend/src/store/rootSlice.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const aggregatePeerChannels = (listPeerChannels: any, listNodes: Node[]) => {
listPeerChannels.channels.forEach((peerChannel: any) => {
peerChannel = {
...peerChannel,
node_alias: listNodes.find((node) => node?.nodeid === peerChannel.peer_id)?.alias || 'Unknown',
node_alias: listNodes.find((node) => node?.nodeid === peerChannel.peer_id)?.alias?.replace(/-\d+-.*$/, '') || 'Unknown',
to_us_sat: Math.floor((peerChannel.to_us_msat || 0) / SATS_MSAT),
total_sat: Math.floor((peerChannel.total_msat || 0) / SATS_MSAT),
to_them_sat: Math.floor(((peerChannel.total_msat || 0) - (peerChannel.to_us_msat || 0)) / SATS_MSAT),
Expand Down
4 changes: 2 additions & 2 deletions apps/frontend/src/utilities/test-utilities/mockData.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1406,11 +1406,11 @@ export const mockBKPRVolume = {
{
in_channel_scid: "110x1x0",
in_channel_peer_id: "020371140f2ec44c4d6cea50c018310e9409c97c410c56fbc120de3e85b0358d02",
in_channel_peer_alias: "IRATESPORK-v25.02-31-g08210da",
in_channel_peer_alias: "IRATESPORK",
in_msat: 15200154,
out_channel_scid: "146x1x0",
out_channel_peer_id: "03fbdd0a9ddba420be1ec9146802c9b95f6233b1a36c5e2c223884fde157be7ff5",
out_channel_peer_alias: "SLICKERMAESTRO-25.02-31-g08210da",
out_channel_peer_alias: "SLICKERMAESTRO",
out_msat: 15200000,
fee_msat: 154
}
Expand Down