@triadxyz/triad-protocol 0.5.2-beta.devnet → 0.5.4-beta.devnet

package/dist/index.d.ts

@@ -1,15 +1,13 @@
 import { AnchorProvider, Program, Wallet } from '@coral-xyz/anchor';
 import { Connection, PublicKey } from '@solana/web3.js';
 import { TriadProtocol } from './types/triad_protocol';
-import Ticker from './ticker';
-import Vault from './vault';
+import Trade from './trade';
 import Stake from './stake';
 import { CreateUserArgs, RpcOptions } from './types';
 export default class TriadProtocolClient {
     program: Program<TriadProtocol>;
     provider: AnchorProvider;
-    ticker: Ticker;
-    vault: Vault;
+    trade: Trade;
     stake: Stake;
     constructor(connection: Connection, wallet: Wallet);
     /**
@@ -31,7 +29,7 @@ export default class TriadProtocolClient {
      * Get Refferal
      * @param name - User name
      */
-    getRefferal: (name: string) => Promise<PublicKey | "">;
+    getReferral: (name: string) => Promise<string>;
     /**
      *  Create User
      *  @param wallet - User wallet

package/dist/index.js

@@ -15,8 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const anchor_1 = require("@coral-xyz/anchor");
 const web3_js_1 = require("@solana/web3.js");
 const idl_triad_protocol_json_1 = __importDefault(require("./types/idl_triad_protocol.json"));
-const ticker_1 = __importDefault(require("./ticker"));
-const vault_1 = __importDefault(require("./vault"));
+const trade_1 = __importDefault(require("./trade"));
 const helpers_1 = require("./utils/helpers");
 const stake_1 = __importDefault(require("./stake"));
 class TriadProtocolClient {
@@ -57,13 +56,23 @@ class TriadProtocolClient {
          * Get Refferal
          * @param name - User name
          */
-        this.getRefferal = (name) => __awaiter(this, void 0, void 0, function* () {
+        this.getReferral = (name) => __awaiter(this, void 0, void 0, function* () {
             try {
-                const response = yield this.program.account.user.all();
-                const data = response.find((item) => item.account.name === name);
-                return data.publicKey;
+                const users = yield this.program.account.user.all([
+                    {
+                        memcmp: {
+                            offset: 8,
+                            bytes: Buffer.from(name).toString('base64')
+                        }
+                    }
+                ]);
+                if (users.length > 0) {
+                    return users[0].publicKey.toString();
+                }
+                return '';
             }
-            catch (_b) {
+            catch (error) {
+                console.error('Error fetching referral:', error);
                 return '';
             }
         });
@@ -95,8 +104,7 @@ class TriadProtocolClient {
         };
         this.provider = new anchor_1.AnchorProvider(connection, wallet, anchor_1.AnchorProvider.defaultOptions());
         this.program = new anchor_1.Program(idl_triad_protocol_json_1.default, this.provider);
-        this.ticker = new ticker_1.default(this.program, this.provider);
-        this.vault = new vault_1.default(this.program, this.provider);
+        this.trade = new trade_1.default(this.program, this.provider);
         this.stake = new stake_1.default(this.program, this.provider);
     }
 }

package/dist/{test.js → local-test.js}

@@ -27,8 +27,8 @@ const triadProtocol = new index_1.default(connection, wallet);
 const depositStakeRewards = () => __awaiter(void 0, void 0, void 0, function* () {
     const response = yield triadProtocol.stake.depositStakeRewards({
         wallet: wallet.publicKey,
-        mint: new web3_js_1.PublicKey(constants_1.TTRIAD_MINT),
-        amount: new anchor_1.BN(192388 * Math.pow(10, 6))
+        mint: constants_1.TRD_MINT,
+        amount: new anchor_1.BN(0 * Math.pow(10, 6))
     });
     console.log(response);
 });

package/dist/stake.d.ts

@@ -17,23 +17,25 @@ export default class Stake {
      * Get Stake Rewards
      */
     getStakeRewards({ wallet, nftName, collections, rank }: ClaimStakeRewardsArgs): Promise<number>;
+    /**
+     * Get all Stakes
+     */
     getStakes(): Promise<StakeResponse[]>;
     /**
-     * Get Stake by wallet
+     * Get User Stakes
+     */
+    getUserStakes(wallet: PublicKey): Promise<StakeResponse[]>;
+    /**
+     * Get Stake By Wallet
      * @param wallet - User wallet
      * @param collections - NFT collections
-     *
+     * @param tensor rank
      */
     getStakeByWallet(wallet: PublicKey, collections: number, ranks: {
         onchainId: string;
         name: string;
         rarityRankHrtt: number;
     }[]): Promise<StakeResponse[]>;
-    /**
-     * Get Stakes by day
-     * @param day - Day timestamp
-     */
-    getStakesByDay(day: number): Promise<StakeResponse[]>;
     /**
      *  Stake NFT
      *  @param mint - NFT mint
@@ -42,11 +44,10 @@ export default class Stake {
      */
     stakeNft({ wallet, items }: StakeNftArgs, options?: RpcOptions): Promise<string>;
     /**
-     *  Stake NFT
+     *  Stake Token
+     *  @param name - Index
      *  @param wallet - User wallet
-     *  @param mint - NFT mint
-     *  @param collections - NFT collections
-     *  @param rarity - NFT rarity
+     *  @param amount - Amount to stake
      *
      */
     stakeToken({ name, wallet, amount }: StakeTokenArgs, options?: RpcOptions): Promise<string>;
@@ -82,9 +83,9 @@ export default class Stake {
      */
     claimStakeRewards({ wallet, nftName, collections, rank }: ClaimStakeRewardsArgs, options?: RpcOptions): Promise<import("@solana/web3.js").Transaction>;
     /**
-     *  Update Stake Boost
+     *  Update Boost
      *  @param wallet - User wallet
-     *  @param nftName - Name of the nft
+     *  @param nfts - Name of the nfts
      *
      */
     updateBoost({ wallet, nfts }: UpdateBoostArgs, options?: RpcOptions): Promise<string>;

package/dist/stake.js

@@ -35,11 +35,8 @@ class Stake {
      */
     getStakeRewards({ wallet, nftName, collections, rank }) {
         return __awaiter(this, void 0, void 0, function* () {
-            const StakeVault = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, this.stakeVaultName);
-            const mint = new web3_js_1.PublicKey(constants_1.TTRIAD_MINT);
-            const Stake = (0, helpers_1.getStakeAddressSync)(this.program.programId, wallet, nftName);
-            const FromAta = (0, helpers_1.getATASync)(StakeVault, mint);
-            const ToAta = (0, helpers_1.getATASync)(wallet, mint);
+            const stakeVaultPDA = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, this.stakeVaultName);
+            const stakePDA = (0, helpers_1.getStakeAddressSync)(this.program.programId, wallet, nftName);
             const method = yield this.program.methods
                 .claimStakeRewards({
                 collections,
@@ -47,40 +44,55 @@ class Stake {
             })
                 .accounts({
                 signer: wallet,
-                fromAta: FromAta,
-                mint: mint,
-                toAta: ToAta,
-                stake: Stake,
-                stakeVault: StakeVault,
-                verifier: new web3_js_1.PublicKey(constants_1.VERIFIER)
+                mint: constants_1.TRD_MINT,
+                stake: stakePDA,
+                stakeVault: stakeVaultPDA,
+                verifier: constants_1.VERIFIER
             })
                 .simulate();
             let value = method.raw[method.raw.length - 2].split(' ')[3];
-            return new anchor_1.BN((0, base64_js_1.toByteArray)(value), 'le').toNumber() / Math.pow(10, constants_1.TTRIAD_DECIMALS);
+            return new anchor_1.BN((0, base64_js_1.toByteArray)(value), 'le').toNumber() / Math.pow(10, constants_1.TRD_DECIMALS);
         });
     }
+    /**
+     * Get all Stakes
+     */
     getStakes() {
         return __awaiter(this, void 0, void 0, function* () {
             const response = yield this.program.account.stakeV2.all();
-            const StakeVault = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, this.stakeVaultName);
-            return response
-                .filter((item) => item.account.stakeVault.toBase58() === StakeVault.toBase58())
-                .map((stake) => (0, helpers_1.formatStake)(stake.account));
+            return response.map((stake) => (0, helpers_1.formatStake)(stake.account));
         });
     }
     /**
-     * Get Stake by wallet
+     * Get User Stakes
+     */
+    getUserStakes(wallet) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const response = yield this.program.account.stakeV2.all([
+                {
+                    memcmp: {
+                        offset: 8 + 1,
+                        bytes: wallet.toBase58()
+                    }
+                }
+            ]);
+            return response.map((stake) => (0, helpers_1.formatStake)(stake.account));
+        });
+    }
+    /**
+     * Get Stake By Wallet
      * @param wallet - User wallet
      * @param collections - NFT collections
-     *
+     * @param tensor rank
      */
     getStakeByWallet(wallet, collections, ranks) {
         return __awaiter(this, void 0, void 0, function* () {
-            const response = (yield this.getStakes()).filter((item) => item.authority === wallet.toBase58());
+            const response = yield this.getUserStakes(wallet);
             const data = [];
             for (const stake of response) {
                 const getRank = (0, getRarity_1.getRarityRank)(ranks, stake.mint, stake.name);
                 let available = 0;
+                yield new Promise((resolve) => setTimeout(resolve, 1000));
                 try {
                     available = yield this.getStakeRewards({
                         wallet,
@@ -90,31 +102,11 @@ class Stake {
                     });
                 }
                 catch (_a) { }
-                yield new Promise((resolve) => setTimeout(resolve, 500));
                 data.push(Object.assign(Object.assign({}, stake), { available }));
             }
             return data;
         });
     }
-    /**
-     * Get Stakes by day
-     * @param day - Day timestamp
-     */
-    getStakesByDay(day) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const stakes = yield this.getStakes();
-            const rewards = [];
-            stakes.forEach((stake) => {
-                const date = stake.initTs * 1000;
-                const stakeDay = day * 1000;
-                const currentDate = new Date().getTime();
-                if (date <= stakeDay && stakeDay <= currentDate) {
-                    rewards.push(stake);
-                }
-            });
-            return rewards;
-        });
-    }
     /**
      *  Stake NFT
      *  @param mint - NFT mint
@@ -124,11 +116,8 @@ class Stake {
     stakeNft({ wallet, items }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             let ixs = [];
-            const stakeVaultPDA = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, this.stakeVaultName);
             for (let i = 0; i < items.length; i++) {
                 let item = items[i];
-                const FromAta = (0, helpers_1.getATASync)(wallet, item.mint);
-                const toAta = (0, helpers_1.getATASync)(stakeVaultPDA, item.mint);
                 ixs.push(yield this.program.methods
                     .stakeNft({
                     name: item.name,
@@ -136,9 +125,7 @@ class Stake {
                 })
                     .accounts({
                     signer: wallet,
-                    fromAta: FromAta,
-                    mint: item.mint,
-                    toAta: toAta
+                    mint: item.mint
                 })
                     .instruction());
             }
@@ -161,20 +148,15 @@ class Stake {
         });
     }
     /**
-     *  Stake NFT
+     *  Stake Token
+     *  @param name - Index
      *  @param wallet - User wallet
-     *  @param mint - NFT mint
-     *  @param collections - NFT collections
-     *  @param rarity - NFT rarity
+     *  @param amount - Amount to stake
      *
      */
     stakeToken({ name, wallet, amount }, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const stakeVaultPDA = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, this.stakeVaultName);
