@triadxyz/triad-protocol 1.6.2-beta → 1.6.3-beta

package/dist/utils/constants.d.ts

@@ -6,8 +6,8 @@ export declare const TRD_MINT: PublicKey;
 export declare const TRIAD_ADMIN: PublicKey;
 export declare const SOL_MINT: PublicKey;
 export declare const TICKET_CORE_COLLECTION: PublicKey;
-export declare const SPIN_NAME = "christmas";
-export declare const TCMAS_MINT: PublicKey;
+export declare const VALENT_SPIN_NAME = "valent";
+export declare const WHEEL_MINT: PublicKey;
 export declare const POSEIDON_COLLECTION_SYMBOL = "$PSN";
 export declare const POSEIDON_CORE_COLLECTION: PublicKey;
 export declare const TICKET_COLLECTION_SYMBOL = "PTCKT";

package/dist/utils/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TICKET_COLLECTION_SYMBOL = exports.POSEIDON_CORE_COLLECTION = exports.POSEIDON_COLLECTION_SYMBOL = exports.TCMAS_MINT = exports.SPIN_NAME = exports.TICKET_CORE_COLLECTION = exports.SOL_MINT = exports.TRIAD_ADMIN = exports.TRD_MINT = exports.VERIFIER = exports.TRD_DECIMALS = exports.STAKE_VAULT_NAME = void 0;
+exports.TICKET_COLLECTION_SYMBOL = exports.POSEIDON_CORE_COLLECTION = exports.POSEIDON_COLLECTION_SYMBOL = exports.WHEEL_MINT = exports.VALENT_SPIN_NAME = exports.TICKET_CORE_COLLECTION = exports.SOL_MINT = exports.TRIAD_ADMIN = exports.TRD_MINT = exports.VERIFIER = exports.TRD_DECIMALS = exports.STAKE_VAULT_NAME = void 0;
 const web3_js_1 = require("@solana/web3.js");
 exports.STAKE_VAULT_NAME = 'Triad Share 1';
 exports.TRD_DECIMALS = 6;
@@ -9,8 +9,8 @@ exports.TRD_MINT = new web3_js_1.PublicKey('t3DohmswhKk94PPbPYwA6ZKACyY3y5kbcqeQ
 exports.TRIAD_ADMIN = new web3_js_1.PublicKey('82ppCojm3yrEKgdpH8B5AmBJTU1r1uAWXFWhxvPs9UCR');
 exports.SOL_MINT = new web3_js_1.PublicKey('So11111111111111111111111111111111111111112');
 exports.TICKET_CORE_COLLECTION = new web3_js_1.PublicKey('BaqopH1VXYUCT6VsojbTibVcd3k5jpGGT6296HFb6fVa');
-exports.SPIN_NAME = 'christmas';
-exports.TCMAS_MINT = new web3_js_1.PublicKey('tCMraBSGHeMcQS76hNnBhnfbMzrtnnT3nbt3vAnSCE2');
+exports.VALENT_SPIN_NAME = 'valent';
+exports.WHEEL_MINT = new web3_js_1.PublicKey('tCMraBSGHeMcQS76hNnBhnfbMzrtnnT3nbt3vAnSCE2');
 exports.POSEIDON_COLLECTION_SYMBOL = '$PSN';
 exports.POSEIDON_CORE_COLLECTION = new web3_js_1.PublicKey('69CLccefLRmvDSAJP7Er632dvn878qkpdcnvq5ZUspSm');
 exports.TICKET_COLLECTION_SYMBOL = 'PTCKT';

package/dist/utils/getPriorityFee.js

@@ -14,7 +14,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const axios_1 = __importDefault(require("axios"));
 const getPriorityFee = () => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield axios_1.default.get('https://solanacompass.com/api/fees');
-    return response.data[1].priorityTx || 1000;
+    let fee = 1000;
+    try {
+        const response = yield axios_1.default.get('https://solanacompass.com/api/fees');
+        fee = response.data[1].priorityTx;
+    }
+    catch (e) {
+        fee = 1000;
+    }
+    return fee;
 });
 exports.default = getPriorityFee;

package/dist/utils/helpers.d.ts

@@ -1,12 +1,10 @@
 import { Stake, StakeVault } from './../types/stake';
