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

package/dist/index.d.ts

@@ -13,14 +13,20 @@ export default class TriadProtocolClient {
     stake: Stake;
     constructor(connection: Connection, wallet: Wallet);
     /**
-     * Get all Users
+     * Get User by wallet
+     * @param wallet - User wallet
+     */
+    getUser: (wallet: PublicKey) => Promise<import("./types/stake").UserResponse>;
+    /**
+     * Get User by wallet
+     * @param wallet - User wallet
      */
     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: (wallet: PublicKey) => Promise<boolean>;
     getUserPositions: (userWallet: PublicKey) => Promise<{}[]>;
     /**
      *  Create User

package/dist/index.js

@@ -22,21 +22,29 @@ const stake_1 = __importDefault(require("./stake"));
 class TriadProtocolClient {
     constructor(connection, wallet) {
         /**
-         * Get all Users
+         * Get User by wallet
+         * @param wallet - User wallet
+         */
+        this.getUser = (wallet) => __awaiter(this, void 0, void 0, function* () {
+            const UserPDA = (0, helpers_1.getUserAddressSync)(this.program.programId, wallet);
+            const response = yield this.program.account.user.fetch(UserPDA);
+            return (0, helpers_1.formatUser)(response);
+        });
+        /**
+         * Get User by wallet
+         * @param wallet - User wallet
          */
         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))
-                .sort((a, b) => b.referred - a.referred);
+            return response.map((item) => (0, helpers_1.formatUser)(item));
         });
         /**
-         * 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 = (wallet) => __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, wallet));
                 return true;
             }
             catch (_a) {
@@ -72,14 +80,13 @@ class TriadProtocolClient {
          *
          */
         this.createUser = ({ wallet, name, referral }, options) => {
-            const referralPDA = (0, helpers_1.getUserAddressSync)(this.program.programId, referral);
             const method = this.program.methods
                 .createUser({
                 name
             })
                 .accounts({
                 signer: wallet,
-                referral: referralPDA
+                referral
             });
             if (options === null || options === void 0 ? void 0 : options.microLamports) {
                 method.postInstructions([

package/dist/stake.js

@@ -164,6 +164,7 @@ class Stake {
         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, wallet);
             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([
@@ -282,6 +284,7 @@ class Stake {
     withdrawStake({ wallet, name, mint, 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, wallet);
             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(new web3_js_1.PublicKey(''));
     console.log(response);
 });

package/dist/types/idl_triad_protocol.json

@@ -233,8 +233,8 @@
                                 "value": [117, 115, 101, 114]
                             },
                             {
-                                "kind": "arg",
-                                "path": "args.name"
+                                "kind": "account",
+                                "path": "signer"
                             }
                         ]
                     }
@@ -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/index.d.ts

@@ -6,5 +6,5 @@ export type RpcOptions = {
 export type CreateUserArgs = {
     wallet: PublicKey;
     name: string;
-    referral?: string;
+    referral?: PublicKey;
 };

package/dist/types/triad_protocol.d.ts

@@ -314,8 +314,8 @@ export type TriadProtocol = {
                                 value: [117, 115, 101, 114];
                             },
                             {
-                                kind: 'arg';
-                                path: 'args.name';
+                                kind: 'account';
+                                path: 'signer';
                             }
                         ];
                     };
@@ -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/dist/utils/helpers.d.ts

@@ -11,7 +11,7 @@ export declare const getStakeVaultAddressSync: (programId: PublicKey, vaultName:
 export declare const getStakeAddressSync: (programId: PublicKey, wallet: PublicKey, name: string) => PublicKey;
 export declare const getNFTRewardsAddressSync: (programId: PublicKey, stake: PublicKey) => PublicKey;
 export declare const getATASync: (address: PublicKey, Mint: PublicKey) => PublicKey;
-export declare const getUserAddressSync: (programId: PublicKey, name: string) => PublicKey;
+export declare const getUserAddressSync: (programId: PublicKey, wallet: PublicKey) => PublicKey;
 export declare const formatNumber: (number: bigint | BN, decimals?: number) => number;
 export declare const formatStakeVault: (stakeVault: any) => StakeVaultResponse;
 export declare const formatStake: (stake: any) => StakeResponse;

package/dist/utils/helpers.js

@@ -91,8 +91,8 @@ const getATASync = (address, Mint) => {
     return ATA;
 };
 exports.getATASync = getATASync;
-const getUserAddressSync = (programId, name) => {
-    const [StakePDA] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('user'), Buffer.from(name)], programId);
+const getUserAddressSync = (programId, wallet) => {
+    const [StakePDA] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('user'), wallet.toBuffer()], programId);
     return StakePDA;
 };
 exports.getUserAddressSync = getUserAddressSync;

package/package.json

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