chore: deprecate auction, metaplex, token-vault (metaplex-foundation#670

) * chore: deprecate auction, metaplex, token-vault * chore: rebuild lock file * chore: adding mpl token vault back to toml file * chore: removing build-metaplex from ci * chore: removing build-metaplex from ci * chore: adding token-vault to testing utils * chore: adding token-vault to testing utils * chore: adding crates * chore: clippy * chore: clippy * chore: clippy * chore: clippy * chore: remove package from local test context * chore: clippy * chore: clippy * chore: clippy * chore: major clippy * chore: major clippy * chore: clippy * chore: test * chore: test * chore: try to fix auctioneer ci * chore: update lock * chore: fixing token-metadata tests * chore: fixing token-metadata tests * chore: fixing builds failing on devdep error * chore: fixing builds failing on devdep error * chore: fixing builds failing on devdep error * chore: fixing builds failing on devdep error * chore: fixing builds failing on devdep error * chore: fixing builds failing on devdep error * chore: bumping solana versions * chore: hopefully final changes before all tests passing * chore: update ci for token-metadata * chore: update ci for token-metadata * chore: merge conflicts * chore: fixing auctioneer tests * chore: fixing auctioneer tests * chore: fix lockfile * chore: delete unneeded deps in toml file, deprecate test and associated code * chore: delete unneeded deps in toml file, deprecate test and associated code * add additional deprecation messages * generate JS lib * remove deprecated function warning to soothe clippy * chore(fixed-price-sale/js): generate JS code * chore: regen token entangler * chore: finally changes for fps * chore: fixing fps tests * chore: updated lock * chore: trying to fix timeouts * chore: trying to fix timeouts * chore: change clippy, add deprecated macro * chore: remove dep * chore: api gen results Co-authored-by: Weiyuan Wu <[email protected]> Co-authored-by: Samuel Vanderwaal <[email protected]>
IssouChancla · Sep 7, 2022 · a24f902 · a24f902
1 parent c14a4a1
commit a24f902
Show file tree

Hide file tree

Showing 349 changed files with 1,928 additions and 41,808 deletions.
diff --git a/.base-ammanrc.js b/.base-ammanrc.js
@@ -15,21 +15,6 @@ const programs = {
         programId: 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s',
         deployPath: localDeployPath('mpl_token_metadata')
     },