-import { User } from './../types';
 import { Market, Order, UserTrade } from '../types/trade';
 import { PublicKey } from '@solana/web3.js';
 export declare const encodeString: (value: string, alloc?: number) => number[];
 export declare const decodeString: (bytes: number[]) => string;
 export declare const formatStakeVault: (stakeVault: any) => StakeVault;
 export declare const formatStake: (stake: any) => Stake;
-export declare const formatUser: (user: any) => User;
 export declare const formatMarket: (account: any, address: PublicKey) => Market;
 export declare const formatOrder: (order: any) => Order;
 export declare const formatUserTrade: (account: any, publicKey: PublicKey) => UserTrade;

package/dist/utils/helpers.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateStakeRewards = exports.formatUserTrade = exports.formatOrder = exports.formatMarket = exports.formatUser = exports.formatStake = exports.formatStakeVault = exports.decodeString = exports.encodeString = void 0;
+exports.calculateStakeRewards = exports.formatUserTrade = exports.formatOrder = exports.formatMarket = exports.formatStake = exports.formatStakeVault = exports.decodeString = exports.encodeString = void 0;
 const trade_1 = require("../types/trade");
 const constants_1 = require("./constants");
 const encodeString = (value, alloc = 32) => {
@@ -50,16 +50,6 @@ const formatStake = (stake) => {
     };
 };
 exports.formatStake = formatStake;
-const formatUser = (user) => {
-    return {
-        ts: user.ts.toNumber(),
-        authority: user.authority.toBase58(),
-        referral: user.referral,
-        referred: user.referred.toNumber(),
-        name: user.name
-    };
-};
-exports.formatUser = formatUser;
 const formatMarket = (account, address) => {
     return {
         bump: account.bump,

package/dist/utils/pda/index.d.ts

@@ -1,11 +1,7 @@
 import { PublicKey } from '@solana/web3.js';
-export declare const getUserPDA: (programId: PublicKey, wallet: PublicKey) => PublicKey;
-export declare const getTickerPDA: (programId: PublicKey, tickerName: string) => PublicKey;
-export declare const getVaultAddressSync: (programId: PublicKey, tickerAddress: PublicKey) => PublicKey;
 export declare const getUserPositionPDA: (programId: PublicKey, wallet: PublicKey, ticker: PublicKey) => PublicKey;
-export declare const getTokenVaultAddressSync: (programId: PublicKey, vault: PublicKey) => PublicKey;
 export declare const getTokenATA: (address: PublicKey, Mint: PublicKey) => PublicKey;
-export declare const getSpinPDA: (programId: PublicKey, name: string) => PublicKey;
+export declare const getWheelPDA: (programId: PublicKey, name: string) => PublicKey;
 export declare const getCollectionPDA: (programId: PublicKey, collectionSymbol: string) => PublicKey;
 export declare const getNftPDA: (programId: PublicKey, number: number) => PublicKey;
 export declare const getPoseidonPDA: (programId: PublicKey, number: number) => PublicKey;

package/dist/utils/pda/index.js

@@ -3,38 +3,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPoseidonPDA = exports.getNftPDA = exports.getCollectionPDA = exports.getSpinPDA = exports.getTokenATA = exports.getTokenVaultAddressSync = exports.getUserPositionPDA = exports.getVaultAddressSync = exports.getTickerPDA = exports.getUserPDA = void 0;
+exports.getPoseidonPDA = exports.getNftPDA = exports.getCollectionPDA = exports.getWheelPDA = exports.getTokenATA = exports.getUserPositionPDA = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const bn_js_1 = __importDefault(require("bn.js"));
 const spl_token_1 = require("@solana/spl-token");
-const getUserPDA = (programId, wallet) => {
-    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('user'), wallet.toBuffer()], programId)[0];
-};
-exports.getUserPDA = getUserPDA;
-const getTickerPDA = (programId, tickerName) => {
-    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('ticker'), Buffer.from(tickerName)], programId)[0];
-};
-exports.getTickerPDA = getTickerPDA;
-const getVaultAddressSync = (programId, tickerAddress) => {
-    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('vault'), tickerAddress.toBuffer()], programId)[0];
-};
-exports.getVaultAddressSync = getVaultAddressSync;
 const getUserPositionPDA = (programId, wallet, ticker) => {
     return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('user_position'), wallet.toBuffer(), ticker.toBuffer()], programId)[0];
 };
 exports.getUserPositionPDA = getUserPositionPDA;
