@triadxyz/triad-protocol 0.0.6-beta → 0.0.8-beta

package/dist/stake.d.ts

@@ -56,7 +56,7 @@ export default class Stake {
      *  @param rarity - NFT rarity
      *
      */
-    stake({ name, wallet, mint, collections, rarity, stakeVault }: StakeArgs, options?: RpcOptions): Promise<string>;
+    stakeNft({ name, wallet, mint, collections, rarity, stakeVault }: StakeArgs, options?: RpcOptions): Promise<string>;
     /**
      *  Initialize Stake Vault
      *  @param name - The ticker's name
@@ -82,14 +82,14 @@ export default class Stake {
      */
     requestWithdraw({ wallet, nftName, mint, stakeVault }: RequestWithdrawArgs, options?: RpcOptions): Promise<string>;
     /**
-     *  Withdraw NFT
+     *  Withdraw Stake
      *  @param wallet - User wallet
-     *  @param nftName - NFT name
+     *  @param nftName - Stake name
      *  @param mint - NFT mint
      *  @param stakeVault - Name of the stake vault
      *
      */
-    withdraw({ wallet, nftName, mint, stakeVault }: WithdrawArgs, options?: RpcOptions): Promise<string>;
+    withdrawStake({ wallet, nftName, mint, stakeVault }: WithdrawArgs, options?: RpcOptions): Promise<string>;
     /**
      *  Update Stake Vault Status
      *  @param wallet - User wallet

package/dist/stake.js

@@ -74,21 +74,24 @@ class Stake {
                         .reduce((a, b) => a + b, 0);
                     let allRewards = stake.dailyRewards.reduce((a, b) => a + b);
                     stake.rewardsToClaim = 0;
-                    stake.dailyRewards.forEach((item, index) => {
-                        let week = 0;
-                        let limit = 6;
+                    let index = 0;
+                    let week = 0;
+                    let limit = 7;
+                    for (const item of stake.dailyRewards) {
                         if (!stake.weeklyRewardsPaid[week]) {
                             stake.rewardsToClaim += item;
                         }
                         if (index === limit) {
                             limit += 6;
-                            week + 1;
+                            week += 1;
                         }
-                    });
+                        index++;
+                    }
                     stake.weeklyRewards = rewards;
                     stake.allRewards = allRewards;
                 }
                 catch (error) {
+                    console.log(error);
                     stake.apr = 0;
                     stake.dailyRewards = [];
                     stake.weeklyRewardsPaid = [];
@@ -154,11 +157,9 @@ class Stake {
      *  @param rarity - NFT rarity
      *
      */
-    stake({ name, wallet, mint, collections, rarity, stakeVault }, options) {
+    stakeNft({ name, wallet, mint, collections, rarity, stakeVault }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const FromAta = (0, helpers_1.getATASync)(wallet, mint);
-            const StakeVault = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, stakeVault);
-            const ToAta = (0, helpers_1.getATASync)(StakeVault, mint);
             let items = [];
             Object.keys(collections).forEach((key) => {
                 if (collections[key]) {
@@ -166,7 +167,7 @@ class Stake {
                 }
             });
             const method = this.program.methods
-                .stake({
+                .stakeNft({
                 name,
                 collections: items,
                 rarity,
@@ -175,7 +176,6 @@ class Stake {
                 .accounts({
                 signer: wallet,
                 fromAta: FromAta,
-                toAta: ToAta,
                 mint: mint
             });
             if (options === null || options === void 0 ? void 0 : options.microLamports) {
@@ -227,8 +227,6 @@ class Stake {
     depositStakeRewards({ wallet, mint, amount, stakeVault }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const FromAta = (0, helpers_1.getATASync)(wallet, mint);
-            const StakeVault = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, stakeVault);
-            const ToAta = (0, helpers_1.getATASync)(StakeVault, mint);
             const method = this.program.methods
                 .depositStakeRewards({
                 amount,
@@ -237,7 +235,6 @@ class Stake {
                 .accounts({
                 signer: wallet,
                 fromAta: FromAta,
-                toAta: ToAta,
                 mint: mint
             });
             if (options === null || options === void 0 ? void 0 : options.microLamports) {
@@ -259,14 +256,13 @@ class Stake {
      */
     requestWithdraw({ wallet, nftName, mint, stakeVault }, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const method = this.program.methods
-                .requestWithdrawNft({
-                nftName,
-                stakeVault
-            })
-                .accounts({
+            const stakeVaultPDA = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, stakeVault);
+            const stakePDA = (0, helpers_1.getStakeAddressSync)(this.program.programId, nftName);
+            const method = this.program.methods.requestWithdrawStake().accounts({
                 signer: wallet,
-                mint: mint
+                mint: mint,
+                stake: stakePDA,
+                stakeVault: stakeVaultPDA
             });
             if (options === null || options === void 0 ? void 0 : options.microLamports) {
                 method.postInstructions([
@@ -279,30 +275,25 @@ class Stake {
         });
     }
     /**
-     *  Withdraw NFT
+     *  Withdraw Stake
      *  @param wallet - User wallet
-     *  @param nftName - NFT name
+     *  @param nftName - Stake name
      *  @param mint - NFT mint
      *  @param stakeVault - Name of the stake vault
      *
      */
-    withdraw({ wallet, nftName, mint, stakeVault }, options) {
+    withdrawStake({ wallet, nftName, mint, stakeVault }, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const StakeVault = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, stakeVault);
-            const FromAta = (0, helpers_1.getATASync)(StakeVault, mint);
-            const ToAta = (0, helpers_1.getATASync)(wallet, mint);
-            const Stake = (0, helpers_1.getStakeAddressSync)(this.program.programId, nftName);
-            const NFTRewards = (0, helpers_1.getNFTRewardsAddressSync)(this.program.programId, Stake);
-            const method = this.program.methods
-                .withdrawNft({
-                nftName,
-                stakeVault
-            })
-                .accounts({
+            const stakeVaultPDA = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, stakeVault);
+            const FromAta = (0, helpers_1.getATASync)(stakeVaultPDA, mint);
+            const stakePDA = (0, helpers_1.getStakeAddressSync)(this.program.programId, nftName);
+            const NFTRewards = (0, helpers_1.getNFTRewardsAddressSync)(this.program.programId, stakePDA);
+            const method = this.program.methods.withdrawStake().accounts({
                 signer: wallet,
                 fromAta: FromAta,
-                toAta: ToAta,
                 nftRewards: NFTRewards,
+                stake: stakePDA,
+                stakeVault: stakeVaultPDA,
                 admin: new web3_js_1.PublicKey('82ppCojm3yrEKgdpH8B5AmBJTU1r1uAWXFWhxvPs9UCR'),
                 mint: mint
             });
@@ -407,7 +398,6 @@ class Stake {
             const Stake = (0, helpers_1.getStakeAddressSync)(this.program.programId, nftName);
             const NFTRewards = (0, helpers_1.getNFTRewardsAddressSync)(this.program.programId, Stake);
             const FromAta = (0, helpers_1.getATASync)(StakeVault, mint);
-            const ToAta = (0, helpers_1.getATASync)(wallet, mint);
             let ixs = [];
             for (let w of week) {
                 ixs.push(yield this.program.methods
@@ -417,7 +407,6 @@ class Stake {
                     .accounts({
                     signer: wallet,
                     fromAta: FromAta,
-                    toAta: ToAta,
                     mint: mint,
                     nftRewards: NFTRewards,
                     stake: Stake,

package/dist/test.js

@@ -17,66 +17,12 @@ const web3_js_1 = require("@solana/web3.js");
 const index_1 = __importDefault(require("./index"));
 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 users_collections_week_1_json_1 = __importDefault(require("./utils/stake-season-1/users-collections-week-1.json"));
-const helpers_1 = require("./utils/helpers");
 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())));
 const connection = new web3_js_1.Connection(rpc_file.toString(), 'confirmed');
 const wallet = new anchor_1.Wallet(keypair);
 const triadProtocol = new index_1.default(connection, wallet);
-const populateStakeDay = () => __awaiter(void 0, void 0, void 0, function* () {
-    const { perDay } = yield triadProtocol.stake.getStakeVaultRewards(constants_1.STAKE_SEASON_1);
-    const day = 1720360651;
-    const stakes = yield triadProtocol.stake.getStakesByDay(constants_1.STAKE_SEASON_1, day);
-    const newItems = [];
-    const itemsByAuthority = stakes.reduce((acc, item) => {
-        const itemRarity = rarity_json_1.default.find((rarity) => rarity.onchainId === item.mint);
-        if (!itemRarity) {
-            return acc;
-        }
-        if (item.withdrawTs !== 0 && item.withdrawTs < 1720441379) {
-            return acc;
-        }
-        if (!acc[item.authority]) {
-            acc[item.authority] = [];
-        }
-        acc[item.authority].push(Object.assign(Object.assign({}, item), { rarity: itemRarity.rarity, rarityRankHrtt: itemRarity.rarityRankHrtt, collections: {} }));
-        return acc;
-    }, {});
-    Object.keys(itemsByAuthority).forEach((authority) => {
-        const items = itemsByAuthority[authority];
-        items.sort((a, b) => a.rarityRankHrtt - b.rarityRankHrtt);
-        items.forEach((item, index) => {
-            var _a;
-            const collections = (_a = users_collections_week_1_json_1.default[item.authority]) !== null && _a !== void 0 ? _a : {};
-            const items = [];
-            Object.keys(collections).forEach((collection) => {
-                if (collections[collection]) {
-                    items.push(collection);
-                }
-            });
-            let totalMultiplier = (0, helpers_1.calculateTotalMultiplier)(index === 0 ? items.map((item) => item.toUpperCase()) : [], {
-                max: 1839,
-                currentPosition: item.rarityRankHrtt
-            });
-            newItems.push(Object.assign(Object.assign({}, item), { totalMultiplier, collections: index === 0 ? collections[0] : {} }));
-        });
-    });
-    const totalMultiplierSum = newItems.reduce((sum, user) => sum + user.totalMultiplier, 0);
-    const rewards = newItems.map((item) => {
-        const rewards = (item.totalMultiplier / totalMultiplierSum) * perDay;
-        return Object.assign(Object.assign({}, item), { rewards, apr: (0, helpers_1.calculateAPR)({
-                rewards,
-                rate: 7,
-                amount: 1,
-                baseRewards: perDay
-            }) });
-    });
-    const orderedRewards = rewards.sort((a, b) => b.rewards - a.rewards);
-    fs_1.default.writeFileSync(`./src/utils/stake-season-1/stakes/2/${day}.json`, JSON.stringify(orderedRewards, null, 2));
-});
 const requestWithdraw = () => __awaiter(void 0, void 0, void 0, function* () {
     const response = yield triadProtocol.stake.requestWithdraw({
         wallet: wallet.publicKey,
@@ -93,8 +39,8 @@ const updateStakeVaultStatus = () => __awaiter(void 0, void 0, void 0, function*
     const response = yield triadProtocol.stake.updateStakeVaultStatus({
         wallet: wallet.publicKey,
         isLocked: true,
-        week: 1,
-        stakeVault: constants_1.STAKE_SEASON_1
+        week: 4,
+        stakeVault: constants_1.STAKE_SEASON
     }, {
         skipPreflight: true,
         microLamports: 10000
@@ -102,7 +48,7 @@ const updateStakeVaultStatus = () => __awaiter(void 0, void 0, void 0, function*
     console.log(response);
 });
 const withdraw = () => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield triadProtocol.stake.withdraw({
+    const response = yield triadProtocol.stake.withdrawStake({
         wallet: wallet.publicKey,
         nftName: 'Triad 0',
         mint: new web3_js_1.PublicKey('FXRhaGeYue7bMCwcksNw4hJRY7jZ1YMwgmCu1Y8fyUNd'),
@@ -114,26 +60,27 @@ const withdraw = () => __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('E48CKgbZVpDzerQ7DdommgqNobRHLqHy8RUVi8HXkSHE'), constants_1.STAKE_SEASON_1);
+    const response = yield triadProtocol.stake.getStakeByWallet(new web3_js_1.PublicKey('E48CKgbZVpDzerQ7DdommgqNobRHLqHy8RUVi8HXkSHE'), constants_1.STAKE_SEASON);
     const stakeVaults = yield triadProtocol.stake.getStakeVaults();
     console.log(response);
     console.log(stakeVaults);
 });
-const claimStakeRewards = () => __awaiter(void 0, void 0, void 0, function* () {
+const claimStakeRewardsV1 = () => __awaiter(void 0, void 0, void 0, function* () {
     const response = yield triadProtocol.stake.claimStakeRewards({
         wallet: wallet.publicKey,
-        mint: new web3_js_1.PublicKey(''),
-        week: [],
-        stakeVault: constants_1.STAKE_SEASON_1,
-        nftName: ''
+        mint: new web3_js_1.PublicKey('t3DohmswhKk94PPbPYwA6ZKACyY3y5kbcqeQerAJjmV'),
+        week: [4],
+        stakeVault: constants_1.STAKE_SEASON,
+        nftName: 'Triad 2807'
     }, {
         skipPreflight: true,
         microLamports: 10000
     });
     console.log(response);
 });
-const getStakes = () => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield triadProtocol.stake.getStakes(constants_1.STAKE_SEASON_1);
+claimStakeRewardsV1();
+const getStakers = () => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield triadProtocol.stake.getStakes(constants_1.STAKE_SEASON);
     console.log(JSON.stringify(response, null, 2));
     const users = response
         .filter((item, index, self) => index === self.findIndex((t) => t.authority === item.authority))
@@ -141,7 +88,7 @@ const getStakes = () => __awaiter(void 0, void 0, void 0, function* () {
     fs_1.default.writeFileSync('./src/utils/stake-season-1/users.json', JSON.stringify(users, null, 2));
 });
 const stake = () => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield triadProtocol.stake.stake({
+    const response = yield triadProtocol.stake.stakeNft({
         name: 'Triad 0',
         wallet: wallet.publicKey,
         stakeVault: 'Rev 1',
@@ -159,51 +106,3 @@ const stake = () => __awaiter(void 0, void 0, void 0, function* () {
     });
     console.log(response);
 });
-const updateStakeRewards = () => __awaiter(void 0, void 0, void 0, function* () {
-    const day = null;
-    const ts = null;
-    let file = fs_1.default.readFileSync(`./src/utils/stake-season-1/stakes/2/${ts}.json`);
-    const data = JSON.parse(file.toString());
-    const chunkLengths = 10;
-    const chunks = [];
-    for (let i = 0; i < data.length; i += chunkLengths) {
-        chunks.push(data.slice(i, i + chunkLengths));
-    }
-    console.log(chunks.length);
-    const failedChunks = [];
-    for (let i = 0; i < chunks.length; i++) {
-        const chunk = chunks[i];
-        const items = [];
-        console.log(`Processing chunk ${i + 1} of ${chunks.length}`);
-        for (let j = 0; j < chunk.length; j++) {
-            const item = chunk[j];
-            items.push({
-                rewards: new anchor_1.BN(item.rewards * Math.pow(10, constants_1.TTRIAD_DECIMALS)),
-                apr: item.apr,
-                nftName: item.name
-            });
-        }
-        try {
-            const rewards = yield triadProtocol.stake.updateStakeRewards({
-                day,
-                wallet: wallet.publicKey,
-                items: items
-            }, {
-                skipPreflight: false,
-                microLamports: 20000
-            });
-            console.log(rewards);
-        }
-        catch (error) {
-            console.error(`Failed to update stake rewards for chunk ${i}:`, error);
-            failedChunks.push(chunk);
-        }
-    }
-    if (failedChunks.length > 0) {
-        fs_1.default.writeFileSync(`./src/utils/stake-season-1/stakes/2/failedChunks_${ts}.json`, JSON.stringify(failedChunks, null, 2));
-        console.log(`Failed chunks saved to ./src/utils/stake-season-1/stakes/2/failedChunks_${ts}.json`);
-    }
-});
-triadProtocol.stake
-    .getStakeByWallet(new web3_js_1.PublicKey('E48CKgbZVpDzerQ7DdommgqNobRHLqHy8RUVi8HXkSHE'), constants_1.STAKE_SEASON_1)
-    .then(console.log);