@triadxyz/triad-protocol 0.2.1-beta → 0.2.2-beta

package/dist/index.d.ts

@@ -17,10 +17,10 @@ export default class TriadProtocolClient {
      */
     getUsers: () => Promise<import("./types/stake").UserResponse[]>;
     /**
-     * Check if user has referral
-     * @param referral - User referral
+     * Check if user exists
+     * @param username - User name
      */
-    hasReferral: (referral: string) => Promise<boolean>;
+    hasUser: (username: string) => Promise<boolean>;
     getUserPositions: (userWallet: PublicKey) => Promise<{}[]>;
     /**
      *  Create User

package/dist/index.js

@@ -31,12 +31,12 @@ class TriadProtocolClient {
                 .sort((a, b) => b.referred - a.referred);
         });
         /**
-         * Check if user has referral
-         * @param referral - User referral
+         * Check if user exists
+         * @param username - User name
          */
-        this.hasReferral = (referral) => __awaiter(this, void 0, void 0, function* () {
+        this.hasUser = (username) => __awaiter(this, void 0, void 0, function* () {
             try {
-                yield this.program.account.user.fetch((0, helpers_1.getUserAddressSync)(this.program.programId, referral));
+                yield this.program.account.user.fetch((0, helpers_1.getUserAddressSync)(this.program.programId, username));
                 return true;
             }
             catch (_a) {

package/dist/stake.d.ts

@@ -63,7 +63,7 @@ export default class Stake {
      *  @param rarity - NFT rarity
      *
      */
-    stakeToken({ name, wallet, stakeVault, amount }: StakeTokenArgs, options?: RpcOptions): Promise<string>;
+    stakeToken({ name, wallet, stakeVault, amount, userName }: StakeTokenArgs, options?: RpcOptions): Promise<string>;
     /**
      *  Initialize Stake Vault
      *  @param name - The ticker's name
@@ -96,7 +96,7 @@ export default class Stake {
      *  @param stakeVault - Name of the stake vault
      *
      */
-    withdrawStake({ wallet, name, mint, stakeVault }: WithdrawArgs, options?: RpcOptions): Promise<string>;
+    withdrawStake({ wallet, name, mint, userName, stakeVault }: WithdrawArgs, options?: RpcOptions): Promise<string>;
     /**
      *  Update Stake Vault Status
      *  @param wallet - User wallet

package/dist/stake.js

@@ -160,10 +160,11 @@ class Stake {
      *  @param rarity - NFT rarity
      *
      */
-    stakeToken({ name, wallet, stakeVault, amount }, options) {
+    stakeToken({ name, wallet, stakeVault, amount, userName }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             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, userName);
             const method = this.program.methods
                 .stakeToken({
                 name,
@@ -173,7 +174,8 @@ class Stake {
                 .accounts({
                 signer: wallet,
                 fromAta: FromAta,
-                mint: ttriad
+                mint: ttriad,
+                user: userPDA
             });
             if (options === null || options === void 0 ? void 0 : options.microLamports) {
                 method.postInstructions([
@@ -279,9 +281,10 @@ class Stake {
      *  @param stakeVault - Name of the stake vault
      *
      */
-    withdrawStake({ wallet, name, mint, stakeVault }, options) {
+    withdrawStake({ wallet, name, mint, userName, stakeVault }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const stakeVaultPDA = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, stakeVault);
+            const userPDA = (0, helpers_1.getUserAddressSync)(this.program.programId, userName);
             const FromAta = (0, helpers_1.getATASync)(stakeVaultPDA, mint);
             const stakePDA = (0, helpers_1.getStakeAddressSync)(this.program.programId, wallet, name);
             const method = this.program.methods.withdrawStake().accounts({
@@ -290,7 +293,8 @@ class Stake {
                 stake: stakePDA,
                 stakeVault: stakeVaultPDA,
                 admin: new web3_js_1.PublicKey('82ppCojm3yrEKgdpH8B5AmBJTU1r1uAWXFWhxvPs9UCR'),
-                mint: mint
+                mint: mint,
+                user: userPDA
             });
             if (options === null || options === void 0 ? void 0 : options.microLamports) {
                 method.postInstructions([

package/dist/test.js

@@ -47,6 +47,6 @@ const getUsers = () => __awaiter(void 0, void 0, void 0, function* () {
 });
 getUsers();
 const getReferral = () => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield triadProtocol.hasReferral('a');
+    const response = yield triadProtocol.hasUser('a');
     console.log(response);
 });

package/dist/types/idl_triad_protocol.json

@@ -661,6 +661,10 @@
                         ]
                     }
                 },
+                {
+                    "name": "user",
+                    "writable": true
+                },
                 {
                     "name": "stake",
                     "writable": true,
@@ -816,6 +820,10 @@
                     "name": "stake_vault",
                     "writable": true
                 },
+                {
+                    "name": "user",
+                    "writable": true
+                },
                 {
                     "name": "stake",
                     "writable": true
@@ -1020,6 +1028,11 @@
             "code": 6019,
             "name": "RewardsAlreadyClaimed",
             "msg": "Rewards already claimed"
+        },
+        {
+            "code": 6020,
+            "name": "StakeOverflow",
+            "msg": "Stake overflow"
         }
     ],
     "types": [
@@ -1514,10 +1527,14 @@
                         "name": "swaps_made",
                         "type": "i16"
                     },
+                    {
+                        "name": "staked",
+                        "type": "u64"
+                    },
                     {
                         "name": "padding",
                         "type": {
-                            "array": ["u8", 48]
+                            "array": ["u8", 40]
                         }
                     }
                 ]

package/dist/types/stake.d.ts

@@ -23,6 +23,7 @@ export type StakeTokenArgs = {
     stakeVault: string;
     mint: PublicKey;
     amount: number;
+    userName: string;
 };
 export type InitializeStakeArgs = {
     name: string;
@@ -47,6 +48,7 @@ export type WithdrawArgs = {
     name: string;
     mint: PublicKey;
     stakeVault: string;
+    userName: string;
 };
 export type UpdateStakeVaultStatusArgs = {
     wallet: PublicKey;

package/dist/types/triad_protocol.d.ts

@@ -887,6 +887,10 @@ export type TriadProtocol = {
                         ];
                     };
                 },
+                {
+                    name: 'user';
+                    writable: true;
+                },
                 {
                     name: 'stake';
                     writable: true;
@@ -1100,6 +1104,10 @@ export type TriadProtocol = {
                     name: 'stakeVault';
                     writable: true;
                 },
+                {
+                    name: 'user';
+                    writable: true;
+                },
                 {
                     name: 'stake';
                     writable: true;
@@ -1362,6 +1370,11 @@ export type TriadProtocol = {
             code: 6019;
             name: 'rewardsAlreadyClaimed';
             msg: 'Rewards already claimed';
+        },
+        {
+            code: 6020;
+            name: 'stakeOverflow';
+            msg: 'Stake overflow';
         }
     ];
     types: [
@@ -1856,10 +1869,14 @@ export type TriadProtocol = {
                         name: 'swapsMade';
                         type: 'i16';
                     },
+                    {
+                        name: 'staked';
+                        type: 'u64';
+                    },
                     {
                         name: 'padding';
                         type: {
-                            array: ['u8', 48];
+                            array: ['u8', 40];
                         };
                     }
                 ];

package/package.json

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