Update Umi to v0.8.0

metaplex-foundation · Jun 13, 2023 · c0b0cc3 · c0b0cc3
1 parent 510f36d
commit c0b0cc3
Show file tree

Hide file tree

Showing 107 changed files with 7,948 additions and 10,552 deletions.
diff --git a/clients/js/package.json b/clients/js/package.json
@@ -25,15 +25,15 @@
   "author": "Metaplex Maintainers <[email protected]>",
   "license": "Apache-2.0",
   "peerDependencies": {
-    "@metaplex-foundation/umi": "0.6 - 0.7"
+    "@metaplex-foundation/umi": "^0.8.0"
   },
   "dependencies": {
-    "@metaplex-foundation/mpl-toolbox": "^0.6.1"
+    "@metaplex-foundation/mpl-toolbox": "^0.7.0"
   },
   "devDependencies": {
     "@ava/typescript": "^3.0.1",
-    "@metaplex-foundation/umi": "^0.7.2",
-    "@metaplex-foundation/umi-bundle-tests": "^0.7.2",
+    "@metaplex-foundation/umi": "^0.8.0",
+    "@metaplex-foundation/umi-bundle-tests": "^0.8.0",
     "@solana/web3.js": "^1.73.0",
     "@typescript-eslint/eslint-plugin": "^5.0.0",
     "@typescript-eslint/parser": "^5.46.1",

diff --git a/clients/js/pnpm-lock.yaml b/clients/js/pnpm-lock.yaml
diff --git a/clients/js/src/digitalAsset.ts b/clients/js/src/digitalAsset.ts
@@ -9,6 +9,7 @@ import {
   assertAccountExists,
   chunk,
   Context,
+  Pda,
   PublicKey,
   RpcAccount,
   RpcGetAccountsOptions,
@@ -48,8 +49,8 @@ export async function fetchDigitalAsset(
   mint: PublicKey,
   options?: RpcGetAccountsOptions
 ): Promise<DigitalAsset> {
-  const metadata = findMetadataPda(context, { mint });
-  const edition = findMasterEditionPda(context, { mint });
+  const [metadata] = findMetadataPda(context, { mint });
+  const [edition] = findMasterEditionPda(context, { mint });
   const [mintAccount, metadataAccount, editionAccount] =
     await context.rpc.getAccounts([mint, metadata, edition], options);
   assertAccountExists(mintAccount, 'Mint');
@@ -64,7 +65,7 @@ export async function fetchDigitalAsset(
 
 export async function fetchDigitalAssetByMetadata(
   context: Pick<Context, 'rpc' | 'serializer' | 'eddsa' | 'programs'>,
-  metadata: PublicKey,
+  metadata: PublicKey | Pda,
   options?: RpcGetAccountsOptions
 ): Promise<DigitalAsset> {
   const metadataAccount = await fetchMetadata(context, metadata, options);
@@ -78,8 +79,8 @@ export async function fetchAllDigitalAsset(
 ): Promise<DigitalAsset[]> {
   const accountsToFetch = mints.flatMap((mint) => [
     mint,
-    findMetadataPda(context, { mint }),
-    findMasterEditionPda(context, { mint }),
+    findMetadataPda(context, { mint })[0],
+    findMasterEditionPda(context, { mint })[0],
   ]);
 
   const accounts = await context.rpc.getAccounts(accountsToFetch, options);
@@ -149,7 +150,7 @@ export async function fetchAllMetadataByOwner(
   }
 ): Promise<Metadata[]> {
   const mints = await fetchAllMintPublicKeyByOwner(context, owner, options);
-  const publicKeys = mints.map((mint) => findMetadataPda(context, { mint }));
+  const publicKeys = mints.map((mint) => findMetadataPda(context, { mint })[0]);
   const maybeAccounts = await context.rpc.getAccounts(publicKeys, options);
   return maybeAccounts.flatMap((maybeAccount) => {
     try {

diff --git a/clients/js/src/digitalAssetWithToken.ts b/clients/js/src/digitalAssetWithToken.ts
@@ -46,10 +46,10 @@ export async function fetchDigitalAssetWithToken(
   ] = await context.rpc.getAccounts(
     [
       mint,
-      findMetadataPda(context, { mint }),
-      findMasterEditionPda(context, { mint }),
+      findMetadataPda(context, { mint })[0],
+      findMasterEditionPda(context, { mint })[0],
       token,
-      findTokenRecordPda(context, { mint, token }),
+      findTokenRecordPda(context, { mint, token })[0],
     ],
     options
   );
@@ -72,7 +72,7 @@ export async function fetchDigitalAssetWithAssociatedToken(
   owner: PublicKey,
   options?: RpcGetAccountsOptions
 ): Promise<DigitalAssetWithToken> {
-  const token = findAssociatedTokenPda(context, { mint, owner });
+  const [token] = findAssociatedTokenPda(context, { mint, owner });
   return fetchDigitalAssetWithToken(context, mint, token, options);
 }
 
@@ -110,9 +110,12 @@ export async function fetchAllDigitalAssetWithTokenByOwner(
   const tokens = await fetchAllTokenByOwner(context, owner, options);
   const accountsToFetch = tokens.flatMap((token) => [
     token.mint,
-    findMetadataPda(context, { mint: token.mint }),
-    findMasterEditionPda(context, { mint: token.mint }),
-    findTokenRecordPda(context, { mint: token.mint, token: token.publicKey }),
+    findMetadataPda(context, { mint: token.mint })[0],
+    findMasterEditionPda(context, { mint: token.mint })[0],
+    findTokenRecordPda(context, {
+      mint: token.mint,
+      token: token.publicKey,
+    })[0],
   ]);
   const accounts = await context.rpc.getAccounts(accountsToFetch, options);
 
@@ -177,13 +180,13 @@ export async function fetchAllDigitalAssetWithTokenByMint(
     .map((token) => token.publicKey);
   const accountsToFetch = [
     mint,
-    findMetadataPda(context, { mint }),
-    findMasterEditionPda(context, { mint }),
+    findMetadataPda(context, { mint })[0],
+    findMasterEditionPda(context, { mint })[0],
   ];
   accountsToFetch.push(
     ...nonEmptyTokens.flatMap((token) => [
       token,
-      findTokenRecordPda(context, { mint, token }),
+      findTokenRecordPda(context, { mint, token })[0],
     ])
   );
   const accounts = await context.rpc.getAccounts(accountsToFetch, options);