@triadxyz/triad-protocol 0.2.0-beta → 0.2.2-beta

package/dist/index.d.ts

@@ -16,7 +16,11 @@ export default class TriadProtocolClient {
      * Get all Users
      */
     getUsers: () => Promise<import("./types/stake").UserResponse[]>;
-    hasReferral: (referral: string) => Promise<boolean>;
+    /**
+     * Check if user exists
+     * @param username - User name
+     */
+    hasUser: (username: string) => Promise<boolean>;
     getUserPositions: (userWallet: PublicKey) => Promise<{}[]>;
     /**
      *  Create User

package/dist/index.js

@@ -26,11 +26,17 @@ class TriadProtocolClient {
          */
         this.getUsers = () => __awaiter(this, void 0, void 0, function* () {
             const response = yield this.program.account.user.all();
-            return response.map((item) => (0, helpers_1.formatUser)(item.account));
+            return response
+                .map((item) => (0, helpers_1.formatUser)(item.account))
+                .sort((a, b) => b.referred - a.referred);
         });
-        this.hasReferral = (referral) => __awaiter(this, void 0, void 0, function* () {
+        /**
+         * Check if user exists
+         * @param username - User name
+         */
+        this.hasUser = (username) => __awaiter(this, void 0, void 0, function* () {
             try {
-                yield this.program.account.user.fetch((0, helpers_1.getUserAddressSync)(this.program.programId, referral));
+                yield this.program.account.user.fetch((0, helpers_1.getUserAddressSync)(this.program.programId, username));
                 return true;
             }
             catch (_a) {
@@ -69,8 +75,7 @@ class TriadProtocolClient {
             const referralPDA = (0, helpers_1.getUserAddressSync)(this.program.programId, referral);
             const method = this.program.methods
                 .createUser({
-                name,
-                referral: referralPDA
+                name
             })
                 .accounts({
                 signer: wallet,

package/dist/stake.d.ts

@@ -63,7 +63,7 @@ export default class Stake {
      *  @param rarity - NFT rarity
      *
      */
-    stakeToken({ name, wallet, stakeVault, amount }: StakeTokenArgs, options?: RpcOptions): Promise<string>;
+    stakeToken({ name, wallet, stakeVault, amount, userName }: StakeTokenArgs, options?: RpcOptions): Promise<string>;
     /**
      *  Initialize Stake Vault
      *  @param name - The ticker's name
@@ -96,7 +96,7 @@ export default class Stake {
      *  @param stakeVault - Name of the stake vault
      *
      */
-    withdrawStake({ wallet, name, mint, stakeVault }: WithdrawArgs, options?: RpcOptions): Promise<string>;
+    withdrawStake({ wallet, name, mint, userName, stakeVault }: WithdrawArgs, options?: RpcOptions): Promise<string>;
     /**
      *  Update Stake Vault Status
      *  @param wallet - User wallet
@@ -105,7 +105,7 @@ export default class Stake {
      *  @param week - Current week rewards (Starts from 0)
      *
      */
-    updateStakeVaultStatus({ wallet, isLocked, week, stakeVault }: UpdateStakeVaultStatusArgs, options?: RpcOptions): Promise<string>;
+    updateStakeVaultStatus({ wallet, isLocked, stakeVault, initTs }: UpdateStakeVaultStatusArgs, options?: RpcOptions): Promise<string>;
     /**
      *  Claim Stake Rewards
      *  @param wallet - User wallet

package/dist/stake.js

@@ -118,12 +118,10 @@ class Stake {
      */
     stakeNft({ wallet, stakeVault, items }, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const StakeVault = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, stakeVault);
             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,
@@ -131,7 +129,6 @@ class Stake {
                 })
                     .accounts({
                     signer: wallet,
-                    toAta: ToAta,
                     fromAta: FromAta,
                     mint: item.mint
                 })
@@ -163,12 +160,11 @@ class Stake {
      *  @param rarity - NFT rarity
      *
      */
-    stakeToken({ name, wallet, stakeVault, amount }, options) {
+    stakeToken({ name, wallet, stakeVault, amount, userName }, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const StakeVault = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, stakeVault);
             const ttriad = new web3_js_1.PublicKey(constants_1.TTRIAD_MINT);
             const FromAta = (0, helpers_1.getATASync)(wallet, ttriad);
-            const ToAta = (0, helpers_1.getATASync)(StakeVault, ttriad);
+            const userPDA = (0, helpers_1.getUserAddressSync)(this.program.programId, userName);
             const method = this.program.methods
                 .stakeToken({
                 name,
@@ -177,9 +173,9 @@ class Stake {
             })
                 .accounts({
                 signer: wallet,
-                toAta: ToAta,
                 fromAta: FromAta,
-                mint: ttriad
+                mint: ttriad,
+                user: userPDA
             });
             if (options === null || options === void 0 ? void 0 : options.microLamports) {
                 method.postInstructions([
@@ -229,8 +225,6 @@ class Stake {
      */
     depositStakeRewards({ wallet, mint, amount, stakeVault }, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const StakeVault = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, stakeVault);
-            const ToAta = (0, helpers_1.getATASync)(StakeVault, mint);
             const FromAta = (0, helpers_1.getATASync)(wallet, mint);
             const method = this.program.methods
                 .depositStakeRewards({
@@ -240,7 +234,6 @@ class Stake {
                 .accounts({
                 signer: wallet,
                 fromAta: FromAta,
-                toAta: ToAta,
                 mint: mint
             });
             if (options === null || options === void 0 ? void 0 : options.microLamports) {
@@ -288,20 +281,20 @@ class Stake {
      *  @param stakeVault - Name of the stake vault
      *
      */
-    withdrawStake({ wallet, name, mint, stakeVault }, options) {
+    withdrawStake({ wallet, name, mint, userName, stakeVault }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const stakeVaultPDA = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, stakeVault);
+            const userPDA = (0, helpers_1.getUserAddressSync)(this.program.programId, userName);
             const FromAta = (0, helpers_1.getATASync)(stakeVaultPDA, mint);
-            const ToAta = (0, helpers_1.getATASync)(wallet, mint);
             const stakePDA = (0, helpers_1.getStakeAddressSync)(this.program.programId, wallet, name);
             const method = this.program.methods.withdrawStake().accounts({
                 signer: wallet,
                 fromAta: FromAta,
                 stake: stakePDA,
-                toAta: ToAta,
                 stakeVault: stakeVaultPDA,
                 admin: new web3_js_1.PublicKey('82ppCojm3yrEKgdpH8B5AmBJTU1r1uAWXFWhxvPs9UCR'),
-                mint: mint
+                mint: mint,
+                user: userPDA
             });
             if (options === null || options === void 0 ? void 0 : options.microLamports) {
                 method.postInstructions([
@@ -321,13 +314,13 @@ class Stake {
      *  @param week - Current week rewards (Starts from 0)
      *
      */
-    updateStakeVaultStatus({ wallet, isLocked, week, stakeVault }, options) {
+    updateStakeVaultStatus({ wallet, isLocked, stakeVault, initTs }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const StakeVault = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, stakeVault);
             const method = this.program.methods
                 .updateStakeVaultStatus({
                 isLocked,
-                week
+                initTs: new anchor_1.BN(initTs)
             })
                 .accounts({
                 signer: wallet,
@@ -355,12 +348,10 @@ class Stake {
         return __awaiter(this, void 0, void 0, function* () {
             const StakeVault = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, stakeVault);
             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.claimStake().accounts({
                 signer: wallet,
                 fromAta: FromAta,
-                toAta: ToATA,
                 mint: mint,
                 stake: Stake,
                 stakeVault: StakeVault

package/dist/test.js

@@ -27,15 +27,14 @@ const updateStakeVaultStatus = () => __awaiter(void 0, void 0, void 0, function*
     const response = yield triadProtocol.stake.updateStakeVaultStatus({
         wallet: wallet.publicKey,
         isLocked: false,
-        week: 4,
-        stakeVault: constants_1.STAKE_SEASON
+        stakeVault: constants_1.STAKE_SEASON,
+        initTs: 0
     }, {
         skipPreflight: true,
         microLamports: 10000
     });
     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();
@@ -46,12 +45,8 @@ const getUsers = () => __awaiter(void 0, void 0, void 0, function* () {
     const response = yield triadProtocol.getUsers();
     console.log(response);
 });
-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));
-});
+getUsers();
 const getReferral = () => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield triadProtocol.hasReferral('a');
+    const response = yield triadProtocol.hasUser('a');
     console.log(response);
 });

package/dist/types/idl_triad_protocol.json

@@ -431,88 +431,6 @@
                 }
             ]
         },
-        {
-            "name": "migrate_stake",
-            "discriminator": [178, 5, 26, 85, 56, 20, 153, 160],
-            "accounts": [
-                {
-                    "name": "signer",
-                    "writable": true,
-                    "signer": true
-                },
-                {
-                    "name": "stake_vault",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [115, 116, 97, 107, 101, 95, 118, 97, 117, 108, 116]
-                            },
-                            {
-                                "kind": "arg",
-                                "path": "args.stake_vault"
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "stake_v1",
-                    "writable": true
-                },
-                {
-                    "name": "stake_v2",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [115, 116, 97, 107, 101]
-                            },
-                            {
-                                "kind": "account",
-                                "path": "stake_v1.authority",
-                                "account": "Stake"
-                            },
-                            {
-                                "kind": "arg",
-                                "path": "args.name"
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "mint",
-                    "writable": true
-                },
-                {
-                    "name": "nft_rewards",
-                    "writable": true
-                },
-                {
-                    "name": "token_program",
-                    "address": "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
-                },
-                {
-                    "name": "associated_token_program",
-                    "address": "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
-                },
-                {
-                    "name": "system_program",
-                    "address": "11111111111111111111111111111111"
-                }
-            ],
-            "args": [
-                {
-                    "name": "args",
-                    "type": {
-                        "defined": {
-                            "name": "MigrateStakeArgs"
-                        }
-                    }
-                }
-            ]
-        },
         {
             "name": "open_position",
             "discriminator": [135, 128, 47, 77, 15, 152, 240, 49],
@@ -743,6 +661,10 @@
                         ]
                     }
                 },
+                {
+                    "name": "user",
+                    "writable": true
+                },
                 {
                     "name": "stake",
                     "writable": true,
@@ -898,6 +820,10 @@
                     "name": "stake_vault",
                     "writable": true
                 },
+                {
+                    "name": "user",
+                    "writable": true
+                },
                 {
                     "name": "stake",
                     "writable": true
@@ -963,14 +889,6 @@
         }
     ],
     "accounts": [
-        {
-            "name": "NFTRewards",
-            "discriminator": [210, 99, 18, 65, 58, 128, 167, 91]
-        },
-        {
-            "name": "Stake",
-            "discriminator": [150, 197, 176, 29, 55, 132, 112, 149]
-        },
         {
             "name": "StakeV2",
             "discriminator": [207, 98, 130, 13, 118, 181, 238, 47]
@@ -1110,6 +1028,11 @@
             "code": 6019,
             "name": "RewardsAlreadyClaimed",
             "msg": "Rewards already claimed"
+        },
+        {
+            "code": 6020,
+            "name": "StakeOverflow",
+            "msg": "Stake overflow"
         }
     ],
     "types": [
@@ -1161,26 +1084,6 @@
                 ]
             }
         },
-        {
-            "name": "Collection",
-            "type": {
-                "kind": "enum",
-                "variants": [
-                    {
-                        "name": "COLETA"
-                    },
-                    {
-                        "name": "UNDEAD"
-                    },
-                    {
-                        "name": "ALLIGATORS"
-                    },
-                    {
-                        "name": "PYTH"
-                    }
-                ]
-            }
-        },
         {
             "name": "CreateTickerArgs",
             "type": {
@@ -1205,10 +1108,6 @@
                     {
                         "name": "name",
                         "type": "string"
-                    },
-                    {
-                        "name": "referral",
-                        "type": "pubkey"
                     }
                 ]
             }
@@ -1253,50 +1152,6 @@
                 ]
             }
         },
-        {
-            "name": "MigrateStakeArgs",
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "name",
-                        "type": "string"
-                    },
-                    {
-                        "name": "stake_vault",
-                        "type": "string"
-                    }
-                ]
-            }
-        },
-        {
-            "name": "NFTRewards",
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "stake",
-                        "type": "pubkey"
-                    },
-                    {
-                        "name": "daily_rewards",
-                        "type": {
-                            "array": ["u64", 30]
-                        }
-                    },
-                    {
-                        "name": "weekly_rewards_paid",
-                        "type": {
-                            "array": ["bool", 5]
-                        }
-                    },
-                    {
-                        "name": "apr",
-                        "type": "f32"
-                    }
-                ]
-            }
-        },
         {
             "name": "OpenPositionArgs",
             "type": {
@@ -1377,94 +1232,6 @@
                 ]
             }
         },
-        {
-            "name": "Rarity",
-            "type": {
-                "kind": "enum",
-                "variants": [
-                    {
-                        "name": "COMMON"
-                    },
-                    {
-                        "name": "UNCOMMON"
-                    },
-                    {
-                        "name": "RARE"
-                    },
-                    {
-                        "name": "EPIC"
-                    },
-                    {
-                        "name": "LEGENDARY"
-                    },
-                    {
-                        "name": "MYTHIC"
-                    }
-                ]
-            }
-        },
-        {
-            "name": "Stake",
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "bump",
-                        "type": "u8"
-                    },
-                    {
-                        "name": "authority",
-                        "type": "pubkey"
-                    },
-                    {
-                        "name": "init_ts",
-                        "type": "i64"
-                    },
-                    {
-                        "name": "is_locked",
-                        "type": "bool"
-                    },
-                    {
-                        "name": "withdraw_ts",
-                        "type": "i64"
-                    },
-                    {
-                        "name": "name",
-                        "type": "string"
-                    },
-                    {
-                        "name": "collections",
-                        "type": {
-                            "vec": {
-                                "defined": {
-                                    "name": "Collection"
-                                }
-                            }
-                        }
-                    },
-                    {
-                        "name": "rarity",
-                        "type": {
-                            "defined": {
-                                "name": "Rarity"
-                            }
-                        }
-                    },
-                    {
-                        "name": "mint",
-                        "type": "pubkey"
-                    },
-                    {
-                        "name": "stake_vault",
-                        "type": "pubkey"
-                    },
-                    {
-                        "name": "stake_rewards",
-                        "type": "pubkey"
-                    }
-                ]
-            }
-        },
         {
             "name": "StakeNFTArgs",
             "type": {
@@ -1705,8 +1472,8 @@
                         "type": "bool"
                     },
                     {
-                        "name": "week",
-                        "type": "u8"
+                        "name": "init_ts",
+                        "type": "i64"
                     }
                 ]
             }
@@ -1751,6 +1518,24 @@
                     {
                         "name": "name",
                         "type": "string"
+                    },
+                    {
+                        "name": "swaps",
+                        "type": "i16"
+                    },
+                    {
+                        "name": "swaps_made",
+                        "type": "i16"
+                    },
+                    {
+                        "name": "staked",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "padding",
+                        "type": {
+                            "array": ["u8", 40]
+                        }
                     }
                 ]
             }

package/dist/types/stake.d.ts

@@ -23,6 +23,7 @@ export type StakeTokenArgs = {
     stakeVault: string;
     mint: PublicKey;
     amount: number;
+    userName: string;
 };
 export type InitializeStakeArgs = {
     name: string;
@@ -47,12 +48,13 @@ export type WithdrawArgs = {
     name: string;
     mint: PublicKey;
     stakeVault: string;
+    userName: string;
 };
 export type UpdateStakeVaultStatusArgs = {
     wallet: PublicKey;
     isLocked: boolean;
-    week: number;
     stakeVault: string;
+    initTs: number;
 };
 export type ClaimStakeRewardsArgs = {
     wallet: PublicKey;