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

package/dist/stake.d.ts

@@ -114,7 +114,6 @@ 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
      *

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
      *

package/dist/test.js

@@ -84,7 +84,7 @@ 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,
+        isLocked: true,
         week: 0,
         stakeVault: constants_1.STAKE_SEASON_1
     }, {
@@ -150,17 +150,3 @@ 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);
-    }
-});

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/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];

package/package.json

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