@triadxyz/triad-protocol 0.0.2-beta → 0.0.4-beta

package/dist/stake.d.ts

@@ -114,10 +114,9 @@ export default class Stake {
      *  @param wallet - User wallet
      *  @param mint - NFT mint
      *  @param week - Week rewards
-     *  @param amount - Reward amount
      *  @param stakeVault - Name of the stake vault
      *  @param nftName - Name of the nft
      *
      */
-    claimStakeRewards({ wallet, mint, week, stakeVault, nftName }: ClaimStakeRewardsArgs, options?: RpcOptions): Promise<string>;
+    claimStakeRewards({ wallet, mint, week, stakeVault, nftName }: ClaimStakeRewardsArgs, options?: RpcOptions): Promise<any>;
 }

package/dist/stake.js

@@ -275,6 +275,8 @@ class Stake {
             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,
@@ -284,6 +286,7 @@ class Stake {
                 signer: wallet,
                 fromAta: FromAta,
                 toAta: ToAta,
+                nftRewards: NFTRewards,
                 admin: new web3_js_1.PublicKey('82ppCojm3yrEKgdpH8B5AmBJTU1r1uAWXFWhxvPs9UCR'),
                 mint: mint
             });
@@ -368,7 +371,8 @@ class Stake {
             }).compileToV0Message();
             const tx = new web3_js_1.VersionedTransaction(messageV0);
             return this.provider.sendAndConfirm(tx, [], {
-                skipPreflight: options === null || options === void 0 ? void 0 : options.skipPreflight
+                skipPreflight: options === null || options === void 0 ? void 0 : options.skipPreflight,
+                commitment: 'confirmed'
             });
         });
     }
