Features/allow payouts even if hydra shares not exhausted

.base-ammanrc.js

@@ -15,8 +15,8 @@ const programs = {
     programId: 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s',
     deployPath: localDeployPath('mpl_token_metadata'),
   },
-  token_sale: {
-    label: 'Fixed Price Token Sale',
+  fixed_price_sale: {
+    label: 'Fixed Price Sale',
     programId: 'SaLeTjyUa5wXHnGuewUSyJ5JWZaHwz3TxqUntCE9czo',
     deployPath: localDeployPath('mpl_fixed_price_sale'),
   },
@@ -25,16 +25,21 @@ const programs = {
     programId: 'cndy3Z4yapfJBmL3ShUp5exZKqR3z33thTzeNMm2gRZ',
     deployPath: localDeployPath('mpl_candy_machine'),
   },
-  hydra: {
-    label: 'Hydra',
-    programId: 'hyDQ4Nz1eYyegS6JfenyKwKzYxRsCWCriYSAjtzP4Vg',
-    deployPath: localDeployPath('mpl_hydra'),
-  },
   candy_machine_core: {
     label: 'Candy Machine Core',
     programId: 'CndyV3LdqHUfDLmE5naZjVN8rBZz4tqhdefbAnjHG3JR',
     deployPath: localDeployPath('mpl_candy_machine_core'),
   },
+  gumdrop: {
+    label: 'Gumdrop',
+    programId: 'gdrpGjVffourzkdDRrQmySw4aTHr8a3xmQzzxSwFD1a',
+    deployPath: localDeployPath('mpl_gumdrop'),
+  },
+  hydra: {
+    label: 'Hydra',
+    programId: 'hyDQ4Nz1eYyegS6JfenyKwKzYxRsCWCriYSAjtzP4Vg',
+    deployPath: localDeployPath('mpl_hydra'),
+  },
 };
 
 const validator = {

.eslintignore

@@ -0,0 +1,3 @@
+**/node_modules/
+**/dist/
+**/coverage/

.github/actions/yarn-install-and-build/action.yml

@@ -23,9 +23,7 @@ runs:
     # Build Contract 
     ##############
     - name: Install Root Modules
-      run: |
-        echo 'Install Root Modules: yarn install'
-        yarn install
+      run: yarn install
       working-directory: ./
       shell: bash
 

.github/actions/yarn-install-and-verify/action.yml

@@ -25,6 +25,11 @@ runs:
     ##############
     # Verify Contract 
     ##############
+    - name: Install Root Modules
+      run: yarn install
+      working-directory: ./
+      shell: bash
+
     - name: Install modules
       run: yarn install
       working-directory: ${{ inputs.working_dir }}

.github/workflows/integration-reusable.yml

@@ -47,7 +47,7 @@ jobs:
               - '.github/workflows/integration-reusable.yml'
   build-and-test:
     name: Build and Test
-    runs-on: buildjet-8vcpu-ubuntu-2004
+    runs-on: buildjet-8vcpu-ubuntu-2204
     needs: changes
     if: |
       inputs.changes == false ||

.github/workflows/integration.yml

@@ -24,9 +24,9 @@ jobs:
       fail-fast: false
       matrix:
         node:
-          - name: "fixed-price-sale"
-          - name: "hydra"
-          - name: "candy-machine-core"
+#          - name: "fixed-price-sale"
+#          - name: "hydra"
+#          - name: "candy-machine-core"
     uses: ./.github/workflows/integration-reusable.yml
     with:
       name: ${{ matrix.node.name }}

.github/workflows/program.yml

@@ -24,16 +24,16 @@ jobs:
       fail-fast: false
       matrix:
         node:
-          - name: "auctioneer"
-          - name: "bubblegum"
-          - name: "candy-machine"
-          - name: "auction-house"
-          - name: "fixed-price-sale"
-          - name: "gumdrop"
-          - name: "hydra"
-          - name: "nft-packs"
-          - name: "token-entangler"
-          - name: "token-metadata"
+#          - name: "auction-house"
+#          - name: "auctioneer"
+#          - name: "bubblegum"
+#          - name: "candy-machine"
+#          - name: "fixed-price-sale"
+#          - name: "gumdrop"
+#          - name: "hydra"
+#          - name: "nft-packs"
+#          - name: "token-entangler"
+#          - name: "token-metadata"
 
     uses: ./.github/workflows/program-reusable.yml
     with:

.github/workflows/sdk.yml

@@ -25,6 +25,7 @@ jobs:
       matrix:
         node:
           - name: "auction-house"
+          - name: "auctioneer"
           - name: "candy-machine"
           - name: "candy-machine-core"
             skip_test: true

.gitignore

@@ -10,6 +10,7 @@ node_modules/
 build/
 dist/
 
+.gitpod.yml
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
@@ -33,3 +34,5 @@ yarn-error.log*
 test-programs/*
 *-keypair.json
 
+**/test-ledger
+

.prettierignore

@@ -0,0 +1 @@
+**/dist

Anchor.toml

@@ -5,40 +5,13 @@ url = "https://anchor.projectserum.com"
 cluster = "localnet"
 wallet = "~/.config/solana/id.json"
 
-[programs.localnet]
-auction_house="hausS13jsjafwWwGqZTUQRmWyvyxn9EQpqMwV1PBBmk"
-bubblegum="BGUMAp9Gq7iTEuizy4pqaxsTyUCBK68MDfK752saRPUY"
-
-[[test.genesis]]
-address = "metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s"
-program = "target/deploy/mpl_token_metadata.so"
-
-[[test.genesis]]
-address = "hausS13jsjafwWwGqZTUQRmWyvyxn9EQpqMwV1PBBmk"
-program = "target/deploy/mpl_auction_house.so"
-
-[[test.genesis]]
-address = "qntmGodpGkrM42mN68VCZHXnKqDCT8rdY23wFcXCLPd"
-program = "target/deploy/mpl_token_entangler.so"
-
-[[test.genesis]]
-address = "SaLeTjyUa5wXHnGuewUSyJ5JWZaHwz3TxqUntCE9czo"
-program = "target/deploy/mpl_fixed_price_sale.so"
-
-[[test.genesis]]
-address = "gdrpGjVffourzkdDRrQmySw4aTHr8a3xmQzzxSwFD1a"
-program = "target/deploy/mpl_gumdrop.so"
-
-[[test.genesis]]
-address = "hyDQ4Nz1eYyegS6JfenyKwKzYxRsCWCriYSAjtzP4Vg"
-program = "target/deploy/mpl_hydra.so"
-
 [workspace]
 members = [
-  "token-entangler/program",
-  "token-metadata/program",
-  "auction-house/program",
-  "fixed-price-sale/program",
-  "hydra/program",
-  "bubblegum/program",
+    "auction-house/program",
+    "auctioneer/program",
+    "bubblegum/program",
+    "candy-machine/program",
+    "candy-machine-core/program",
+    "gumdrop/program",
+    "hydra/program",
 ]