@triadxyz/triad-protocol 0.1.7-beta → 0.1.9-beta

package/dist/index.js

@@ -73,7 +73,8 @@ class TriadProtocolClient {
                 referral: referralPDA
             })
                 .accounts({
-                signer: wallet
+                signer: wallet,
+                referral: referralPDA
             });
             if (options === null || options === void 0 ? void 0 : options.microLamports) {
                 method.postInstructions([

package/dist/stake.d.ts

@@ -2,7 +2,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, MigrateStakeArgs } from './types/stake';
+import { DepositStakeRewardsArgs, InitializeStakeArgs, StakeNftArgs, RequestWithdrawArgs, WithdrawArgs, StakeResponse, UpdateStakeVaultStatusArgs, ClaimStakeRewardsArgs, StakeTokenArgs } from './types/stake';
 export default class Stake {
     program: Program<TriadProtocol>;
     provider: AnchorProvider;
@@ -49,12 +49,12 @@ export default class Stake {
     getStakesByDay(stakeVault: string, day: number): Promise<StakeResponse[]>;
     /**
      *  Stake NFT
-     *  @param name - NFT name
-     *  @param wallet - User wallet
      *  @param mint - NFT mint
+     *  @param stakeVault - Name of the stake vault
+     *  @param items - NFT items
      *
      */
-    stakeNft({ name, wallet, mint, stakeVault }: StakeNftArgs, options?: RpcOptions): Promise<string>;
+    stakeNft({ wallet, stakeVault, items }: StakeNftArgs, options?: RpcOptions): Promise<string>;
     /**
      *  Stake NFT
      *  @param wallet - User wallet
@@ -115,12 +115,4 @@ export default class Stake {
      *
      */
     claimStakeRewards({ wallet, mint, stakeVault, nftName }: ClaimStakeRewardsArgs, options?: RpcOptions): Promise<string>;
-    /**
-     *  Migrate Stake
-     *  @param name - NFT name
-     *  @param wallet - User wallet
-     *  @param mint - NFT mint
-     *
-     */
-    migrateStake({ name, wallet, mint, stakeVault }: MigrateStakeArgs, options?: RpcOptions): Promise<string>;
 }

package/dist/stake.js

@@ -44,16 +44,11 @@ class Stake {
      */
     getStakes(stakeVault) {
         return __awaiter(this, void 0, void 0, function* () {
-            const response1 = yield this.program.account.stake.all();
             const response = yield this.program.account.stakeV2.all();
             const StakeVault = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, stakeVault);
-            const data = response
+            return response
                 .filter((item) => item.account.stakeVault.toBase58() === StakeVault.toBase58())
                 .map((stake) => (0, helpers_1.formatStake)(stake.account));
-            const data1 = response1
-                .filter((item) => item.account.stakeVault.toBase58() === StakeVault.toBase58())
-                .map((stake) => (0, helpers_1.formatStake)(stake.account));
-            return [...data, ...data1];
         });
     }
     /**
@@ -116,36 +111,48 @@ class Stake {
     }
     /**
      *  Stake NFT
-     *  @param name - NFT name
-     *  @param wallet - User wallet
      *  @param mint - NFT mint
+     *  @param stakeVault - Name of the stake vault
+     *  @param items - NFT items
      *
      */
-    stakeNft({ name, wallet, mint, stakeVault }, options) {
+    stakeNft({ wallet, stakeVault, items }, 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)(wallet, mint);
-            const ToAta = (0, helpers_1.getATASync)(StakeVault, mint);
-            let items = [];
-            const method = this.program.methods
-                .stakeNft({
-                name,
-                stakeVault
-            })
-                .accounts({
-                signer: wallet,
-                toAta: ToAta,
-                fromAta: FromAta,
-                mint: mint
-            });
+            let ixs = [];
+            for (let i = 0; i < items.length; i++) {
+                let item = items[i];
+                const FromAta = (0, helpers_1.getATASync)(wallet, item.mint);
+                const ToAta = (0, helpers_1.getATASync)(StakeVault, item.mint);
+                ixs.push(yield this.program.methods
+                    .stakeNft({
+                    name: item.name,
+                    stakeVault
+                })
+                    .accounts({
+                    signer: wallet,
+                    toAta: ToAta,
+                    fromAta: FromAta,
+                    mint: item.mint
+                })
+                    .instruction());
+            }
             if (options === null || options === void 0 ? void 0 : options.microLamports) {
-                method.postInstructions([
-                    web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
-                        microLamports: options.microLamports
-                    })
-                ]);
+                ixs.push(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
+                    microLamports: options.microLamports
+                }));
             }
-            return method.rpc({ skipPreflight: options === null || options === void 0 ? void 0 : options.skipPreflight });
+            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'
+            });
         });
     }
     /**
@@ -368,37 +375,5 @@ class Stake {
             return method.rpc({ skipPreflight: options === null || options === void 0 ? void 0 : options.skipPreflight });
         });
     }
-    /**
-     *  Migrate Stake
-     *  @param name - NFT name
-     *  @param wallet - User wallet
-     *  @param mint - NFT mint
-     *
-     */
-    migrateStake({ name, wallet, mint, stakeVault }, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const stakeV1 = (0, helpers_1.getStakeV1AddressSync)(this.program.programId, name);
-            const NFTRewards = (0, helpers_1.getNFTRewardsAddressSync)(this.program.programId, stakeV1);
-            const method = this.program.methods
-                .migrateStake({
-                name,
-                stakeVault
-            })
-                .accounts({
-                signer: wallet,
-                stakeV1,
-                nftRewards: NFTRewards,
-                mint: mint
-            });
-            if (options === null || options === void 0 ? void 0 : options.microLamports) {
-                method.postInstructions([
-                    web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
-                        microLamports: options.microLamports
-                    })
-                ]);
-            }
-            return method.rpc({ skipPreflight: options === null || options === void 0 ? void 0 : options.skipPreflight });
-        });
-    }
 }
 exports.default = Stake;

