@triadxyz/triad-protocol 0.1.6-beta → 0.1.8-beta

package/dist/index.js

@@ -66,13 +66,11 @@ class TriadProtocolClient {
          *
          */
         this.createUser = ({ wallet, name, referral }, options) => {
-            let referralPDA = (0, helpers_1.getUserAddressSync)(this.program.programId, name);
-            if (referral) {
-                referralPDA = (0, helpers_1.getUserAddressSync)(this.program.programId, referral);
-            }
+            const referralPDA = (0, helpers_1.getUserAddressSync)(this.program.programId, referral);
             const method = this.program.methods
                 .createUser({
-                name
+                name,
+                referral: referralPDA
             })
                 .accounts({
                 signer: wallet,

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;
@@ -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];
         });
     }
     /**
@@ -350,7 +345,7 @@ class Stake {
             const Stake = (0, helpers_1.getStakeAddressSync)(this.program.programId, wallet, nftName);
             const ToATA = (0, helpers_1.getATASync)(wallet, mint);
             const FromAta = (0, helpers_1.getATASync)(StakeVault, mint);
-            const method = this.program.methods.claimStakeRewards().accounts({
+            const method = this.program.methods.claimStake().accounts({
                 signer: wallet,
                 fromAta: FromAta,
                 toAta: ToATA,
@@ -368,37 +363,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,18 +23,6 @@ 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,
@@ -47,36 +35,12 @@ 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);
-});
 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',
@@ -93,20 +57,12 @@ 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

@@ -7,8 +7,8 @@
     },
     "instructions": [
         {
-            "name": "claim_stake_rewards",
-            "discriminator": [107, 91, 233, 196, 211, 47, 218, 21],
+            "name": "claim_stake",
+            "discriminator": [62, 145, 133, 242, 244, 59, 53, 139],
             "accounts": [
                 {
                     "name": "signer",
@@ -1205,6 +1205,10 @@
                     {
                         "name": "name",
                         "type": "string"
+                    },
+                    {
+                        "name": "referral",
+                        "type": "pubkey"
                     }
                 ]
             }

package/dist/types/stake.d.ts

@@ -9,9 +9,11 @@ export type StakeNftArgs = {
 };
 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

@@ -13,8 +13,8 @@ export type TriadProtocol = {
     };
     instructions: [
         {
-            name: 'claimStakeRewards';
-            discriminator: [107, 91, 233, 196, 211, 47, 218, 21];
+            name: 'claimStake';
+            discriminator: [62, 145, 133, 242, 244, 59, 53, 139];
             accounts: [
                 {
                     name: 'signer';
@@ -1117,6 +1117,10 @@ export type TriadProtocol = {
                     {
                         name: 'name';
                         type: 'string';
+                    },
+                    {
+                        name: 'referral';
+                        type: 'pubkey';
                     }
                 ];
             };

package/package.json

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