@triadxyz/triad-protocol 0.3.0-beta → 0.3.2-beta

package/dist/stake.d.ts

@@ -11,6 +11,10 @@ export default class Stake {
      * Get all Stake Vaults
      */
     getStakeVaults(): Promise<import("./types/stake").StakeVaultResponse[]>;
+    /**
+     * Get Stake Rewards
+     */
+    getStakeRewards({ wallet, mint, stakeVault, nftName }: ClaimStakeRewardsArgs): Promise<void>;
     /**
      * Get Stake Vault by name
      * @param stakeVault - Stake Vault name
@@ -29,18 +33,6 @@ export default class Stake {
      *
      */
     getStakeByWallet(wallet: PublicKey, stakeVault: string): Promise<StakeResponse[]>;
-    /**
-     * Get Stake Vault Rewards details
-     * @param stakeVault - Stake Vault name
-     */
-    getStakeVaultRewards(stakeVault: string): Promise<{
-        amount: number;
-        perDay: number;
-        perWeek: number;
-        perMonth: number;
-        period: number;
-        days: number[];
-    }>;
     /**
      * Get Stakes by day
      * @param stakeVault - Stake Vault name

package/dist/stake.js

@@ -27,6 +27,29 @@ class Stake {
             return response.map((stakeVault) => (0, helpers_1.formatStakeVault)(stakeVault.account));
         });
     }
+    /**
+     * Get Stake Rewards
+     */
+    getStakeRewards({ wallet, mint, stakeVault, nftName }) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const StakeVault = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, stakeVault);
+            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 method = this.program.methods
+                .claimStakeRewards()
+                .accounts({
+                signer: wallet,
+                fromAta: FromAta,
+                mint: mint,
+                toAta: ToAta,
+                stake: Stake,
+                stakeVault: StakeVault
+            })
+                .simulate();
+            console.log(method);
+        });
+    }
     /**
      * Get Stake Vault by name
      * @param stakeVault - Stake Vault name
@@ -64,31 +87,6 @@ class Stake {
             return myStakes;
         });
     }
-    /**
-     * Get Stake Vault Rewards details
-     * @param stakeVault - Stake Vault name
-     */
-    getStakeVaultRewards(stakeVault) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const StakeVault = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, stakeVault);
-            const response = yield this.program.account.stakeVault.fetch(StakeVault);
-            const amount = response.amount.toNumber() / Math.pow(10, constants_1.TTRIAD_DECIMALS);
-            const period = (response.endTs.toNumber() - response.initTs.toNumber()) / (60 * 60 * 24);
-            const netAmount = amount - (amount * constants_1.TTRIAD_FEE) / 100;
-            const data = {
-                amount: netAmount,
-                perDay: netAmount / period,
-                perWeek: (netAmount / period) * 7,
-                perMonth: (netAmount / period) * 30,
-                period,
-                days: []
-            };
-            for (let ts = response.initTs.toNumber(); ts <= response.endTs.toNumber(); ts += 60 * 60 * 24) {
-                data.days.push(ts);
-            }
-            return data;
-        });
-    }
     /**
      * Get Stakes by day
      * @param stakeVault - Stake Vault name
@@ -263,9 +261,11 @@ class Stake {
         return __awaiter(this, void 0, void 0, function* () {
             const stakeVaultPDA = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, stakeVault);
             const stakePDA = (0, helpers_1.getStakeAddressSync)(this.program.programId, wallet, name);
+            const userPAD = (0, helpers_1.getUserAddressSync)(this.program.programId, wallet);
             const method = this.program.methods.requestWithdrawStake().accounts({
                 signer: wallet,
                 mint: mint,
+                user: userPAD,
                 stake: stakePDA,
                 stakeVault: stakeVaultPDA
             });
@@ -328,7 +328,8 @@ class Stake {
             const method = this.program.methods
                 .updateStakeVaultStatus({
                 isLocked,
-                initTs: new anchor_1.BN(initTs)
+                initTs: new anchor_1.BN(initTs),
+                slots: new anchor_1.BN(1839)
             })
                 .accounts({
                 signer: wallet,
@@ -358,7 +359,7 @@ class Stake {
             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 method = this.program.methods.claimStake().accounts({
+            const method = this.program.methods.claimStakeRewards().accounts({
                 signer: wallet,
                 fromAta: FromAta,
                 mint: mint,

package/dist/test.js

@@ -36,18 +36,19 @@ const updateStakeVaultStatus = () => __awaiter(void 0, void 0, void 0, function*
     console.log(response);
 });
 const getStake = () => __awaiter(void 0, void 0, void 0, function* () {
-    // const response = await triadProtocol.stake.getStakeByWallet(
-    //   new PublicKey('BCTdjdcjMiECGFbF5Ps15yjLRPzy5YZGJNa4VdGRbhjB'),
-    //   STAKE_SEASON
-    // )
+    const response = yield triadProtocol.stake.getStakeByWallet(new web3_js_1.PublicKey('HjJQdfTHgC3EBX3471w4st8BXbBmtbaMyCAXNgcUb7dq'), constants_1.STAKE_SEASON);
     const stakeVaults = yield triadProtocol.stake.getStakeVaults();
-    // console.log(response)
+    console.log(response);
     console.log(stakeVaults);
 });
 const getUsers = () => __awaiter(void 0, void 0, void 0, function* () {
     const response = yield triadProtocol.getUsers();
     console.log(response);
 });
+const getUser = () => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield triadProtocol.getUser(new web3_js_1.PublicKey('HjJQdfTHgC3EBX3471w4st8BXbBmtbaMyCAXNgcUb7dq'));
+    console.log(response);
+});
 const getReferral = () => __awaiter(void 0, void 0, void 0, function* () {
     const response = yield triadProtocol.hasUser(new web3_js_1.PublicKey('6MuTdUhc4LDHDW3fiTemyns4NgR99oAWvHM2SwCSTcau'));
     console.log(response);
@@ -61,4 +62,13 @@ const createUser = () => __awaiter(void 0, void 0, void 0, function* () {
         microLamports: 10000
     });
 });
-getStake();
+const getRewards = () => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield triadProtocol.stake.getStakeRewards({
+        wallet: new web3_js_1.PublicKey('HjJQdfTHgC3EBX3471w4st8BXbBmtbaMyCAXNgcUb7dq'),
+        mint: new web3_js_1.PublicKey('BPK5P2YVnBaJJ4GRESCKQHYFmENzVspd7tZ2Mw7HmJYZ'),
+        nftName: 'Triad 3081',
+        stakeVault: constants_1.STAKE_SEASON
+    });
+    console.log(response);
+});
+getRewards();

package/dist/types/idl_triad_protocol.json

@@ -2,13 +2,14 @@
     "address": "TRDwq3BN4mP3m9KsuNUWSN6QDff93VKGSwE95Jbr9Ss",
     "metadata": {
         "name": "triad_protocol",
-        "version": "0.1.0",
-        "spec": "0.1.0"
+        "version": "0.1.4",
+        "spec": "0.1.0",
+        "description": "Triad protocol, trade solana projects"
     },
     "instructions": [
         {
-            "name": "claim_stake",
-            "discriminator": [62, 145, 133, 242, 244, 59, 53, 139],
+            "name": "claim_stake_rewards",
+            "discriminator": [107, 91, 233, 196, 211, 47, 218, 21],
             "accounts": [
                 {
                     "name": "signer",
@@ -76,7 +77,8 @@
                     "address": "11111111111111111111111111111111"
                 }
             ],
-            "args": []
+            "args": [],
+            "returns": "u64"
         },
         {
             "name": "close_position",
@@ -508,6 +510,10 @@
                     "name": "stake_vault",
                     "writable": true
                 },
+                {
+                    "name": "user",
+                    "writable": true
+                },
                 {
                     "name": "stake",
                     "writable": true
@@ -749,6 +755,38 @@
                 }
             ]
         },
+        {
+            "name": "swap_404",
+            "discriminator": [227, 249, 224, 136, 128, 95, 255, 239],
+            "accounts": [
+                {
+                    "name": "signer",
+                    "writable": true,
+                    "signer": true
+                },
+                {
+                    "name": "user",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "const",
+                                "value": [117, 115, 101, 114]
+                            },
+                            {
+                                "kind": "account",
+                                "path": "signer"
+                            }
+                        ]
+                    }
+                },
+                {
+                    "name": "system_program",
+                    "address": "11111111111111111111111111111111"
+                }
+            ],
+            "args": []
+        },
         {
             "name": "update_stake_vault_status",
             "discriminator": [71, 64, 188, 150, 86, 254, 221, 65],
@@ -1033,6 +1071,16 @@
             "code": 6020,
             "name": "StakeOverflow",
             "msg": "Stake overflow"
+        },
+        {
+            "code": 6021,
+            "name": "SwapsReachedLimit",
+            "msg": "Swaps reached limit"
+        },
+        {
+            "code": 6022,
+            "name": "InsufficientFunds",
+            "msg": "Insufficient funds"
         }
     ],
     "types": [
@@ -1474,6 +1522,10 @@
                     {
                         "name": "init_ts",
                         "type": "i64"
+                    },
+                    {
+                        "name": "slots",
+                        "type": "u64"
                     }
                 ]
             }
@@ -1531,10 +1583,14 @@
                         "name": "staked",
                         "type": "u64"
                     },
+                    {
+                        "name": "first_swap",
+                        "type": "i64"
+                    },
                     {
                         "name": "padding",
                         "type": {
-                            "array": ["u8", 40]
+                            "array": ["u8", 32]
                         }
                     }
                 ]

package/dist/types/triad_protocol.d.ts

@@ -8,13 +8,14 @@ export type TriadProtocol = {
     address: 'TRDwq3BN4mP3m9KsuNUWSN6QDff93VKGSwE95Jbr9Ss';
     metadata: {
         name: 'triadProtocol';
-        version: '0.1.0';
+        version: '0.1.4';
         spec: '0.1.0';
+        description: 'Triad protocol, trade solana projects';
     };
     instructions: [
         {
-            name: 'claimStake';
-            discriminator: [62, 145, 133, 242, 244, 59, 53, 139];
+            name: 'claimStakeRewards';
+            discriminator: [107, 91, 233, 196, 211, 47, 218, 21];
             accounts: [
                 {
                     name: 'signer';
@@ -55,6 +56,7 @@ export type TriadProtocol = {
                 }
             ];
             args: [];
+            returns: 'u64';
         },
         {
             name: 'closePosition';
@@ -340,92 +342,6 @@ export type TriadProtocol = {
                 {
                     name: 'toAta';
                     writable: true;
-                    pda: {
-                        seeds: [
-                            {
-                                kind: 'account';
-                                path: 'stakeVault';
-                            },
-                            {
-                                kind: 'const';
-                                value: [
-                                    6,
-                                    221,
-                                    246,
-                                    225,
-                                    215,
-                                    101,
-                                    161,
-                                    147,
-                                    217,
-                                    203,
-                                    225,
-                                    70,
-                                    206,
-                                    235,
-                                    121,
-                                    172,
-                                    28,
-                                    180,
-                                    133,
-                                    237,
-                                    95,
-                                    91,
-                                    55,
-                                    145,
-                                    58,
-                                    140,
-                                    245,
-                                    133,
-                                    126,
-                                    255,
-                                    0,
-                                    169
-                                ];
-                            },
-                            {
-                                kind: 'account';
-                                path: 'mint';
-                            }
-                        ];
-                        program: {
-                            kind: 'const';
-                            value: [
-                                140,
-                                151,
-                                37,
-                                143,
-                                78,
-                                36,
-                                137,
-                                241,
-                                187,
-                                61,
-                                16,
-                                41,
-                                20,
-                                142,
-                                13,
-                                131,
-                                11,
-                                90,
-                                19,
-                                153,
-                                218,
-                                255,
-                                16,
-                                132,
-                                4,
-                                142,
-                                123,
-                                216,
-                                219,
-                                233,
-                                248,
-                                89
-                            ];
-                        };
-                    };
                 },
                 {
                     name: 'tokenProgram';
@@ -590,6 +506,10 @@ export type TriadProtocol = {
                     name: 'stakeVault';
                     writable: true;
                 },
+                {
+                    name: 'user';
+                    writable: true;
+                },
                 {
                     name: 'stake';
                     writable: true;
@@ -775,6 +695,38 @@ export type TriadProtocol = {
                 }
             ];
         },
+        {
+            name: 'swap404';
+            discriminator: [227, 249, 224, 136, 128, 95, 255, 239];
+            accounts: [
+                {
+                    name: 'signer';
+                    writable: true;
+                    signer: true;
+                },
+                {
+                    name: 'user';
+                    writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: 'const';
+                                value: [117, 115, 101, 114];
+                            },
+                            {
+                                kind: 'account';
+                                path: 'signer';
+                            }
+                        ];
+                    };
+                },
+                {
+                    name: 'systemProgram';
+                    address: '11111111111111111111111111111111';
+                }
+            ];
+            args: [];
+        },
         {
             name: 'updateStakeVaultStatus';
             discriminator: [71, 64, 188, 150, 86, 254, 221, 65];
@@ -1031,6 +983,16 @@ export type TriadProtocol = {
             code: 6020;
             name: 'stakeOverflow';
             msg: 'Stake overflow';
+        },
+        {
+            code: 6021;
+            name: 'swapsReachedLimit';
+            msg: 'Swaps reached limit';
+        },
+        {
+            code: 6022;
+            name: 'insufficientFunds';
+            msg: 'Insufficient funds';
         }
     ];
     types: [
@@ -1472,6 +1434,10 @@ export type TriadProtocol = {
                     {
                         name: 'initTs';
                         type: 'i64';
+                    },
+                    {
+                        name: 'slots';
+                        type: 'u64';
                     }
                 ];
             };
@@ -1529,10 +1495,14 @@ export type TriadProtocol = {
                         name: 'staked';
                         type: 'u64';
                     },
+                    {
+                        name: 'firstSwap';
+                        type: 'i64';
+                    },
                     {
                         name: 'padding';
                         type: {
-                            array: ['u8', 40];
+                            array: ['u8', 32];
                         };
                     }
                 ];

package/package.json

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