@triadxyz/triad-protocol 0.3.9-beta → 0.4.1-beta

package/dist/stake.d.ts

@@ -3,7 +3,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, StakeNftArgs, RequestWithdrawArgs, WithdrawArgs, StakeResponse, UpdateStakeVaultStatusArgs, ClaimStakeRewardsArgs, StakeTokenArgs } from './types/stake';
+import { DepositStakeRewardsArgs, InitializeStakeArgs, StakeNftArgs, RequestWithdrawArgs, WithdrawArgs, StakeResponse, UpdateStakeVaultStatusArgs, ClaimStakeRewardsArgs, StakeTokenArgs, UpdateBoostArgs } from './types/stake';
 export default class Stake {
     program: Program<TriadProtocol>;
     provider: AnchorProvider;
@@ -38,19 +38,7 @@ export default class Stake {
         onchainId: string;
         name: string;
         rarityRankHrtt: number;
-    }[]): Promise<{
-        available: number;
-        name: string;
-        stakeVault: string;
-        authority: string;
-        initTs: number;
-        withdrawTs: number;
-        mint: string;
-        claimedTs: number;
-        boost: boolean;
-        claimed: number;
-        amount: number;
-    }[]>;
+    }[]): Promise<StakeResponse[]>;
     /**
      * Get Stakes by day
      * @param stakeVault - Stake Vault name
@@ -115,7 +103,7 @@ export default class Stake {
      *  @param week - Current week rewards (Starts from 0)
      *
      */
-    updateStakeVaultStatus({ wallet, isLocked, stakeVault, initTs }: UpdateStakeVaultStatusArgs, options?: RpcOptions): Promise<string>;
+    updateStakeVaultStatus({ wallet, isLocked, stakeVault }: UpdateStakeVaultStatusArgs, options?: RpcOptions): Promise<string>;
     /**
      *  Claim Stake Rewards
      *  @param wallet - User wallet
@@ -125,4 +113,12 @@ export default class Stake {
      *
      */
     claimStakeRewards({ wallet, stakeVault, nftName, collections, rank }: ClaimStakeRewardsArgs, options?: RpcOptions): Promise<import("@solana/web3.js").Transaction>;
+    /**
+     *  Update Stake Boost
+     *  @param wallet - User wallet
+     *  @param nftName - Name of the nft
+     *  @param boost - Boost value
+     *
+     */
+    updateBoost({ wallet, nfts, boost }: UpdateBoostArgs, options?: RpcOptions): Promise<string>;
 }

package/dist/stake.js

