Skip to content

Commit 82f12f6

Browse files
committed
handle unknown addresses
1 parent dd6463f commit 82f12f6

File tree

3 files changed

+22
-44
lines changed

3 files changed

+22
-44
lines changed

app/[locale]/10years/_components/CurrentTorchHolderCard.tsx

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ import {
2525

2626
interface CurrentTorchHolderCardProps {
2727
currentHolder: TorchHolderMetadata | null
28-
isFiltered?: boolean
28+
isBurned?: boolean
2929
className?: string
3030
}
3131

3232
const CurrentTorchHolderCard = ({
3333
currentHolder,
34-
isFiltered = false,
34+
isBurned = false,
3535
className,
3636
}: CurrentTorchHolderCardProps) => {
3737
return (
@@ -94,24 +94,24 @@ const CurrentTorchHolderCard = ({
9494
</BaseLink>
9595
</div>
9696
</div>
97-
) : isFiltered ? (
97+
) : isBurned ? (
9898
<div className="flex flex-col items-center gap-4 text-center">
99-
<div className="text-2xl font-bold text-gray-500">
100-
🤐 Unknown Holder
99+
<div className="text-2xl font-bold text-red-500">
100+
🔥 Torch Burned 🔥
101101
</div>
102102
<div className="text-lg">
103-
The current torch holder&apos;s identity is not publicly
104-
available.
103+
The Ethereum Torch has been burned to celebrate the 10-year
104+
anniversary!
105105
</div>
106106
</div>
107107
) : (
108108
<div className="flex flex-col items-center gap-4 text-center">
109-
<div className="text-2xl font-bold text-red-500">
110-
🔥 Torch Burned 🔥
109+
<div className="text-2xl font-bold text-gray-500">
110+
🤐 Unknown Bearer
111111
</div>
112112
<div className="text-lg">
113-
The Ethereum Torch has been burned to celebrate the 10-year
114-
anniversary!
113+
The current torch bearer&apos;s identity is not publicly
114+
available.
115115
</div>
116116
</div>
117117
)}

app/[locale]/10years/page.tsx

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,7 @@ import {
4343
import { fetch10YearEvents } from "@/lib/api/fetch10YearEvents"
4444
import { fetch10YearStories } from "@/lib/api/fetch10YearStories"
4545
import { fetchTorchHolders } from "@/lib/api/fetchTorchHolders"
46-
import {
47-
getCurrentHolderAddress,
48-
getHolders,
49-
isAddressFiltered,
50-
} from "@/lib/torch"
46+
import { getCurrentHolderAddress, getHolders } from "@/lib/torch"
5147
import TenYearLogo from "@/public/images/10-year-anniversary/10-year-logo.png"
5248

5349
export const dynamic = "force-static"
@@ -104,14 +100,7 @@ const Page = async ({ params }: { params: Promise<{ locale: Lang }> }) => {
104100
const isBurned =
105101
currentHolderAddress === "0x0000000000000000000000000000000000000000"
106102

107-
// Check if current holder should be filtered
108-
const isCurrentHolderFiltered =
109-
!isBurned && isAddressFiltered(currentHolderAddress)
110-
111-
const currentHolder =
112-
isBurned || isCurrentHolderFiltered
113-
? null
114-
: torchHolderMap[currentHolderAddress.toLowerCase()]
103+
const currentHolder = torchHolderMap[currentHolderAddress.toLowerCase()]
115104
const torchHolders = await getHolders(torchHolderMap)
116105

117106
return (
@@ -142,7 +131,7 @@ const Page = async ({ params }: { params: Promise<{ locale: Lang }> }) => {
142131
<CurrentTorchHolderCard
143132
className="w-[420px]"
144133
currentHolder={currentHolder}
145-
isFiltered={isCurrentHolderFiltered}
134+
isBurned={isBurned}
146135
/>
147136
</div>
148137
</div>

src/lib/torch/index.ts

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import blockies from "ethereum-blockies-base64"
22
import type { Address } from "viem"
3-
import { hardhat } from "viem/chains"
3+
import { sepolia } from "viem/chains"
44
import { createConfig, getPublicClient, http } from "@wagmi/core"
55

66
import Torch from "@/data/Torch.json"
@@ -22,12 +22,12 @@ export const isAddressFiltered = (address: string): boolean => {
2222
}
2323

2424
export const config = createConfig({
25-
chains: [hardhat],
25+
chains: [sepolia],
2626
transports: {
27-
// [sepolia.id]: http(
28-
// `https://eth-sepolia.g.alchemy.com/v2/${process.env.ALCHEMY_API_KEY}`
29-
// ),
30-
[hardhat.id]: http("http://127.0.0.1:8545"),
27+
[sepolia.id]: http(
28+
`https://eth-sepolia.g.alchemy.com/v2/${process.env.ALCHEMY_API_KEY}`
29+
),
30+
// [hardhat.id]: http("http://127.0.0.1:8545"),
3131
},
3232
})
3333

@@ -125,17 +125,6 @@ const getHolderEvents = async (
125125
}
126126
}
127127

128-
// If the address is filtered, show as unknown holder
129-
if (isAddressFiltered(event.to)) {
130-
return {
131-
address: event.to,
132-
name: `Unknown Holder (${formatAddress(event.to)})`,
133-
role: "Previous torch holder",
134-
twitter: "",
135-
event,
136-
}
137-
}
138-
139128
// If we have metadata for this holder, use it
140129
if (holderMetadata) {
141130
return {
@@ -147,8 +136,8 @@ const getHolderEvents = async (
147136
// If no metadata found, create a fallback entry
148137
return {
149138
address: event.to,
150-
name: `Unknown Holder (${formatAddress(event.to)})`,
151-
role: "Previous torch holder",
139+
name: `Unknown Bearer (${formatAddress(event.to)})`,
140+
role: "",
152141
twitter: "",
153142
event,
154143
}

0 commit comments

Comments
 (0)