move models/metaplex to common pkg

js/packages/common/src/actions/auction.ts

@@ -672,7 +672,7 @@ export async function createAuction(
   );
 }
 
-export async function startAuction(
+export async function startAuctionWithResource(
   resource: StringPublicKey,
   creator: StringPublicKey,
   instructions: TransactionInstruction[],

js/packages/common/src/contexts/index.tsx

@@ -4,5 +4,4 @@ export * as Connection from './connection';
 export * from './connection';
 export * as Wallet from './wallet';
 export * from './wallet';
-export * as Store from './store';
 export * from './store';

js/packages/common/src/models/index.ts

@@ -1 +1,2 @@
 export * from './account';
+export * from './metaplex';

js/packages/common/src/models/metaplex/claimBid.ts

@@ -1,13 +1,9 @@
-import {
-  getBidderPotKey,
-  programIds,
-  StringPublicKey,
-  toPublicKey,
-} from '@oyster/common';
 import { SYSVAR_CLOCK_PUBKEY, TransactionInstruction } from '@solana/web3.js';
 import { serialize } from 'borsh';
 
 import { getAuctionKeys, ClaimBidArgs, SCHEMA } from '.';
+import { getBidderPotKey } from '../../actions';
+import { programIds, StringPublicKey, toPublicKey } from '../../utils';
 
 export async function claimBid(
   acceptPayment: StringPublicKey,

js/packages/common/src/models/metaplex/decommissionAuctionManager.ts

@@ -1,8 +1,8 @@
-import { programIds, StringPublicKey, toPublicKey } from '@oyster/common';
 import { SYSVAR_CLOCK_PUBKEY, TransactionInstruction } from '@solana/web3.js';
 import { serialize } from 'borsh';
 
 import { DecommissionAuctionManagerArgs, SCHEMA } from '.';
+import { programIds, StringPublicKey, toPublicKey } from '../../utils';
 
 export async function decommissionAuctionManager(
   auctionManager: StringPublicKey,

js/packages/common/src/models/metaplex/deprecatedInitAuctionManagerV1.ts

@@ -1,4 +1,3 @@
-import { programIds, StringPublicKey, toPublicKey } from '@oyster/common';
 import {
   SystemProgram,
   SYSVAR_RENT_PUBKEY,
@@ -7,6 +6,7 @@ import {
 import { serialize } from 'borsh';
 
 import { getAuctionKeys, SCHEMA } from '.';
+import { programIds, StringPublicKey, toPublicKey } from '../../utils';
 import {
   AuctionManagerSettingsV1,
   DeprecatedInitAuctionManagerV1Args,

js/packages/common/src/models/metaplex/deprecatedPopulateParticipationPrintingAccount.ts

@@ -1,15 +1,13 @@
-import {
-  programIds,
-  VAULT_PREFIX,
-  getAuctionExtended,
-  findProgramAddress,
-  StringPublicKey,
-  toPublicKey,
-} from '@oyster/common';
 import { SYSVAR_RENT_PUBKEY, TransactionInstruction } from '@solana/web3.js';
 import { serialize } from 'borsh';
-
 import { SCHEMA } from '.';
+import { getAuctionExtended, VAULT_PREFIX } from '../../actions';
+import {
+  findProgramAddress,
+  programIds,
+  StringPublicKey,
+  toPublicKey,
+} from '../../utils';
 import { DeprecatedPopulateParticipationPrintingAccountArgs } from './deprecatedStates';
 
 export async function deprecatedPopulateParticipationPrintingAccount(

js/packages/common/src/models/metaplex/deprecatedRedeemParticipationBid.ts

@@ -1,4 +1,3 @@
-import { programIds, StringPublicKey, toPublicKey } from '@oyster/common';
 import {
   SystemProgram,
   SYSVAR_RENT_PUBKEY,
@@ -12,6 +11,7 @@ import {
   SCHEMA,
   getSafetyDepositConfig,
 } from '.';
+import { programIds, StringPublicKey, toPublicKey } from '../../utils';
 import { DeprecatedRedeemParticipationBidArgs } from './deprecatedStates';
 
 export async function deprecatedRedeemParticipationBid(

js/packages/common/src/models/metaplex/deprecatedStates.ts

@@ -1,4 +1,3 @@
-import { programIds, findProgramAddress, toPublicKey } from '@oyster/common';
 import BN from 'bn.js';
 import {
   AuctionManagerStatus,
@@ -9,6 +8,7 @@ import {
   WinningConfigType,
   WinningConstraint,
 } from '.';
+import { findProgramAddress, programIds, toPublicKey } from '../../utils';
 
 export const MAX_BID_REDEMPTION_TICKET_V1_SIZE = 3;
 

js/packages/common/src/models/metaplex/deprecatedValidateParticipation.ts

@@ -1,4 +1,3 @@
-import { programIds, StringPublicKey, toPublicKey } from '@oyster/common';
 import {
   SystemProgram,
   SYSVAR_RENT_PUBKEY,
@@ -7,6 +6,7 @@ import {
 import { serialize } from 'borsh';
 
 import { SCHEMA } from '.';
+import { programIds, StringPublicKey, toPublicKey } from '../../utils';
 import { DeprecatedValidateParticipationArgs } from './deprecatedStates';
 
 export async function deprecatedValidateParticipation(

js/packages/common/src/models/metaplex/deprecatedValidateSafetyDepositBoxV1.ts

@@ -1,4 +1,3 @@
-import { programIds, StringPublicKey, toPublicKey } from '@oyster/common';
 import {
   SystemProgram,
   SYSVAR_RENT_PUBKEY,
@@ -7,6 +6,7 @@ import {
 import { serialize } from 'borsh';
 
 import { getAuctionKeys, getOriginalAuthority, SCHEMA } from '.';
+import { programIds, StringPublicKey, toPublicKey } from '../../utils';
 
 import {
   getSafetyDepositBoxValidationTicket,

js/packages/common/src/models/metaplex/emptyPaymentAccount.ts

@@ -1,4 +1,3 @@
-import { programIds, StringPublicKey, toPublicKey } from '@oyster/common';
 import {
   SystemProgram,
   SYSVAR_RENT_PUBKEY,
@@ -13,6 +12,7 @@ import {
   getSafetyDepositConfig,
   SCHEMA,
 } from '.';
+import { programIds, StringPublicKey, toPublicKey } from '../../utils';
 
 export async function emptyPaymentAccount(
   acceptPayment: StringPublicKey,

js/packages/common/src/models/metaplex/index.ts

@@ -1,24 +1,24 @@
-import {
-  AUCTION_PREFIX,
-  programIds,
-  METADATA,
-  AccountParser,
-  findProgramAddress,
-  AuctionData,
-  ParsedAccount,
-  Vault,
-  Metadata,
-  MasterEditionV1,
-  SafetyDepositBox,
-  MasterEditionV2,
-  toPublicKey,
-  StringPublicKey,
-} from '@oyster/common';
 import { AccountInfo, SystemProgram } from '@solana/web3.js';
 import BN from 'bn.js';
-import { deserializeUnchecked } from 'borsh';
 import bs58 from 'bs58';
-import { AuctionViewItem } from '../../hooks';
+import { deserializeUnchecked } from 'borsh';
+import {
+  AuctionData,
+  AUCTION_PREFIX,
+  MasterEditionV1,
+  MasterEditionV2,
+  METADATA,
+  Metadata,
+  SafetyDepositBox,
+  Vault,
+} from '../../actions';
+import { AccountParser, ParsedAccount } from '../../contexts';
+import {
+  findProgramAddress,
+  programIds,
+  toPublicKey,
+  StringPublicKey,
+} from '../../utils';
 import {
   AuctionManagerV1,
   BidRedemptionTicketV1,
@@ -35,6 +35,7 @@ export * from './deprecatedValidateSafetyDepositBoxV1';
 export * from './redeemParticipationBidV3';
 export * from './redeemPrintingV2Bid';
 export * from './withdrawMasterEdition';
+export * from './deprecatedStates';
 
 export const METAPLEX_PREFIX = 'metaplex';
 export const TOTALS = 'totals';
@@ -537,6 +538,14 @@ export interface BidRedemptionTicket {
 
   getBidRedeemed(order: number): boolean;
 }
+
+export interface AuctionViewItem {
+  winningConfigType: WinningConfigType;
+  amount: BN;
+  metadata: ParsedAccount<Metadata>;
+  safetyDeposit: ParsedAccount<SafetyDepositBox>;
+  masterEdition?: ParsedAccount<MasterEditionV1 | MasterEditionV2>;
+}
 export class BidRedemptionTicketV2 implements BidRedemptionTicket {
   key: MetaplexKey = MetaplexKey.BidRedemptionTicketV2;
   winnerIndex: BN | null;

js/packages/common/src/models/metaplex/initAuctionManagerV2.ts

@@ -1,4 +1,3 @@
-import { programIds, StringPublicKey, toPublicKey } from '@oyster/common';
 import {
   SystemProgram,
   SYSVAR_RENT_PUBKEY,
@@ -14,6 +13,7 @@ import {
   SCHEMA,
   TupleNumericType,
 } from '.';
+import { programIds, StringPublicKey, toPublicKey } from '../../utils';
 
 export async function initAuctionManagerV2(
   vault: StringPublicKey,

js/packages/common/src/models/metaplex/redeemBid.ts

@@ -1,10 +1,3 @@
-import {
-  findProgramAddress,
-  programIds,
-  StringPublicKey,
-  toPublicKey,
-  VAULT_PREFIX,
-} from '@oyster/common';
 import {
   SystemProgram,
   SYSVAR_RENT_PUBKEY,
@@ -21,6 +14,13 @@ import {
   RedeemUnusedWinningConfigItemsAsAuctioneerArgs,
   SCHEMA,
 } from '.';
+import { VAULT_PREFIX } from '../../actions';
+import {
+  findProgramAddress,
+  programIds,
+  StringPublicKey,
+  toPublicKey,
+} from '../../utils';
 
 export async function redeemBid(
   vault: StringPublicKey,

js/packages/common/src/models/metaplex/redeemFullRightsTransferBid.ts

@@ -1,10 +1,3 @@
-import {
-  programIds,
-  VAULT_PREFIX,
-  findProgramAddress,
-  StringPublicKey,
-  toPublicKey,
-} from '@oyster/common';
 import {
   SystemProgram,
   SYSVAR_RENT_PUBKEY,
@@ -21,6 +14,13 @@ import {
   RedeemUnusedWinningConfigItemsAsAuctioneerArgs,
   SCHEMA,
 } from '.';
+import { VAULT_PREFIX } from '../../actions';
+import {
+  findProgramAddress,
+  programIds,
+  StringPublicKey,
+  toPublicKey,
+} from '../../utils';
 
 export async function redeemFullRightsTransferBid(
   vault: StringPublicKey,

js/packages/common/src/models/metaplex/redeemParticipationBidV3.ts

@@ -1,12 +1,3 @@
-import {
-  getEdition,
-  programIds,
-  getMetadata,
-  getEditionMarkPda,
-  getAuctionExtended,
-  StringPublicKey,
-  toPublicKey,
-} from '@oyster/common';
 import {
   SystemProgram,
   SYSVAR_RENT_PUBKEY,
@@ -23,6 +14,13 @@ import {
   getPrizeTrackingTicket,
   getSafetyDepositConfig,
 } from '.';
+import {
+  getAuctionExtended,
+  getEdition,
+  getEditionMarkPda,
+  getMetadata,
+} from '../../actions';
+import { programIds, StringPublicKey, toPublicKey } from '../../utils';
 
 export async function redeemParticipationBidV3(
   vault: StringPublicKey,

js/packages/common/src/models/metaplex/redeemPrintingV2Bid.ts

@@ -1,11 +1,3 @@
-import {
-  getEdition,
-  getEditionMarkPda,
-  getMetadata,
-  programIds,
-  StringPublicKey,
-  toPublicKey,
-} from '@oyster/common';
 import {
   SystemProgram,
   SYSVAR_RENT_PUBKEY,
@@ -22,6 +14,8 @@ import {
   SCHEMA,
   getSafetyDepositConfig,
 } from '.';
+import { getEdition, getEditionMarkPda, getMetadata } from '../../actions';
+import { programIds, StringPublicKey, toPublicKey } from '../../utils';
 
 export async function redeemPrintingV2Bid(
   vault: StringPublicKey,

js/packages/common/src/models/metaplex/setStore.ts

@@ -1,8 +1,8 @@
-import { programIds, StringPublicKey, toPublicKey } from '@oyster/common';
 import { SYSVAR_RENT_PUBKEY, TransactionInstruction } from '@solana/web3.js';
 import { serialize } from 'borsh';
 
 import { SCHEMA, SetStoreArgs } from '.';
+import { programIds, StringPublicKey, toPublicKey } from '../../utils';
 
 export async function setStore(
   isPublic: boolean,

js/packages/common/src/models/metaplex/setWhitelistedCreator.ts

@@ -1,8 +1,8 @@
-import { programIds, StringPublicKey, toPublicKey } from '@oyster/common';
 import { SYSVAR_RENT_PUBKEY, TransactionInstruction } from '@solana/web3.js';
 import { serialize } from 'borsh';
 
 import { getWhitelistedCreator, SCHEMA, SetWhitelistedCreatorArgs } from '.';
+import { programIds, StringPublicKey, toPublicKey } from '../../utils';
 
 export async function setWhitelistedCreator(
   creator: StringPublicKey,

js/packages/common/src/models/metaplex/startAuction.ts

@@ -1,8 +1,8 @@
-import { programIds, StringPublicKey, toPublicKey } from '@oyster/common';
 import { SYSVAR_CLOCK_PUBKEY, TransactionInstruction } from '@solana/web3.js';
 import { serialize } from 'borsh';
 
 import { getAuctionKeys, SCHEMA, StartAuctionArgs } from '.';
+import { programIds, StringPublicKey, toPublicKey } from '../../utils';
 
 export async function startAuction(
   vault: StringPublicKey,

js/packages/common/src/models/metaplex/validateSafetyDepositBoxV2.ts

@@ -1,4 +1,3 @@
-import { programIds, toPublicKey, StringPublicKey } from '@oyster/common';
 import {
   SystemProgram,
   SYSVAR_RENT_PUBKEY,
@@ -15,6 +14,7 @@ import {
   SCHEMA,
   ValidateSafetyDepositBoxV2Args,
 } from '.';
+import { programIds, toPublicKey, StringPublicKey } from '../../utils';
 
 export async function validateSafetyDepositBoxV2(
   vault: StringPublicKey,

js/packages/common/src/models/metaplex/withdrawMasterEdition.ts

@@ -1,12 +1,3 @@
-import {
-  AUCTION_PREFIX,
-  EXTENDED,
-  findProgramAddress,
-  programIds,
-  StringPublicKey,
-  toPublicKey,
-  VAULT_PREFIX,
-} from '@oyster/common';
 import { SYSVAR_RENT_PUBKEY, TransactionInstruction } from '@solana/web3.js';
 import { serialize } from 'borsh';
 
@@ -17,6 +8,13 @@ import {
   getPrizeTrackingTicket,
   getSafetyDepositConfig,
 } from '.';
+import { AUCTION_PREFIX, EXTENDED, VAULT_PREFIX } from '../../actions';
+import {
+  findProgramAddress,
+  programIds,
+  toPublicKey,
+  StringPublicKey,
+} from '../../utils';
 
 export async function withdrawMasterEdition(
   vault: StringPublicKey,

js/packages/web/src/actions/addTokensToVault.ts

@@ -1,22 +1,24 @@
 import { Keypair, Connection, TransactionInstruction } from '@solana/web3.js';
 import {
   utils,
-  actions,
-  models,
   findProgramAddress,
   MetadataKey,
   StringPublicKey,
   toPublicKey,
   WalletSigner,
 } from '@oyster/common';
+import { SafetyDepositConfig } from '@oyster/common/dist/lib/models/metaplex/index';
+import { approve } from '@oyster/common/dist/lib/models/account';
+import { createTokenAccount } from '@oyster/common/dist/lib/actions/account';
+import {
+  addTokenToInactiveVault,
+  VAULT_PREFIX,
+} from '@oyster/common/dist/lib/actions/vault';
 
 import { AccountLayout } from '@solana/spl-token';
 import BN from 'bn.js';
 import { SafetyDepositDraft } from './createAuctionManager';
-import { SafetyDepositConfig } from '../models/metaplex';
 import { WalletNotConnectedError } from '@solana/wallet-adapter-base';
-const { createTokenAccount, addTokenToInactiveVault, VAULT_PREFIX } = actions;
-const { approve } = models;
 
 export interface SafetyDepositInstructionTemplate {
   box: {

js/packages/web/src/actions/cancelBid.ts

@@ -16,7 +16,10 @@ import {
 import { AccountLayout } from '@solana/spl-token';
 import { TransactionInstruction, Keypair, Connection } from '@solana/web3.js';
 import { AuctionView } from '../hooks';
-import { BidRedemptionTicket, PrizeTrackingTicket } from '../models/metaplex';
+import {
+  BidRedemptionTicket,
+  PrizeTrackingTicket,
+} from '@oyster/common/dist/lib/models/metaplex/index';
 import { claimUnusedPrizes } from './claimUnusedPrizes';
 import { setupPlaceBid } from './sendPlaceBid';
 import { WalletNotConnectedError } from '@solana/wallet-adapter-base';

js/packages/web/src/actions/claimUnusedPrizes.ts

@@ -1,6 +1,5 @@
 import { Keypair, Connection, TransactionInstruction } from '@solana/web3.js';
 import {
-  actions,
   ParsedAccount,
   TokenAccount,
   SafetyDepositBox,
@@ -16,7 +15,7 @@ import {
 } from '@oyster/common';
 import { WalletNotConnectedError } from '@solana/wallet-adapter-base';
 import { AccountLayout, MintLayout } from '@solana/spl-token';
-import { AuctionView, AuctionViewItem } from '../hooks';
+import { AuctionView } from '../hooks';
 import {
   WinningConfigType,
   redeemBid,
@@ -25,13 +24,14 @@ import {
   BidRedemptionTicket,
   getBidRedemption,
   PrizeTrackingTicket,
-} from '../models/metaplex';
+  AuctionViewItem,
+} from '@oyster/common/dist/lib/models/metaplex/index';
+import { createTokenAccount } from '@oyster/common/dist/lib/actions/account';
 import {
   eligibleForParticipationPrizeGivenWinningIndex,
   setupRedeemParticipationInstructions,
   setupRedeemPrintingV2Instructions,
 } from './sendRedeemBid';
-const { createTokenAccount } = actions;
 
 export async function findEligibleParticipationBidsForRedemption(
   auctionView: AuctionView,

js/packages/web/src/actions/closeVault.ts

@@ -1,16 +1,15 @@
 import { Keypair, Connection, TransactionInstruction } from '@solana/web3.js';
-import {
-  actions,
-  models,
-  StringPublicKey,
-  toPublicKey,
-  WalletSigner,
-} from '@oyster/common';
 import { WalletNotConnectedError } from '@solana/wallet-adapter-base';
+import { StringPublicKey, toPublicKey, WalletSigner } from '@oyster/common';
+import { createTokenAccount } from '@oyster/common/dist/lib/actions/account';
+import {
+  activateVault,
+  combineVault,
+} from '@oyster/common/dist/lib/actions/vault';
+import { approve } from '@oyster/common/dist/lib/models/account';
+
 import { AccountLayout } from '@solana/spl-token';
 import BN from 'bn.js';
-const { createTokenAccount, activateVault, combineVault } = actions;
-const { approve } = models;
 
 // This command "closes" the vault, by activating & combining it in one go, handing it over to the auction manager
 // authority (that may or may not exist yet.)

js/packages/web/src/actions/createAuctionManager.ts

@@ -5,7 +5,6 @@ import {
   SystemProgram,
 } from '@solana/web3.js';
 import {
-  actions,
   Metadata,
   ParsedAccount,
   MasterEditionV1,
@@ -41,7 +40,8 @@ import {
   TupleNumericType,
   SafetyDepositConfig,
   ParticipationStateV2,
-} from '../models/metaplex';
+} from '@oyster/common/dist/lib/models/metaplex/index';
+import { createTokenAccount } from '@oyster/common/dist/lib/actions/account';
 import { createVault } from './createVault';
 import { closeVault } from './closeVault';
 import {
@@ -50,15 +50,13 @@ import {
 } from './addTokensToVault';
 import { makeAuction } from './makeAuction';
 import { createExternalPriceAccount } from './createExternalPriceAccount';
-import { deprecatedValidateParticipation } from '../models/metaplex/deprecatedValidateParticipation';
+import { deprecatedValidateParticipation } from '@oyster/common/dist/lib/models/metaplex/deprecatedValidateParticipation';
 import { deprecatedCreateReservationListForTokens } from './deprecatedCreateReservationListsForTokens';
 import { deprecatedPopulatePrintingTokens } from './deprecatedPopulatePrintingTokens';
 import { setVaultAndAuctionAuthorities } from './setVaultAndAuctionAuthorities';
 import { markItemsThatArentMineAsSold } from './markItemsThatArentMineAsSold';
-import { validateSafetyDepositBoxV2 } from '../models/metaplex/validateSafetyDepositBoxV2';
-import { initAuctionManagerV2 } from '../models/metaplex/initAuctionManagerV2';
-
-const { createTokenAccount } = actions;
+import { validateSafetyDepositBoxV2 } from '@oyster/common/dist/lib/models/metaplex/validateSafetyDepositBoxV2';
+import { initAuctionManagerV2 } from '@oyster/common/dist/lib/models/metaplex/initAuctionManagerV2';
 
 interface normalPattern {
   instructions: TransactionInstruction[];

js/packages/web/src/actions/createExternalPriceAccount.ts

@@ -4,22 +4,22 @@ import {
   SystemProgram,
   TransactionInstruction,
 } from '@solana/web3.js';
+import { WalletNotConnectedError } from '@solana/wallet-adapter-base';
+
 import {
   utils,
-  actions,
   StringPublicKey,
   toPublicKey,
   WalletSigner,
 } from '@oyster/common';
-import { WalletNotConnectedError } from '@solana/wallet-adapter-base';
-import BN from 'bn.js';
-import { QUOTE_MINT } from '../constants';
-
-const {
+import {
   updateExternalPriceAccount,
   ExternalPriceAccount,
   MAX_EXTERNAL_ACCOUNT_SIZE,
-} = actions;
+} from '@oyster/common/dist/lib/actions/vault';
+
+import BN from 'bn.js';
+import { QUOTE_MINT } from '../constants';
 
 // This command creates the external pricing oracle
 export async function createExternalPriceAccount(

js/packages/web/src/actions/createVault.ts

@@ -6,19 +6,22 @@ import {
 } from '@solana/web3.js';
 import {
   utils,
-  actions,
   createMint,
   findProgramAddress,
   StringPublicKey,
   toPublicKey,
   WalletSigner,
 } from '@oyster/common';
+import {
+  initVault,
+  MAX_VAULT_SIZE,
+  VAULT_PREFIX,
+} from '@oyster/common/dist/lib/actions/vault';
+import { createTokenAccount } from '@oyster/common/dist/lib/actions/account';
 
 import { AccountLayout, MintLayout } from '@solana/spl-token';
 import { WalletNotConnectedError } from '@solana/wallet-adapter-base';
 
-const { createTokenAccount, initVault, MAX_VAULT_SIZE, VAULT_PREFIX } = actions;
-
 // This command creates the external pricing oracle a vault
 // This gets the vault ready for adding the tokens.
 export async function createVault(

js/packages/web/src/actions/decommAuctionManagerAndReturnPrizes.ts

@@ -9,8 +9,8 @@ import {
 } from '@oyster/common';
 import { WalletNotConnectedError } from '@solana/wallet-adapter-base';
 import { AuctionView } from '../hooks';
-import { AuctionManagerStatus } from '../models/metaplex';
-import { decommissionAuctionManager } from '../models/metaplex/decommissionAuctionManager';
+import { AuctionManagerStatus } from '@oyster/common/dist/lib/models/metaplex/index';
+import { decommissionAuctionManager } from '@oyster/common/dist/lib/models/metaplex/decommissionAuctionManager';
 import { unwindVault } from './unwindVault';
 
 export async function decommAuctionManagerAndReturnPrizes(

js/packages/web/src/actions/deprecatedCreateReservationListsForTokens.ts

@@ -6,7 +6,7 @@ import {
 } from '@oyster/common';
 import { WalletNotConnectedError } from '@solana/wallet-adapter-base';
 import { SafetyDepositInstructionTemplate } from './addTokensToVault';
-import { WinningConfigType } from '../models/metaplex';
+import { WinningConfigType } from '@oyster/common/dist/lib/models/metaplex/index';
 
 const BATCH_SIZE = 10;
 // This command batches out creating reservation lists for those tokens who are being sold in PrintingV1 mode.

js/packages/web/src/actions/makeAuction.ts

@@ -1,7 +1,6 @@
 import { Keypair, TransactionInstruction } from '@solana/web3.js';
 import {
   utils,
-  actions,
   findProgramAddress,
   IPartialCreateAuctionArgs,
   CreateAuctionArgs,
@@ -9,10 +8,12 @@ import {
   toPublicKey,
   WalletSigner,
 } from '@oyster/common';
+import {
+  AUCTION_PREFIX,
+  createAuction,
+} from '@oyster/common/dist/lib/actions/auction';
 import { WalletNotConnectedError } from '@solana/wallet-adapter-base';
 
-const { AUCTION_PREFIX, createAuction } = actions;
-
 // This command makes an auction
 export async function makeAuction(
   wallet: WalletSigner,

js/packages/web/src/actions/saveAdmin.ts

@@ -5,10 +5,10 @@ import {
   sendTransactionWithRetry,
   WalletSigner,
 } from '@oyster/common';
+import { WhitelistedCreator } from '@oyster/common/dist/lib/models/metaplex/index';
+import { setStore } from '@oyster/common/dist/lib/models/metaplex/setStore';
+import { setWhitelistedCreator } from '@oyster/common/dist/lib/models/metaplex/setWhitelistedCreator';
 import { WalletNotConnectedError } from '@solana/wallet-adapter-base';
-import { WhitelistedCreator } from '../models/metaplex';
-import { setStore } from '../models/metaplex/setStore';
-import { setWhitelistedCreator } from '../models/metaplex/setWhitelistedCreator';
 
 // TODO if this becomes very slow move to batching txns like we do with settle.ts
 // but given how little this should be used keep it simple

js/packages/web/src/actions/sendPlaceBid.ts

@@ -1,11 +1,8 @@
 import { Keypair, Connection, TransactionInstruction } from '@solana/web3.js';
 import {
-  actions,
   sendTransactionWithRetry,
   placeBid,
-  models,
   cache,
-  TokenAccount,
   ensureWrappedAccount,
   toLamports,
   ParsedAccount,
@@ -13,15 +10,16 @@ import {
   WalletSigner,
 } from '@oyster/common';
 import { WalletNotConnectedError } from '@solana/wallet-adapter-base';
+import { approve } from '@oyster/common/dist/lib/models/account';
+import { createTokenAccount } from '@oyster/common/dist/lib/actions/account';
+import { TokenAccount } from '@oyster/common/dist/lib/models/account';
+
 import { AccountLayout, MintInfo } from '@solana/spl-token';
 import { AuctionView } from '../hooks';
 import BN from 'bn.js';
 import { setupCancelBid } from './cancelBid';
 import { QUOTE_MINT } from '../constants';
 
-const { createTokenAccount } = actions;
-const { approve } = models;
-
 export async function sendPlaceBid(
   connection: Connection,
   wallet: WalletSigner,

js/packages/web/src/actions/sendRedeemBid.ts

@@ -1,9 +1,7 @@
 import { Keypair, Connection, TransactionInstruction } from '@solana/web3.js';
 import {
-  actions,
   ParsedAccount,
   programIds,
-  models,
   TokenAccount,
   createMint,
   SafetyDepositBox,
@@ -28,8 +26,10 @@ import {
 } from '@oyster/common';
 import { WalletNotConnectedError } from '@solana/wallet-adapter-base';
 import { AccountLayout, MintLayout, Token } from '@solana/spl-token';
-import { AuctionView, AuctionViewItem } from '../hooks';
+import { AuctionView } from '../hooks';
 import {
+  AuctionManagerV1,
+  ParticipationStateV1,
   WinningConfigType,
   NonWinningConstraint,
   redeemBid,
@@ -41,21 +41,18 @@ import {
   PrizeTrackingTicket,
   getPrizeTrackingTicket,
   BidRedemptionTicket,
-} from '../models/metaplex';
-import { claimBid } from '../models/metaplex/claimBid';
+  AuctionViewItem,
+} from '@oyster/common/dist/lib/models/metaplex/index';
+import { claimBid } from '@oyster/common/dist/lib/models/metaplex/claimBid';
+import { approve } from '@oyster/common/dist/lib/models/account';
+import { createTokenAccount } from '@oyster/common/dist/lib/actions/account';
 import { setupCancelBid } from './cancelBid';
-import { deprecatedPopulateParticipationPrintingAccount } from '../models/metaplex/deprecatedPopulateParticipationPrintingAccount';
+import { deprecatedPopulateParticipationPrintingAccount } from '@oyster/common/dist/lib/models/metaplex/deprecatedPopulateParticipationPrintingAccount';
 import { setupPlaceBid } from './sendPlaceBid';
 import { claimUnusedPrizes } from './claimUnusedPrizes';
 import { createMintAndAccountWithOne } from './createMintAndAccountWithOne';
 import { BN } from 'bn.js';
 import { QUOTE_MINT } from '../constants';
-import {
-  AuctionManagerV1,
-  ParticipationStateV1,
-} from '../models/metaplex/deprecatedStates';
-const { createTokenAccount } = actions;
-const { approve } = models;
 
 export function eligibleForParticipationPrizeGivenWinningIndex(
   winnerIndex: number | null,

js/packages/web/src/actions/settle.ts

@@ -16,8 +16,8 @@ import {
 
 import { AuctionView } from '../hooks';
 
-import { claimBid } from '../models/metaplex/claimBid';
-import { emptyPaymentAccount } from '../models/metaplex/emptyPaymentAccount';
+import { claimBid } from '@oyster/common/dist/lib/models/metaplex/claimBid';
+import { emptyPaymentAccount } from '@oyster/common/dist/lib/models/metaplex/emptyPaymentAccount';
 import { QUOTE_MINT } from '../constants';
 import { setupPlaceBid } from './sendPlaceBid';
 import { WalletNotConnectedError } from '@solana/wallet-adapter-base';

js/packages/web/src/actions/startAuctionManually.ts

@@ -1,5 +1,5 @@
 import { Connection, Keypair, TransactionInstruction } from '@solana/web3.js';
-import { startAuction } from '../models/metaplex';
+import { startAuction } from '@oyster/common/dist/lib/models/metaplex/index';
 import { notify, sendTransactionWithRetry, WalletSigner } from '@oyster/common';
 import { AuctionView } from '../hooks';
 

js/packages/web/src/components/AuctionCard/index.tsx

@@ -43,7 +43,7 @@ import { findEligibleParticipationBidsForRedemption } from '../../actions/claimU
 import {
   BidRedemptionTicket,
   MAX_PRIZE_TRACKING_TICKET_SIZE,
-} from '../../models/metaplex';
+} from '@oyster/common/dist/lib/models/metaplex/index';
 
 async function calculateTotalCostOfRedeemingOtherPeoplesBids(
   connection: Connection,

js/packages/web/src/contexts/meta/isMetadataPartOfStore.ts

@@ -1,5 +1,8 @@
 import { Metadata, ParsedAccount } from '@oyster/common';
-import { Store, WhitelistedCreator } from '../../models/metaplex';
+import {
+  Store,
+  WhitelistedCreator,
+} from '@oyster/common/dist/lib/models/metaplex/index';
 
 export const isMetadataPartOfStore = (
   m: ParsedAccount<Metadata>,

js/packages/web/src/contexts/meta/loadAccounts.ts

@@ -6,6 +6,17 @@ import {
   toPublicKey,
   VAULT_ID,
 } from '@oyster/common/dist/lib/utils/ids';
+import { getMultipleAccounts, Metadata, ParsedAccount } from '@oyster/common';
+import { MAX_WHITELISTED_CREATOR_SIZE } from '@oyster/common/dist/lib/models/index';
+import {
+  getEdition,
+  MAX_CREATOR_LEN,
+  MAX_CREATOR_LIMIT,
+  MAX_NAME_LENGTH,
+  MAX_SYMBOL_LENGTH,
+  MAX_URI_LENGTH,
+  METADATA_PREFIX,
+} from '@oyster/common/dist/lib/actions/index';
 import { AccountInfo, Connection, PublicKey } from '@solana/web3.js';
 import { AccountAndPubkey, MetaState, ProcessAccountsFunc } from './types';
 import { isMetadataPartOfStore } from './isMetadataPartOfStore';
@@ -13,19 +24,6 @@ import { processAuctions } from './processAuctions';
 import { processMetaplexAccounts } from './processMetaplexAccounts';
 import { processMetaData } from './processMetaData';
 import { processVaultData } from './processVaultData';
-import {
-  getEdition,
-  getMultipleAccounts,
-  MAX_CREATOR_LEN,
-  MAX_CREATOR_LIMIT,
-  MAX_NAME_LENGTH,
-  MAX_SYMBOL_LENGTH,
-  MAX_URI_LENGTH,
-  Metadata,
-  METADATA_PREFIX,
-  ParsedAccount,
-} from '@oyster/common';
-import { MAX_WHITELISTED_CREATOR_SIZE } from '../../models/metaplex';
 
 async function getProgramAccounts(
   connection: Connection,

js/packages/web/src/contexts/meta/processMetaplexAccounts.ts

@@ -1,6 +1,7 @@
 import { programIds, cache, ParsedAccount, METAPLEX_ID } from '@oyster/common';
 import { AccountInfo, PublicKey } from '@solana/web3.js';
 import {
+  AuctionManagerV1,
   AuctionManagerV2,
   BidRedemptionTicket,
   decodeAuctionManager,
@@ -19,8 +20,7 @@ import {
   BidRedemptionTicketV2,
   decodeSafetyDepositConfig,
   SafetyDepositConfig,
-} from '../../models/metaplex';
-import { AuctionManagerV1 } from '../../models/metaplex/deprecatedStates';
+} from '@oyster/common/dist/lib/models/metaplex/index';
 import names from '../../config/userNames.json';
 import { ProcessAccountsFunc } from './types';
 

js/packages/web/src/contexts/meta/types.ts

@@ -14,6 +14,7 @@ import {
 } from '@oyster/common';
 import { AccountInfo } from '@solana/web3.js';
 import {
+  AuctionManagerV1,
   BidRedemptionTicket,
   Store,
   WhitelistedCreator,
@@ -22,8 +23,7 @@ import {
   AuctionManagerV2,
   SafetyDepositConfig,
   BidRedemptionTicketV2,
-} from '../../models/metaplex';
-import { AuctionManagerV1 } from '../../models/metaplex/deprecatedStates';
+} from '@oyster/common/dist/lib/models/metaplex/index';
 
 export interface MetaState {
   metadata: ParsedAccount<Metadata>[];

js/packages/web/src/hooks/useArt.ts

@@ -10,7 +10,7 @@ import {
   ParsedAccount,
   StringPublicKey,
 } from '@oyster/common';
-import { WhitelistedCreator } from '../models/metaplex';
+import { WhitelistedCreator } from '@oyster/common/dist/lib/models/metaplex/index';
 import { Cache } from 'three';
 import { useInView } from 'react-intersection-observer';
 import { pubkeyToString } from '../utils/pubkeyToString';

js/packages/web/src/hooks/useAuctions.ts

@@ -18,14 +18,15 @@ import { useMeta } from '../contexts';
 import {
   AuctionManager,
   AuctionManagerStatus,
+  AuctionManagerV1,
   AuctionManagerV2,
   BidRedemptionTicket,
   BidRedemptionTicketV2,
   getBidderKeys,
   SafetyDepositConfig,
   WinningConfigType,
-} from '../models/metaplex';
-import { AuctionManagerV1 } from '../models/metaplex/deprecatedStates';
+  AuctionViewItem,
+} from '@oyster/common/dist/lib/models/metaplex/index';
 
 export enum AuctionViewState {
   Live = '0',
@@ -35,14 +36,6 @@ export enum AuctionViewState {
   Defective = '-1',
 }
 
-export interface AuctionViewItem {
-  winningConfigType: WinningConfigType;
-  amount: BN;
-  metadata: ParsedAccount<Metadata>;
-  safetyDeposit: ParsedAccount<SafetyDepositBox>;
-  masterEdition?: ParsedAccount<MasterEditionV1 | MasterEditionV2>;
-}
-
 // Flattened surface item for easy display
 export interface AuctionView {
   // items 1:1 with winning configs FOR NOW

js/packages/web/src/hooks/useUserArts.ts

@@ -12,7 +12,7 @@ import {
   ParticipationConfigV2,
   WinningConfigType,
   WinningConstraint,
-} from '../models/metaplex';
+} from '@oyster/common/dist/lib/models/metaplex/index';
 import { useMeta } from './../contexts';
 
 export const useUserArts = (): SafetyDepositDraft[] => {

js/packages/web/src/views/admin/index.tsx

@@ -12,7 +12,7 @@ import {
   Divider,
 } from 'antd';
 import { useMeta } from '../../contexts';
-import { Store, WhitelistedCreator } from '../../models/metaplex';
+import { Store, WhitelistedCreator } from '@oyster/common/dist/lib/models/metaplex/index';
 import {
   MasterEditionV1,
   notify,

js/packages/web/src/views/analytics/index.tsx

@@ -1,7 +1,7 @@
 import React, { Dispatch, SetStateAction, useState } from 'react';
 import { Layout, Button, Col, Spin } from 'antd';
 import { useMeta } from '../../contexts';
-import { AuctionManagerV2, WinningConfigType } from '../../models/metaplex';
+import { AuctionManagerV1, AuctionManagerV2, WinningConfigType } from '@oyster/common/dist/lib/models/metaplex/index';
 import { Pie, Bar } from 'react-chartjs-2';
 import {
   AuctionDataExtended,
@@ -16,7 +16,6 @@ import {
 import { AuctionView, useAuctions } from '../../hooks';
 import { QUOTE_MINT } from '../../constants';
 import { MintInfo } from '@solana/spl-token';
-import { AuctionManagerV1 } from '../../models/metaplex/deprecatedStates';
 
 const { Content } = Layout;
 export const AnalyticsView = () => {

js/packages/web/src/views/auction/billing.tsx

@@ -33,7 +33,7 @@ import {
   NonWinningConstraint,
   PayoutTicket,
   WinningConstraint,
-} from '../../models/metaplex';
+} from '@oyster/common/dist/lib/models/metaplex/index';
 import { Connection } from '@solana/web3.js';
 import { settle } from '../../actions/settle';
 import { MintInfo } from '@solana/spl-token';

js/packages/web/src/views/auction/index.tsx

@@ -3,9 +3,9 @@ import { useParams } from 'react-router-dom';
 import { Row, Col, Button, Skeleton, Carousel, List, Card } from 'antd';
 import { AuctionCard } from '../../components/AuctionCard';
 import { Connection } from '@solana/web3.js';
+import { AuctionViewItem } from '@oyster/common/dist/lib/models/metaplex/index';
 import {
   AuctionView as Auction,
-  AuctionViewItem,
   useArt,
   useAuction,
   useBidsForAuction,

js/packages/web/src/views/auctionCreate/index.tsx

@@ -37,7 +37,10 @@ import { useWallet } from '@solana/wallet-adapter-react';
 import { MintLayout } from '@solana/spl-token';
 import { useHistory, useParams } from 'react-router-dom';
 import { capitalize } from 'lodash';
-import { WinningConfigType, AmountRange } from '../../models/metaplex';
+import {
+  WinningConfigType,
+  AmountRange,
+} from '@oyster/common/dist/lib/models/metaplex/index';
 import moment from 'moment';
 import {
   createAuctionManager,

js/packages/web/src/views/home/setup.tsx

@@ -2,7 +2,7 @@ import {
   useConnection,
   useStore,
   useWalletModal,
-  WalletSigner,
+  WhitelistedCreator,
 } from '@oyster/common';
 import { useWallet } from '@solana/wallet-adapter-react';
 import { Button } from 'antd';
@@ -10,9 +10,7 @@ import { useCallback, useEffect, useState } from 'react';
 import { useHistory } from 'react-router-dom';
 import { saveAdmin } from '../../actions/saveAdmin';
 import { useMeta } from '../../contexts';
-import { WhitelistedCreator } from '../../models/metaplex';
 import { SetupVariables } from '../../components/SetupVariables';
-import { WalletAdapter } from '@solana/wallet-adapter-base';
 
 export const SetupView = () => {
   const [isInitalizingStore, setIsInitalizingStore] = useState(false);