feat: port makeAuction action (#131)

* feat: makeAuction action has been added * test: run test against localhost and move vault creation inside makeAuction action * test: refactored utility actions * refactor: move utility actions to separate folder with test migration to localhost * refactor: move test localhost connection and wallet generation to separate function * refactor: test/shared/index import ordering * test: fix addTokensToVault test Co-authored-by: Tymur Biedukhin <[email protected]>
metaplex-foundation · Jan 5, 2022 · 715d1d4 · 715d1d4
1 parent d5c8983
commit 715d1d4
Show file tree

Hide file tree

Showing 14 changed files with 185 additions and 96 deletions.
diff --git a/package.json b/package.json
@@ -116,4 +116,4 @@
       "@commitlint/config-conventional"
     ]
   }
-}
+}
diff --git a/src/actions/index.ts b/src/actions/index.ts
@@ -4,9 +4,6 @@ export * from './initStore';
 export * from './initStoreV2';
 export * from './mintNFT';
 export * from './mintEditionFromMaster';
-export * from './closeVault';
-export * from './createVault';
-export * from './createExternalPriceAccount';
 export * from './createMetadata';
 export * from './createMasterEdition';
 export * from './signMetadata';

diff --git a/src/actions/closeVault.ts → src/actions/utility/closeVault.ts b/src/actions/closeVault.ts → src/actions/utility/closeVault.ts
@@ -1,14 +1,14 @@
-import { Connection } from '../Connection';
-import { Wallet } from '../wallet';
-
-import { ActivateVault, CombineVault, Vault } from '@metaplex-foundation/mpl-token-vault';
-import { Keypair, PublicKey, TransactionSignature } from '@solana/web3.js';
-import { AccountLayout, Token, TOKEN_PROGRAM_ID } from '@solana/spl-token';
-import { CreateTokenAccount } from '../programs';
-import { sendTransaction } from '../actions/transactions';
 import BN from 'bn.js';
-import { TransactionsBatch } from '../utils/transactions-batch';
 import { Transaction } from '@metaplex-foundation/mpl-core';
+import { Keypair, PublicKey, TransactionSignature } from '@solana/web3.js';
+import { AccountLayout, Token, TOKEN_PROGRAM_ID } from '@solana/spl-token';
+import { ActivateVault, CombineVault, Vault } from '@metaplex-foundation/mpl-token-vault';
+
+import { Wallet } from '../../wallet';
+import { Connection } from '../../Connection';
+import { sendTransaction } from '../transactions';
+import { CreateTokenAccount } from '../../programs';
+import { TransactionsBatch } from '../../utils/transactions-batch';
 
 interface CloseVaultParams {
   connection: Connection;
@@ -116,7 +116,5 @@ export const closeVault = async ({
     wallet,
   });
 
-  return {
-    txId,
-  };
+  return { txId };
 };