@@ -92,24 +92,25 @@ class Stake {
     getStakeByWallet(wallet, stakeVault, collections, ranks) {
         return __awaiter(this, void 0, void 0, function* () {
             const response = yield this.getStakes(stakeVault);
-            const stakePromises = response
-                .filter((item) => item.authority === wallet.toBase58())
-                .map((nft) => __awaiter(this, void 0, void 0, function* () {
-                const getRank = (0, getRarity_1.getRarityRank)(ranks, nft.mint, nft.name);
+            const data = [];
+            for (const stake of response) {
+                const getRank = (0, getRarity_1.getRarityRank)(ranks, stake.mint, stake.name);
                 let available = 0;
                 try {
                     available = yield this.getStakeRewards({
                         wallet,
-                        nftName: nft.name,
+                        nftName: stake.name,
                         stakeVault,
                         rank: getRank,
                         collections
                     });
                 }
-                catch (error) { }
-                return Object.assign(Object.assign({}, nft), { available });
-            }));
-            return Promise.all(stakePromises);
+                catch (error) {
+                    console.log(error);
+                }
+                data.push(Object.assign(Object.assign({}, stake), { available }));
+            }
+            return data;
         });
     }
     /**
@@ -254,7 +255,9 @@ class Stake {
      */
     depositStakeRewards({ wallet, mint, amount, stakeVault }, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            const StakeVaultPDA = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, stakeVault);
             const FromAta = (0, helpers_1.getATASync)(wallet, mint);
+            const ToAta = (0, helpers_1.getATASync)(StakeVaultPDA, mint);
             const method = this.program.methods
                 .depositStakeRewards({
                 amount,
@@ -263,7 +266,8 @@ class Stake {
                 .accounts({
                 signer: wallet,
                 fromAta: FromAta,
-                mint: mint
+                mint: mint,
+                toAta: ToAta
             });
             if (options === null || options === void 0 ? void 0 : options.microLamports) {
                 method.postInstructions([
@@ -347,15 +351,11 @@ class Stake {
      *  @param week - Current week rewards (Starts from 0)
      *
      */
-    updateStakeVaultStatus({ wallet, isLocked, stakeVault, initTs }, options) {
+    updateStakeVaultStatus({ wallet, isLocked, stakeVault }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const StakeVault = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, stakeVault);
             const method = this.program.methods
-                .updateStakeVaultStatus({
-                isLocked,
-                initTs: new anchor_1.BN(initTs),
-                slots: new anchor_1.BN(1839)
-            })
+                .updateStakeVaultStatus(isLocked)
                 .accounts({
                 signer: wallet,
                 stakeVault: StakeVault
@@ -409,5 +409,43 @@ class Stake {
             return method.transaction();
         });
     }
+    /**
+     *  Update Stake Boost
+     *  @param wallet - User wallet
+     *  @param nftName - Name of the nft
+     *  @param boost - Boost value
+     *
+     */
+    updateBoost({ wallet, nfts, boost }, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            for (const nft of nfts) {
+                const Stake = (0, helpers_1.getStakeAddressSync)(this.program.programId, new web3_js_1.PublicKey(nft.wallet), nft.name);
+                ixs.push(yield this.program.methods
+                    .updateStakeBoost(boost)
+                    .accounts({
+                    signer: wallet,
+                    stake: Stake
+                })
+                    .instruction());
+            }
+            if (options === null || options === void 0 ? void 0 : options.microLamports) {
+                ixs.push(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
+                    microLamports: options.microLamports
+                }));
+            }
+            const { blockhash } = yield this.provider.connection.getLatestBlockhash();
+            const messageV0 = 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, [], {
+                skipPreflight: options === null || options === void 0 ? void 0 : options.skipPreflight,
+                commitment: 'confirmed'
+            });
+        });
+    }
 }
 exports.default = Stake;

package/dist/test.js

@@ -19,6 +19,7 @@ const anchor_1 = require("@coral-xyz/anchor");
 const constants_1 = require("./utils/constants");
 const rarity_json_1 = __importDefault(require("./utils/stake-season-1/rarity.json"));
 const getRarity_1 = require("./utils/getRarity");
+const axios_1 = __importDefault(require("axios"));
 const file = fs_1.default.readFileSync('/Users/dannpl/.config/solana/id.json');
 const rpc_file = fs_1.default.readFileSync('/Users/dannpl/.config/solana/rpc.txt');
 const keypair = web3_js_1.Keypair.fromSecretKey(new Uint8Array(JSON.parse(file.toString())));
@@ -49,4 +50,38 @@ const getStake = () => __awaiter(void 0, void 0, void 0, function* () {
     console.log(items);
     console.log(response.length);
 });
-getStake();
+const deposit = () => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield triadProtocol.stake.depositStakeRewards({
+        wallet: wallet.publicKey,
+        stakeVault: constants_1.STAKE_SEASON,
+        mint: new web3_js_1.PublicKey(constants_1.TTRIAD_MINT),
+        amount: new anchor_1.BN(192388 * Math.pow(10, 6))
+    });
+    console.log(response);
+});
+const getStakeVault = () => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield triadProtocol.stake.getStakeVaultByName(constants_1.STAKE_SEASON);
+    console.log(response);
+});
+const getStakeaa = () => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield triadProtocol.stake.getStakeByWallet(new web3_js_1.PublicKey('HjJQdfTHgC3EBX3471w4st8BXbBmtbaMyCAXNgcUb7dq'), constants_1.STAKE_SEASON, 1, rarity_json_1.default);
+    console.log(response);
+});
+const updateBoost = () => __awaiter(void 0, void 0, void 0, function* () {
+    const response = (yield axios_1.default.get('https://api.triadfi.co/boost'))
+        .data;
+    const stakes = yield triadProtocol.stake.getStakes(constants_1.STAKE_SEASON);
+    const update = [];
+    for (const stake of stakes) {
+        if (response.includes(stake.mint) && !stake.boost) {
+            update.push({ name: stake.name, wallet: stake.authority });
+        }
+    }
+    const updateBoost = yield triadProtocol.stake.updateBoost({
+        wallet: wallet.publicKey,
+        stakeVault: constants_1.STAKE_SEASON,
+        nfts: update,
+        boost: true
+    });
+    console.log(updateBoost);
+});

package/dist/types/idl_triad_protocol.json

@@ -801,6 +801,31 @@
             ],
             "args": []
         },
