@triadxyz/triad-protocol 1.6.4-beta → 1.6.6-beta

package/dist/local-test/index.js

@@ -274,7 +274,11 @@ const closeOrders = () => __awaiter(void 0, void 0, void 0, function* () {
     }
 });
 const resolveMarket = () => __awaiter(void 0, void 0, void 0, function* () {
-    const marketsToResolve = [{ marketId: 130, winningDirection: { hype: {} } }];
+    const marketsToResolve = [
+        { marketId: 123, winningDirection: { flop: {} } },
+        { marketId: 125, winningDirection: { flop: {} } },
+        { marketId: 124, winningDirection: { flop: {} } }
+    ];
     for (const market of marketsToResolve) {
         const response = yield triadProtocol.trade.resolveMarket({
             marketId: market.marketId,
@@ -440,7 +444,7 @@ const collectRemainingLiquidity = () => __awaiter(void 0, void 0, void 0, functi
     }
 });
 const allowMarketToPayout = () => __awaiter(void 0, void 0, void 0, function* () {
-    const markets = [130];
+    const markets = [123, 124, 125];
     for (const market of markets) {
         try {
             const response = yield triadProtocol.trade.allowMarketToPayout(Number(market));
@@ -482,25 +486,25 @@ const deployImage = (image) => __awaiter(void 0, void 0, void 0, function* () {
     console.log(file);
     return file;
 });
-// 1 - TRD 10k - 10,000 / 1 to 20
-// 2 - TRD 50 - 10,000 / 21 to 2021
-// 3 - TRD 5 - 50,000 / 2022 to 102022
-// 4 - Honeyland NFT - 30 NFT / 102023 to 132023
-// 5 - Poseidon NFT - 20 NFT / 132024 to 152024
-// 6 - SMB 3 - 2 NFT / 152025 to 157025
-// 7 - 500 tridents / 157026 to 657026
-// 8 - 2k tridents / 657027 to 857027
-// 9 - 50 HXD - 10,000 / 857028 to 864008
-// 10 - 0.01 ORE - 10 ORE / 864009 to 924009
-// 11 - TRD 100 - 5,000 / 924010 to 925010
-// 12 - 10 STREAM - 15K STREAM / 925011 to 1000000
+// 1 - TRD 10k - 10,000
+// 2 - TRD 50 - 10,000
+// 3 - TRD 5 - 50,000
+// 4 - Honeyland NFT - 30 NFT
+// 5 - Poseidon NFT - 20 NFT
+// 6 - SMB 3 - 2 NFT
+// 7 - 500 tridents
+// 8 - 2k tridents
+// 9 - 50 HXD - 10,000
+// 10 - 0.01 ORE - 10 ORE
+// 11 - PYTH 20 - 5,000
+// 12 - 10 STREAM - 15K STREAM
 const addWheelPrize = () => __awaiter(void 0, void 0, void 0, function* () {
     const response = yield triadProtocol.wheel.addWheelPrize({
         prize: 11,
         amount: 20,
-        rangeMin: 924010,
-        rangeMax: 925010,
-        availableQuantity: 50
+        rangeMin: 922970,
+        rangeMax: 923970,
+        availableQuantity: 30
     });
     console.log(response);
 });
@@ -515,10 +519,10 @@ const getWheel = () => __awaiter(void 0, void 0, void 0, function* () {
         rangeMax: prize.rangeMax.toString(),
         availableQuantity: prize.availableQuantity.toString()
     }));
-    console.log(prizes);
+    console.table(prizes);
 });
+getWheel();
 const spinWheel = () => __awaiter(void 0, void 0, void 0, function* () {
     const spin = (0, pda_1.getWheelPDA)(triadProtocol.program.programId, constants_1.VALENT_SPIN_NAME);
     console.log(spin);
 });
-spinWheel();

package/dist/local-test/init-market.js

@@ -21,11 +21,11 @@ class InitMarket {
         this.triadProtocol = triadProtocol;
         this.markets = [
             {
-                marketId: 1001,
-                question: 'Will PHOTOM flip TRON in 7D revenue by february 15?',
+                marketId: 131,
+                question: 'Will $HXD be above $0.015 on february 17 at 11PM UTC?',
                 startTime: 1239663940,
-                endTime: 1739663940,
-                image: ''
+                endTime: 1739833140,
+                image: 'hxd.png'
             }
         ];
         this.initializeMarkets = () => __awaiter(this, void 0, void 0, function* () {

package/dist/wheel.d.ts

@@ -1,5 +1,4 @@
-/// <reference types="bn.js" />
-import { AnchorProvider, BN, Program } from '@coral-xyz/anchor';
+import { AnchorProvider, Program } from '@coral-xyz/anchor';
 import { Keypair } from '@solana/web3.js';
 import { TriadProtocol } from './types/triad_protocol';
 import { RpcOptions } from './types';
@@ -45,16 +44,14 @@ export default class Wheel {
      */
     spinWheel(args: {
         isSol: boolean;
-        prize: number;
+        prizes: number[];
         verifier: Keypair;
     }, options?: RpcOptions): Promise<string>;
     /**
      * Get Spin Wheel
      *
      */
-    getSpinWheel(): Promise<BN | {
-        none: {};
-    }>;
+    getSpinWheel(amount: number): Promise<any[] | 999>;
     /**
      * Swap Wheel Token
      * @param amount - Amount of tokens to buy

package/dist/wheel.js

@@ -86,36 +86,43 @@ class Wheel {
     spinWheel(args, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const wheelPDA = (0, pda_1.getWheelPDA)(this.program.programId, constants_1.VALENT_SPIN_NAME);
-            const ix = yield this.program.methods
-                .spinWheel({
-                isSol: args.isSol,
-                prize: new anchor_1.BN(args.prize)
-            })
-                .accounts({
-                signer: this.provider.wallet.publicKey,
-                verifier: constants_1.VERIFIER,
-                wheel: wheelPDA,
-                mint: constants_1.WHEEL_MINT
-            })
-                .instruction();
-            return (0, sendVersionedTransaction_1.default)(this.provider, [ix], options, undefined, [], args.verifier);
+            let ixs = [];
+            for (const prize of args.prizes) {
+                ixs.push(yield this.program.methods
+                    .spinWheel({
+                    isSol: args.isSol,
+                    prize: new anchor_1.BN(prize)
+                })
+                    .accounts({
+                    signer: this.provider.wallet.publicKey,
+                    verifier: constants_1.VERIFIER,
+                    wheel: wheelPDA,
+                    mint: constants_1.WHEEL_MINT
+                })
+                    .instruction());
+                return (0, sendVersionedTransaction_1.default)(this.provider, ixs, options, undefined, [], args.verifier);
+            }
         });
     }
     /**
      * Get Spin Wheel
      *
      */
-    getSpinWheel() {
+    getSpinWheel(amount) {
         return __awaiter(this, void 0, void 0, function* () {
             const [wheel] = yield this.program.account.wheel.all();
-            const randomNumber = Math.floor(Math.random() * 1000000) + 1;
-            const prize = wheel.account.prizes.find((p) => randomNumber >= p.rangeMin.toNumber() &&
-                randomNumber <= p.rangeMax.toNumber() &&
-                p.status.claimed);
-            if (!prize) {
-                return { none: {} };
+            const prizes = [];
+            for (let i = 0; i < amount; i++) {
+                const randomNumber = Math.floor(Math.random() * 1000000) + 1;
+                const prize = wheel.account.prizes.find((p) => randomNumber >= p.rangeMin.toNumber() &&
+                    randomNumber <= p.rangeMax.toNumber() &&
+                    p.status.claimed);
+                if (!prize) {
+                    return 999;
+                }
+                prizes.push(prize.prize);
             }
-            return prize.prize;
+            return prizes;
         });
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triadxyz/triad-protocol",
-  "version": "1.6.4-beta",
+  "version": "1.6.6-beta",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",