package/dist/test.js

@@ -23,22 +23,10 @@ const keypair = web3_js_1.Keypair.fromSecretKey(new Uint8Array(JSON.parse(file.t
 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 requestWithdraw = () => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield triadProtocol.stake.requestWithdraw({
-        wallet: wallet.publicKey,
-        name: 'Triad 873',
-        mint: new web3_js_1.PublicKey('FnLsRRfs7Ghhiwybr7fzZhFyfQEKQbxCJMtLghjiKLHy'),
-        stakeVault: constants_1.STAKE_SEASON
-    }, {
-        microLamports: 10000,
-        skipPreflight: true
-    });
-    console.log(response);
-});
 const updateStakeVaultStatus = () => __awaiter(void 0, void 0, void 0, function* () {
     const response = yield triadProtocol.stake.updateStakeVaultStatus({
         wallet: wallet.publicKey,
-        isLocked: true,
+        isLocked: false,
         week: 4,
         stakeVault: constants_1.STAKE_SEASON
     }, {
@@ -47,66 +35,23 @@ 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.withdrawStake({
-        wallet: wallet.publicKey,
-        name: 'Triad 2807',
-        mint: new web3_js_1.PublicKey('A4fu2s6bCbKAveVgACkxpMgtJUHqoRJsTyzRp1Jp8nuE'),
-        stakeVault: constants_1.STAKE_SEASON
-    }, {
-        microLamports: 10000,
-        skipPreflight: true
-    });
-    console.log(response);
-});
+updateStakeVaultStatus();
 const getStake = () => __awaiter(void 0, void 0, void 0, function* () {
     const response = yield triadProtocol.stake.getStakeByWallet(new web3_js_1.PublicKey('BCTdjdcjMiECGFbF5Ps15yjLRPzy5YZGJNa4VdGRbhjB'), constants_1.STAKE_SEASON);
     const stakeVaults = yield triadProtocol.stake.getStakeVaults();
     console.log(response);
     console.log(stakeVaults);
 });
-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('t3DohmswhKk94PPbPYwA6ZKACyY3y5kbcqeQerAJjmV'),
-        stakeVault: constants_1.STAKE_SEASON,
-        nftName: 'Triad 2807'
-    }, {
-        skipPreflight: true,
-        microLamports: 10000
-    });
-    console.log(response);
-});
-const stake = () => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield triadProtocol.stake.stakeNft({
-        name: 'Triad 0',
-        wallet: wallet.publicKey,
-        stakeVault: 'Rev 1',
-        mint: new web3_js_1.PublicKey('FXRhaGeYue7bMCwcksNw4hJRY7jZ1YMwgmCu1Y8fyUNd')
-    }, {
-        skipPreflight: true,
-        microLamports: 20000
-    });
-    console.log(response);
-});
 const getUsers = () => __awaiter(void 0, void 0, void 0, function* () {
     const response = yield triadProtocol.getUsers();
     console.log(response);
 });
-const getReferral = () => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield triadProtocol.hasReferral('a');
+const getStakes = () => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield triadProtocol.stake.getStakes(constants_1.STAKE_SEASON);
     console.log(response);
+    fs_1.default.writeFileSync('stakes.json', JSON.stringify(response));
 });
-getReferral();
-const migrateStake = () => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield triadProtocol.stake.migrateStake({
-        wallet: wallet.publicKey,
-        name: 'Triad 2972',
-        mint: new web3_js_1.PublicKey('9vnAPEnSj8EppTRUw6xuFSHLWvdMagKFzxoJujkUFHyg'),
-        stakeVault: constants_1.STAKE_SEASON
-    }, {
-        skipPreflight: true,
-        microLamports: 10000
-    });
+const getReferral = () => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield triadProtocol.hasReferral('a');
     console.log(response);
 });

package/dist/types/idl_triad_protocol.json

@@ -219,6 +219,10 @@
                     "writable": true,
                     "signer": true
                 },
+                {
+                    "name": "referral",
+                    "writable": true
+                },
                 {
                     "name": "user",
                     "writable": true,

package/dist/types/stake.d.ts

@@ -6,12 +6,18 @@ export type StakeNftArgs = {
     wallet: PublicKey;
     stakeVault: string;
     mint: PublicKey;
+    items: {
+        mint: PublicKey;
+        name: string;
+    }[];
 };
 export type MigrateStakeArgs = {
     wallet: PublicKey;
-    name: string;
-    mint: PublicKey;
     stakeVault: string;
+    items: {
+        mint: PublicKey;
+        name: string;
+    }[];
 };
 export type StakeTokenArgs = {
     name: string;

package/dist/types/triad_protocol.d.ts

@@ -214,6 +214,10 @@ export type TriadProtocol = {
                     writable: true;
                     signer: true;
                 },
+                {
+                    name: 'referral';
+                    writable: true;
+                },
                 {
                     name: 'user';
                     writable: true;

package/package.json

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