-    vault: {
-        label: "Vault",
-        programId: 'vau1zxA2LbssAUEF7Gpw91zMM1LvXrvpzJtmZ58rPsn',
-        deployPath: localDeployPath('mpl_token_vault')
-    },
-    auction: {
-        label: "Auction",
-        programId: 'auctxRXPeJoc4817jDhf4HbjnhEcr1cCXenosMhK5R8',
-        deployPath: localDeployPath('mpl_auction')
-    },
-    metaplex: {
-        label: "Metaplex",
-        programId: 'p1exdMJcjVao65QdewkaZRUnU6VPSXhus9n2GzWfh98',
-        deployPath: localDeployPath('mpl_metaplex')
-    },
     token_sale: {
         label: "Fixed Price Token Sale",
         programId: 'SaLeTjyUa5wXHnGuewUSyJ5JWZaHwz3TxqUntCE9czo',

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -9,16 +9,13 @@ body:
       label: Which package is this bug report for?
       options:
         - auction-house
-        - auction
         - candy-machine
         - core
         - fixed-price-sale
         - gumdrop
-        - metaplex
         - nft-packs
         - token-entangler
         - token-metadata
-        - token-vault
     validations:
       required: true
   - type: dropdown

diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -9,16 +9,13 @@ body:
       label: Which package is this feature request for?
       options:
         - auction-house
-        - auction
         - candy-machine
         - core
         - fixed-price-sale
         - gumdrop
-        - metaplex
         - nft-packs
         - token-entangler
         - token-metadata
-        - token-vault
     validations:
       required: true
   - type: textarea

diff --git a/.github/actions/build-auction/action.yml b/.github/actions/build-auction/action.yml
diff --git a/.github/actions/build-metaplex/action.yml b/.github/actions/build-metaplex/action.yml
diff --git a/.github/actions/build-token-vault/action.yml b/.github/actions/build-token-vault/action.yml
diff --git a/.github/actions/make-version-changes/script.js b/.github/actions/make-version-changes/script.js
@@ -8,10 +8,6 @@ const MPL_PROGRAM_CONFIG = {
     has_idl: true,
     uses_anchor: true,
   },
-  auction: {
-    has_idl: false,
-    uses_anchor: false,
-  },
   auctioneer: {
     has_idl: true,
     uses_anchor: true,
@@ -32,10 +28,6 @@ const MPL_PROGRAM_CONFIG = {
     has_idl: true,
     uses_anchor: true,
   },
-  metaplex: {
-    has_idl: false,
-    uses_anchor: false,
-  },
   'nft-packs': {
     has_idl: false,
     uses_anchor: false,
@@ -49,11 +41,6 @@ const MPL_PROGRAM_CONFIG = {
     has_idl: true,
     uses_anchor: false,
   },
-  // uses shank
-  'token-vault': {
-    has_idl: true,
-    uses_anchor: false,
-  },
 };
 
 const wrappedExec = (cmd, cwd) => {

diff --git a/.github/actions/verify-rust/action.yml b/.github/actions/verify-rust/action.yml
@@ -18,4 +18,4 @@ runs:
       uses: actions-rs/cargo@v1
       with:
         command: clippy
-        args: --all-targets --all-features --no-deps --manifest-path ${{ inputs.working-directory }}/Cargo.toml -- -D warnings
+        args: --all-targets --all-features --no-deps --manifest-path ${{ inputs.working-directory }}/Cargo.toml
diff --git a/.github/actions/yarn-install-and-build/action.yml b/.github/actions/yarn-install-and-build/action.yml
@@ -12,18 +12,10 @@ inputs:
     description: If not false it will build the core package
     required: false
     default: true
-  build_auction:
-    description: If true it will build the auction package
-    required: false
-    default: false
   build_token_metadata:
     description: If true it will build the token_metadata package
     required: false
     default: false
-  build_token_vault:
-    description: If true it will build the token_vault package
-    required: false
-    default: false
 
 runs:
   using: composite
@@ -40,9 +32,7 @@ runs:
     # All contract SDKs depend on mpl-core so we need to build at least that
     # We avoid running build in the project root to avoid a check for a contract failing due to
     # an issue in another contract which would cause a build failure.
-    # For the metaplex contract this is unfortunately not entirely possible as it depends on core, token-metadat,
-    # token-vault and auction
-
+
     - name: Install and Build core
       if: inputs.build_core == 'true'
       run: |
@@ -53,16 +43,6 @@ runs:
       working-directory: ./core/js 
       shell: bash
 
-    - name: Install and Build auction
-      if: inputs.build_auction == 'true'
-      run: |
-        echo 'Install and Build auction: yarn install'
-        yarn install
-        echo 'Install and Build auction: yarn build'
-        yarn build
-      working-directory: ./auction/js 
-      shell: bash
-
     - name: Install and Build token-metadata
       if: inputs.build_token_metadata == 'true'
       run: |
@@ -73,16 +53,6 @@ runs:
       working-directory: ./token-metadata/js 
       shell: bash
 
-    - name: Install and Build token-vault
-      if: inputs.build_token_vault == 'true'
-      run: |
-        echo 'Install and Build token-vault: yarn install'
-        yarn install
-        echo 'Install and Build token-vault: yarn build'
-        yarn build
-      working-directory: ./token-vault/js 
-      shell: bash
-
     ##############
     # Build Contract 
     ##############

diff --git a/.github/actions/yarn-install-and-verify/action.yml b/.github/actions/yarn-install-and-verify/action.yml
@@ -16,18 +16,10 @@ inputs:
     description: If not false it will build the core package before running checks
     required: false
     default: true
-  build_auction:
-    description: If true it will build the auction package before running checks
-    required: false
-    default: false
   build_token_metadata:
     description: If true it will build the token_metadata package before running checks
     required: false
     default: false
-  build_token_vault:
-    description: If true it will build the token_vault package before running checks
-    required: false
-    default: false
 
 runs:
   using: composite
@@ -44,8 +36,6 @@ runs:
     # Some contract SDKs depend on mpl-core so we need to build at least that by default.
     # We avoid running build in the project root to avoid a check for a contract failing due to
     # an issue in another contract which would cause a build failure.
-    # For the metaplex contract this is unfortunately not entirely possible as it depends on core, token-metadat,
-    # token-vault and auction
 
     - name: Install and Build core
       if: inputs.build_core == 'true'
@@ -57,16 +47,6 @@ runs:
       working-directory: ./core/js 
       shell: bash
 
-    - name: Install and Build auction
-      if: inputs.build_auction == 'true'
-      run: |
-        echo 'Install and Build auction: yarn install'
-        yarn install
-        echo 'Install and Build auction: yarn build'
-        yarn build
-      working-directory: ./auction/js 
-      shell: bash
-
     - name: Install and Build token-metadata
       if: inputs.build_token_metadata == 'true'
       run: |
@@ -77,16 +57,6 @@ runs:
       working-directory: ./token-metadata/js 
       shell: bash
 
-    - name: Install and Build token-vault
-      if: inputs.build_token_vault == 'true'
-      run: |
-        echo 'Install and Build token-vault: yarn install'
-        yarn install
-        echo 'Install and Build token-vault: yarn build'
-        yarn build
-      working-directory: ./token-vault/js 
-      shell: bash
-
     ##############
     # Verify Contract 
     ##############

diff --git a/.github/workflows/integration-fixed-price-sale.yml b/.github/workflows/integration-fixed-price-sale.yml
@@ -8,7 +8,7 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-  SOLANA_VERSION: 1.9.5
+  SOLANA_VERSION: 1.10.25
   RUST_TOOLCHAIN: stable
 
 jobs:

diff --git a/.github/workflows/integration-metaplex.yml b/.github/workflows/integration-metaplex.yml