@triadxyz/triad-protocol 1.3.5-beta → 1.3.7-beta

package/dist/index.d.ts

@@ -82,19 +82,5 @@ export default class TriadProtocolClient {
      * @param verifier - Verifier keypair
      * @param options - RPC options
      */
-    spinWheel(isSol: boolean, options?: RpcOptions): Promise<any>;
-    /**
-     * Mint Poseidon
-     * @param number - Poseidon number
-     * @param attributes - Poseidon attributes
-     * @param options - RPC options
-     *
-     */
-    mintPoseidon(items: {
-        number: number;
-        attributes: {
-            key: string;
-            value: string;
-        }[];
-    }[], options?: RpcOptions): Promise<string>;
+    spinWheel(isSol: boolean, options?: RpcOptions): Promise<number>;
 }

package/dist/index.js

@@ -14,6 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const anchor_1 = require("@coral-xyz/anchor");
 const web3_js_1 = require("@solana/web3.js");
+const base64_js_1 = require("base64-js");
 const idl_triad_protocol_json_1 = __importDefault(require("./types/idl_triad_protocol.json"));
 const trade_1 = __importDefault(require("./trade"));
 const helpers_1 = require("./utils/helpers");
@@ -228,6 +229,7 @@ class TriadProtocolClient {
      * @param options - RPC options
      */
     spinWheel(isSol, options) {
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             const spinPDA = (0, pda_1.getSpinPDA)(this.program.programId, constants_1.SPIN_NAME);
             const method = this.program.methods.spinWheel(isSol).accounts({
@@ -236,46 +238,16 @@ class TriadProtocolClient {
                 mint: constants_1.TCMAS_MINT
             });
             const tx = yield (0, sendTransactionWithOptions_1.default)(method, options);
-            const txLogs = yield this.provider.connection.getTransaction(tx, {
+            const txResult = (yield this.provider.connection.getTransaction(tx, {
                 commitment: 'confirmed',
                 maxSupportedTransactionVersion: 0
-            });
-            const eventLog = txLogs.meta.logMessages.find((log) => log.includes('SpinWheelResult'));
-            if (!eventLog) {
-                throw new Error('Spin result not found in transaction logs');
-            }
-            const prizeType = JSON.parse(eventLog.split('RouletteSpinResult')[1]).data
-                .prize;
-            return prizeType;
-        });
-    }
-    /**
-     * Mint Poseidon
-     * @param number - Poseidon number
-     * @param attributes - Poseidon attributes
-     * @param options - RPC options
-     *
-     */
-    mintPoseidon(items, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const assets = [];
-            const ixs = [];
-            for (const item of items) {
-                const asset = web3_js_1.Keypair.generate();
-                assets.push(asset);
-                ixs.push(yield this.program.methods
-                    .mintPoseidon({
-                    collectionSymbol: constants_1.POSEIDON_COLLECTION_SYMBOL,
-                    number: new anchor_1.BN(item.number)
-                })
-                    .accounts({
-                    signer: this.provider.wallet.publicKey,
-                    asset: asset.publicKey,
-                    coreCollection: constants_1.POSEIDON_CORE_COLLECTION
-                })
-                    .instruction());
+            }));
+            const returnData = (_b = (_a = txResult.meta) === null || _a === void 0 ? void 0 : _a.returnData) === null || _b === void 0 ? void 0 : _b.data;
+            if (!returnData) {
+                throw new Error('No return data found in transaction');
             }
-            return (0, sendVersionedTransaction_1.default)(this.provider, ixs, options, undefined, [], undefined, assets);
+            let value = (_c = txResult.meta) === null || _c === void 0 ? void 0 : _c.returnData.data[0];
+            return new anchor_1.BN((0, base64_js_1.toByteArray)(value), 'le').toNumber();
         });
     }
 }

package/dist/local-test.js

@@ -446,11 +446,8 @@ const getSpinPrize = () => __awaiter(void 0, void 0, void 0, function* () {
     console.log(prizes);
 });
 const spinWheel = () => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield triadProtocol.spinWheel(false, { skipPreflight: true });
-    console.log(response);
-});
-spinWheel();
-const mintPoseidon = () => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield triadProtocol.mintPoseidon([]);
+    const response = yield triadProtocol.spinWheel(false, {
+        skipPreflight: false
+    });
     console.log(response);
 });

package/dist/stake.d.ts