-const getTokenVaultAddressSync = (programId, vault) => {
-    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('vault_token_account'), vault.toBuffer()], programId)[0];
-};
-exports.getTokenVaultAddressSync = getTokenVaultAddressSync;
 const getTokenATA = (address, Mint) => {
     return web3_js_1.PublicKey.findProgramAddressSync([address.toBytes(), spl_token_1.TOKEN_2022_PROGRAM_ID.toBytes(), Mint.toBytes()], new web3_js_1.PublicKey(spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID))[0];
 };
 exports.getTokenATA = getTokenATA;
-const getSpinPDA = (programId, name) => {
-    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('spin'), Buffer.from(name)], programId)[0];
+const getWheelPDA = (programId, name) => {
+    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('wheel'), Buffer.from(name)], programId)[0];
 };
-exports.getSpinPDA = getSpinPDA;
+exports.getWheelPDA = getWheelPDA;
 const getCollectionPDA = (programId, collectionSymbol) => {
     return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('collection'), Buffer.from(collectionSymbol)], programId)[0];
 };

package/dist/utils/pda/stake.d.ts

@@ -1,4 +1,3 @@
 import { PublicKey } from '@solana/web3.js';
 export declare const getStakeVaultPDA: (programId: PublicKey, vaultName: string) => PublicKey;
 export declare const getStakePDA: (programId: PublicKey, wallet: PublicKey, name: string) => PublicKey;
-export declare const getNFTRewardsPDA: (programId: PublicKey, stake: PublicKey) => PublicKey;

package/dist/utils/pda/stake.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNFTRewardsPDA = exports.getStakePDA = exports.getStakeVaultPDA = void 0;
+exports.getStakePDA = exports.getStakeVaultPDA = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const getStakeVaultPDA = (programId, vaultName) => {
     return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('stake_vault'), Buffer.from(vaultName)], programId)[0];
@@ -10,7 +10,3 @@ const getStakePDA = (programId, wallet, name) => {
     return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('stake'), wallet.toBuffer(), Buffer.from(name)], programId)[0];
 };
 exports.getStakePDA = getStakePDA;
-const getNFTRewardsPDA = (programId, stake) => {
-    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('nft_rewards'), stake.toBuffer()], programId)[0];
-};
-exports.getNFTRewardsPDA = getNFTRewardsPDA;

package/dist/wheel.d.ts

@@ -0,0 +1,65 @@
+/// <reference types="bn.js" />
+import { AnchorProvider, BN, Program } from '@coral-xyz/anchor';
+import { Keypair } from '@solana/web3.js';
+import { TriadProtocol } from './types/triad_protocol';
+import { RpcOptions } from './types';
+export default class Wheel {
+    private program;
+    private provider;
+    constructor(program: Program<TriadProtocol>, provider: AnchorProvider);
+    /**
+     * Add Whell Prize
+     * @param args.rangeMin - Range min to get prize
+     * @param args.rangeMax - Range max to get prize
+     * @param args.prize - Prize number it's indentifier
+     * @param args.availableQuantity - Amount available to get
+     * @param args.amount - Amount to send
+     *
+     * @param options - RPC options
+     *
+     */
+    addWheelPrize({ rangeMin, rangeMax, prize, availableQuantity, amount }: {
+        rangeMin: number;
+        rangeMax: number;
+        prize: number;
+        availableQuantity: number;
+        amount: number;
+    }, options?: RpcOptions): Promise<string>;
+    /**
+     * Claim Wheel Token
+     * @param amount - Amount of tokens to claim
+     * @param verifier - Verifier keypair
+     *
+     * @param options - RPC options
+     *
+     */
+    claimWheelToken(amount: number, verifier: Keypair, options?: RpcOptions): Promise<string>;
+    /**
+     * Spin Wheel
+     * @param args.isSol - Whether to pay with SOL or token
+     * @param args.verifier - Verifier keypair
+     * @param args.prize - Prize number
+     *
+     * @param options - RPC options
+     *
+     */
+    spinWheel(args: {
+        isSol: boolean;
+        prize: number;
+        verifier: Keypair;
+    }, options?: RpcOptions): Promise<string>;
+    /**
+     * Get Spin Wheel
+     *
+     */
+    getSpinWheel(): Promise<BN | {
+        none: {};
+    }>;
+    /**
+     * Swap Wheel Token
+     * @param amount - Amount of tokens to buy
+     * @param options - RPC options
+     *
+     */
+    swapWheelToken(amount: number, options?: RpcOptions): Promise<string>;
+}

package/dist/wheel.js