-            const ttriad = new web3_js_1.PublicKey(constants_1.TTRIAD_MINT);
-            const FromAta = (0, helpers_1.getATASync)(wallet, ttriad);
             const userPDA = (0, helpers_1.getUserAddressSync)(this.program.programId, wallet);
-            const toAta = (0, helpers_1.getATASync)(stakeVaultPDA, ttriad);
             const method = this.program.methods
                 .stakeToken({
                 name,
@@ -183,10 +165,8 @@ class Stake {
             })
                 .accounts({
                 signer: wallet,
-                fromAta: FromAta,
-                mint: ttriad,
-                user: userPDA,
-                toAta: toAta
+                mint: constants_1.TRD_MINT,
+                user: userPDA
             });
             if (options === null || options === void 0 ? void 0 : options.microLamports) {
                 method.postInstructions([
@@ -207,9 +187,6 @@ class Stake {
      */
     depositStakeRewards({ wallet, mint, amount }, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const StakeVaultPDA = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, this.stakeVaultName);
-            const FromAta = (0, helpers_1.getATASync)(wallet, mint);
-            const ToAta = (0, helpers_1.getATASync)(StakeVaultPDA, mint);
             const method = this.program.methods
                 .depositStakeRewards({
                 amount,
@@ -217,9 +194,7 @@ class Stake {
             })
                 .accounts({
                 signer: wallet,
-                fromAta: FromAta,
-                mint: mint,
-                toAta: ToAta
+                mint: mint
             });
             if (options === null || options === void 0 ? void 0 : options.microLamports) {
                 method.postInstructions([
@@ -241,11 +216,11 @@ class Stake {
         return __awaiter(this, void 0, void 0, function* () {
             const stakeVaultPDA = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, this.stakeVaultName);
             const stakePDA = (0, helpers_1.getStakeAddressSync)(this.program.programId, wallet, name);
-            const userPAD = (0, helpers_1.getUserAddressSync)(this.program.programId, wallet);
+            const userPDA = (0, helpers_1.getUserAddressSync)(this.program.programId, wallet);
             const method = this.program.methods.requestWithdrawStake().accounts({
                 signer: wallet,
                 mint: mint,
-                user: userPAD,
+                user: userPDA,
                 stake: stakePDA,
                 stakeVault: stakeVaultPDA
             });
@@ -270,17 +245,13 @@ class Stake {
         return __awaiter(this, void 0, void 0, function* () {
             const stakeVaultPDA = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, this.stakeVaultName);
             const userPDA = (0, helpers_1.getUserAddressSync)(this.program.programId, wallet);
-            const FromAta = (0, helpers_1.getATASync)(stakeVaultPDA, mint);
             const stakePDA = (0, helpers_1.getStakeAddressSync)(this.program.programId, wallet, name);
-            const ToAta = (0, helpers_1.getATASync)(wallet, mint);
             const method = this.program.methods.withdrawStake().accounts({
                 signer: wallet,
-                fromAta: FromAta,
                 stake: stakePDA,
                 stakeVault: stakeVaultPDA,
-                admin: new web3_js_1.PublicKey('82ppCojm3yrEKgdpH8B5AmBJTU1r1uAWXFWhxvPs9UCR'),
+                admin: constants_1.TRIAD_ADMIN,
                 mint: mint,
-                toAta: ToAta,
                 user: userPDA
             });
             if (options === null || options === void 0 ? void 0 : options.microLamports) {
@@ -302,11 +273,8 @@ class Stake {
      */
     claimStakeRewards({ wallet, nftName, collections, rank }, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const StakeVault = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, this.stakeVaultName);
-            const mint = new web3_js_1.PublicKey(constants_1.TTRIAD_MINT);
-            const Stake = (0, helpers_1.getStakeAddressSync)(this.program.programId, wallet, nftName);
-            const FromAta = (0, helpers_1.getATASync)(StakeVault, mint);
-            const ToAta = (0, helpers_1.getATASync)(wallet, mint);
+            const stakeVaultPDA = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, this.stakeVaultName);
+            const stakePDA = (0, helpers_1.getStakeAddressSync)(this.program.programId, wallet, nftName);
             const method = this.program.methods
                 .claimStakeRewards({
                 collections,
@@ -314,12 +282,10 @@ class Stake {
             })
                 .accounts({
                 signer: wallet,
-                fromAta: FromAta,
-                mint: mint,
-                toAta: ToAta,
-                stake: Stake,
-                stakeVault: StakeVault,
-                verifier: new web3_js_1.PublicKey(constants_1.VERIFIER)
+                mint: constants_1.TRD_MINT,
+                stake: stakePDA,
+                stakeVault: stakeVaultPDA,
+                verifier: constants_1.VERIFIER
             });
             if (options === null || options === void 0 ? void 0 : options.microLamports) {
                 method.postInstructions([
@@ -332,9 +298,9 @@ class Stake {
         });
     }
     /**
-     *  Update Stake Boost
+     *  Update Boost
      *  @param wallet - User wallet
-     *  @param nftName - Name of the nft
+     *  @param nfts - Name of the nfts
      *
      */
     updateBoost({ wallet, nfts }, options) {
@@ -356,13 +322,11 @@ class Stake {
                 }));
             }
             const { blockhash } = yield this.provider.connection.getLatestBlockhash();
-            const messageV0 = new web3_js_1.TransactionMessage({
+            return this.provider.sendAndConfirm(new web3_js_1.VersionedTransaction(new web3_js_1.TransactionMessage({
                 instructions: ixs,
                 recentBlockhash: blockhash,
                 payerKey: wallet
-            }).compileToV0Message();
-            const tx = new web3_js_1.VersionedTransaction(messageV0);
-            return this.provider.sendAndConfirm(tx, [], {
+            }).compileToV0Message()), [], {
                 skipPreflight: options === null || options === void 0 ? void 0 : options.skipPreflight,
                 commitment: 'confirmed'
             });

package/dist/trade.d.ts

@@ -0,0 +1,17 @@
+import { AnchorProvider, Program } from '@coral-xyz/anchor';
+import { TriadProtocol } from './types/triad_protocol';
+import { Market } from './types/trade';
+import { PublicKey } from '@solana/web3.js';
+export default class Trade {
+    program: Program<TriadProtocol>;
+    provider: AnchorProvider;
+    constructor(program: Program<TriadProtocol>, provider: AnchorProvider);
+    /**
+     * Get all Markets
+     */
+    getMarkets(): Promise<Market[]>;
+    /**
+     * Get Market By Address
+     */
+    getMarketByAddress(address: PublicKey): Promise<Market>;
+}

package/dist/trade.js

@@ -0,0 +1,77 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+class Trade {
+    constructor(program, provider) {
+        this.provider = provider;
+        this.program = program;
+    }
+    /**
+     * Get all Markets
+     */
+    getMarkets() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.program.account.market.all().then((markets) => markets.map(({ account }) => ({
+                bump: account.bump,
+                authority: account.authority.toString(),
+                marketId: account.marketId.toNumber(),
+                name: account.name,
+                hypePrice: account.hypePrice.toNumber(),
+                flopPrice: account.flopPrice.toNumber(),
+                hypeLiquidity: account.hypeLiquidity.toNumber(),
+                flopLiquidity: account.flopLiquidity.toNumber(),
+                totalHypeShares: account.totalHypeShares.toNumber(),
+                totalFlopShares: account.totalFlopShares.toNumber(),
+                totalVolume: account.totalVolume.toNumber(),
+                vaultTokenAccount: account.vaultTokenAccount.toString(),
+                mint: account.mint.toString(),
+                lastUpdateTs: account.lastUpdateTs.toNumber(),
+                openOrdersCount: account.openOrdersCount.toNumber(),
+                nextOrderId: account.nextOrderId.toNumber(),
+                feeBps: account.feeBps,
+                feeVault: account.feeVault.toBase58(),
+                isActive: account.isActive,
+                isOfficial: account.isOfficial
+            })));
+        });
+    }
+    /**
+     * Get Market By Address
+     */
+    getMarketByAddress(address) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const account = yield this.program.account.market.fetch(address);
+            return {
+                bump: account.bump,
+                authority: account.authority.toString(),
+                marketId: account.marketId.toNumber(),
+                name: account.name,
+                hypePrice: account.hypePrice.toNumber(),
+                flopPrice: account.flopPrice.toNumber(),
+                hypeLiquidity: account.hypeLiquidity.toNumber(),
+                flopLiquidity: account.flopLiquidity.toNumber(),
+                totalHypeShares: account.totalHypeShares.toNumber(),
+                totalFlopShares: account.totalFlopShares.toNumber(),
+                totalVolume: account.totalVolume.toNumber(),
+                vaultTokenAccount: account.vaultTokenAccount.toString(),
+                mint: account.mint.toString(),
+                lastUpdateTs: account.lastUpdateTs.toNumber(),
+                openOrdersCount: account.openOrdersCount.toNumber(),
+                nextOrderId: account.nextOrderId.toNumber(),
+                feeBps: account.feeBps,
+                feeVault: account.feeVault.toBase58(),
+                isActive: account.isActive,
+                isOfficial: account.isOfficial
+            };
+        });
+    }
+}
+exports.default = Trade;