@triadxyz/triad-protocol 3.1.2-beta → 3.1.4-beta

package/dist/utils/helpers.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getOrderStatus = exports.getOrderSide = exports.getOrderType = exports.getOrderSideFromNumber = exports.getOrderDirectionFromNumber = exports.getOrderDirection = exports.getTokenProgram = exports.calculateStakeRewards = exports.formatCustomer = exports.formatBookOrder = exports.formatOrder = exports.formatUserTrade = exports.formatMarket = exports.formatPool = exports.formatUnstake = exports.formatStake = exports.formatStakeVault = exports.decodeString = exports.encodeString = void 0;
+exports.getOrderStatus = exports.getOrderSide = exports.getOrderType = exports.getOrderSideFromNumber = exports.getOrderDirectionFromNumber = exports.getOrderDirection = exports.getTokenProgram = exports.calculateStakeRewards = exports.formatClaimedUser = exports.formatClaimVault = exports.formatCustomer = exports.formatBookOrder = exports.formatOrder = exports.formatUserTrade = exports.formatMarket = exports.formatPool = exports.formatUnstake = exports.formatStake = exports.formatStakeVault = exports.decodeString = exports.encodeString = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
 const types_1 = require("../types");
@@ -19,18 +19,18 @@ const formatStakeVault = (stakeVault) => {
     return {
         name: stakeVault.name,
         collection: stakeVault.collection,
-        slots: stakeVault.slots.toNumber(),
         amount: stakeVault.amount.toNumber(),
         isLocked: stakeVault.isLocked,
         tokenMint: stakeVault.tokenMint.toBase58(),
         tokenDecimals: stakeVault.tokenDecimals,
         amountPaid: stakeVault.amountPaid.toNumber(),
-        nftStaked: stakeVault.nftStaked.toNumber(),
         week: stakeVault.week,
         initTs: stakeVault.initTs.toNumber(),
         endTs: stakeVault.endTs.toNumber(),
         authority: stakeVault.authority.toBase58(),
-        tokenStaked: stakeVault.tokenStaked.toNumber() / Math.pow(10, stakeVault.tokenDecimals)
+        tokenStaked: stakeVault.tokenStaked.toNumber() / Math.pow(10, stakeVault.tokenDecimals),
+        revShareClaimed: stakeVault.revShareClaimed.toNumber() / Math.pow(10, 6),
+        revShareAvailable: stakeVault.revShareAvailable.toNumber() / Math.pow(10, 6)
     };
 };
 exports.formatStakeVault = formatStakeVault;
@@ -41,7 +41,10 @@ const formatStake = (stake) => {
         checkedTs: stake.checkedTs.toNumber(),
         claimed: stake.claimed.toNumber() / Math.pow(10, 6),
         available: stake.available.toNumber() / Math.pow(10, 6),
-        amount: stake.amount.toNumber() / Math.pow(10, 6)
+        amount: stake.amount.toNumber() / Math.pow(10, 6),
+        revShareCheckedTs: stake.revShareCheckedTs.toNumber(),
+        revShareClaimed: stake.revShareClaimed.toNumber() / Math.pow(10, 6),
+        revShareAvailable: stake.revShareAvailable.toNumber() / Math.pow(10, 6)
     };
 };
 exports.formatStake = formatStake;
@@ -102,11 +105,9 @@ const formatMarket = (account, address) => {
     };
 };
 exports.formatMarket = formatMarket;
-const formatUserTrade = (account, publicKey) => {
+const formatUserTrade = (account, address) => {
     return {
-        user: publicKey.toString(),
-        totalDeposits: account.totalDeposits.toString(),
-        totalWithdraws: account.totalWithdraws.toString(),
+        user: address.toString(),
         orders: account.orders.map((order) => (0, exports.formatOrder)(order, account.authority.toString())),
         nonce: account.nonce.toString(),
         poseidon: account.poseidon ? account.poseidon.toString() : '',
@@ -159,6 +160,35 @@ const formatCustomer = (account, publicKey) => {
     };
 };
 exports.formatCustomer = formatCustomer;
+const formatClaimVault = (account, address) => {
+    return {
+        address: address.toString(),
+        authority: account.authority.toString(),
+        initTs: account.initTs.toNumber(),
+        endTs: account.endTs.toNumber(),
+        totalAmount: account.totalAmount.toNumber(),
+        totalClaimed: account.totalClaimed.toNumber(),
+        totalUsers: account.totalUsers.toNumber(),
+        claimedUsers: account.claimedUsers.toNumber(),
+        tokenPerUser: account.tokenPerUser.toNumber(),
+        mint: account.mint.toBase58(),
+        isActive: account.isActive,
+        name: account.name,
+        isFirstComeFirstServed: account.isFirstComeFirstServed,
+        merkleRoot: account.merkleRoot
+    };
+};
+exports.formatClaimVault = formatClaimVault;
+const formatClaimedUser = (account, address) => {
+    return {
+        user: address.toString(),
+        address: account.user.toString(),
+        claimVault: account.claimVault.toString(),
+        amount: account.amount.toNumber(),
+        ts: account.ts.toNumber()
+    };
+};
+exports.formatClaimedUser = formatClaimedUser;
 const calculateStakeRewards = (stake) => {
     const maxRank = 1633;
     const rank = 369;

package/dist/utils/pda.d.ts

@@ -10,3 +10,5 @@ export declare const getStakePDA: (programId: PublicKey, user: PublicKey) => Pub
 export declare const getCollectionPDA: (programId: PublicKey, collectionSymbol: string) => PublicKey;
 export declare const getNftPDA: (programId: PublicKey, number: number) => PublicKey;
 export declare const getPoseidonPDA: (programId: PublicKey, number: number) => PublicKey;
+export declare const getClaimVaultPDA: (programId: PublicKey, name: string) => PublicKey;
+export declare const getClaimedUserPDA: (programId: PublicKey, claimVault: PublicKey, user: PublicKey) => PublicKey;

package/dist/utils/pda.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPoseidonPDA = exports.getNftPDA = exports.getCollectionPDA = exports.getStakePDA = exports.getPoolPDA = exports.getSubUserTradePDA = exports.getUserTradePDA = exports.getCustomerPDA = exports.getOrderBookPDA = exports.getMarketPDA = exports.getTokenATA = void 0;
+exports.getClaimedUserPDA = exports.getClaimVaultPDA = exports.getPoseidonPDA = exports.getNftPDA = exports.getCollectionPDA = exports.getStakePDA = exports.getPoolPDA = exports.getSubUserTradePDA = exports.getUserTradePDA = exports.getCustomerPDA = exports.getOrderBookPDA = exports.getMarketPDA = exports.getTokenATA = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const bn_js_1 = __importDefault(require("bn.js"));
 const spl_token_1 = require("@solana/spl-token");
@@ -55,3 +55,11 @@ const getPoseidonPDA = (programId, number) => {
     return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('poseidon'), new bn_js_1.default(number).toArrayLike(Buffer, 'le', 8)], programId)[0];
 };
 exports.getPoseidonPDA = getPoseidonPDA;
+const getClaimVaultPDA = (programId, name) => {
+    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('claim_vault'), Buffer.from(name)], programId)[0];
+};
+exports.getClaimVaultPDA = getClaimVaultPDA;
+const getClaimedUserPDA = (programId, claimVault, user) => {
+    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('claimed_user'), claimVault.toBuffer(), user.toBuffer()], programId)[0];
+};
+exports.getClaimedUserPDA = getClaimedUserPDA;

package/package.json

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