@triadxyz/triad-protocol 0.3.3-beta → 0.3.5-beta

package/dist/stake.d.ts

@@ -14,7 +14,7 @@ export default class Stake {
     /**
      * Get Stake Rewards
      */
-    getStakeRewards({ wallet, mint, stakeVault, nftName }: ClaimStakeRewardsArgs): Promise<import("@coral-xyz/anchor/dist/cjs/program/namespace/simulate").SimulateResponse<any, any>>;
+    getStakeRewards({ wallet, stakeVault, nftName, collections, rank }: ClaimStakeRewardsArgs): Promise<number>;
     /**
      * Get Stake Vault by name
      * @param stakeVault - Stake Vault name
@@ -106,5 +106,5 @@ export default class Stake {
      *  @param nftName - Name of the nft
      *
      */
-    claimStakeRewards({ wallet, mint, stakeVault, nftName }: ClaimStakeRewardsArgs, options?: RpcOptions): Promise<string>;
+    claimStakeRewards({ wallet, stakeVault, nftName, collections, rank }: ClaimStakeRewardsArgs, options?: RpcOptions): Promise<string>;
 }

package/dist/stake.js

@@ -13,6 +13,7 @@ const anchor_1 = require("@coral-xyz/anchor");
 const web3_js_1 = require("@solana/web3.js");
 const helpers_1 = require("./utils/helpers");
 const constants_1 = require("./utils/constants");
+const base64_js_1 = require("base64-js");
 class Stake {
     constructor(program, provider) {
         this.provider = provider;
@@ -30,24 +31,30 @@ class Stake {
     /**
      * Get Stake Rewards
      */
-    getStakeRewards({ wallet, mint, stakeVault, nftName }) {
+    getStakeRewards({ wallet, stakeVault, nftName, collections, rank }) {
         return __awaiter(this, void 0, void 0, function* () {
             const StakeVault = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, stakeVault);
+            const mint = new web3_js_1.PublicKey(constants_1.TTRIAD_MINT);
             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()
+            const method = yield this.program.methods
+                .claimStakeRewards({
+                collections,
+                rank
+            })
                 .accounts({
                 signer: wallet,
                 fromAta: FromAta,
                 mint: mint,
                 toAta: ToAta,
                 stake: Stake,
-                stakeVault: StakeVault
+                stakeVault: StakeVault,
+                verifier: new web3_js_1.PublicKey(constants_1.VERIFIER)
             })
                 .simulate();
-            return method;
+            let value = method.raw[method.raw.length - 2].split(' ')[3];
+            return new anchor_1.BN((0, base64_js_1.toByteArray)(value), 'le').toNumber() / Math.pow(10, constants_1.TTRIAD_DECIMALS);
         });
     }
     /**
@@ -353,19 +360,26 @@ class Stake {
      *  @param nftName - Name of the nft
      *
      */
-    claimStakeRewards({ wallet, mint, stakeVault, nftName }, options) {
+    claimStakeRewards({ wallet, stakeVault, nftName, collections, rank }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const StakeVault = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, stakeVault);
+            const mint = new web3_js_1.PublicKey(constants_1.TTRIAD_MINT);
             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({
+            const method = this.program.methods
+                .claimStakeRewards({
+                collections,
+                rank
+            })
+                .accounts({
                 signer: wallet,
                 fromAta: FromAta,
                 mint: mint,
                 toAta: ToAta,
                 stake: Stake,
-                stakeVault: StakeVault
+                stakeVault: StakeVault,
+                verifier: new web3_js_1.PublicKey(constants_1.VERIFIER)
             });
             if (options === null || options === void 0 ? void 0 : options.microLamports) {
                 method.postInstructions([

package/dist/test.js

@@ -36,39 +36,22 @@ 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 = yield triadProtocol.stake.getStakeByWallet(new web3_js_1.PublicKey('HjJQdfTHgC3EBX3471w4st8BXbBmtbaMyCAXNgcUb7dq'), constants_1.STAKE_SEASON);
-    const stakeVaults = yield triadProtocol.stake.getStakeVaults();
+    const response = yield triadProtocol.stake.getStakeByWallet(new web3_js_1.PublicKey('BCTdjdcjMiECGFbF5Ps15yjLRPzy5YZGJNa4VdGRbhjB'), constants_1.STAKE_SEASON);
     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);
-});
-const createUser = () => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield triadProtocol.createUser({
-        wallet: wallet.publicKey,
-        referral: new web3_js_1.PublicKey('5vPF9vByRCUB2pr1oGmJsRPm9WDrH9a2v6iF4pbMiobK'),
-        name: 'Builder'
-    }, {
-        microLamports: 10000
-    });
 });
 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);
+    let sum = 0;
+    const a = yield triadProtocol.stake.getStakeByWallet(new web3_js_1.PublicKey('HjJQdfTHgC3EBX3471w4st8BXbBmtbaMyCAXNgcUb7dq'), constants_1.STAKE_SEASON);
+    for (let i = 0; i < a.length; i++) {
+        const stake = a[i];
+        const response = yield triadProtocol.stake.getStakeRewards({
+            wallet: new web3_js_1.PublicKey('HjJQdfTHgC3EBX3471w4st8BXbBmtbaMyCAXNgcUb7dq'),
+            nftName: stake.name,
+            stakeVault: constants_1.STAKE_SEASON,
+            collections: 5,
+            rank: i
+        });
+        sum += response;
+    }
+    console.log(sum);
 });
-getRewards();

package/dist/types/idl_triad_protocol.json

@@ -16,6 +16,11 @@
                     "writable": true,
                     "signer": true
                 },
