@triadxyz/triad-protocol 0.1.3-beta → 0.1.6-beta

package/dist/index.d.ts

@@ -4,6 +4,7 @@ import { TriadProtocol } from './types/triad_protocol';
 import Ticker from './ticker';
 import Vault from './vault';
 import Stake from './stake';
+import { CreateUserArgs, RpcOptions } from './types';
 export default class TriadProtocolClient {
     program: Program<TriadProtocol>;
     provider: AnchorProvider;
@@ -11,5 +12,18 @@ export default class TriadProtocolClient {
     vault: Vault;
     stake: Stake;
     constructor(connection: Connection, wallet: Wallet);
+    /**
+     * Get all Users
+     */
+    getUsers: () => Promise<import("./types/stake").UserResponse[]>;
+    hasReferral: (referral: string) => Promise<boolean>;
     getUserPositions: (userWallet: PublicKey) => Promise<{}[]>;
+    /**
+     *  Create User
+     *  @param wallet - User wallet
+     *  @param name - user name
+     *  @param referral - user referral
+     *
+     */
+    createUser: ({ wallet, name, referral }: CreateUserArgs, options?: RpcOptions) => Promise<string>;
 }

package/dist/index.js

@@ -13,6 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 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"));
@@ -20,6 +21,22 @@ const helpers_1 = require("./utils/helpers");
 const stake_1 = __importDefault(require("./stake"));
 class TriadProtocolClient {
     constructor(connection, wallet) {
+        /**
+         * Get all Users
+         */
+        this.getUsers = () => __awaiter(this, void 0, void 0, function* () {
+            const response = yield this.program.account.user.all();
+            return response.map((item) => (0, helpers_1.formatUser)(item.account));
+        });
+        this.hasReferral = (referral) => __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield this.program.account.user.fetch((0, helpers_1.getUserAddressSync)(this.program.programId, referral));
+                return true;
+            }
+            catch (_a) {
+                return false;
+            }
+        });
         this.getUserPositions = (userWallet) => __awaiter(this, void 0, void 0, function* () {
             const tickers = yield this.ticker.getTickers();
             const positions = yield Promise.all(tickers
@@ -33,7 +50,7 @@ class TriadProtocolClient {
                         position
                     };
                 }
-                catch (_a) {
+                catch (_b) {
                     return;
                 }
                 return data;
@@ -41,6 +58,35 @@ class TriadProtocolClient {
                 .filter(Boolean));
             return positions;
         });
+        /**
+         *  Create User
+         *  @param wallet - User wallet
+         *  @param name - user name
+         *  @param referral - user referral
+         *
+         */
+        this.createUser = ({ wallet, name, referral }, options) => {
+            let referralPDA = (0, helpers_1.getUserAddressSync)(this.program.programId, name);
+            if (referral) {
+                referralPDA = (0, helpers_1.getUserAddressSync)(this.program.programId, referral);
+            }
+            const method = this.program.methods
+                .createUser({
+                name
+            })
+                .accounts({
+                signer: wallet,
+                referral: referralPDA
+            });
+            if (options === null || options === void 0 ? void 0 : options.microLamports) {
+                method.postInstructions([
+                    web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
+                        microLamports: options.microLamports
+                    })
+                ]);
+            }
+            return method.rpc({ skipPreflight: options === null || options === void 0 ? void 0 : options.skipPreflight });
+        };
         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);

package/dist/stake.d.ts

@@ -2,7 +2,7 @@ import { AnchorProvider, Program } from '@coral-xyz/anchor';
 import { PublicKey } from '@solana/web3.js';
 import { TriadProtocol } from './types/triad_protocol';
 import { RpcOptions } from './types';
