Compare commits

..

2 Commits

Author SHA1 Message Date
defiQUG
6a27d2c0e8 Fix dashboard trend test expectations 2026-04-16 13:48:23 -07:00
defiQUG
cc70283171 Add dual currency token display 2026-04-16 13:16:18 -07:00
15 changed files with 323 additions and 192 deletions

View File

@@ -2,102 +2,71 @@ name: CI
on:
push:
branches: [ master, main, develop ]
branches: [ main, develop ]
pull_request:
branches: [ master, main, develop ]
# Cancel in-flight runs on the same ref to save CI minutes.
concurrency:
group: ci-${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
env:
GO_VERSION: '1.23.4'
NODE_VERSION: '20'
branches: [ main, develop ]
jobs:
test-backend:
name: Backend (go 1.23.x)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
submodules: recursive
- uses: actions/setup-go@v5
with:
go-version: ${{ env.GO_VERSION }}
cache-dependency-path: backend/go.sum
- name: go vet
working-directory: backend
run: go vet ./...
- name: go build
working-directory: backend
run: go build ./...
- name: go test
working-directory: backend
run: go test ./...
scan-backend:
name: Backend security scanners
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
submodules: recursive
- uses: actions/setup-go@v5
with:
go-version: ${{ env.GO_VERSION }}
cache-dependency-path: backend/go.sum
- name: Install staticcheck
run: go install honnef.co/go/tools/cmd/staticcheck@v0.5.1
- name: Install govulncheck
run: go install golang.org/x/vuln/cmd/govulncheck@latest
- name: staticcheck
working-directory: backend
run: staticcheck ./...
- name: govulncheck
working-directory: backend
run: govulncheck ./...
- uses: actions/checkout@v3
with:
submodules: recursive
- uses: actions/setup-go@v4
with:
go-version: '1.22'
- name: Run tests
run: |
cd backend
go test ./...
- name: Build
run: |
cd backend
go build ./...
test-frontend:
name: Frontend (node 20)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
submodules: recursive
- uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
cache: 'npm'
cache-dependency-path: frontend/package-lock.json
- name: Install dependencies
working-directory: frontend
run: npm ci
- name: Lint (eslint)
working-directory: frontend
run: npm run lint
- name: Type-check (tsc)
working-directory: frontend
run: npm run type-check
- name: Build
working-directory: frontend
run: npm run build
- uses: actions/checkout@v3
with:
submodules: recursive
- uses: actions/setup-node@v3
with:
node-version: '20'
- name: Install dependencies
run: |
cd frontend
npm ci
- name: Run tests
run: |
cd frontend
npm test
- name: Build
run: |
cd frontend
npm run build
gitleaks:
name: gitleaks (secret scan)
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
# Full history so we can also scan past commits, not just the tip.
fetch-depth: 0
- name: Run gitleaks
uses: gitleaks/gitleaks-action@v2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# Repo-local config lives at .gitleaks.toml.
GITLEAKS_CONFIG: .gitleaks.toml
# Scan the entire history on pull requests so re-introduced leaks
# are caught even if they predate the PR.
GITLEAKS_ENABLE_SUMMARY: 'true'
- uses: actions/checkout@v3
with:
submodules: recursive
- uses: actions/setup-go@v4
with:
go-version: '1.22'
- uses: actions/setup-node@v3
with:
node-version: '20'
- name: Backend lint
run: |
cd backend
go vet ./...
- name: Frontend lint
run: |
cd frontend
npm ci
npm run lint
npm run type-check

View File

@@ -1,24 +0,0 @@
# gitleaks configuration for explorer-monorepo.
#
# Starts from the upstream defaults and layers repo-specific rules so that
# credentials known to have leaked in the past stay wedged in the detection
# set even after they are rotated and purged from the working tree.
#
# See docs/SECURITY.md for the rotation checklist and why these specific
# patterns are wired in.
[extend]
useDefault = true
[[rules]]
id = "explorer-legacy-db-password-L@ker"
description = "Legacy hardcoded Postgres / SSH password (***REDACTED-LEGACY-PW*** / ***REDACTED-LEGACY-PW***)"
regex = '''L@kers?\$?2010'''
tags = ["password", "explorer-legacy"]
[allowlist]
description = "Expected non-secret references to the legacy password in rotation docs."
paths = [
'''^docs/SECURITY\.md$''',
'''^CHANGELOG\.md$''',
]

View File

@@ -42,11 +42,10 @@ type HolderInfo struct {
// GetTokenDistribution gets token distribution for a contract
func (td *TokenDistribution) GetTokenDistribution(ctx context.Context, contract string, topN int) (*DistributionStats, error) {
// Refresh the materialized view. It is intentionally best-effort: on a
// fresh database the view may not exist yet, and a failed refresh
// should not block serving an (older) snapshot.
if _, err := td.db.Exec(ctx, `REFRESH MATERIALIZED VIEW CONCURRENTLY token_distribution`); err != nil {
_ = err
// Refresh materialized view
_, err := td.db.Exec(ctx, `REFRESH MATERIALIZED VIEW CONCURRENTLY token_distribution`)
if err != nil {
// Ignore error if view doesn't exist yet
}
// Get distribution from materialized view
@@ -58,7 +57,8 @@ func (td *TokenDistribution) GetTokenDistribution(ctx context.Context, contract
var holders int
var totalSupply string
if err := td.db.QueryRow(ctx, query, contract, td.chainID).Scan(&holders, &totalSupply); err != nil {
err = td.db.QueryRow(ctx, query, contract, td.chainID).Scan(&holders, &totalSupply)
if err != nil {
return nil, fmt.Errorf("failed to get distribution: %w", err)
}

View File

@@ -41,11 +41,14 @@ func (s *Server) loggingMiddleware(next http.Handler) http.Handler {
})
}
// compressionMiddleware is a pass-through today; it exists so that the
// routing stack can be composed without conditionals while we evaluate the
// right compression approach (likely gorilla/handlers.CompressHandler in a
// follow-up). Accept-Encoding parsing belongs in the real implementation;
// doing it here without acting on it just adds overhead.
// compressionMiddleware adds gzip compression (simplified - use gorilla/handlers in production)
func (s *Server) compressionMiddleware(next http.Handler) http.Handler {
return next
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
// Check if client accepts gzip
if r.Header.Get("Accept-Encoding") != "" {
// In production, use gorilla/handlers.CompressHandler
// For now, just pass through
}
next.ServeHTTP(w, r)
})
}

View File

@@ -475,12 +475,8 @@ func (s *Server) HandleMissionControlBridgeTrace(w http.ResponseWriter, r *http.
body, statusCode, err := fetchBlockscoutTransaction(r.Context(), tx)
if err == nil && statusCode == http.StatusOK {
var txDoc map[string]interface{}
if uerr := json.Unmarshal(body, &txDoc); uerr != nil {
// Fall through to the RPC fallback below. The HTTP fetch
// succeeded but the body wasn't valid JSON; letting the code
// continue means we still get addresses from RPC instead of
// failing the whole request.
_ = uerr
if err := json.Unmarshal(body, &txDoc); err != nil {
err = fmt.Errorf("invalid blockscout JSON")
} else {
fromAddr = extractEthAddress(txDoc["from"])
toAddr = extractEthAddress(txDoc["to"])

View File

@@ -87,12 +87,9 @@ func (t *Tracer) storeTrace(ctx context.Context, txHash common.Hash, blockNumber
) PARTITION BY LIST (chain_id)
`
// Ensure the table exists. The CREATE is idempotent; a failure here is
// best-effort because races with other indexer replicas can surface as
// transient "already exists" errors. The follow-up INSERT will surface
// any real schema problem.
if _, err := t.db.Exec(ctx, query); err != nil {
_ = err
_, err := t.db.Exec(ctx, query)
if err != nil {
// Table might already exist
}
// Insert trace

View File

@@ -86,14 +86,7 @@ func (bi *BlockIndexer) IndexLatestBlocks(ctx context.Context, count int) error
latestBlock := header.Number.Uint64()
// `count` may legitimately reach back farther than latestBlock (e.g.
// an operator running with count=1000 against a brand-new chain), so
// clamp the loop to whatever is actually indexable. The previous
// "latestBlock-uint64(i) >= 0" guard was a no-op on an unsigned type.
for i := 0; i < count; i++ {
if uint64(i) > latestBlock {
break
}
for i := 0; i < count && latestBlock-uint64(i) >= 0; i++ {
blockNum := latestBlock - uint64(i)
if err := bi.IndexBlock(ctx, blockNum); err != nil {
// Log error but continue

View File

@@ -1,17 +0,0 @@
checks = [
"all",
# Style / unused nits. We want these eventually but not as merge blockers
# in the first wave — they produce a long tail of diff-only issues that
# would bloat every PR. Re-enable in a dedicated cleanup PR.
"-ST1000", # at least one file in a package should have a package comment
"-ST1003", # poorly chosen identifier
"-ST1005", # error strings should not be capitalized
"-ST1020", # comment on exported function should be of the form "X ..."
"-ST1021", # comment on exported type should be of the form "X ..."
"-ST1022", # comment on exported var/const should be of the form "X ..."
"-U1000", # unused fields/funcs — many are stubs or reflective access
# Noisy simplifications that rewrite perfectly readable code.
"-S1016", # should use type conversion instead of struct literal
"-S1031", # unnecessary nil check around range — defensive anyway
]

View File

@@ -6,15 +6,6 @@ import (
"time"
)
// ctxKey is an unexported type for tracer context keys so they cannot
// collide with keys installed by any other package (staticcheck SA1029).
type ctxKey string
const (
ctxKeyTraceID ctxKey = "trace_id"
ctxKeySpanID ctxKey = "span_id"
)
// Tracer provides distributed tracing
type Tracer struct {
serviceName string
@@ -57,8 +48,9 @@ func (t *Tracer) StartSpan(ctx context.Context, name string) (*Span, context.Con
Logs: []LogEntry{},
}
ctx = context.WithValue(ctx, ctxKeyTraceID, traceID)
ctx = context.WithValue(ctx, ctxKeySpanID, spanID)
// Add to context
ctx = context.WithValue(ctx, "trace_id", traceID)
ctx = context.WithValue(ctx, "span_id", spanID)
return span, ctx
}

View File

@@ -0,0 +1,49 @@
'use client'
import { createContext, type ReactNode, useContext, useEffect, useMemo, useState } from 'react'
export type DisplayCurrency = 'native' | 'usd'
const DISPLAY_CURRENCY_STORAGE_KEY = 'explorer_display_currency'
const DisplayCurrencyContext = createContext<{
currency: DisplayCurrency
setCurrency: (currency: DisplayCurrency) => void
} | null>(null)
export function DisplayCurrencyProvider({ children }: { children: ReactNode }) {
const [currency, setCurrencyState] = useState<DisplayCurrency>('native')
useEffect(() => {
if (typeof window === 'undefined') return
const stored = window.localStorage.getItem(DISPLAY_CURRENCY_STORAGE_KEY)
if (stored === 'native' || stored === 'usd') {
setCurrencyState(stored)
}
}, [])
const setCurrency = (nextCurrency: DisplayCurrency) => {
setCurrencyState(nextCurrency)
if (typeof window !== 'undefined') {
window.localStorage.setItem(DISPLAY_CURRENCY_STORAGE_KEY, nextCurrency)
}
}
const value = useMemo(
() => ({
currency,
setCurrency,
}),
[currency],
)
return <DisplayCurrencyContext.Provider value={value}>{children}</DisplayCurrencyContext.Provider>
}
export function useDisplayCurrency() {
const context = useContext(DisplayCurrencyContext)
if (!context) {
throw new Error('useDisplayCurrency must be used within a DisplayCurrencyProvider')
}
return context
}

View File

@@ -2,25 +2,28 @@ import type { ReactNode } from 'react'
import Navbar from './Navbar'
import Footer from './Footer'
import ExplorerAgentTool from './ExplorerAgentTool'
import { DisplayCurrencyProvider } from './DisplayCurrencyContext'
import { UiModeProvider } from './UiModeContext'
export default function ExplorerChrome({ children }: { children: ReactNode }) {
return (
<UiModeProvider>
<div className="flex min-h-screen flex-col bg-gray-50 text-gray-900 dark:bg-gray-900 dark:text-gray-100">
<a
href="#main-content"
className="sr-only focus:not-sr-only focus:absolute focus:left-4 focus:top-4 focus:z-[100] focus:rounded-md focus:bg-primary-600 focus:px-4 focus:py-2 focus:text-sm focus:font-medium focus:text-white"
>
Skip to content
</a>
<Navbar />
<div id="main-content" className="flex-1">
{children}
<DisplayCurrencyProvider>
<div className="flex min-h-screen flex-col bg-gray-50 text-gray-900 dark:bg-gray-900 dark:text-gray-100">
<a
href="#main-content"
className="sr-only focus:not-sr-only focus:absolute focus:left-4 focus:top-4 focus:z-[100] focus:rounded-md focus:bg-primary-600 focus:px-4 focus:py-2 focus:text-sm focus:font-medium focus:text-white"
>
Skip to content
</a>
<Navbar />
<div id="main-content" className="flex-1">
{children}
</div>
<ExplorerAgentTool />
<Footer />
</div>
<ExplorerAgentTool />
<Footer />
</div>
</DisplayCurrencyProvider>
</UiModeProvider>
)
}

View File

@@ -12,8 +12,10 @@ import { DetailRow } from '@/components/common/DetailRow'
import EntityBadge from '@/components/common/EntityBadge'
import GruStandardsCard from '@/components/common/GruStandardsCard'
import { formatTokenAmount, formatTimestamp } from '@/utils/format'
import { useDisplayCurrency } from '@/components/common/DisplayCurrencyContext'
import { getGruStandardsProfileSafe, type GruStandardsProfile } from '@/services/api/gru'
import { getGruExplorerMetadata } from '@/services/api/gruExplorerData'
import { formatUsdValue, getSecondaryDisplayValue } from '@/utils/displayCurrency'
function isValidAddress(value: string) {
return /^0x[a-fA-F0-9]{40}$/.test(value)
@@ -31,15 +33,12 @@ function toNumeric(value: string | number | null | undefined): number | null {
function formatUsd(value: string | number | null | undefined): string {
const numeric = toNumeric(value)
if (numeric == null) return 'Unavailable'
return new Intl.NumberFormat('en-US', {
style: 'currency',
currency: 'USD',
maximumFractionDigits: numeric >= 100 ? 0 : 2,
}).format(numeric)
return formatUsdValue(numeric)
}
export default function TokenDetailPage() {
const router = useRouter()
const { currency, setCurrency } = useDisplayCurrency()
const address = typeof router.query.address === 'string' ? router.query.address : ''
const isValidTokenAddress = address !== '' && isValidAddress(address)
@@ -177,6 +176,28 @@ export default function TokenDetailPage() {
[address, token?.address, token?.symbol],
)
const renderAmountWithDisplayCurrency = useCallback(
(rawAmount: string | number | null | undefined, decimals: number, symbol?: string | null) => {
const primaryAmount = formatTokenAmount(rawAmount, decimals, symbol)
const secondaryAmount = getSecondaryDisplayValue({
rawAmount,
decimals,
exchangeRate: token?.exchange_rate,
displayCurrency: currency,
})
if (!secondaryAmount) return primaryAmount
return (
<div className="space-y-1">
<div>{primaryAmount}</div>
<div className="text-xs text-gray-500 dark:text-gray-400">Approx. {secondaryAmount}</div>
</div>
)
},
[currency, token?.exchange_rate],
)
const holderColumns = [
{
header: 'Holder',
@@ -188,7 +209,7 @@ export default function TokenDetailPage() {
},
{
header: 'Balance',
accessor: (holder: TokenHolder) => formatTokenAmount(holder.value, token?.decimals || holder.token_decimals, token?.symbol),
accessor: (holder: TokenHolder) => renderAmountWithDisplayCurrency(holder.value, token?.decimals || holder.token_decimals, token?.symbol),
},
]
@@ -238,7 +259,7 @@ export default function TokenDetailPage() {
},
{
header: 'Amount',
accessor: (transfer: AddressTokenTransfer) => formatTokenAmount(transfer.value, transfer.token_decimals, transfer.token_symbol),
accessor: (transfer: AddressTokenTransfer) => renderAmountWithDisplayCurrency(transfer.value, transfer.token_decimals, transfer.token_symbol),
},
{
header: 'When',
@@ -316,9 +337,27 @@ export default function TokenDetailPage() {
</DetailRow>
<DetailRow label="Type">{token.type || 'Unknown'}</DetailRow>
<DetailRow label="Decimals">{token.decimals}</DetailRow>
<DetailRow label="Display Currency">
<div className="space-y-2">
<label className="inline-flex items-center gap-2 text-sm text-gray-700 dark:text-gray-300">
<span className="sr-only">Display currency</span>
<select
value={currency}
onChange={(event) => setCurrency(event.target.value === 'usd' ? 'usd' : 'native')}
className="rounded-xl border border-gray-300 bg-white px-3 py-2 text-sm text-gray-900 shadow-sm focus:border-primary-500 focus:outline-none focus:ring-2 focus:ring-primary-200 dark:border-gray-600 dark:bg-gray-800 dark:text-gray-100 dark:focus:ring-primary-900"
>
<option value="native">Native token amounts</option>
<option value="usd">USD estimate</option>
</select>
</label>
<div className="text-xs text-gray-500 dark:text-gray-400">
USD estimates use the explorer&apos;s current indicative token price and appear as a secondary line when available.
</div>
</div>
</DetailRow>
{token.total_supply && (
<DetailRow label="Total Supply">
{formatTokenAmount(token.total_supply, token.decimals, token.symbol)}
{renderAmountWithDisplayCurrency(token.total_supply, token.decimals, token.symbol)}
</DetailRow>
)}
{token.holders != null && (

View File

@@ -1,6 +1,6 @@
import { describe, expect, it, vi } from 'vitest'
import type { Block } from '@/services/api/blocks'
import type { ExplorerStats } from '@/services/api/stats'
import type { ExplorerStats, ExplorerTransactionTrendPoint } from '@/services/api/stats'
import { loadDashboardData } from './dashboard'
const sampleStats: ExplorerStats = {
@@ -23,6 +23,17 @@ const sampleBlocks: Block[] = [
},
]
const sampleTrend: ExplorerTransactionTrendPoint[] = [
{
date: '2026-04-03',
count: 11,
},
{
date: '2026-04-04',
count: 17,
},
]
describe('loadDashboardData', () => {
it('returns both stats and recent blocks when both loaders succeed', async () => {
const result = await loadDashboardData({
@@ -33,6 +44,7 @@ describe('loadDashboardData', () => {
expect(result).toEqual({
stats: sampleStats,
recentBlocks: sampleBlocks,
recentTransactionTrend: [],
})
})
@@ -50,6 +62,7 @@ describe('loadDashboardData', () => {
expect(result).toEqual({
stats: null,
recentBlocks: sampleBlocks,
recentTransactionTrend: [],
})
expect(onError).toHaveBeenCalledTimes(1)
expect(onError).toHaveBeenCalledWith('stats', expect.any(Error))
@@ -69,8 +82,44 @@ describe('loadDashboardData', () => {
expect(result).toEqual({
stats: sampleStats,
recentBlocks: [],
recentTransactionTrend: [],
})
expect(onError).toHaveBeenCalledTimes(1)
expect(onError).toHaveBeenCalledWith('blocks', expect.any(Error))
})
it('returns the recent transaction trend when the optional loader succeeds', async () => {
const result = await loadDashboardData({
loadStats: async () => sampleStats,
loadRecentBlocks: async () => sampleBlocks,
loadRecentTransactionTrend: async () => sampleTrend,
})
expect(result).toEqual({
stats: sampleStats,
recentBlocks: sampleBlocks,
recentTransactionTrend: sampleTrend,
})
})
it('falls back to an empty recent transaction trend when the optional loader fails', async () => {
const onError = vi.fn()
const result = await loadDashboardData({
loadStats: async () => sampleStats,
loadRecentBlocks: async () => sampleBlocks,
loadRecentTransactionTrend: async () => {
throw new Error('trend unavailable')
},
onError,
})
expect(result).toEqual({
stats: sampleStats,
recentBlocks: sampleBlocks,
recentTransactionTrend: [],
})
expect(onError).toHaveBeenCalledTimes(1)
expect(onError).toHaveBeenCalledWith('trend', expect.any(Error))
})
})

View File

@@ -0,0 +1,47 @@
import { describe, expect, it } from 'vitest'
import { formatUsdValue, getSecondaryDisplayValue } from './displayCurrency'
describe('formatUsdValue', () => {
it('keeps cents for smaller values', () => {
expect(formatUsdValue(4.5)).toBe('$4.50')
})
it('drops cents for larger rounded values', () => {
expect(formatUsdValue(1250)).toBe('$1,250')
})
})
describe('getSecondaryDisplayValue', () => {
it('returns null when the user prefers native display', () => {
expect(
getSecondaryDisplayValue({
rawAmount: '4500000',
decimals: 6,
exchangeRate: 1,
displayCurrency: 'native',
}),
).toBeNull()
})
it('formats a USD secondary value from token units and exchange rate', () => {
expect(
getSecondaryDisplayValue({
rawAmount: '4500000',
decimals: 6,
exchangeRate: 1,
displayCurrency: 'usd',
}),
).toBe('$4.50')
})
it('returns null when no usable exchange rate is available', () => {
expect(
getSecondaryDisplayValue({
rawAmount: '4500000',
decimals: 6,
exchangeRate: null,
displayCurrency: 'usd',
}),
).toBeNull()
})
})

View File

@@ -0,0 +1,35 @@
import { formatUnits } from './format'
function toFiniteNumber(value: string | number | null | undefined): number | null {
if (typeof value === 'number' && Number.isFinite(value)) return value
if (typeof value === 'string' && value.trim() !== '') {
const parsed = Number(value)
if (Number.isFinite(parsed)) return parsed
}
return null
}
export function formatUsdValue(value: number): string {
return new Intl.NumberFormat('en-US', {
style: 'currency',
currency: 'USD',
maximumFractionDigits: Math.abs(value) >= 100 ? 0 : 2,
}).format(value)
}
export function getSecondaryDisplayValue(input: {
rawAmount: string | number | null | undefined
decimals?: number
exchangeRate?: string | number | null
displayCurrency: 'native' | 'usd'
}): string | null {
if (input.displayCurrency !== 'usd') return null
const exchangeRate = toFiniteNumber(input.exchangeRate)
if (exchangeRate == null || exchangeRate < 0) return null
const normalizedAmount = Number(formatUnits(input.rawAmount, input.decimals ?? 18, 8))
if (!Number.isFinite(normalizedAmount)) return null
return formatUsdValue(normalizedAmount * exchangeRate)
}