@@ -377,7 +381,6 @@ class Stake {
      *  @param wallet - User wallet
      *  @param mint - NFT mint
      *  @param week - Week rewards
-     *  @param amount - Reward amount
      *  @param stakeVault - Name of the stake vault
      *  @param nftName - Name of the nft
      *
@@ -389,19 +392,22 @@ class Stake {
             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);
-            const method = this.program.methods
-                .claimStakeRewards({
-                week
-            })
-                .accounts({
-                signer: wallet,
-                fromAta: FromAta,
-                toAta: ToAta,
-                mint: mint,
-                nftRewards: NFTRewards,
-                stake: Stake,
-                stakeVault: StakeVault
-            });
+            let method;
+            for (let w of week) {
+                method = this.program.methods
+                    .claimStakeRewards({
+                    week: w
+                })
+                    .accounts({
+                    signer: wallet,
+                    fromAta: FromAta,
+                    toAta: ToAta,
+                    mint: mint,
+                    nftRewards: NFTRewards,
+                    stake: Stake,
+                    stakeVault: StakeVault
+                });
+            }
             if (options === null || options === void 0 ? void 0 : options.microLamports) {
                 method.postInstructions([
                     web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({

package/dist/test.js

@@ -28,7 +28,7 @@ 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 = 1719755851;
+    const day = 1720360651;
     const stakes = yield triadProtocol.stake.getStakesByDay(constants_1.STAKE_SEASON_1, day);
     const newItems = [];
     const itemsByAuthority = stakes.reduce((acc, item) => {
@@ -36,6 +36,9 @@ const populateStakeDay = () => __awaiter(void 0, void 0, void 0, function* () {
         if (!itemRarity) {
             return acc;
         }
+        if (item.withdrawTs !== 0 && item.withdrawTs < 1720441379) {
+            return acc;
+        }
         if (!acc[item.authority]) {
             acc[item.authority] = [];
         }
@@ -46,14 +49,19 @@ const populateStakeDay = () => __awaiter(void 0, void 0, void 0, function* () {
         const items = itemsByAuthority[authority];
         items.sort((a, b) => a.rarityRankHrtt - b.rarityRankHrtt);
         items.forEach((item, index) => {
-            const collections = Object.values(users_collections_week_1_json_1.default.find((collection) => Object.keys(collection)[0] === item.authority))[0];
-            let totalMultiplier = (0, helpers_1.calculateTotalMultiplier)(index === 0
-                ? Object.keys(item.collections).map((x) => x.toUpperCase())
-                : [], {
+            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 : {} }));
+            newItems.push(Object.assign(Object.assign({}, item), { totalMultiplier, collections: index === 0 ? collections[0] : {} }));
         });
     });
     const totalMultiplierSum = newItems.reduce((sum, user) => sum + user.totalMultiplier, 0);
@@ -84,8 +92,8 @@ const requestWithdraw = () => __awaiter(void 0, void 0, void 0, function* () {
 const updateStakeVaultStatus = () => __awaiter(void 0, void 0, void 0, function* () {
     const response = yield triadProtocol.stake.updateStakeVaultStatus({
         wallet: wallet.publicKey,
-        isLocked: false,
-        week: 0,
+        isLocked: true,
+        week: 1,
         stakeVault: constants_1.STAKE_SEASON_1
     }, {
         skipPreflight: true,
@@ -115,7 +123,7 @@ const claimStakeRewards = () => __awaiter(void 0, void 0, void 0, function* () {
     const response = yield triadProtocol.stake.claimStakeRewards({
         wallet: wallet.publicKey,
         mint: new web3_js_1.PublicKey(''),
-        week: 0,
+        week: [],
         stakeVault: constants_1.STAKE_SEASON_1,
         nftName: ''
     }, {
@@ -126,6 +134,7 @@ const claimStakeRewards = () => __awaiter(void 0, void 0, void 0, function* () {
 });
 const getStakes = () => __awaiter(void 0, void 0, void 0, function* () {
     const response = yield triadProtocol.stake.getStakes(constants_1.STAKE_SEASON_1);
+    console.log(JSON.stringify(response, null, 2));
     const users = response
         .filter((item, index, self) => index === self.findIndex((t) => t.authority === item.authority))
         .map((user) => user.authority);
@@ -150,17 +159,48 @@ const stake = () => __awaiter(void 0, void 0, void 0, function* () {
     });
     console.log(response);
 });
-const getWeeklyRewards = () => __awaiter(void 0, void 0, void 0, function* () {
-    let weekly_rewards = 0;
-    const users = fs_1.default.readFileSync('./src/utils/stake-season-1/users.json', 'utf-8');
-    const usersArray = JSON.parse(users);
-    for (let i = 0; i < usersArray.length; i++) {
-        const user = usersArray[i];
-        const stakes = yield triadProtocol.stake.getStakeByWallet(new web3_js_1.PublicKey(user), constants_1.STAKE_SEASON_1);
-        const rewards = stakes.reduce((acc, stake) => {
-            return acc + stake.weeklyRewards;
-        }, 0);
-        weekly_rewards += rewards;
-        console.log(weekly_rewards);
+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`);
     }
 });

package/dist/types/idl_triad_protocol.json

@@ -343,6 +343,31 @@
                 }
             ]
         },
+        {
+            "name": "jupiter_swap",
+            "discriminator": [116, 207, 0, 196, 252, 120, 243, 18],
+            "accounts": [
+                {
+                    "name": "user_account",
+                    "writable": true,
+                    "signer": true
+                },
+                {
+                    "name": "jupiter_program",
+                    "address": "JUP6LkbZbjS1jKKwapdHNy74zcZ3tLUZoi5QNyVTaV4"
+                },
+                {
+                    "name": "system_program",
+                    "address": "11111111111111111111111111111111"
+                }
+            ],
+            "args": [
+                {
+                    "name": "data",
+                    "type": "bytes"
+                }
+            ]
+        },
         {
             "name": "open_position",
             "discriminator": [135, 128, 47, 77, 15, 152, 240, 49],

package/dist/types/stake.d.ts

@@ -53,7 +53,7 @@ export type UpdateStakeVaultStatusArgs = {
 };
 export type ClaimStakeRewardsArgs = {
     wallet: PublicKey;
-    week: number;
+    week: number[];
     mint: PublicKey;
     stakeVault: string;
     nftName: string;

package/dist/types/triad_protocol.d.ts

@@ -378,6 +378,31 @@ export type TriadProtocol = {
                 }
             ];
         },
+        {
+            name: 'jupiterSwap';
+            discriminator: [116, 207, 0, 196, 252, 120, 243, 18];
+            accounts: [
+                {
+                    name: 'userAccount';
+                    writable: true;
+                    signer: true;
+                },
+                {
+                    name: 'jupiterProgram';
+                    address: 'JUP6LkbZbjS1jKKwapdHNy74zcZ3tLUZoi5QNyVTaV4';
+                },
+                {
+                    name: 'systemProgram';
+                    address: '11111111111111111111111111111111';
+                }
+            ];
+            args: [
+                {
+                    name: 'data';
+                    type: 'bytes';
+                }
+            ];
+        },
         {
             name: 'openPosition';
             discriminator: [135, 128, 47, 77, 15, 152, 240, 49];