-import { DepositStakeRewardsArgs, InitializeStakeArgs, StakeNftArgsV1, RequestWithdrawArgs, WithdrawArgs, StakeResponse, UpdateStakeVaultStatusArgs, ClaimStakeRewardsArgs, CreateUserArgs, StakeTokenArgs, MigrateStakeArgs } from './types/stake';
+import { DepositStakeRewardsArgs, InitializeStakeArgs, StakeNftArgs, RequestWithdrawArgs, WithdrawArgs, StakeResponse, UpdateStakeVaultStatusArgs, ClaimStakeRewardsArgs, StakeTokenArgs, MigrateStakeArgs } from './types/stake';
 export default class Stake {
     program: Program<TriadProtocol>;
     provider: AnchorProvider;
@@ -11,10 +11,6 @@ export default class Stake {
      * Get all Stake Vaults
      */
     getStakeVaults(): Promise<import("./types/stake").StakeVaultResponse[]>;
-    /**
-     * Get all Users
-     */
-    getUsers(): Promise<import("./types/stake").UserResponse[]>;
     /**
      * Get Stake Vault by name
      * @param stakeVault - Stake Vault name
@@ -56,11 +52,9 @@ export default class Stake {
      *  @param name - NFT name
      *  @param wallet - User wallet
      *  @param mint - NFT mint
-     *  @param collections - NFT collections
-     *  @param rarity - NFT rarity
      *
      */
-    stakeNft({ name, wallet, mint, collections, rarity, stakeVault }: StakeNftArgsV1, options?: RpcOptions): Promise<string>;
+    stakeNft({ name, wallet, mint, stakeVault }: StakeNftArgs, options?: RpcOptions): Promise<string>;
     /**
      *  Stake NFT
      *  @param wallet - User wallet
@@ -116,20 +110,11 @@ export default class Stake {
      *  Claim Stake Rewards
      *  @param wallet - User wallet
      *  @param mint - NFT mint
-     *  @param week - Week rewards
      *  @param stakeVault - Name of the stake vault
      *  @param nftName - Name of the nft
      *
      */
     claimStakeRewards({ wallet, mint, stakeVault, nftName }: ClaimStakeRewardsArgs, options?: RpcOptions): Promise<string>;
-    /**
-     *  Create User
-     *  @param wallet - User wallet
-     *  @param name - user name
-     *  @param referral - user referral
-     *
-     */
-    createUser({ wallet, name, referral }: CreateUserArgs, options?: RpcOptions): Promise<string>;
     /**
      *  Migrate Stake
      *  @param name - NFT name

package/dist/stake.js

@@ -27,15 +27,6 @@ class Stake {
             return response.map((stakeVault) => (0, helpers_1.formatStakeVault)(stakeVault.account));
         });
     }
-    /**
-     * Get all Users
-     */
-    getUsers() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const response = yield this.program.account.user.all();
-            return response.map((item) => (0, helpers_1.formatUser)(item.account));
-        });
-    }
     /**
      * Get Stake Vault by name
      * @param stakeVault - Stake Vault name
@@ -128,26 +119,17 @@ class Stake {
      *  @param name - NFT name
      *  @param wallet - User wallet
      *  @param mint - NFT mint
-     *  @param collections - NFT collections
-     *  @param rarity - NFT rarity
      *
      */