@@ -15,7 +15,7 @@ export default class Stake {
     /**
      * Get Stake Rewards
      */
-    getStakeRewards({ wallet, nftName, collections, rank }: ClaimStakeRewardsArgs): Promise<number>;
+    getStakeRewards({ wallet, nftName, collections }: ClaimStakeRewardsArgs): Promise<number>;
     /**
      * Get all Stakes
      */

package/dist/stake.js

@@ -17,7 +17,6 @@ const helpers_1 = require("./utils/helpers");
 const stake_1 = require("./utils/pda/stake");
 const pda_1 = require("./utils/pda");
 const constants_1 = require("./utils/constants");
-const base64_js_1 = require("base64-js");
 const getRarityRank_1 = __importDefault(require("./utils/getRarityRank"));
 const sendVersionedTransaction_1 = __importDefault(require("./utils/sendVersionedTransaction"));
 const sendTransactionWithOptions_1 = __importDefault(require("./utils/sendTransactionWithOptions"));
@@ -40,25 +39,11 @@ class Stake {
     /**
      * Get Stake Rewards
      */
-    getStakeRewards({ wallet, nftName, collections, rank }) {
+    getStakeRewards({ wallet, nftName, collections }) {
         return __awaiter(this, void 0, void 0, function* () {
-            const stakeVaultPDA = (0, stake_1.getStakeVaultPDA)(this.program.programId, this.stakeVaultName);
             const stakePDA = (0, stake_1.getStakePDA)(this.program.programId, wallet, nftName);
-            const method = yield this.program.methods
-                .claimStakeRewards({
-                collections,
-                rank
-            })
-                .accounts({
-                signer: wallet,
-                mint: constants_1.TRD_MINT,
-                stake: stakePDA,
-                stakeVault: stakeVaultPDA,
-                verifier: constants_1.VERIFIER
-            })
-                .simulate();
-            let value = method.raw[method.raw.length - 2].split(' ')[3];
-            return new anchor_1.BN((0, base64_js_1.toByteArray)(value), 'le').toNumber() / Math.pow(10, constants_1.TRD_DECIMALS);
+            const stake = yield this.program.account.stakeV2.fetch(stakePDA);
+            return (0, helpers_1.calculateStakeRewards)((0, helpers_1.formatStake)(stake), collections);
         });
     }
     /**

package/dist/types/idl_triad_protocol.json

@@ -755,76 +755,6 @@
                 }
             ]
         },
-        {
-            "name": "mint_poseidon",
-            "discriminator": [102, 210, 5, 220, 154, 54, 98, 23],
-            "accounts": [
-                {
-                    "name": "signer",
-                    "writable": true,
-                    "signer": true
-                },
-                {
-                    "name": "nft",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [112, 111, 115, 101, 105, 100, 111, 110]
-                            },
-                            {
-                                "kind": "arg",
-                                "path": "args.number"
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "asset",
-                    "writable": true,
-                    "signer": true
-                },
-                {
-                    "name": "collection",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [99, 111, 108, 108, 101, 99, 116, 105, 111, 110]
-                            },
-                            {
-                                "kind": "arg",
-                                "path": "args.collection_symbol"
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "core_collection",
-                    "writable": true
-                },
-                {
-                    "name": "metaplex_program",
-                    "address": "CoREENxT6tW1HoK8ypY1SxRMZTcVPm7R94rH4PZNhX7d"
-                },
-                {
-                    "name": "system_program",
-                    "address": "11111111111111111111111111111111"
-                }
-            ],
-            "args": [
-                {
-                    "name": "args",
-                    "type": {
-                        "defined": {
-                            "name": "MintPoseidonArgs"
-                        }
-                    }
-                }
-            ]
-        },
         {
             "name": "mint_ticket",
             "discriminator": [159, 167, 223, 60, 138, 6, 23, 29],
@@ -2522,22 +2452,6 @@
                 ]
             }
         },
-        {
-            "name": "MintPoseidonArgs",
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "collection_symbol",
-                        "type": "string"
-                    },
-                    {
-                        "name": "number",
-                        "type": "u64"
-                    }
-                ]
-            }
-        },
         {
             "name": "MintTicketArgs",
             "type": {

package/dist/types/triad_protocol.d.ts

@@ -1080,76 +1080,6 @@ export type TriadProtocol = {
                 }
             ];
         },
-        {
-            name: 'mintPoseidon';
-            discriminator: [102, 210, 5, 220, 154, 54, 98, 23];
-            accounts: [
-                {
-                    name: 'signer';
-                    writable: true;
-                    signer: true;
-                },
-                {
-                    name: 'nft';
-                    writable: true;
-                    pda: {
-                        seeds: [
-                            {
-                                kind: 'const';
-                                value: [112, 111, 115, 101, 105, 100, 111, 110];
-                            },
-                            {
-                                kind: 'arg';
-                                path: 'args.number';
-                            }
-                        ];
-                    };
-                },
-                {
-                    name: 'asset';
-                    writable: true;
-                    signer: true;
-                },
-                {
-                    name: 'collection';
-                    writable: true;
-                    pda: {
-                        seeds: [
-                            {
-                                kind: 'const';
-                                value: [99, 111, 108, 108, 101, 99, 116, 105, 111, 110];
-                            },
-                            {
-                                kind: 'arg';
-                                path: 'args.collection_symbol';
-                            }
-                        ];
-                    };
-                },
-                {
-                    name: 'coreCollection';
-                    writable: true;
-                },
-                {
-                    name: 'metaplexProgram';
-                    address: 'CoREENxT6tW1HoK8ypY1SxRMZTcVPm7R94rH4PZNhX7d';
-                },
-                {
-                    name: 'systemProgram';
-                    address: '11111111111111111111111111111111';
-                }
-            ];
-            args: [
-                {
-                    name: 'args';
-                    type: {
-                        defined: {
-                            name: 'mintPoseidonArgs';
-                        };
-                    };
-                }
-            ];
-        },
         {
             name: 'mintTicket';
             discriminator: [159, 167, 223, 60, 138, 6, 23, 29];
@@ -3278,22 +3208,6 @@ export type TriadProtocol = {
                 ];
             };
         },
-        {
-            name: 'mintPoseidonArgs';
-            type: {
-                kind: 'struct';
-                fields: [
-                    {
-                        name: 'collectionSymbol';
-                        type: 'string';
-                    },
-                    {
-                        name: 'number';
-                        type: 'u64';
-                    }
-                ];
-            };
-        },
         {
             name: 'mintTicketArgs';
             type: {

package/dist/utils/helpers.d.ts

@@ -9,3 +9,4 @@ export declare const formatStake: (stake: any) => Stake;
 export declare const formatUser: (user: any) => User;
 export declare const formatMarket: (account: any, address: PublicKey) => Market;
 export declare const accountToMarketV1: (account: any, address: PublicKey) => Market;
+export declare const calculateStakeRewards: (stake: Stake, collections: number) => number;

package/dist/utils/helpers.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.accountToMarketV1 = exports.formatMarket = exports.formatUser = exports.formatStake = exports.formatStakeVault = exports.decodeString = exports.encodeString = void 0;
+exports.calculateStakeRewards = exports.accountToMarketV1 = exports.formatMarket = exports.formatUser = exports.formatStake = exports.formatStakeVault = exports.decodeString = exports.encodeString = void 0;
 const trade_1 = require("../types/trade");
+const constants_1 = require("./constants");
 const encodeString = (value, alloc = 32) => {
     const buffer = Buffer.alloc(alloc, 32);
     buffer.write(value);
@@ -125,3 +126,25 @@ const accountToMarketV1 = (account, address) => {
     };
 };
 exports.accountToMarketV1 = accountToMarketV1;
+const calculateStakeRewards = (stake, collections) => {
+    if (stake.withdrawTs !== 0)
+        return 0;
+    if (collections > 3)
+        return 0;
+    const collectionsMultiplier = collections * 150;
+    const maxRank = 1633;
+    const rank = 963;
+    const rankWeight = (maxRank - rank + 1) / maxRank;
+    const userStakedAmount = stake.mint === constants_1.TRD_MINT.toBase58()
+        ? stake.amount
+        : stake.amount * 10000 * Math.pow(10, constants_1.TRD_DECIMALS);
+    const formattedAmount = userStakedAmount / Math.pow(10, constants_1.TRD_DECIMALS) + collectionsMultiplier;
+    const adjustedAmount = formattedAmount * rankWeight;
+    const lastClaim = stake.claimedTs === 0 ? stake.initTs : stake.claimedTs;
+    const currentTime = Math.floor(Date.now() / 1000);
+    const secondsStaked = currentTime - lastClaim;
+    const userBaseRewards = ((adjustedAmount / 10000) * secondsStaked) / 86400;
+    const rewards = userBaseRewards * Math.pow(10, constants_1.TRD_DECIMALS);
+    return (rewards + stake.available) / Math.pow(10, constants_1.TRD_DECIMALS);
+};
+exports.calculateStakeRewards = calculateStakeRewards;

package/package.json

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