+                {
+                    "name": "verifier",
+                    "writable": true,
+                    "signer": true
+                },
                 {
                     "name": "stake_vault",
                     "writable": true
@@ -77,7 +82,16 @@
                     "address": "11111111111111111111111111111111"
                 }
             ],
-            "args": [],
+            "args": [
+                {
+                    "name": "args",
+                    "type": {
+                        "defined": {
+                            "name": "ClaimStakeRewardsArgs"
+                        }
+                    }
+                }
+            ],
             "returns": "u64"
         },
         {
@@ -1084,6 +1098,22 @@
         }
     ],
     "types": [
+        {
+            "name": "ClaimStakeRewardsArgs",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "rank",
+                        "type": "u16"
+                    },
+                    {
+                        "name": "collections",
+                        "type": "u8"
+                    }
+                ]
+            }
+        },
         {
             "name": "ClosePositionArgs",
             "type": {

package/dist/types/stake.d.ts

@@ -55,9 +55,10 @@ export type UpdateStakeVaultStatusArgs = {
 };
 export type ClaimStakeRewardsArgs = {
     wallet: PublicKey;
-    mint: PublicKey;
     stakeVault: string;
     nftName: string;
+    collections: number;
+    rank: number;
 };
 export type UpdateStakeRewardsArgs = {
     day: number;

package/dist/types/triad_protocol.d.ts

@@ -22,6 +22,11 @@ export type TriadProtocol = {
                     writable: true;
                     signer: true;
                 },
+                {
+                    name: 'verifier';
+                    writable: true;
+                    signer: true;
+                },
                 {
                     name: 'stakeVault';
                     writable: true;
@@ -55,7 +60,16 @@ export type TriadProtocol = {
                     address: '11111111111111111111111111111111';
                 }
             ];
-            args: [];
+            args: [
+                {
+                    name: 'args';
+                    type: {
+                        defined: {
+                            name: 'claimStakeRewardsArgs';
+                        };
+                    };
+                }
+            ];
             returns: 'u64';
         },
         {
@@ -996,6 +1010,22 @@ export type TriadProtocol = {
         }
     ];
     types: [
+        {
+            name: 'claimStakeRewardsArgs';
+            type: {
+                kind: 'struct';
+                fields: [
+                    {
+                        name: 'rank';
+                        type: 'u16';
+                    },
+                    {
+                        name: 'collections';
+                        type: 'u8';
+                    }
+                ];
+            };
+        },
         {
             name: 'closePositionArgs';
             type: {

package/dist/utils/constants.d.ts

@@ -1,6 +1,7 @@
 export declare const TRIAD_PROTOCOL_PROGRAM_ID = "TRDwq3BN4mP3m9KsuNUWSN6QDff93VKGSwE95Jbr9Ss";
 export declare const ATA_PROGRAM_ID = "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL";
 export declare const ADMIN = "";
+export declare const VERIFIER = "42n6BHufivUKrb5Bi6tXbMZvM8NHovrDLX1Rt5w2a919";
 export declare const STAKE_SEASON = "Triad Share 1";
 export declare const TTRIAD_DECIMALS = 6;
 export declare const TTRIAD_MINT = "t3DohmswhKk94PPbPYwA6ZKACyY3y5kbcqeQerAJjmV";

package/dist/utils/constants.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RARITY_RANK_SEASON_1 = exports.TTRIAD_FEE = exports.TTRIAD_MINT = exports.TTRIAD_DECIMALS = exports.STAKE_SEASON = exports.ADMIN = exports.ATA_PROGRAM_ID = exports.TRIAD_PROTOCOL_PROGRAM_ID = void 0;
+exports.RARITY_RANK_SEASON_1 = exports.TTRIAD_FEE = exports.TTRIAD_MINT = exports.TTRIAD_DECIMALS = exports.STAKE_SEASON = exports.VERIFIER = exports.ADMIN = exports.ATA_PROGRAM_ID = exports.TRIAD_PROTOCOL_PROGRAM_ID = void 0;
 exports.TRIAD_PROTOCOL_PROGRAM_ID = 'TRDwq3BN4mP3m9KsuNUWSN6QDff93VKGSwE95Jbr9Ss';
 exports.ATA_PROGRAM_ID = 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL';
 exports.ADMIN = '';
+exports.VERIFIER = '42n6BHufivUKrb5Bi6tXbMZvM8NHovrDLX1Rt5w2a919';
 exports.STAKE_SEASON = 'Triad Share 1';
 exports.TTRIAD_DECIMALS = 6;
 exports.TTRIAD_MINT = 't3DohmswhKk94PPbPYwA6ZKACyY3y5kbcqeQerAJjmV';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triadxyz/triad-protocol",
-  "version": "0.3.3-beta",
+  "version": "0.3.5-beta",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -36,6 +36,7 @@
     "@solana/spl-token": "0.4.6",
     "@solana/web3.js": "1.89.1",
     "axios": "^1.5.1",
+    "base64-js": "^1.5.1",
     "bn.js": "^5.2.1",
     "bs58": "5.0.0",
     "uuid": "^9.0.1"