diff --git a/src/actions/createExternalPriceAccount.ts → ...ons/utility/createExternalPriceAccount.ts b/src/actions/createExternalPriceAccount.ts → ...ons/utility/createExternalPriceAccount.ts
@@ -1,6 +1,4 @@
-import { Connection } from '../Connection';
-import { Wallet } from '../wallet';
-
+import BN from 'bn.js';
 import {
   ExternalPriceAccountData,
   Vault,
@@ -16,9 +14,11 @@ import {
 } from '@solana/web3.js';
 import { NATIVE_MINT } from '@solana/spl-token';
 import { Transaction } from '@metaplex-foundation/mpl-core';
-import { sendTransaction } from '../actions/transactions';
-import { TransactionsBatch } from '../utils/transactions-batch';
-import BN from 'bn.js';
+
+import { Wallet } from '../../wallet';
+import { Connection } from '../../Connection';
+import { sendTransaction } from '../transactions';
+import { TransactionsBatch } from '../../utils/transactions-batch';
 
 interface CreateExternalPriceAccountParams {
   connection: Connection;

diff --git a/src/actions/createVault.ts → src/actions/utility/createVault.ts b/src/actions/createVault.ts → src/actions/utility/createVault.ts
@@ -1,13 +1,13 @@
-import { Connection } from '../Connection';
-import { Wallet } from '../wallet';
-
 import { Transaction } from '@metaplex-foundation/mpl-core';
+import { AccountLayout, MintLayout, NATIVE_MINT } from '@solana/spl-token';
 import { InitVault, Vault, VaultProgram } from '@metaplex-foundation/mpl-token-vault';
 import { Keypair, PublicKey, SystemProgram, TransactionSignature } from '@solana/web3.js';
-import { AccountLayout, MintLayout, NATIVE_MINT } from '@solana/spl-token';
-import { CreateMint, CreateTokenAccount } from '../programs';
-import { sendTransaction } from '../actions/transactions';
-import { TransactionsBatch } from '../utils/transactions-batch';
+
+import { Wallet } from '../../wallet';
+import { Connection } from '../../Connection';
+import { sendTransaction } from '../transactions';
+import { CreateMint, CreateTokenAccount } from '../../programs';
+import { TransactionsBatch } from '../../utils/transactions-batch';
 
 interface CreateVaultParams {
   connection: Connection;

diff --git a/src/actions/utility/index.ts b/src/actions/utility/index.ts
@@ -0,0 +1,4 @@
+export * from './closeVault';
+export * from './createExternalPriceAccount';
+export * from './createVault';
+export * from './initAuction';
diff --git a/src/actions/utility/initAuction.ts b/src/actions/utility/initAuction.ts
@@ -0,0 +1,60 @@
+import { Transaction } from '@metaplex-foundation/mpl-core';
+import {
+  Auction,
+  AuctionExtended,
+  CreateAuction,
+  CreateAuctionArgs,
+} from '@metaplex-foundation/mpl-auction';
+import { PublicKey, TransactionSignature } from '@solana/web3.js';
+
+import { Wallet } from '../../wallet';
+import { Connection } from '../../Connection';
+import { sendTransaction } from '../transactions';
+
+interface MakeAuctionParams {
+  connection: Connection;
+  wallet: Wallet;
+  vault: PublicKey;
+  auctionSettings: Omit<CreateAuctionArgs, 'resource' | 'authority'>;
+}
+
+interface MakeAuctionResponse {
+  txId: TransactionSignature;
+  auction: PublicKey;
+}
+
+export const initAuction = async ({
+  connection,
+  wallet,
+  vault,
+  auctionSettings,
+}: MakeAuctionParams): Promise<MakeAuctionResponse> => {
+  const txOptions = { feePayer: wallet.publicKey };
+
+  const [auctionKey, auctionExtended] = await Promise.all([
+    Auction.getPDA(vault),
+    AuctionExtended.getPDA(vault),
+  ]);
+
+  const fullSettings = new CreateAuctionArgs({
+    ...auctionSettings,
+    authority: wallet.publicKey.toBase58(),
+    resource: vault.toBase58(),
+  });
+
+  const auctionTx: Transaction = new CreateAuction(txOptions, {
+    args: fullSettings,
+    auction: auctionKey,
+    creator: wallet.publicKey,
+    auctionExtended,
+  });
+
+  const txId = await sendTransaction({
+    connection,
+    signers: [],
+    txs: [auctionTx],
+    wallet,
+  });
+
+  return { txId, auction: auctionKey };
+};
diff --git a/test/actions/addTokensToVault.test.ts b/test/actions/addTokensToVault.test.ts
@@ -1,24 +1,17 @@
 import BN from 'bn.js';
 import { Transaction } from '@metaplex-foundation/mpl-core';
-import { airdrop, LOCALHOST } from '@metaplex-foundation/amman';
-import { Keypair, sendAndConfirmTransaction } from '@solana/web3.js';
+import { sendAndConfirmTransaction } from '@solana/web3.js';
 
-import { Connection, NodeWallet } from '../../src';
-import {
-  addTokensToVault,
-  createExternalPriceAccount,
-  createVault,
-  prepareTokenAccountAndMintTxs,
-} from '../../src/actions';
+import { generateConnectionAndWallet } from './shared';
+import { addTokensToVault, prepareTokenAccountAndMintTxs } from '../../src/actions';
+import { createExternalPriceAccount, createVault } from '../../src/actions/utility';
 
 describe('addTokensToVault action', () => {
   test('creation and adding of multiple mint tokens to newly created vault', async () => {
-    const payer = Keypair.generate();
-    const wallet = new NodeWallet(payer);
-    const connection = new Connection(LOCALHOST, 'confirmed');
-    await airdrop(connection, payer.publicKey, 10);
-
     const TOKEN_AMOUNT = 2;
+
+    const { connection, wallet, payer } = await generateConnectionAndWallet();
+
     const externalPriceAccountData = await createExternalPriceAccount({ connection, wallet });
 
     const { vault } = await createVault({

diff --git a/test/actions/createExternalPriceAccountLocal.test.ts b/test/actions/createExternalPriceAccountLocal.test.ts
diff --git a/test/actions/shared/index.ts b/test/actions/shared/index.ts
@@ -1,6 +1,8 @@
-import axios, { AxiosResponse } from 'axios';
-import { Wallet } from '../../../src';
 import { Keypair } from '@solana/web3.js';
+import axios, { AxiosResponse } from 'axios';
+import { airdrop, LOCALHOST } from '@metaplex-foundation/amman';
+
+import { Connection, NodeWallet, Wallet } from '../../../src';
 
 export const uri =
   'https://bafkreibj4hjlhf3ehpugvfy6bzhhu2c7frvyhrykjqmoocsvdw24omfqga.ipfs.dweb.link';
@@ -52,3 +54,12 @@ export const mockAxios404 = () => {
   };
   mockedAxiosGet.mockRejectedValue(mockedResponse);
 };
+
+export const generateConnectionAndWallet = async () => {
+  const payer = Keypair.generate();
+  const connection = new Connection(LOCALHOST, 'confirmed');
+  await airdrop(connection, payer.publicKey, 10);
+  const wallet = new NodeWallet(payer);
+
+  return { connection, wallet, payer };
+};
diff --git a/test/actions/closeVault.test.ts → test/actions/utility/closeVault.test.ts b/test/actions/closeVault.test.ts → test/actions/utility/closeVault.test.ts
@@ -1,28 +1,26 @@
 import { NATIVE_MINT } from '@solana/spl-token';
-import { Connection, NodeWallet } from '../../src';
-import { createVault, closeVault, createExternalPriceAccount } from '../../src/actions';
-import { FEE_PAYER, pause } from '../utils';
 import { Vault, VaultState } from '@metaplex-foundation/mpl-token-vault';
 
-describe('closing a Vault', () => {
-  const connection = new Connection('devnet');
-  const wallet = new NodeWallet(FEE_PAYER);
+import { pause } from '../../utils';
+import { generateConnectionAndWallet } from '../shared';
+import { closeVault, createVault, createExternalPriceAccount } from '../../../src/actions/utility';
 
+describe('closing a Vault', () => {
   describe('success', () => {
     test('closes vault', async () => {
+      const { connection, wallet } = await generateConnectionAndWallet();
       let vault;
 
       const externalPriceAccountData = await createExternalPriceAccount({ connection, wallet });
 
-      await pause(20000);
-
       const vaultResponse = await createVault({
         connection,
         wallet,
         ...externalPriceAccountData,
       });
 
-      await pause(20000);
+      await pause(1000);
+
       vault = await Vault.load(connection, vaultResponse.vault);
       expect(vault).toHaveProperty('data');
       expect(vault.data.state).toEqual(VaultState.Inactive);
@@ -34,11 +32,11 @@ describe('closing a Vault', () => {
         priceMint: NATIVE_MINT,
       });
 
-      await pause(20000);
+      await pause(1000);
 
       vault = await Vault.load(connection, vaultResponse.vault);
       expect(vault).toHaveProperty('data');
       expect(vault.data.state).toEqual(VaultState.Combined);
-    }, 70000);
+    });
   });
 });
diff --git a/...ctions/createExternalPriceAccount.test.ts → ...y/createExternalPriceAccountLocal.test.ts b/...ctions/createExternalPriceAccount.test.ts → ...y/createExternalPriceAccountLocal.test.ts
@@ -1,17 +1,16 @@
-import { Connection, NodeWallet } from '../../src';
-import { createExternalPriceAccount } from '../../src/actions';
-import { FEE_PAYER } from '../utils';
+import { generateConnectionAndWallet } from '../shared';
+import { createExternalPriceAccount } from '../../../src/actions/utility';
 
 describe('creating an external price account', () => {
-  const connection = new Connection('devnet');
-  const wallet = new NodeWallet(FEE_PAYER);
-
   describe('success', () => {
     test('creates EPA', async () => {
+      const { connection, wallet } = await generateConnectionAndWallet();
+
       const externalPriceAccount = await createExternalPriceAccount({
         connection,
         wallet,
       });
+
       expect(externalPriceAccount).toHaveProperty('externalPriceAccount');
       expect(externalPriceAccount).toHaveProperty('priceMint');
     });

diff --git a/test/actions/createVault.test.ts → test/actions/utility/createVault.test.ts b/test/actions/createVault.test.ts → test/actions/utility/createVault.test.ts
@@ -1,28 +1,26 @@
-import { Connection, NodeWallet } from '../../src';
-import { createVault, createExternalPriceAccount } from '../../src/actions';
-import { FEE_PAYER, pause } from '../utils';
 import { Vault, VaultState } from '@metaplex-foundation/mpl-token-vault';
 
-describe('creating a Vault', () => {
-  const connection = new Connection('devnet');
-  const wallet = new NodeWallet(FEE_PAYER);
+import { pause } from '../../utils';
+import { createVault, createExternalPriceAccount } from '../../../src/actions/utility';
+import { generateConnectionAndWallet } from '../shared';
 
+describe('creating a Vault', () => {
   describe('success', () => {
     test('generates vault', async () => {
-      const externalPriceAccountData = await createExternalPriceAccount({ connection, wallet });
+      const { connection, wallet } = await generateConnectionAndWallet();
 
-      await pause(20000);
+      const externalPriceAccountData = await createExternalPriceAccount({ connection, wallet });
 
       const vaultResponse = await createVault({
         connection,
         wallet,
         ...externalPriceAccountData,
       });
 
-      await pause(20000);
+      await pause(1000);
       const vault = await Vault.load(connection, vaultResponse.vault);
       expect(vault).toHaveProperty('data');
       expect(vault.data.state).toEqual(VaultState.Inactive);
-    }, 50000);
+    });
   });
 });