-    stakeNft({ name, wallet, mint, collections, rarity, stakeVault }, options) {
+    stakeNft({ name, wallet, mint, stakeVault }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const StakeVault = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, stakeVault);
             const FromAta = (0, helpers_1.getATASync)(wallet, mint);
             const ToAta = (0, helpers_1.getATASync)(StakeVault, mint);
             let items = [];
-            Object.keys(collections).forEach((key) => {
-                if (collections[key]) {
-                    items.push({ [key]: {} });
-                }
-            });
             const method = this.program.methods
                 .stakeNft({
                 name,
-                collections: items,
-                rarity,
                 stakeVault
             })
                 .accounts({
@@ -358,7 +340,6 @@ class Stake {
      *  Claim Stake Rewards
      *  @param wallet - User wallet
      *  @param mint - NFT mint
-     *  @param week - Week rewards
      *  @param stakeVault - Name of the stake vault
      *  @param nftName - Name of the nft
      *
@@ -387,34 +368,6 @@ class Stake {
             return method.rpc({ skipPreflight: options === null || options === void 0 ? void 0 : options.skipPreflight });
         });
     }
-    /**
-     *  Create User
-     *  @param wallet - User wallet
-     *  @param name - user name
-     *  @param referral - user referral
-     *
-     */
-    createUser({ wallet, name, referral }, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const referralPDA = (0, helpers_1.getUserAddressSync)(this.program.programId, referral);
-            const method = this.program.methods
-                .createUser({
-                name
-            })
-                .accounts({
-                signer: wallet,
-                referral: referralPDA
-            });
-            if (options === null || options === void 0 ? void 0 : options.microLamports) {
-                method.postInstructions([
-                    web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
-                        microLamports: options.microLamports
-                    })
-                ]);
-            }
-            return method.rpc({ skipPreflight: options === null || options === void 0 ? void 0 : options.skipPreflight });
-        });
-    }
     /**
      *  Migrate Stake
      *  @param name - NFT name

package/dist/test.js

@@ -65,12 +65,10 @@ const getStake = () => __awaiter(void 0, void 0, void 0, function* () {
     console.log(response);
     console.log(stakeVaults);
 });
-getStake();
 const claimStakeRewardsV1 = () => __awaiter(void 0, void 0, void 0, function* () {
     const response = yield triadProtocol.stake.claimStakeRewards({
         wallet: wallet.publicKey,
         mint: new web3_js_1.PublicKey('t3DohmswhKk94PPbPYwA6ZKACyY3y5kbcqeQerAJjmV'),
-        week: [4],
         stakeVault: constants_1.STAKE_SEASON,
         nftName: 'Triad 2807'
     }, {
@@ -84,13 +82,6 @@ const stake = () => __awaiter(void 0, void 0, void 0, function* () {
         name: 'Triad 0',
         wallet: wallet.publicKey,
         stakeVault: 'Rev 1',
-        rarity: { mythic: {} },
-        collections: {
-            coleta: false,
-            undead: false,
-            alligators: false,
-            pyth: false
-        },
         mint: new web3_js_1.PublicKey('FXRhaGeYue7bMCwcksNw4hJRY7jZ1YMwgmCu1Y8fyUNd')
     }, {
         skipPreflight: true,
@@ -99,9 +90,14 @@ const stake = () => __awaiter(void 0, void 0, void 0, function* () {
     console.log(response);
 });
 const getUsers = () => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield triadProtocol.stake.getUsers();
+    const response = yield triadProtocol.getUsers();
     console.log(response);
 });
+const getReferral = () => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield triadProtocol.hasReferral('a');
+    console.log(response);
+});
+getReferral();
 const migrateStake = () => __awaiter(void 0, void 0, void 0, function* () {
     const response = yield triadProtocol.stake.migrateStake({
         wallet: wallet.publicKey,

package/dist/types/idl_triad_protocol.json

@@ -1470,27 +1470,9 @@
                         "name": "name",
                         "type": "string"
                     },
-                    {
-                        "name": "rarity",
-                        "type": {
-                            "defined": {
-                                "name": "Rarity"
-                            }
-                        }
-                    },
                     {
                         "name": "stake_vault",
                         "type": "string"
-                    },
-                    {
-                        "name": "collections",
-                        "type": {
-                            "vec": {
-                                "defined": {
-                                    "name": "Collection"
-                                }
-                            }
-                        }
                     }
                 ]
             }

package/dist/types/index.d.ts

@@ -1,4 +1,10 @@
+import { PublicKey } from '@solana/web3.js';
 export type RpcOptions = {
     skipPreflight?: boolean;
     microLamports?: number;
 };
+export type CreateUserArgs = {
+    wallet: PublicKey;
+    name: string;
+    referral?: string;
+};

package/dist/types/stake.d.ts

@@ -1,25 +1,11 @@
 import { PublicKey } from '@solana/web3.js';
 import BN from 'bn.js';
 export type Collection = 'alligators' | 'coleta' | 'undead' | 'pyth';
-export type StakeNftArgsV1 = {
+export type StakeNftArgs = {
     name: string;
     wallet: PublicKey;
     stakeVault: string;
     mint: PublicKey;
-    collections: Record<Collection, boolean>;
-    rarity: {
-        common: {};
-    } | {
-        uncommon: {};
-    } | {
-        rare: {};
-    } | {
-        epic: {};
-    } | {
-        legendary: {};
-    } | {
-        mythic: {};
-    };
 };
 export type MigrateStakeArgs = {
     wallet: PublicKey;
@@ -66,16 +52,10 @@ export type UpdateStakeVaultStatusArgs = {
 };
 export type ClaimStakeRewardsArgs = {
     wallet: PublicKey;
-    week: number[];
     mint: PublicKey;
     stakeVault: string;
     nftName: string;
 };
-export type CreateUserArgs = {
-    wallet: PublicKey;
-    name: string;
-    referral: string;
-};
 export type UpdateStakeRewardsArgs = {
     day: number;
     wallet: PublicKey;

package/dist/types/triad_protocol.d.ts

@@ -1382,27 +1382,9 @@ export type TriadProtocol = {
                         name: 'name';
                         type: 'string';
                     },
-                    {
-                        name: 'rarity';
-                        type: {
-                            defined: {
-                                name: 'rarity';
-                            };
-                        };
-                    },
                     {
                         name: 'stakeVault';
                         type: 'string';
-                    },
-                    {
-                        name: 'collections';
-                        type: {
-                            vec: {
-                                defined: {
-                                    name: 'collection';
-                                };
-                            };
-                        };
                     }
                 ];
             };

package/package.json

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