@@ -0,0 +1,142 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const anchor_1 = require("@coral-xyz/anchor");
+const pda_1 = require("./utils/pda");
+const sendVersionedTransaction_1 = __importDefault(require("./utils/sendVersionedTransaction"));
+const constants_1 = require("./utils/constants");
+const sendTransactionWithOptions_1 = __importDefault(require("./utils/sendTransactionWithOptions"));
+class Wheel {
+    constructor(program, provider) {
+        this.program = program;
+        this.provider = provider;
+    }
+    /**
+     * Add Whell Prize
+     * @param args.rangeMin - Range min to get prize
+     * @param args.rangeMax - Range max to get prize
+     * @param args.prize - Prize number it's indentifier
+     * @param args.availableQuantity - Amount available to get
+     * @param args.amount - Amount to send
+     *
+     * @param options - RPC options
+     *
+     */
+    addWheelPrize({ rangeMin, rangeMax, prize, availableQuantity, amount }, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const method = this.program.methods
+                .addWheelPrize({
+                name: constants_1.VALENT_SPIN_NAME,
+                rangeMin: new anchor_1.BN(rangeMin),
+                rangeMax: new anchor_1.BN(rangeMax),
+                prize: new anchor_1.BN(prize),
+                availableQuantity: new anchor_1.BN(availableQuantity),
+                amount: new anchor_1.BN(amount)
+            })
+                .accounts({
+                signer: this.provider.wallet.publicKey
+            });
+            return (0, sendTransactionWithOptions_1.default)(method, options);
+        });
+    }
+    /**
+     * Claim Wheel Token
+     * @param amount - Amount of tokens to claim
+     * @param verifier - Verifier keypair
+     *
+     * @param options - RPC options
+     *
+     */
+    claimWheelToken(amount, verifier, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const ix = yield this.program.methods
+                .claimWheelToken({
+                name: constants_1.VALENT_SPIN_NAME,
+                amount: new anchor_1.BN(amount * Math.pow(10, 6))
+            })
+                .accounts({
+                signer: this.provider.wallet.publicKey,
+                verifier: verifier.publicKey,
+                mint: constants_1.WHEEL_MINT
+            })
+                .instruction();
+            return (0, sendVersionedTransaction_1.default)(this.provider, [ix], options, undefined, [], verifier);
+        });
+    }
+    /**
+     * Spin Wheel
+     * @param args.isSol - Whether to pay with SOL or token
+     * @param args.verifier - Verifier keypair
+     * @param args.prize - Prize number
+     *
+     * @param options - RPC options
+     *
+     */
+    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);
+        });
+    }
+    /**
+     * Get Spin Wheel
+     *
+     */
+    getSpinWheel() {
+        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: {} };
+            }
+            return prize.prize;
+        });
+    }
+    /**
+     * Swap Wheel Token
+     * @param amount - Amount of tokens to buy
+     * @param options - RPC options
+     *
+     */
+    swapWheelToken(amount, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const method = this.program.methods
+                .swapWheelToken({
+                name: constants_1.VALENT_SPIN_NAME,
+                amount: new anchor_1.BN(amount)
+            })
+                .accounts({
+                signer: this.provider.wallet.publicKey,
+                mint: constants_1.WHEEL_MINT
+            });
+            return (0, sendTransactionWithOptions_1.default)(method, options);
+        });
+    }
+}
+exports.default = Wheel;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triadxyz/triad-protocol",
-  "version": "1.6.2-beta",
+  "version": "1.6.3-beta",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -8,7 +8,7 @@
     "clean": "rimraf dist",
     "build": "yarn run clean && tsc",
     "prepublishOnly": "yarn build",
-    "test": "rimraf dist && tsc && node ./dist/local-test.js"
+    "test": "rimraf dist && tsc && node ./dist/local-test/index.js"
   },
   "publishConfig": {
     "access": "public"

package/dist/utils/getRarityRank.d.ts

@@ -1,6 +0,0 @@
-declare const getRarityRank: (ranks: {
-    onchainId: string;
-    name: string;
-    rarityRankHrtt: number;
-}[], onchainId: string, name: string) => number;
-export default getRarityRank;

package/dist/utils/getRarityRank.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const getRarityRank = (ranks, onchainId, name) => {
-    const item = ranks.find((entry) => entry.onchainId === onchainId || entry.name === name);
-    return item ? item.rarityRankHrtt : 963;
-};
-exports.default = getRarityRank;