Skip to content

Commit de4005d

Browse files
jonasXchenjonasXchen
committed
fix: update metadata parser
1 parent 40a950e commit de4005d

2 files changed

Lines changed: 58 additions & 18 deletions

File tree

‎rewards-delegated-vrf/dashboard/components/NftActions.tsx‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
TOKEN_PROGRAM_ID,
99
unpackAccount,
1010
} from "@solana/spl-token";
11-
import { getMetadataAccountDataSerializer } from "@metaplex-foundation/mpl-token-metadata";
11+
import { Metadata } from "@metaplex-foundation/mpl-token-metadata";
1212
import { Zap, Grid } from "lucide-react";
1313
import { useTransaction } from "@/hooks/useTransaction";
1414
import { useGlobalTransactionHistory } from "@/hooks/useGlobalTransactionHistory";
@@ -83,7 +83,6 @@ export const NftActions: React.FC<NftActionsProps> = ({ selectedDistributor }) =
8383
? connection
8484
: new Connection(readEndpoint, "confirmed");
8585
const metadataProgramId = new PublicKey("metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s");
86-
const serializer = getMetadataAccountDataSerializer();
8786
const programResponses = await Promise.all([
8887
readConnection.getTokenAccountsByOwner(publicKey, { programId: TOKEN_PROGRAM_ID }),
8988
readConnection.getTokenAccountsByOwner(publicKey, { programId: TOKEN_2022_PROGRAM_ID }),
@@ -137,14 +136,14 @@ export const NftActions: React.FC<NftActionsProps> = ({ selectedDistributor }) =
137136
}
138137

139138
try {
140-
const [metadata] = serializer.deserialize(metadataAccount.data);
139+
const [metadata] = Metadata.deserialize(metadataAccount.data);
141140
if (!metadata.collectionDetails) {
142141
return;
143142
}
144143

145144
const metadataName =
146-
typeof metadata.name === "string"
147-
? metadata.name.replace(/\0/g, "").trim()
145+
typeof metadata.data.name === "string"
146+
? metadata.data.name.replace(/\0/g, "").trim()
148147
: mint.toBase58().slice(0, 8);
149148

150149
collectionOptions.push({

‎rewards-delegated-vrf/dashboard/yarn.lock‎

Lines changed: 54 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -274,17 +274,43 @@
274274
tweetnacl "^1.0.3"
275275
typescript "^5.3.0"
276276

277-
"@metaplex-foundation/mpl-token-metadata@^3.2.0":
278-
version "3.4.0"
279-
resolved "https://registry.npmjs.org/@metaplex-foundation/mpl-token-metadata/-/mpl-token-metadata-3.4.0.tgz"
280-
integrity sha512-AxBAYCK73JWxY3g9//z/C9krkR0t1orXZDknUPS4+GjwGH2vgPfsk04yfZ31Htka2AdS9YE/3wH7sMUBHKn9Rg==
277+
"@metaplex-foundation/beet-solana@^0.4.0":
278+
version "0.4.1"
279+
resolved "https://registry.yarnpkg.com/@metaplex-foundation/beet-solana/-/beet-solana-0.4.1.tgz#255747aa7feee1c20202146a752c057feca1948f"
280+
integrity sha512-/6o32FNUtwK8tjhotrvU/vorP7umBuRFvBZrC6XCk51aKidBHe5LPVPA5AjGPbV3oftMfRuXPNd9yAGeEqeCDQ==
281281
dependencies:
282-
"@metaplex-foundation/mpl-toolbox" "^0.10.0"
282+
"@metaplex-foundation/beet" ">=0.1.0"
283+
"@solana/web3.js" "^1.56.2"
284+
bs58 "^5.0.0"
285+
debug "^4.3.4"
283286

284-
"@metaplex-foundation/mpl-toolbox@^0.10.0":
285-
version "0.10.0"
286-
resolved "https://registry.npmjs.org/@metaplex-foundation/mpl-toolbox/-/mpl-toolbox-0.10.0.tgz"
287-
integrity sha512-84KD1L5cFyw5xnntHwL4uPwfcrkKSiwuDeypiVr92qCUFuF3ZENa2zlFVPu+pQcjTlod2LmEX3MhBmNjRMpdKg==
287+
"@metaplex-foundation/beet@>=0.1.0", "@metaplex-foundation/beet@^0.7.1":
288+
version "0.7.2"
289+
resolved "https://registry.yarnpkg.com/@metaplex-foundation/beet/-/beet-0.7.2.tgz#fa4726e4cfd4fb6fed6cddc9b5213c1c2a2d0b77"
290+
integrity sha512-K+g3WhyFxKPc0xIvcIjNyV1eaTVJTiuaHZpig7Xx0MuYRMoJLLvhLTnUXhFdR5Tu2l2QSyKwfyXDgZlzhULqFg==
291+
dependencies:
292+
ansicolors "^0.3.2"
293+
assert "^2.1.0"
294+
bn.js "^5.2.0"
295+
debug "^4.3.3"
296+
297+
"@metaplex-foundation/cusper@^0.0.2":
298+
version "0.0.2"
299+
resolved "https://registry.yarnpkg.com/@metaplex-foundation/cusper/-/cusper-0.0.2.tgz#dc2032a452d6c269e25f016aa4dd63600e2af975"
300+
integrity sha512-S9RulC2fFCFOQraz61bij+5YCHhSO9llJegK8c8Y6731fSi6snUSQJdCUqYS8AIgR0TKbQvdvgSyIIdbDFZbBA==
301+
302+
"@metaplex-foundation/mpl-token-metadata@^2.13.0":
303+
version "2.13.0"
304+
resolved "https://registry.yarnpkg.com/@metaplex-foundation/mpl-token-metadata/-/mpl-token-metadata-2.13.0.tgz#ea498190ad4ed1d4c0b8218a72d03bd17a883d11"
305+
integrity sha512-Fl/8I0L9rv4bKTV/RAl5YIbJe9SnQPInKvLz+xR1fEc4/VQkuCn3RPgypfUMEKWmCznzaw4sApDxy6CFS4qmJw==
306+
dependencies:
307+
"@metaplex-foundation/beet" "^0.7.1"
308+
"@metaplex-foundation/beet-solana" "^0.4.0"
309+
"@metaplex-foundation/cusper" "^0.0.2"
310+
"@solana/spl-token" "^0.3.6"
311+
"@solana/web3.js" "^1.66.2"
312+
bn.js "^5.2.0"
313+
debug "^4.3.4"
288314

289315
"@mobily/ts-belt@^3.13.1":
290316
version "3.13.1"
@@ -1265,13 +1291,23 @@
12651291
dependencies:
12661292
"@solana/codecs" "2.0.0-rc.1"
12671293

1268-
"@solana/spl-token-metadata@^0.1.6":
1294+
"@solana/spl-token-metadata@^0.1.2", "@solana/spl-token-metadata@^0.1.6":
12691295
version "0.1.6"
1270-
resolved "https://registry.npmjs.org/@solana/spl-token-metadata/-/spl-token-metadata-0.1.6.tgz"
1296+
resolved "https://registry.yarnpkg.com/@solana/spl-token-metadata/-/spl-token-metadata-0.1.6.tgz#d240947aed6e7318d637238022a7b0981b32ae80"
12711297
integrity sha512-7sMt1rsm/zQOQcUWllQX9mD2O6KhSAtY1hFR2hfFwgqfFWzSY9E9GDvFVNYUI1F0iQKcm6HmePU9QbKRXTEBiA==
12721298
dependencies:
12731299
"@solana/codecs" "2.0.0-rc.1"
12741300

1301+
"@solana/spl-token@^0.3.6":
1302+
version "0.3.11"
1303+
resolved "https://registry.yarnpkg.com/@solana/spl-token/-/spl-token-0.3.11.tgz#cdc10f9472b29b39c8983c92592cadd06627fb9a"
1304+
integrity sha512-bvohO3rIMSVL24Pb+I4EYTJ6cL82eFpInEXD/I8K8upOGjpqHsKUoAempR/RnUlI1qSFNyFlWJfu6MNUgfbCQQ==
1305+
dependencies:
1306+
"@solana/buffer-layout" "^4.0.0"
1307+
"@solana/buffer-layout-utils" "^0.2.0"
1308+
"@solana/spl-token-metadata" "^0.1.2"
1309+
buffer "^6.0.3"
1310+
12751311
"@solana/spl-token@^0.4.5":
12761312
version "0.4.14"
12771313
resolved "https://registry.npmjs.org/@solana/spl-token/-/spl-token-0.4.14.tgz"
@@ -1751,7 +1787,7 @@
17511787
"@wallet-standard/app" "^1.1.0"
17521788
"@wallet-standard/base" "^1.1.0"
17531789

1754-
"@solana/web3.js@^1.32.0", "@solana/web3.js@^1.36.0", "@solana/web3.js@^1.69.0", "@solana/web3.js@^1.87.0", "@solana/web3.js@^1.91.4", "@solana/web3.js@^1.98.0":
1790+
"@solana/web3.js@^1.32.0", "@solana/web3.js@^1.36.0", "@solana/web3.js@^1.56.2", "@solana/web3.js@^1.66.2", "@solana/web3.js@^1.69.0", "@solana/web3.js@^1.87.0", "@solana/web3.js@^1.91.4", "@solana/web3.js@^1.98.0":
17551791
version "1.98.4"
17561792
resolved "https://registry.npmjs.org/@solana/web3.js/-/web3.js-1.98.4.tgz"
17571793
integrity sha512-vv9lfnvjUsRiq//+j5pBdXig0IQdtzA0BRZ3bXEP4KaIyF1CcaydWqgyzQgfZMNIsWNWmG+AUHwPy4AHOD6gpw==
@@ -2696,6 +2732,11 @@ ansi-styles@^4.0.0:
26962732
dependencies:
26972733
color-convert "^2.0.1"
26982734

2735+
ansicolors@^0.3.2:
2736+
version "0.3.2"
2737+
resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"
2738+
integrity sha512-QXu7BPrP29VllRxH8GwB7x5iX5qWKAAMLqKQGWTeLWVlNHNOpVMJ91dsxQAIWXpjuW5wqvxu3Jd/nRjrJ+0pqg==
2739+
26992740
any-promise@^1.0.0:
27002741
version "1.3.0"
27012742
resolved "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz"
@@ -3396,7 +3437,7 @@ dayjs@1.11.13:
33963437
resolved "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz"
33973438
integrity sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==
33983439

3399-
debug@^4.3.4, debug@~4.4.1:
3440+
debug@^4.3.3, debug@^4.3.4, debug@~4.4.1:
34003441
version "4.4.3"
34013442
resolved "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz"
34023443
integrity sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==

0 commit comments

Comments
 (0)