diff --git a/auction/js/package.json b/auction/js/package.json index 693a56707e..936110c23a 100644 --- a/auction/js/package.json +++ b/auction/js/package.json @@ -1,10 +1,11 @@ { - "name": "@metaplex/mpl-auction", + "name": "@metaplex-foundation/mpl-auction", "version": "0.0.0", "description": "MPL Token Metadata JavaScript API.", "main": "dist/src/mpl-auction.js", "types": "dist/src/mpl-auction.d.ts", "scripts": { + "prepublish": "yarn build && yarn test", "build:docs": "typedoc", "build": "rimraf dist && tsc -p tsconfig.json", "test": "echo mpl-auction tests coming up ...", @@ -24,12 +25,12 @@ "blockchain" ], "homepage": "https://metaplex.com", - "repository": "https://github.com/metaplex/metaplex-program-library.git", + "repository": "https://github.com/metaplex-foundation/metaplex-program-library.git", "author": "Metaplex Maintainers ", "license": "MIT", "private": false, "dependencies": { - "@metaplex/mpl-core": "0.0.0", + "@metaplex-foundation/mpl-core": "0.0.0", "@solana/spl-token": "^0.1.8", "@solana/web3.js": "^1.31.0" }, diff --git a/auction/js/src/AuctionProgram.ts b/auction/js/src/AuctionProgram.ts index 32e43762db..8a14bc3161 100644 --- a/auction/js/src/AuctionProgram.ts +++ b/auction/js/src/AuctionProgram.ts @@ -1,5 +1,5 @@ import { PublicKey } from '@solana/web3.js'; -import { config, Program } from '@metaplex/mpl-core'; +import { config, Program } from '@metaplex-foundation/mpl-core'; export class AuctionProgram extends Program { static readonly PREFIX = 'auction'; diff --git a/auction/js/src/accounts/Auction.ts b/auction/js/src/accounts/Auction.ts index 2cf22d754f..75663e93c0 100644 --- a/auction/js/src/accounts/Auction.ts +++ b/auction/js/src/accounts/Auction.ts @@ -4,7 +4,7 @@ import { ERROR_INVALID_OWNER, AnyPublicKey, StringPublicKey, -} from '@metaplex/mpl-core'; +} from '@metaplex-foundation/mpl-core'; import { AccountInfo, Connection, PublicKey } from '@solana/web3.js'; import BN from 'bn.js'; import { Buffer } from 'buffer'; diff --git a/auction/js/src/accounts/AuctionExtended.ts b/auction/js/src/accounts/AuctionExtended.ts index fcedfc4b5f..2d74398e06 100644 --- a/auction/js/src/accounts/AuctionExtended.ts +++ b/auction/js/src/accounts/AuctionExtended.ts @@ -4,7 +4,7 @@ import { ERROR_INVALID_ACCOUNT_DATA, ERROR_INVALID_OWNER, AnyPublicKey, -} from '@metaplex/mpl-core'; +} from '@metaplex-foundation/mpl-core'; import BN from 'bn.js'; import { AuctionProgram } from '../AuctionProgram'; import { Buffer } from 'buffer'; diff --git a/auction/js/src/accounts/BidderMetadata.ts b/auction/js/src/accounts/BidderMetadata.ts index 378c0cef29..1ffd3ce54e 100644 --- a/auction/js/src/accounts/BidderMetadata.ts +++ b/auction/js/src/accounts/BidderMetadata.ts @@ -5,7 +5,7 @@ import { ERROR_INVALID_OWNER, AnyPublicKey, StringPublicKey, -} from '@metaplex/mpl-core'; +} from '@metaplex-foundation/mpl-core'; import { AccountInfo, PublicKey } from '@solana/web3.js'; import BN from 'bn.js'; import { AuctionProgram } from '../AuctionProgram'; diff --git a/auction/js/src/accounts/BidderPot.ts b/auction/js/src/accounts/BidderPot.ts index 081f600135..9ccb1fc243 100644 --- a/auction/js/src/accounts/BidderPot.ts +++ b/auction/js/src/accounts/BidderPot.ts @@ -5,7 +5,7 @@ import { ERROR_INVALID_OWNER, AnyPublicKey, StringPublicKey, -} from '@metaplex/mpl-core'; +} from '@metaplex-foundation/mpl-core'; import { AuctionProgram } from '../AuctionProgram'; import { AccountInfo, PublicKey } from '@solana/web3.js'; import { Buffer } from 'buffer'; diff --git a/auction/js/src/transactions/CancelBid.ts b/auction/js/src/transactions/CancelBid.ts index aaa3f8a6de..97599cc78e 100644 --- a/auction/js/src/transactions/CancelBid.ts +++ b/auction/js/src/transactions/CancelBid.ts @@ -1,4 +1,4 @@ -import { Borsh, StringPublicKey, Transaction } from '@metaplex/mpl-core'; +import { Borsh, StringPublicKey, Transaction } from '@metaplex-foundation/mpl-core'; import { TOKEN_PROGRAM_ID } from '@solana/spl-token'; import { PublicKey, diff --git a/auction/js/src/transactions/CreateAuction.ts b/auction/js/src/transactions/CreateAuction.ts index fb06e756f1..6aecfabbbd 100644 --- a/auction/js/src/transactions/CreateAuction.ts +++ b/auction/js/src/transactions/CreateAuction.ts @@ -1,4 +1,4 @@ -import { Borsh, Transaction, StringPublicKey } from '@metaplex/mpl-core'; +import { Borsh, Transaction, StringPublicKey } from '@metaplex-foundation/mpl-core'; import { PublicKey, SystemProgram, diff --git a/auction/js/src/transactions/CreateAuctionV2.ts b/auction/js/src/transactions/CreateAuctionV2.ts index 66bccb5f7b..2df1e6366f 100644 --- a/auction/js/src/transactions/CreateAuctionV2.ts +++ b/auction/js/src/transactions/CreateAuctionV2.ts @@ -1,4 +1,4 @@ -import { Borsh, Transaction, StringPublicKey } from '@metaplex/mpl-core'; +import { Borsh, Transaction, StringPublicKey } from '@metaplex-foundation/mpl-core'; import { PublicKey, SystemProgram, diff --git a/auction/js/src/transactions/PlaceBid.ts b/auction/js/src/transactions/PlaceBid.ts index cf1127796e..ecf470ac0a 100644 --- a/auction/js/src/transactions/PlaceBid.ts +++ b/auction/js/src/transactions/PlaceBid.ts @@ -1,4 +1,4 @@ -import { Borsh, Transaction, StringPublicKey } from '@metaplex/mpl-core'; +import { Borsh, Transaction, StringPublicKey } from '@metaplex-foundation/mpl-core'; import { PublicKey, SystemProgram, diff --git a/auction/js/src/transactions/SetAuctionAuthority.ts b/auction/js/src/transactions/SetAuctionAuthority.ts index 09192d4236..237c88c427 100644 --- a/auction/js/src/transactions/SetAuctionAuthority.ts +++ b/auction/js/src/transactions/SetAuctionAuthority.ts @@ -1,4 +1,4 @@ -import { Borsh, Transaction } from '@metaplex/mpl-core'; +import { Borsh, Transaction } from '@metaplex-foundation/mpl-core'; import { PublicKey, TransactionCtorFields, TransactionInstruction } from '@solana/web3.js'; import { AuctionProgram } from '../AuctionProgram'; diff --git a/core/js/package.json b/core/js/package.json index 2af834cdc5..7ab2914964 100644 --- a/core/js/package.json +++ b/core/js/package.json @@ -1,10 +1,11 @@ { - "name": "@metaplex/mpl-core", + "name": "@metaplex-foundation/mpl-core", "version": "0.0.0", "description": "MPL Core Tooling.", "main": "dist/src/mpl-core.js", "types": "dist/src/mpl-core.d.ts", "scripts": { + "prepublish": "yarn build && yarn test", "build:docs": "typedoc", "build": "rimraf dist && tsc -p tsconfig.json", "test": "echo mpl-core tests coming up ...", @@ -24,7 +25,7 @@ "blockchain" ], "homepage": "https://metaplex.com", - "repository": "https://github.com/metaplex/metaplex-program-library.git", + "repository": "https://github.com/metaplex-foundation/metaplex-program-library.git", "author": "Metaplex Maintainers ", "license": "MIT", "private": false, diff --git a/lerna.json b/lerna.json index 3e4c74120c..434d700ffc 100644 --- a/lerna.json +++ b/lerna.json @@ -2,5 +2,12 @@ "npmClient": "yarn", "packages": ["core/js", "auction/js", "token-vault/js", "token-metadata/js", "metaplex/js"], "useWorkspaces": true, - "version": "0.0.0" + "version": "independent", + "command": { + "version": { + "allowBranch": ["master"], + "message": "chore: version updated packages", + "ignoreChanges": ["**/test/**", "**/*.md"] + } + } } diff --git a/metaplex/js/package.json b/metaplex/js/package.json index a6ec534178..47fb087f8c 100644 --- a/metaplex/js/package.json +++ b/metaplex/js/package.json @@ -1,10 +1,11 @@ { - "name": "@metaplex/mpl-metaplex", + "name": "@metaplex-foundation/mpl-metaplex", "version": "0.0.0", "description": "MPL Token Metadata JavaScript API.", "main": "dist/src/mpl-metaplex.js", "types": "dist/src/mpl-metaplex.d.ts", "scripts": { + "prepublish": "yarn build && yarn test", "build:docs": "typedoc", "build": "rimraf dist && tsc -p tsconfig.json", "test": "echo mpl-metaplex tests coming up ...", @@ -24,15 +25,15 @@ "blockchain" ], "homepage": "https://metaplex.com", - "repository": "https://github.com/metaplex/metaplex-program-library.git", + "repository": "https://github.com/metaplex-foundation/metaplex-program-library.git", "author": "Metaplex Maintainers ", "license": "MIT", "private": false, "dependencies": { - "@metaplex/mpl-auction": "0.0.0", - "@metaplex/mpl-core": "0.0.0", - "@metaplex/mpl-token-metadata": "0.0.0", - "@metaplex/mpl-token-vault": "0.0.0", + "@metaplex-foundation/mpl-auction": "0.0.0", + "@metaplex-foundation/mpl-core": "0.0.0", + "@metaplex-foundation/mpl-token-metadata": "0.0.0", + "@metaplex-foundation/mpl-token-vault": "0.0.0", "@solana/spl-token": "^0.1.8", "@solana/web3.js": "^1.31.0" }, diff --git a/metaplex/js/src/MetaplexProgram.ts b/metaplex/js/src/MetaplexProgram.ts index 9d1f2afc24..0693833b0c 100644 --- a/metaplex/js/src/MetaplexProgram.ts +++ b/metaplex/js/src/MetaplexProgram.ts @@ -1,4 +1,4 @@ -import { config, Program } from '@metaplex/mpl-core'; +import { config, Program } from '@metaplex-foundation/mpl-core'; import { PublicKey } from '@solana/web3.js'; export enum MetaplexKey { diff --git a/metaplex/js/src/accounts/AuctionManager.ts b/metaplex/js/src/accounts/AuctionManager.ts index 55e1fad263..d6c09263df 100644 --- a/metaplex/js/src/accounts/AuctionManager.ts +++ b/metaplex/js/src/accounts/AuctionManager.ts @@ -4,7 +4,7 @@ import bs58 from 'bs58'; import { BidRedemptionTicket, WINNER_INDEX_OFFSETS } from './BidRedemptionTicket'; import { MetaplexKey, MetaplexProgram } from '../MetaplexProgram'; import { Buffer } from 'buffer'; -import { Auction } from '@metaplex/mpl-auction'; +import { Auction } from '@metaplex-foundation/mpl-auction'; import { Account, AnyPublicKey, @@ -13,7 +13,7 @@ import { ERROR_INVALID_ACCOUNT_DATA, ERROR_INVALID_OWNER, StringPublicKey, -} from '@metaplex/mpl-core'; +} from '@metaplex-foundation/mpl-core'; export enum AuctionManagerStatus { Initialized, diff --git a/metaplex/js/src/accounts/AuctionWinnerTokenTypeTracker.ts b/metaplex/js/src/accounts/AuctionWinnerTokenTypeTracker.ts index 91d2fe4e7f..1eca63a86e 100644 --- a/metaplex/js/src/accounts/AuctionWinnerTokenTypeTracker.ts +++ b/metaplex/js/src/accounts/AuctionWinnerTokenTypeTracker.ts @@ -5,7 +5,7 @@ import { ERROR_INVALID_OWNER, TupleNumericType, getBNFromData, -} from '@metaplex/mpl-core'; +} from '@metaplex-foundation/mpl-core'; import { AccountInfo, PublicKey } from '@solana/web3.js'; import BN from 'bn.js'; import { Buffer } from 'buffer'; diff --git a/metaplex/js/src/accounts/BidRedemptionTicket.ts b/metaplex/js/src/accounts/BidRedemptionTicket.ts index b1872b6f77..7ac0ac5c9c 100644 --- a/metaplex/js/src/accounts/BidRedemptionTicket.ts +++ b/metaplex/js/src/accounts/BidRedemptionTicket.ts @@ -9,7 +9,7 @@ import { ERROR_DEPRECATED_ACCOUNT_DATA, ERROR_INVALID_ACCOUNT_DATA, ERROR_INVALID_OWNER, -} from '@metaplex/mpl-core'; +} from '@metaplex-foundation/mpl-core'; import { Buffer } from 'buffer'; export interface BidRedemptionTicketV2Data { diff --git a/metaplex/js/src/accounts/PayoutTicket.ts b/metaplex/js/src/accounts/PayoutTicket.ts index 15aae3f92e..0009e51a8b 100644 --- a/metaplex/js/src/accounts/PayoutTicket.ts +++ b/metaplex/js/src/accounts/PayoutTicket.ts @@ -8,7 +8,7 @@ import { Borsh, ERROR_INVALID_ACCOUNT_DATA, ERROR_INVALID_OWNER, -} from '@metaplex/mpl-core'; +} from '@metaplex-foundation/mpl-core'; import { MetaplexKey, MetaplexProgram } from '../MetaplexProgram'; import { Buffer } from 'buffer'; diff --git a/metaplex/js/src/accounts/PrizeTrackingTicket.ts b/metaplex/js/src/accounts/PrizeTrackingTicket.ts index 17c8390833..2223c9a1be 100644 --- a/metaplex/js/src/accounts/PrizeTrackingTicket.ts +++ b/metaplex/js/src/accounts/PrizeTrackingTicket.ts @@ -6,7 +6,7 @@ import { Borsh, ERROR_INVALID_ACCOUNT_DATA, ERROR_INVALID_OWNER, -} from '@metaplex/mpl-core'; +} from '@metaplex-foundation/mpl-core'; import { MetaplexKey, MetaplexProgram } from '../MetaplexProgram'; import { Buffer } from 'buffer'; diff --git a/metaplex/js/src/accounts/SafetyDepositConfig.ts b/metaplex/js/src/accounts/SafetyDepositConfig.ts index f388658f99..4abc168544 100644 --- a/metaplex/js/src/accounts/SafetyDepositConfig.ts +++ b/metaplex/js/src/accounts/SafetyDepositConfig.ts @@ -9,7 +9,7 @@ import { ERROR_INVALID_OWNER, getBNFromData, TupleNumericType, -} from '@metaplex/mpl-core'; +} from '@metaplex-foundation/mpl-core'; import { MetaplexKey, MetaplexProgram } from '../MetaplexProgram'; import { Buffer } from 'buffer'; diff --git a/metaplex/js/src/accounts/Store.ts b/metaplex/js/src/accounts/Store.ts index 4d004d6a68..ce8ba59761 100644 --- a/metaplex/js/src/accounts/Store.ts +++ b/metaplex/js/src/accounts/Store.ts @@ -5,7 +5,7 @@ import { ERROR_INVALID_ACCOUNT_DATA, ERROR_INVALID_OWNER, Borsh, -} from '@metaplex/mpl-core'; +} from '@metaplex-foundation/mpl-core'; import { MetaplexProgram, MetaplexKey } from '../MetaplexProgram'; import { AccountInfo, Connection, PublicKey } from '@solana/web3.js'; import bs58 from 'bs58'; diff --git a/metaplex/js/src/accounts/WhitelistedCreator.ts b/metaplex/js/src/accounts/WhitelistedCreator.ts index 9fa0f8cbf9..a74ba99d4e 100644 --- a/metaplex/js/src/accounts/WhitelistedCreator.ts +++ b/metaplex/js/src/accounts/WhitelistedCreator.ts @@ -5,7 +5,7 @@ import { Account, ERROR_INVALID_ACCOUNT_DATA, ERROR_INVALID_OWNER, -} from '@metaplex/mpl-core'; +} from '@metaplex-foundation/mpl-core'; import { MetaplexProgram, MetaplexKey } from '../MetaplexProgram'; import { Buffer } from 'buffer'; import { AccountInfo, PublicKey } from '@solana/web3.js'; diff --git a/metaplex/js/src/transactions/ClaimBid.ts b/metaplex/js/src/transactions/ClaimBid.ts index 55339d6fb5..68199c6efd 100644 --- a/metaplex/js/src/transactions/ClaimBid.ts +++ b/metaplex/js/src/transactions/ClaimBid.ts @@ -1,6 +1,6 @@ -import { Borsh, Transaction } from '@metaplex/mpl-core'; -import { ParamsWithStore } from '@metaplex/mpl-token-vault'; -import { AuctionProgram } from '@metaplex/mpl-auction'; +import { Borsh, Transaction } from '@metaplex-foundation/mpl-core'; +import { ParamsWithStore } from '@metaplex-foundation/mpl-token-vault'; +import { AuctionProgram } from '@metaplex-foundation/mpl-auction'; import { TOKEN_PROGRAM_ID } from '@solana/spl-token'; import { PublicKey, diff --git a/metaplex/js/src/transactions/EndAuction.ts b/metaplex/js/src/transactions/EndAuction.ts index 7f9a2fbb76..1674f3dd12 100644 --- a/metaplex/js/src/transactions/EndAuction.ts +++ b/metaplex/js/src/transactions/EndAuction.ts @@ -1,13 +1,13 @@ import BN from 'bn.js'; -import { Borsh, Transaction } from '@metaplex/mpl-core'; +import { Borsh, Transaction } from '@metaplex-foundation/mpl-core'; import { PublicKey, SYSVAR_CLOCK_PUBKEY, TransactionCtorFields, TransactionInstruction, } from '@solana/web3.js'; -import { ParamsWithStore } from '@metaplex/mpl-token-vault'; -import { AuctionProgram } from '@metaplex/mpl-auction'; +import { ParamsWithStore } from '@metaplex-foundation/mpl-token-vault'; +import { AuctionProgram } from '@metaplex-foundation/mpl-auction'; import { MetaplexProgram } from '../MetaplexProgram'; export class EndAuctionArgs extends Borsh.Data<{ reveal: BN[] | null }> { diff --git a/metaplex/js/src/transactions/InitAuctionManagerV2.ts b/metaplex/js/src/transactions/InitAuctionManagerV2.ts index 2974df6d2c..5dc6fcf60a 100644 --- a/metaplex/js/src/transactions/InitAuctionManagerV2.ts +++ b/metaplex/js/src/transactions/InitAuctionManagerV2.ts @@ -1,5 +1,5 @@ -import { Borsh, TupleNumericType, Transaction } from '@metaplex/mpl-core'; -import { ParamsWithStore } from '@metaplex/mpl-token-vault'; +import { Borsh, TupleNumericType, Transaction } from '@metaplex-foundation/mpl-core'; +import { ParamsWithStore } from '@metaplex-foundation/mpl-token-vault'; import { PublicKey, SystemProgram, diff --git a/metaplex/js/src/transactions/RedeemBid.ts b/metaplex/js/src/transactions/RedeemBid.ts index 63d26ca5a4..e727a1a29b 100644 --- a/metaplex/js/src/transactions/RedeemBid.ts +++ b/metaplex/js/src/transactions/RedeemBid.ts @@ -1,4 +1,4 @@ -import { Borsh, Transaction } from '@metaplex/mpl-core'; +import { Borsh, Transaction } from '@metaplex-foundation/mpl-core'; import { TOKEN_PROGRAM_ID } from '@solana/spl-token'; import { PublicKey, @@ -7,8 +7,8 @@ import { TransactionCtorFields, TransactionInstruction, } from '@solana/web3.js'; -import { MetadataProgram } from '@metaplex/mpl-token-metadata'; -import { VaultProgram, ParamsWithStore } from '@metaplex/mpl-token-vault'; +import { MetadataProgram } from '@metaplex-foundation/mpl-token-metadata'; +import { VaultProgram, ParamsWithStore } from '@metaplex-foundation/mpl-token-vault'; import { MetaplexProgram } from '../MetaplexProgram'; export class RedeemBidArgs extends Borsh.Data { diff --git a/metaplex/js/src/transactions/RedeemFullRightsTransferBid.ts b/metaplex/js/src/transactions/RedeemFullRightsTransferBid.ts index c8ad68e0e5..dde3b5d6e8 100644 --- a/metaplex/js/src/transactions/RedeemFullRightsTransferBid.ts +++ b/metaplex/js/src/transactions/RedeemFullRightsTransferBid.ts @@ -1,4 +1,4 @@ -import { Borsh, Transaction } from '@metaplex/mpl-core'; +import { Borsh, Transaction } from '@metaplex-foundation/mpl-core'; import { TOKEN_PROGRAM_ID } from '@solana/spl-token'; import { PublicKey, @@ -7,8 +7,8 @@ import { TransactionCtorFields, TransactionInstruction, } from '@solana/web3.js'; -import { MetadataProgram } from '@metaplex/mpl-token-metadata'; -import { VaultProgram, ParamsWithStore } from '@metaplex/mpl-token-vault'; +import { MetadataProgram } from '@metaplex-foundation/mpl-token-metadata'; +import { VaultProgram, ParamsWithStore } from '@metaplex-foundation/mpl-token-vault'; import { MetaplexProgram } from '../MetaplexProgram'; import { ProxyCallAddress, RedeemUnusedWinningConfigItemsAsAuctioneerArgs } from './RedeemBid'; diff --git a/metaplex/js/src/transactions/SetStore.ts b/metaplex/js/src/transactions/SetStore.ts index 98c0d0954c..e0b1cc3f51 100644 --- a/metaplex/js/src/transactions/SetStore.ts +++ b/metaplex/js/src/transactions/SetStore.ts @@ -1,4 +1,4 @@ -import { Borsh, Transaction } from '@metaplex/mpl-core'; +import { Borsh, Transaction } from '@metaplex-foundation/mpl-core'; import { TOKEN_PROGRAM_ID } from '@solana/spl-token'; import { PublicKey, @@ -8,9 +8,9 @@ import { TransactionInstruction, } from '@solana/web3.js'; -import { MetadataProgram } from '@metaplex/mpl-token-metadata'; -import { VaultProgram, ParamsWithStore } from '@metaplex/mpl-token-vault'; -import { AuctionProgram } from '@metaplex/mpl-auction'; +import { MetadataProgram } from '@metaplex-foundation/mpl-token-metadata'; +import { VaultProgram, ParamsWithStore } from '@metaplex-foundation/mpl-token-vault'; +import { AuctionProgram } from '@metaplex-foundation/mpl-auction'; import { MetaplexProgram } from '../MetaplexProgram'; export class SetStoreArgs extends Borsh.Data<{ public: boolean }> { diff --git a/metaplex/js/src/transactions/SetWhitelistedCreator.ts b/metaplex/js/src/transactions/SetWhitelistedCreator.ts index e6680e1ff0..8dcdd0a118 100644 --- a/metaplex/js/src/transactions/SetWhitelistedCreator.ts +++ b/metaplex/js/src/transactions/SetWhitelistedCreator.ts @@ -1,5 +1,5 @@ -import { Borsh, Transaction } from '@metaplex/mpl-core'; -import { ParamsWithStore } from '@metaplex/mpl-token-vault'; +import { Borsh, Transaction } from '@metaplex-foundation/mpl-core'; +import { ParamsWithStore } from '@metaplex-foundation/mpl-token-vault'; import { PublicKey, SystemProgram, diff --git a/metaplex/js/src/transactions/StartAuction.ts b/metaplex/js/src/transactions/StartAuction.ts index f07604f607..4a6a2d41f9 100644 --- a/metaplex/js/src/transactions/StartAuction.ts +++ b/metaplex/js/src/transactions/StartAuction.ts @@ -1,13 +1,13 @@ -import { Borsh, Transaction } from '@metaplex/mpl-core'; +import { Borsh, Transaction } from '@metaplex-foundation/mpl-core'; import { PublicKey, SYSVAR_CLOCK_PUBKEY, TransactionCtorFields, TransactionInstruction, } from '@solana/web3.js'; -import { AuctionProgram } from '@metaplex/mpl-auction'; +import { AuctionProgram } from '@metaplex-foundation/mpl-auction'; import { MetaplexProgram } from '../MetaplexProgram'; -import { ParamsWithStore } from '@metaplex/mpl-token-vault'; +import { ParamsWithStore } from '@metaplex-foundation/mpl-token-vault'; export class StartAuctionArgs extends Borsh.Data { static readonly SCHEMA = this.struct([['instruction', 'u8']]); diff --git a/package.json b/package.json index 9ab129f17a..fd637fda30 100644 --- a/package.json +++ b/package.json @@ -1,16 +1,18 @@ { - "name": "@metaplex/metaplex-program-library", + "name": "@metaplex-foundation/metaplex-program-library", "version": "0.0.0", "description": "Web interface to Smart Contracts by the Metaplex team.", "scripts": { - "build:core": "lerna run build --scope @metaplex/mpl-core", - "build:auction": "lerna run build --scope @metaplex/mpl-auction", - "build:parallel": "lerna run --ignore @metaplex/mpl-core --ignore @metaplex/mpl-auction --ignore @metaplex/mpl-metaplex --parallel build", - "build:metaplex": "lerna run build --scope @metaplex/mpl-metaplex", + "build:core": "lerna run build --scope @metaplex-foundation/mpl-core", + "build:auction": "lerna run build --scope @metaplex-foundation/mpl-auction", + "build:parallel": "lerna run --ignore @metaplex-foundation/mpl-core --ignore @metaplex-foundation/mpl-auction --ignore @metaplex-foundation/mpl-metaplex --parallel build", + "build:metaplex": "lerna run build --scope @metaplex-foundation/mpl-metaplex", "build": "yarn build:core && yarn build:auction && yarn build:parallel && yarn build:metaplex", "test": "lerna run --parallel test", "lint": "lerna run --parallel lint", - "fix": "lerna run --parallel fix" + "fix": "lerna run --parallel fix", + "lerna:version": "lerna version", + "lerna:publish": "lerna publish" }, "workspaces": { "packages": [ @@ -21,7 +23,7 @@ "metaplex/js" ] }, - "repository": "git@github.com:metaplex/metaplex-program-library.git", + "repository": "git@github.com:metaplex-foundation/metaplex-program-library.git", "author": "Metaplex Maintainers ", "license": "MIT", "private": true, diff --git a/token-metadata/js/package.json b/token-metadata/js/package.json index 84d50a3c50..a1bfb9654d 100644 --- a/token-metadata/js/package.json +++ b/token-metadata/js/package.json @@ -1,10 +1,11 @@ { - "name": "@metaplex/mpl-token-metadata", + "name": "@metaplex-foundation/mpl-token-metadata", "version": "0.0.0", "description": "MPL Token Metadata JavaScript API.", "main": "dist/src/mpl-token-metadata.js", "types": "dist/src/mpl-token-metadata.d.ts", "scripts": { + "prepublish": "yarn build && yarn test", "build:docs": "typedoc", "build": "rimraf dist && tsc -p tsconfig.json", "test": "echo mpl-token-metadata tests coming up ...", @@ -24,12 +25,12 @@ "blockchain" ], "homepage": "https://metaplex.com", - "repository": "https://github.com/metaplex/metaplex-program-library.git", + "repository": "https://github.com/metaplex-foundation/metaplex-program-library.git", "author": "Metaplex Maintainers ", "license": "MIT", "private": false, "dependencies": { - "@metaplex/mpl-core": "0.0.0", + "@metaplex-foundation/mpl-core": "0.0.0", "@solana/spl-token": "^0.1.8", "@solana/web3.js": "^1.31.0" }, diff --git a/token-metadata/js/src/MetadataProgram.ts b/token-metadata/js/src/MetadataProgram.ts index d83189be37..982aecb083 100644 --- a/token-metadata/js/src/MetadataProgram.ts +++ b/token-metadata/js/src/MetadataProgram.ts @@ -1,5 +1,5 @@ import { PublicKey } from '@solana/web3.js'; -import { Program, config } from '@metaplex/mpl-core'; +import { Program, config } from '@metaplex-foundation/mpl-core'; export enum MetadataKey { Uninitialized = 0, diff --git a/token-metadata/js/src/accounts/Edition.ts b/token-metadata/js/src/accounts/Edition.ts index 206109c66d..976861198b 100644 --- a/token-metadata/js/src/accounts/Edition.ts +++ b/token-metadata/js/src/accounts/Edition.ts @@ -5,7 +5,7 @@ import { ERROR_INVALID_OWNER, AnyPublicKey, StringPublicKey, -} from '@metaplex/mpl-core'; +} from '@metaplex-foundation/mpl-core'; import { MetadataProgram, MetadataKey } from '../MetadataProgram'; import { AccountInfo, PublicKey } from '@solana/web3.js'; import BN from 'bn.js'; diff --git a/token-metadata/js/src/accounts/EditionMarker.ts b/token-metadata/js/src/accounts/EditionMarker.ts index 21117ba1e0..df183e7738 100644 --- a/token-metadata/js/src/accounts/EditionMarker.ts +++ b/token-metadata/js/src/accounts/EditionMarker.ts @@ -4,7 +4,7 @@ import { ERROR_INVALID_ACCOUNT_DATA, ERROR_INVALID_OWNER, AnyPublicKey, -} from '@metaplex/mpl-core'; +} from '@metaplex-foundation/mpl-core'; import { AccountInfo, PublicKey } from '@solana/web3.js'; import BN from 'bn.js'; import { Edition } from './Edition'; diff --git a/token-metadata/js/src/accounts/MasterEdition.ts b/token-metadata/js/src/accounts/MasterEdition.ts index ddb07acddb..1033eb9652 100644 --- a/token-metadata/js/src/accounts/MasterEdition.ts +++ b/token-metadata/js/src/accounts/MasterEdition.ts @@ -5,7 +5,7 @@ import { ERROR_INVALID_OWNER, AnyPublicKey, StringPublicKey, -} from '@metaplex/mpl-core'; +} from '@metaplex-foundation/mpl-core'; import BN from 'bn.js'; import bs58 from 'bs58'; import { Edition } from './Edition'; diff --git a/token-metadata/js/src/accounts/Metadata.ts b/token-metadata/js/src/accounts/Metadata.ts index abe1f60551..7a716a4966 100644 --- a/token-metadata/js/src/accounts/Metadata.ts +++ b/token-metadata/js/src/accounts/Metadata.ts @@ -7,7 +7,7 @@ import { AnyPublicKey, StringPublicKey, TokenAccount, -} from '@metaplex/mpl-core'; +} from '@metaplex-foundation/mpl-core'; import { AccountInfo, Connection, PublicKey } from '@solana/web3.js'; import BN from 'bn.js'; import bs58 from 'bs58'; diff --git a/token-metadata/js/src/transactions/CreateMasterEdition.ts b/token-metadata/js/src/transactions/CreateMasterEdition.ts index 523888139d..ef7829b0d8 100644 --- a/token-metadata/js/src/transactions/CreateMasterEdition.ts +++ b/token-metadata/js/src/transactions/CreateMasterEdition.ts @@ -1,4 +1,4 @@ -import { Borsh, Transaction } from '@metaplex/mpl-core'; +import { Borsh, Transaction } from '@metaplex-foundation/mpl-core'; import { TOKEN_PROGRAM_ID } from '@solana/spl-token'; import { PublicKey, diff --git a/token-metadata/js/src/transactions/CreateMetadata.ts b/token-metadata/js/src/transactions/CreateMetadata.ts index 5739ccc244..84701c14f4 100644 --- a/token-metadata/js/src/transactions/CreateMetadata.ts +++ b/token-metadata/js/src/transactions/CreateMetadata.ts @@ -1,4 +1,4 @@ -import { Borsh, Transaction } from '@metaplex/mpl-core'; +import { Borsh, Transaction } from '@metaplex-foundation/mpl-core'; import { PublicKey, SystemProgram, diff --git a/token-metadata/js/src/transactions/MintNewEditionFromMasterEditionViaToken.ts b/token-metadata/js/src/transactions/MintNewEditionFromMasterEditionViaToken.ts index 23179fae5a..36527acd2e 100644 --- a/token-metadata/js/src/transactions/MintNewEditionFromMasterEditionViaToken.ts +++ b/token-metadata/js/src/transactions/MintNewEditionFromMasterEditionViaToken.ts @@ -1,4 +1,4 @@ -import { Borsh, Transaction } from '@metaplex/mpl-core'; +import { Borsh, Transaction } from '@metaplex-foundation/mpl-core'; import { TOKEN_PROGRAM_ID } from '@solana/spl-token'; import { PublicKey, diff --git a/token-metadata/js/src/transactions/SignMetadata.ts b/token-metadata/js/src/transactions/SignMetadata.ts index d07ba41add..d7dd6c8a31 100644 --- a/token-metadata/js/src/transactions/SignMetadata.ts +++ b/token-metadata/js/src/transactions/SignMetadata.ts @@ -1,4 +1,4 @@ -import { Borsh, Transaction } from '@metaplex/mpl-core'; +import { Borsh, Transaction } from '@metaplex-foundation/mpl-core'; import { PublicKey, TransactionCtorFields, TransactionInstruction } from '@solana/web3.js'; import { MetadataProgram } from '../MetadataProgram'; diff --git a/token-metadata/js/src/transactions/UpdateMetadata.ts b/token-metadata/js/src/transactions/UpdateMetadata.ts index 7422a19c0d..13e4c5af0f 100644 --- a/token-metadata/js/src/transactions/UpdateMetadata.ts +++ b/token-metadata/js/src/transactions/UpdateMetadata.ts @@ -1,4 +1,4 @@ -import { Borsh, Transaction } from '@metaplex/mpl-core'; +import { Borsh, Transaction } from '@metaplex-foundation/mpl-core'; import { PublicKey, TransactionCtorFields, TransactionInstruction } from '@solana/web3.js'; import { MetadataDataData } from '../accounts/Metadata'; import { MetadataProgram } from '../MetadataProgram'; diff --git a/token-metadata/js/src/transactions/UpdatePrimarySaleHappenedViaToken.ts b/token-metadata/js/src/transactions/UpdatePrimarySaleHappenedViaToken.ts index 3fb4451231..c5cb30ff74 100644 --- a/token-metadata/js/src/transactions/UpdatePrimarySaleHappenedViaToken.ts +++ b/token-metadata/js/src/transactions/UpdatePrimarySaleHappenedViaToken.ts @@ -1,4 +1,4 @@ -import { Borsh, Transaction } from '@metaplex/mpl-core'; +import { Borsh, Transaction } from '@metaplex-foundation/mpl-core'; import { PublicKey, TransactionCtorFields, TransactionInstruction } from '@solana/web3.js'; import { MetadataProgram } from '../MetadataProgram'; diff --git a/token-vault/js/package.json b/token-vault/js/package.json index 03a2876861..5d02eb63af 100644 --- a/token-vault/js/package.json +++ b/token-vault/js/package.json @@ -1,10 +1,11 @@ { - "name": "@metaplex/mpl-token-vault", + "name": "@metaplex-foundation/mpl-token-vault", "version": "0.0.0", "description": "MPL Token Vault JavaScript API.", "main": "dist/src/mpl-token-vault.js", "types": "dist/src/mpl-token-vault.d.ts", "scripts": { + "prepublish": "yarn build && yarn test", "build:docs": "typedoc", "build": "rimraf dist && tsc -p tsconfig.json", "test": "echo mpl-token-vault tests coming up ...", @@ -24,12 +25,12 @@ "blockchain" ], "homepage": "https://metaplex.com", - "repository": "https://github.com/metaplex/metaplex-program-library.git", + "repository": "https://github.com/metaplex-foundation/metaplex-program-library.git", "author": "Metaplex Maintainers ", "license": "MIT", "private": false, "dependencies": { - "@metaplex/mpl-core": "0.0.0", + "@metaplex-foundation/mpl-core": "0.0.0", "@solana/spl-token": "^0.1.8", "@solana/web3.js": "^1.31.0" }, diff --git a/token-vault/js/src/VaultProgram.ts b/token-vault/js/src/VaultProgram.ts index e6488c8b46..f95c1fbd6b 100644 --- a/token-vault/js/src/VaultProgram.ts +++ b/token-vault/js/src/VaultProgram.ts @@ -1,4 +1,4 @@ -import { config, Program } from '@metaplex/mpl-core'; +import { config, Program } from '@metaplex-foundation/mpl-core'; import { PublicKey } from '@solana/web3.js'; export enum VaultKey { diff --git a/token-vault/js/src/accounts/ExternalPriceAccount.ts b/token-vault/js/src/accounts/ExternalPriceAccount.ts index 1814519a45..b22916b303 100644 --- a/token-vault/js/src/accounts/ExternalPriceAccount.ts +++ b/token-vault/js/src/accounts/ExternalPriceAccount.ts @@ -8,7 +8,7 @@ import { Account, ERROR_INVALID_ACCOUNT_DATA, ERROR_INVALID_OWNER, -} from '@metaplex/mpl-core'; +} from '@metaplex-foundation/mpl-core'; import { VaultKey, VaultProgram } from '../VaultProgram'; type Args = { diff --git a/token-vault/js/src/accounts/SafetyDepositBox.ts b/token-vault/js/src/accounts/SafetyDepositBox.ts index fbc234181e..7cc690e674 100644 --- a/token-vault/js/src/accounts/SafetyDepositBox.ts +++ b/token-vault/js/src/accounts/SafetyDepositBox.ts @@ -8,7 +8,7 @@ import { ERROR_INVALID_ACCOUNT_DATA, ERROR_INVALID_OWNER, StringPublicKey, -} from '@metaplex/mpl-core'; +} from '@metaplex-foundation/mpl-core'; type Args = { vault: StringPublicKey; diff --git a/token-vault/js/src/accounts/Vault.ts b/token-vault/js/src/accounts/Vault.ts index f106200c5d..38cb4dabf3 100644 --- a/token-vault/js/src/accounts/Vault.ts +++ b/token-vault/js/src/accounts/Vault.ts @@ -8,7 +8,7 @@ import { ERROR_INVALID_ACCOUNT_DATA, ERROR_INVALID_OWNER, StringPublicKey, -} from '@metaplex/mpl-core'; +} from '@metaplex-foundation/mpl-core'; import { SafetyDepositBox } from './SafetyDepositBox'; import { VaultKey, VaultProgram } from '../VaultProgram'; import { Buffer } from 'buffer'; diff --git a/token-vault/js/src/transactions/ActivateVault.ts b/token-vault/js/src/transactions/ActivateVault.ts index 964a5cbc5e..74ce4d8066 100644 --- a/token-vault/js/src/transactions/ActivateVault.ts +++ b/token-vault/js/src/transactions/ActivateVault.ts @@ -4,7 +4,7 @@ import BN from 'bn.js'; import { VaultInstructions } from '../VaultProgram'; import { NumberOfShareArgs } from '../accounts/Vault'; import { VaultProgram } from '../VaultProgram'; -import { Transaction } from '@metaplex/mpl-core'; +import { Transaction } from '@metaplex-foundation/mpl-core'; type ActivateVaultParams = { vault: PublicKey; diff --git a/token-vault/js/src/transactions/AddSharesToTreasury.ts b/token-vault/js/src/transactions/AddSharesToTreasury.ts index 428ee73063..d625472a99 100644 --- a/token-vault/js/src/transactions/AddSharesToTreasury.ts +++ b/token-vault/js/src/transactions/AddSharesToTreasury.ts @@ -9,7 +9,7 @@ import BN from 'bn.js'; import { VaultInstructions } from '../VaultProgram'; import { NumberOfShareArgs } from '../accounts/Vault'; import { VaultProgram } from '../VaultProgram'; -import { Transaction } from '@metaplex/mpl-core'; +import { Transaction } from '@metaplex-foundation/mpl-core'; import { ParamsWithStore } from '../types'; type AddSharesToTreasuryParams = { diff --git a/token-vault/js/src/transactions/AddTokenToInactiveVault.ts b/token-vault/js/src/transactions/AddTokenToInactiveVault.ts index 924ae9f9fd..779fa60822 100644 --- a/token-vault/js/src/transactions/AddTokenToInactiveVault.ts +++ b/token-vault/js/src/transactions/AddTokenToInactiveVault.ts @@ -1,4 +1,4 @@ -import { Transaction } from '@metaplex/mpl-core'; +import { Transaction } from '@metaplex-foundation/mpl-core'; import { TOKEN_PROGRAM_ID } from '@solana/spl-token'; import { PublicKey, diff --git a/token-vault/js/src/transactions/CombineVault.ts b/token-vault/js/src/transactions/CombineVault.ts index dd978f83b3..47b7b2ceba 100644 --- a/token-vault/js/src/transactions/CombineVault.ts +++ b/token-vault/js/src/transactions/CombineVault.ts @@ -1,4 +1,4 @@ -import { Borsh, Transaction } from '@metaplex/mpl-core'; +import { Borsh, Transaction } from '@metaplex-foundation/mpl-core'; import { TOKEN_PROGRAM_ID } from '@solana/spl-token'; import { PublicKey, TransactionCtorFields, TransactionInstruction } from '@solana/web3.js'; import { VaultInstructions } from '../VaultProgram'; diff --git a/token-vault/js/src/transactions/InitVault.ts b/token-vault/js/src/transactions/InitVault.ts index 74de556f20..c152b3fad0 100644 --- a/token-vault/js/src/transactions/InitVault.ts +++ b/token-vault/js/src/transactions/InitVault.ts @@ -1,4 +1,4 @@ -import { Borsh, Transaction } from '@metaplex/mpl-core'; +import { Borsh, Transaction } from '@metaplex-foundation/mpl-core'; import { TOKEN_PROGRAM_ID } from '@solana/spl-token'; import { PublicKey, diff --git a/token-vault/js/src/transactions/MintFractionalShares.ts b/token-vault/js/src/transactions/MintFractionalShares.ts index 199207b643..b26903dada 100644 --- a/token-vault/js/src/transactions/MintFractionalShares.ts +++ b/token-vault/js/src/transactions/MintFractionalShares.ts @@ -2,7 +2,7 @@ import { TOKEN_PROGRAM_ID } from '@solana/spl-token'; import { PublicKey, TransactionCtorFields, TransactionInstruction } from '@solana/web3.js'; import BN from 'bn.js'; import { VaultInstructions } from '../VaultProgram'; -import { Transaction } from '@metaplex/mpl-core'; +import { Transaction } from '@metaplex-foundation/mpl-core'; import { NumberOfShareArgs } from '../accounts/Vault'; import { VaultProgram } from '../VaultProgram'; import { ParamsWithStore } from '../types'; diff --git a/token-vault/js/src/transactions/RedeemShares.ts b/token-vault/js/src/transactions/RedeemShares.ts index 1b4a5cbb7a..d7098c6d4c 100644 --- a/token-vault/js/src/transactions/RedeemShares.ts +++ b/token-vault/js/src/transactions/RedeemShares.ts @@ -1,4 +1,4 @@ -import { Borsh, Transaction } from '@metaplex/mpl-core'; +import { Borsh, Transaction } from '@metaplex-foundation/mpl-core'; import { TOKEN_PROGRAM_ID } from '@solana/spl-token'; import { PublicKey, diff --git a/token-vault/js/src/transactions/SetVaultAuthority.ts b/token-vault/js/src/transactions/SetVaultAuthority.ts index a21ed33312..6107e71b42 100644 --- a/token-vault/js/src/transactions/SetVaultAuthority.ts +++ b/token-vault/js/src/transactions/SetVaultAuthority.ts @@ -1,4 +1,4 @@ -import { Borsh, Transaction } from '@metaplex/mpl-core'; +import { Borsh, Transaction } from '@metaplex-foundation/mpl-core'; import { PublicKey, TransactionCtorFields, TransactionInstruction } from '@solana/web3.js'; import { VaultInstructions } from '../VaultProgram'; import { VaultProgram } from '../VaultProgram'; diff --git a/token-vault/js/src/transactions/UpdateExternalPriceAccount.ts b/token-vault/js/src/transactions/UpdateExternalPriceAccount.ts index 38920fa93c..f3d2eeafbb 100644 --- a/token-vault/js/src/transactions/UpdateExternalPriceAccount.ts +++ b/token-vault/js/src/transactions/UpdateExternalPriceAccount.ts @@ -1,4 +1,4 @@ -import { Borsh, Transaction } from '@metaplex/mpl-core'; +import { Borsh, Transaction } from '@metaplex-foundation/mpl-core'; import { PublicKey, TransactionCtorFields, TransactionInstruction } from '@solana/web3.js'; import { VaultInstructions } from '../VaultProgram'; import { ExternalPriceAccountData } from '../accounts/ExternalPriceAccount'; diff --git a/token-vault/js/src/transactions/WithdrawSharesFromTreasury.ts b/token-vault/js/src/transactions/WithdrawSharesFromTreasury.ts index aeda6b1028..53a14a7035 100644 --- a/token-vault/js/src/transactions/WithdrawSharesFromTreasury.ts +++ b/token-vault/js/src/transactions/WithdrawSharesFromTreasury.ts @@ -1,4 +1,4 @@ -import { Transaction } from '@metaplex/mpl-core'; +import { Transaction } from '@metaplex-foundation/mpl-core'; import { TOKEN_PROGRAM_ID } from '@solana/spl-token'; import { PublicKey, diff --git a/token-vault/js/src/transactions/WithdrawTokenFromSafetyDepositBox.ts b/token-vault/js/src/transactions/WithdrawTokenFromSafetyDepositBox.ts index 4c9b8660a5..30644779e3 100644 --- a/token-vault/js/src/transactions/WithdrawTokenFromSafetyDepositBox.ts +++ b/token-vault/js/src/transactions/WithdrawTokenFromSafetyDepositBox.ts @@ -1,4 +1,4 @@ -import { Transaction } from '@metaplex/mpl-core'; +import { Transaction } from '@metaplex-foundation/mpl-core'; import { TOKEN_PROGRAM_ID } from '@solana/spl-token'; import { PublicKey,