+        {
+            "name": "update_stake_boost",
+            "discriminator": [239, 85, 19, 140, 235, 236, 88, 70],
+            "accounts": [
+                {
+                    "name": "signer",
+                    "writable": true,
+                    "signer": true
+                },
+                {
+                    "name": "stake",
+                    "writable": true
+                },
+                {
+                    "name": "system_program",
+                    "address": "11111111111111111111111111111111"
+                }
+            ],
+            "args": [
+                {
+                    "name": "boost",
+                    "type": "bool"
+                }
+            ]
+        },
         {
             "name": "update_stake_vault_status",
             "discriminator": [71, 64, 188, 150, 86, 254, 221, 65],
@@ -821,12 +846,8 @@
             ],
             "args": [
                 {
-                    "name": "args",
-                    "type": {
-                        "defined": {
-                            "name": "UpdateStakeVaultStatusArgs"
-                        }
-                    }
+                    "name": "is_locked",
+                    "type": "bool"
                 }
             ]
         },
@@ -1095,6 +1116,11 @@
             "code": 6022,
             "name": "InsufficientFunds",
             "msg": "Insufficient funds"
+        },
+        {
+            "code": 6023,
+            "name": "NoRewardsAvailable",
+            "msg": "No rewards available"
         }
     ],
     "types": [
@@ -1540,26 +1566,6 @@
                 ]
             }
         },
-        {
-            "name": "UpdateStakeVaultStatusArgs",
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "is_locked",
-                        "type": "bool"
-                    },
-                    {
-                        "name": "init_ts",
-                        "type": "i64"
-                    },
-                    {
-                        "name": "slots",
-                        "type": "u64"
-                    }
-                ]
-            }
-        },
         {
             "name": "UpdateTickerPriceArgs",
             "type": {

package/dist/types/stake.d.ts

@@ -51,7 +51,6 @@ export type UpdateStakeVaultStatusArgs = {
     wallet: PublicKey;
     isLocked: boolean;
     stakeVault: string;
-    initTs: number;
 };
 export type ClaimStakeRewardsArgs = {
     wallet: PublicKey;
@@ -60,6 +59,15 @@ export type ClaimStakeRewardsArgs = {
     collections: number;
     rank: number;
 };
+export type UpdateBoostArgs = {
+    wallet: PublicKey;
+    stakeVault: string;
+    nfts: {
+        name: string;
+        wallet: string;
+    }[];
+    boost: boolean;
+};
 export type UpdateStakeRewardsArgs = {
     day: number;
     wallet: PublicKey;

package/dist/types/triad_protocol.d.ts

@@ -741,6 +741,31 @@ export type TriadProtocol = {
             ];
             args: [];
         },
+        {
+            name: 'updateStakeBoost';
+            discriminator: [239, 85, 19, 140, 235, 236, 88, 70];
+            accounts: [
+                {
+                    name: 'signer';
+                    writable: true;
+                    signer: true;
+                },
+                {
+                    name: 'stake';
+                    writable: true;
+                },
+                {
+                    name: 'systemProgram';
+                    address: '11111111111111111111111111111111';
+                }
+            ];
+            args: [
+                {
+                    name: 'boost';
+                    type: 'bool';
+                }
+            ];
+        },
         {
             name: 'updateStakeVaultStatus';
             discriminator: [71, 64, 188, 150, 86, 254, 221, 65];
@@ -761,12 +786,8 @@ export type TriadProtocol = {
             ];
             args: [
                 {
-                    name: 'args';
-                    type: {
-                        defined: {
-                            name: 'updateStakeVaultStatusArgs';
-                        };
-                    };
+                    name: 'isLocked';
+                    type: 'bool';
                 }
             ];
         },
@@ -1007,6 +1028,11 @@ export type TriadProtocol = {
             code: 6022;
             name: 'insufficientFunds';
             msg: 'Insufficient funds';
+        },
+        {
+            code: 6023;
+            name: 'noRewardsAvailable';
+            msg: 'No rewards available';
         }
     ];
     types: [
@@ -1452,26 +1478,6 @@ export type TriadProtocol = {
                 ];
             };
         },
-        {
-            name: 'updateStakeVaultStatusArgs';
-            type: {
-                kind: 'struct';
-                fields: [
-                    {
-                        name: 'isLocked';
-                        type: 'bool';
-                    },
-                    {
-                        name: 'initTs';
-                        type: 'i64';
-                    },
-                    {
-                        name: 'slots';
-                        type: 'u64';
-                    }
-                ];
-            };
-        },
         {
             name: 'updateTickerPriceArgs';
             type: {

package/package.json

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