Merge branch 'main' of github.com:blockiosaurus/blob-asset into main

clients/js/package.json

@@ -45,7 +45,7 @@
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "prettier": "^2.5.1",
+    "prettier": "^2.8.8",
     "rimraf": "^3.0.2",
     "typedoc": "^0.23.16",
     "typedoc-plugin-expand-object-like-types": "^0.1.1",

clients/js/src/hooked/types.ts

@@ -13,8 +13,8 @@ import {
 } from '../generated';
 
 export type BaseAuthority = {
-  type: PluginAuthorityType
-  address?: PublicKey
+  type: PluginAuthorityType;
+  address?: PublicKey;
 };
 
 export type PluginAuthorityType = Pick<Authority, '__kind'>['__kind'];

clients/js/test/_setup.ts

@@ -109,10 +109,10 @@ export const createAssetWithCollection: (
   const collection = assetInput.collection
     ? await fetchCollectionWithPlugins(umi, publicKey(assetInput.collection))
     : await createCollection(umi, {
-      payer: assetInput.payer,
-      updateAuthority: assetInput.updateAuthority,
-      ...collectionInput,
-    });
+        payer: assetInput.payer,
+        updateAuthority: assetInput.updateAuthority,
+        ...collectionInput,
+      });
 
   const asset = await createAsset(umi, {
     ...assetInput,
@@ -136,7 +136,7 @@ export const assertAsset = async (
     uri?: string | RegExp;
   } & PluginsList
 ) => {
-  const { asset, owner, name, uri, ...rest } = input
+  const { asset, owner, name, uri, ...rest } = input;
   const assetAddress = publicKey(input.asset);
   const assetWithPlugins = await fetchAssetWithPlugins(umi, assetAddress);
 
@@ -152,7 +152,7 @@ export const assertAsset = async (
     key: Key.Asset,
     publicKey: assetAddress,
     owner: publicKey(owner),
-    ...rest
+    ...rest,
   };
 
   t.like(assetWithPlugins, testObj);
@@ -170,10 +170,13 @@ export const assertCollection = async (
     currentSize?: number;
   } & PluginsList
 ) => {
-  const { collection, name, uri, updateAuthority, ...rest } = input
+  const { collection, name, uri, updateAuthority, ...rest } = input;
 
   const collectionAddress = publicKey(collection);
-  const collectionWithPlugins = await fetchCollectionWithPlugins(umi, collectionAddress);
+  const collectionWithPlugins = await fetchCollectionWithPlugins(
+    umi,
+    collectionAddress
+  );
 
   // Name.
   if (typeof name === 'string') t.is(collectionWithPlugins.name, name);
@@ -186,7 +189,7 @@ export const assertCollection = async (
   const testObj = <CollectionWithPlugins>{
     key: Key.Collection,
     publicKey: collectionAddress,
-    ...rest
+    ...rest,
   };
 
   if (updateAuthority) {

clients/js/test/approveAuthority.test.ts

@@ -15,13 +15,13 @@ test('it can add an authority to a plugin', async (t) => {
   const umi = await createUmi();
   const delegateAddress = generateSigner(umi);
 
-  const asset = await createAsset(umi, {})
+  const asset = await createAsset(umi, {});
 
   await assertAsset(t, umi, {
     asset: asset.publicKey,
     owner: umi.identity.publicKey,
     updateAuthority: updateAuthority('Address', [umi.identity.publicKey]),
-  })
+  });
 
   await addPlugin(umi, {
     asset: asset.publicKey,

clients/js/test/burn.test.ts

@@ -5,12 +5,7 @@ import {
 } from '@metaplex-foundation/umi';
 import test from 'ava';
 
-import {
-  burn,
-  Key,
-  updateAuthority,
-  plugin,
-} from '../src';
+import { burn, Key, updateAuthority, plugin } from '../src';
 import { DEFAULT_ASSET, assertAsset, createAsset, createUmi } from './_setup';
 
 test('it can burn an asset as the owner', async (t) => {
@@ -22,7 +17,7 @@ test('it can burn an asset as the owner', async (t) => {
     asset: asset.publicKey,
     owner: umi.identity.publicKey,
     updateAuthority: updateAuthority('Address', [umi.identity.publicKey]),
-  })
+  });
 
   await burn(umi, {
     asset: asset.publicKey,
@@ -48,7 +43,7 @@ test('it cannot burn an asset if not the owner', async (t) => {
     asset: asset.publicKey,
     owner: umi.identity.publicKey,
     updateAuthority: updateAuthority('Address', [umi.identity.publicKey]),
-  })
+  });
 
   const result = burn(umi, {
     asset: asset.publicKey,
@@ -61,15 +56,17 @@ test('it cannot burn an asset if not the owner', async (t) => {
     asset: asset.publicKey,
     owner: umi.identity.publicKey,
     updateAuthority: updateAuthority('Address', [umi.identity.publicKey]),
-  })
+  });
 });
 
 test('it cannot burn an asset if it is frozen', async (t) => {
   // Given a Umi instance and a new signer.
   const umi = await createUmi();
 
   const asset = await createAsset(umi, {
-    plugins: [{ plugin: plugin('Freeze', [{ frozen: true }]), authority: null }],
+    plugins: [
+      { plugin: plugin('Freeze', [{ frozen: true }]), authority: null },
+    ],
   });
 
   await assertAsset(t, umi, {

clients/js/test/collect.test.ts

@@ -1,58 +1,67 @@
 import { PublicKey, Umi, sol } from '@metaplex-foundation/umi';
 import test from 'ava';
 
-import {
-  PluginType,
-  addPlugin,
-  plugin,
-  removePlugin,
-} from '../src';
+import { PluginType, addPlugin, plugin, removePlugin } from '../src';
 import { createAsset, createUmi } from './_setup';
 
 const hasCollectAmount = async (umi: Umi, address: PublicKey) => {
   const account = await umi.rpc.getAccount(address);
   if (account.exists) {
-    const rent = await umi.rpc.getRent(account.data.length)
-    const diff = account.lamports.basisPoints - rent.basisPoints
-    return diff === sol(0.0015).basisPoints
+    const rent = await umi.rpc.getRent(account.data.length);
+    const diff = account.lamports.basisPoints - rent.basisPoints;
+    return diff === sol(0.0015).basisPoints;
   }
-  return false
-}
+  return false;
+};
 
 test('it can create a new asset with collect amount', async (t) => {
   // Given a Umi instance and a new signer.
   const umi = await createUmi();
-  const asset = await createAsset(umi, {})
+  const asset = await createAsset(umi, {});
 
-  t.assert(await hasCollectAmount(umi, asset.publicKey), 'Collect amount not found')
+  t.assert(
+    await hasCollectAmount(umi, asset.publicKey),
+    'Collect amount not found'
+  );
 });
 
 test('it can add asset plugin with collect amount', async (t) => {
   // Given a Umi instance and a new signer.
   const umi = await createUmi();
-  const asset = await createAsset(umi, {})
+  const asset = await createAsset(umi, {});
 
   await addPlugin(umi, {
     asset: asset.publicKey,
     plugin: plugin('Freeze', [{ frozen: true }]),
-    initAuthority: null
+    initAuthority: null,
   }).sendAndConfirm(umi);
 
-  t.assert(await hasCollectAmount(umi, asset.publicKey), 'Collect amount not found')
+  t.assert(
+    await hasCollectAmount(umi, asset.publicKey),
+    'Collect amount not found'
+  );
 });
 
 test('it can add remove asset plugin with collect amount', async (t) => {
   // Given a Umi instance and a new signer.
   const umi = await createUmi();
   const asset = await createAsset(umi, {
-    plugins: [{ plugin: plugin('Freeze', [{ frozen: true }]), authority: null }]
-  })
+    plugins: [
+      { plugin: plugin('Freeze', [{ frozen: true }]), authority: null },
+    ],
+  });
 
-  t.assert(await hasCollectAmount(umi, asset.publicKey), 'Collect amount not found')
+  t.assert(
+    await hasCollectAmount(umi, asset.publicKey),
+    'Collect amount not found'
+  );
 
   await removePlugin(umi, {
     asset: asset.publicKey,
     pluginType: PluginType.Freeze,
   }).sendAndConfirm(umi);
-  t.assert(await hasCollectAmount(umi, asset.publicKey), 'Collect amount not found')
-});
+  t.assert(
+    await hasCollectAmount(umi, asset.publicKey),
+    'Collect amount not found'
+  );
+});

clients/js/test/compress.test.ts

@@ -18,7 +18,7 @@ import { createAsset, createUmi } from './_setup';
 test.skip('it can compress an asset without any plugins as the owner', async (t) => {
   // Given a Umi instance and a new signer.
   const umi = await createUmi();
-  const asset = await createAsset(umi, {}); 
+  const asset = await createAsset(umi, {});
 
   // And when we compress the asset.
   await compress(umi, {
@@ -114,7 +114,7 @@ test('it cannot compress an asset because it is not available', async (t) => {
   });
 
   // And when we compress the asset.
-  const result =  compress(umi, {
+  const result = compress(umi, {
     asset: assetAddress.publicKey,
     authority: umi.identity,
     logWrapper: publicKey('noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV'),