@triadxyz/triad-protocol 3.5.2-beta → 4.0.0

package/dist/utils/feeCalculator.d.ts

@@ -2,19 +2,19 @@
  * Calculate dynamic fee based on price
  * Returns fee in basis points (bps)
  */
-export declare function calculateDynamicFeeBps(price: number): number;
+export declare function calculateDynamicFeeBps(price: number, feeBps: number): number;
 /**
  * Apply dynamic fee to price for buy orders (adds fee)
  */
-export declare function applyBuyFee(price: number): number;
+export declare function applyBuyFee(price: number, feeBps: number): number;
 /**
  * Apply dynamic fee to price for sell orders (subtracts fee)
  */
-export declare function applySellFee(price: number): number;
+export declare function applySellFee(price: number, feeBps: number): number;
 /**
  * Simulate a buy order with given amount and price
  */
-export declare function simulateBuyOrder(amount: number, price: number): {
+export declare function simulateBuyOrder(amount: number, price: number, feeBps: number): {
     entryPrice: number;
     effectivePrice: number;
     sharesReceived: number;
@@ -24,18 +24,10 @@ export declare function simulateBuyOrder(amount: number, price: number): {
 /**
  * Simulate a sell order with given shares and price
  */
-export declare function simulateSellOrder(shares: number, price: number): {
+export declare function simulateSellOrder(shares: number, price: number, feeBps: number): {
     entryPrice: number;
     effectivePrice: number;
     sharesReceived: number;
     feeAmount: number;
     feePercentage: number;
 };
-/**
- * Generate fee curve data for visualization
- */
-export declare function generateFeeCurve(step?: number): Array<{
-    price: number;
-    feeBps: number;
-    feePercentage: number;
-}>;

package/dist/utils/feeCalculator.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateFeeCurve = exports.simulateSellOrder = exports.simulateBuyOrder = exports.applySellFee = exports.applyBuyFee = exports.calculateDynamicFeeBps = void 0;
+exports.simulateSellOrder = exports.simulateBuyOrder = exports.applySellFee = exports.applyBuyFee = exports.calculateDynamicFeeBps = void 0;
 /**
  * Calculate dynamic fee based on price
  * Returns fee in basis points (bps)
  */
-function calculateDynamicFeeBps(price) {
+function calculateDynamicFeeBps(price, feeBps) {
     const internalPrice = price * Math.pow(10, 6);
     if (internalPrice <= 900000) {
-        return 380;
+        return feeBps;
     }
     return Math.floor(((990000 - internalPrice) * 1900) / price);
 }
@@ -16,10 +16,10 @@ exports.calculateDynamicFeeBps = calculateDynamicFeeBps;
 /**
  * Apply dynamic fee to price for buy orders (adds fee)
  */
-function applyBuyFee(price) {
-    const feeBps = calculateDynamicFeeBps(price);
+function applyBuyFee(price, feeBps) {
+    const dynamicFeeBps = calculateDynamicFeeBps(price, feeBps);
     const internalPrice = Math.floor(price * 1000000);
-    const effectiveInternalPrice = Math.floor((internalPrice * (10000 + feeBps)) / 10000);
+    const effectiveInternalPrice = Math.floor((internalPrice * (10000 + dynamicFeeBps)) / 10000);
     const clampedPrice = Math.min(effectiveInternalPrice, 999999);
     return clampedPrice / 1000000;
 }
@@ -27,10 +27,10 @@ exports.applyBuyFee = applyBuyFee;
 /**
  * Apply dynamic fee to price for sell orders (subtracts fee)
  */
-function applySellFee(price) {
-    const feeBps = calculateDynamicFeeBps(price);
+function applySellFee(price, feeBps) {
+    const dynamicFeeBps = calculateDynamicFeeBps(price, feeBps);
     const internalPrice = Math.floor(price * 1000000);
-    const effectiveInternalPrice = Math.floor((internalPrice * (10000 - feeBps)) / 10000);
+    const effectiveInternalPrice = Math.floor((internalPrice * (10000 - dynamicFeeBps)) / 10000);
     const clampedPrice = Math.max(effectiveInternalPrice, 1);
     return clampedPrice / 1000000;
 }
@@ -38,8 +38,8 @@ exports.applySellFee = applySellFee;
 /**
  * Simulate a buy order with given amount and price
  */
-function simulateBuyOrder(amount, price) {
-    const effectivePrice = applyBuyFee(price);
+function simulateBuyOrder(amount, price, feeBps) {
+    const effectivePrice = applyBuyFee(price, feeBps);
     const sharesReceived = amount / effectivePrice;
     const valueAtOriginalPrice = sharesReceived * price;
     const feeAmount = amount - valueAtOriginalPrice;
@@ -56,8 +56,8 @@ exports.simulateBuyOrder = simulateBuyOrder;
 /**
  * Simulate a sell order with given shares and price
  */
-function simulateSellOrder(shares, price) {
-    const effectivePrice = applySellFee(price);
+function simulateSellOrder(shares, price, feeBps) {
+    const effectivePrice = applySellFee(price, feeBps);
     const amountReceived = shares * effectivePrice;
     const valueAtOriginalPrice = shares * price;
     const feeAmount = valueAtOriginalPrice - amountReceived;
@@ -71,19 +71,3 @@ function simulateSellOrder(shares, price) {
     };
 }
 exports.simulateSellOrder = simulateSellOrder;
-/**
- * Generate fee curve data for visualization
- */
-function generateFeeCurve(step = 0.01) {
-    const curve = [];
-    for (let price = 0.01; price <= 0.99; price += step) {
-        const feeBps = calculateDynamicFeeBps(price);
-        curve.push({
-            price: Math.round(price * 100) / 100,
-            feeBps,
-            feePercentage: feeBps / 100
-        });
-    }
-    return curve;
-}
-exports.generateFeeCurve = generateFeeCurve;

package/dist/utils/helpers.d.ts

@@ -1,19 +1,17 @@
 import { PublicKey } from '@solana/web3.js';
 import { IdlAccounts } from '@coral-xyz/anchor';
-import { Market, Order, OrderDirection, OrderSide, OrderStatus, OrderType, OrderDirectionEncoded, OrderTypeEncoded, OrderSideEncoded, OrderStatusEncoded, Stake, StakeVault, Unstake, Pool, BookOrder, Customer, ClaimVault, ClaimedUser } from '../types';
+import { Market, Order, OrderDirection, OrderSide, OrderStatus, OrderType, OrderDirectionEncoded, OrderTypeEncoded, OrderSideEncoded, OrderStatusEncoded, Stake, StakeVault, Unstake, Pool, BookOrder, Customer } from '../types';
 import { TriadProtocol } from '../types/triad_protocol';
 export declare const encodeString: (value: string, alloc?: number) => number[];
 export declare const decodeString: (bytes: number[]) => string;
 export declare const formatStakeVault: (stakeVault: IdlAccounts<TriadProtocol>['stakeVault']) => StakeVault;
-export declare const formatStake: (stake: IdlAccounts<TriadProtocol>['stakeV3']) => Stake;
+export declare const formatStake: (stake: IdlAccounts<TriadProtocol>['stakeV3'], address: PublicKey) => Stake;
 export declare const formatUnstake: (unstake: IdlAccounts<TriadProtocol>['unstake'], address: PublicKey) => Unstake;
 export declare const formatPool: (account: IdlAccounts<TriadProtocol>['pool'], address: PublicKey) => Pool;
 export declare const formatMarket: (account: IdlAccounts<TriadProtocol>['marketV2'], address: PublicKey) => Market;
 export declare const formatOrder: (order: IdlAccounts<TriadProtocol>['orderV2'], address: PublicKey) => Order;
 export declare const formatBookOrder: (order: IdlAccounts<TriadProtocol>['orderBook']['hypeOrders'][number] | IdlAccounts<TriadProtocol>['orderBook']['flopOrders'][number], marketId: number) => BookOrder;
 export declare const formatCustomer: (account: IdlAccounts<TriadProtocol>['customer'], publicKey: PublicKey) => Customer;
-export declare const formatClaimVault: (account: IdlAccounts<TriadProtocol>['claimVault'], address: PublicKey) => ClaimVault;
-export declare const formatClaimedUser: (account: IdlAccounts<TriadProtocol>['claimedUser'], address: PublicKey) => ClaimedUser;
 export declare const calculateStakeRewards: (stake: Stake) => number;
 export declare const getTokenProgram: (mint: PublicKey) => PublicKey;
 export declare const getOrderDirection: (orderDirection: OrderDirectionEncoded) => OrderDirection;

package/dist/utils/helpers.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getOppositeOrderDirectionEncoded = exports.getOppositeOrderDirection = exports.getOrderDirectionEncoded = 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.formatMarket = exports.formatPool = exports.formatUnstake = exports.formatStake = exports.formatStakeVault = exports.decodeString = exports.encodeString = void 0;
+exports.getOppositeOrderDirectionEncoded = exports.getOppositeOrderDirection = exports.getOrderDirectionEncoded = exports.getOrderStatus = exports.getOrderSide = exports.getOrderType = exports.getOrderSideFromNumber = exports.getOrderDirectionFromNumber = exports.getOrderDirection = exports.getTokenProgram = exports.calculateStakeRewards = exports.formatCustomer = exports.formatBookOrder = exports.formatOrder = 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");
@@ -34,8 +34,9 @@ const formatStakeVault = (stakeVault) => {
     };
 };
 exports.formatStakeVault = formatStakeVault;
-const formatStake = (stake) => {
+const formatStake = (stake, address) => {
     return {
+        address: address.toBase58(),
         authority: stake.authority.toBase58(),
         initTs: stake.initTs.toNumber(),
         checkedTs: stake.checkedTs.toNumber(),
@@ -62,9 +63,7 @@ const formatPool = (account, address) => {
         address: address.toString(),
         id: account.id.toNumber(),
         question: Buffer.from(account.question).toString().replace(/\0+$/, ''),
-        authority: account.authority.toString(),
-        isFast: account.isFast,
-        isFastMarketActive: account.isFastMarketActive
+        authority: account.authority.toString()
     };
 };
 exports.formatPool = formatPool;
@@ -146,36 +145,6 @@ 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() / Math.pow(10, 6),
-        totalClaimed: account.totalClaimed.toNumber() / Math.pow(10, 6),
-        totalUsers: account.totalUsers.toNumber(),
-        claimedUsers: account.claimedUsers.toNumber(),
-        tokenPerUser: account.tokenPerUser.toNumber() / Math.pow(10, 6),
-        mint: account.mint.toBase58(),
-        isActive: account.isActive,
-        name: account.name,
-        isFirstComeFirstServed: account.isFirstComeFirstServed,
-        merkleRoot: account.merkleRoot,
-        ts: account.ts.toNumber()
-    };
-};
-exports.formatClaimVault = formatClaimVault;
-const formatClaimedUser = (account, address) => {
-    return {
-        user: address.toString(),
-        address: account.user.toString(),
-        claimVault: account.claimVault.toString(),
-        amount: account.amount.toNumber() / Math.pow(10, 6),
-        ts: account.ts.toNumber()
-    };
-};
-exports.formatClaimedUser = formatClaimedUser;
 const calculateStakeRewards = (stake) => {
     const maxRank = 1633;
     const rank = 369;

package/package.json

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

package/dist/claim.d.ts

@@ -1,59 +0,0 @@
-/// <reference types="@coral-xyz/anchor/node_modules/@solana/web3.js" />
-import { Program } from '@coral-xyz/anchor';
-import { PublicKey } from '@solana/web3.js';
-import { TriadProtocol } from './types/triad_protocol';
-import { RpcOptions, CreateClaimVaultArgs, ClaimTokenArgs, UpdateClaimVaultIsActiveArgs, UpdateClaimVaultAmountArgs, UpdateClaimVaultEndTsArgs } from './types';
-export default class Claim {
-    private program;
-    private rpcOptions;
-    constructor(program: Program<TriadProtocol>, rpcOptions: RpcOptions);
-    /**
-     * Get All Claim Vaults
-     */
-    getAllClaimVaults(): Promise<import("./types").ClaimVault[]>;
-    /**
-     * Get Claim Vault
-     * @param name - Name of the claim vault
-     */
-    getClaimVault(name: string): Promise<import("./types").ClaimVault>;
-    /**
-     * Get Claimed User
-     * @param claimVault - Claim vault
-     * @param user - User
-     */
-    getClaimedUser(claimVault: PublicKey, user: PublicKey): Promise<import("./types").ClaimedUser>;
-    /**
-     * Claim Token
-     * @param claimData - Claim data
-     * @param claimVaultName - Vault name
-     * @param payer - Payer
-     * @param mint - Mint
-     * @param amount - Amount to claim
-     */
-    claimToken({ mint, claimVaultName, claimData, amount, isFirstComeFirstServed }: ClaimTokenArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
-    /**
-     * Create Claim Vault
-     * @param args - Create Claim Vault Args
-     */
-    createClaimVault({ totalAmount, totalUsers, name, isFirstComeFirstServed, endTs, claimData, mint }: CreateClaimVaultArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
-    /**
-     * Update Claim Vault Is Active
-     * @param isActive - Is active
-     * @param claimVault - Claim vault
-     */
-    updateClaimVaultIsActive({ isActive, claimVaultName }: UpdateClaimVaultIsActiveArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
-    /**
-     * Update Claim Vault Amount
-     * @param amount - Amount to add
-     * @param newUsers - New users to add
-     * @param claimVaultName - Claim vault name
-     * @param mint - Mint
-     */
-    updateClaimVaultAmount({ amount, newUsers, claimVaultName, mint, claimData }: UpdateClaimVaultAmountArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
-    /**
-     * Update Claim Vault End Ts
-     * @param endTs - End ts
-     * @param claimVaultName - Claim vault name
-     */
-    updateClaimVaultEndTs({ endTs, claimVaultName }: UpdateClaimVaultEndTsArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
-}

package/dist/claim.js

@@ -1,193 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const anchor_1 = require("@coral-xyz/anchor");
-const helpers_1 = require("./utils/helpers");
-const sendVersionedTransaction_1 = __importDefault(require("./utils/sendVersionedTransaction"));
-const pda_1 = require("./utils/pda");
-const merkle_1 = require("./utils/merkle");
-class Claim {
-    constructor(program, rpcOptions) {
-        this.program = program;
-        this.rpcOptions = rpcOptions;
-    }
-    /**
-     * Get All Claim Vaults
-     */
-    getAllClaimVaults() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const claimVaults = yield this.program.account.claimVault.all();
-            return claimVaults.map(({ account, publicKey }) => (0, helpers_1.formatClaimVault)(account, publicKey));
-        });
-    }
-    /**
-     * Get Claim Vault
-     * @param name - Name of the claim vault
-     */
-    getClaimVault(name) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const claimVaultPDA = (0, pda_1.getClaimVaultPDA)(this.program.programId, name);
-            const claimVault = yield this.program.account.claimVault.fetch(claimVaultPDA);
-            return (0, helpers_1.formatClaimVault)(claimVault, claimVaultPDA);
-        });
-    }
-    /**
-     * Get Claimed User
-     * @param claimVault - Claim vault
-     * @param user - User
-     */
-    getClaimedUser(claimVault, user) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const claimedUserPDA = (0, pda_1.getClaimedUserPDA)(this.program.programId, claimVault, user);
-            const claimedUser = yield this.program.account.claimedUser.fetch(claimedUserPDA);
-            return (0, helpers_1.formatClaimedUser)(claimedUser, claimedUserPDA);
-        });
-    }
-    /**
-     * Claim Token
-     * @param claimData - Claim data
-     * @param claimVaultName - Vault name
-     * @param payer - Payer
-     * @param mint - Mint
-     * @param amount - Amount to claim
-     */
-    claimToken({ mint, claimVaultName, claimData, amount, isFirstComeFirstServed }) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            let proof = [];
-            if (!isFirstComeFirstServed) {
-                const { proofs } = (0, merkle_1.generateMerkleTree)(claimData);
-                proof = (_a = proofs.find((p) => p.user.toBase58() === this.program.provider.publicKey.toBase58())) === null || _a === void 0 ? void 0 : _a.proof;
-            }
-            const ixs = [
-                yield this.program.methods
-                    .claimToken({
-                    amount: new anchor_1.BN(amount * Math.pow(10, 6)),
-                    merkleProof: proof
-                })
-                    .accounts({
-                    signer: this.program.provider.publicKey,
-                    payer: this.rpcOptions.payer,
-                    mint,
-                    claimVault: (0, pda_1.getClaimVaultPDA)(this.program.programId, claimVaultName),
-                    tokenProgram: (0, helpers_1.getTokenProgram)(mint)
-                })
-                    .instruction()
-            ];
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
-        });
-    }
-    /**
-     * Create Claim Vault
-     * @param args - Create Claim Vault Args
-     */
-    createClaimVault({ totalAmount, totalUsers, name, isFirstComeFirstServed, endTs, claimData, mint }) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let merkleRoot = null;
-            if (claimData) {
-                const { merkleRoot: root } = (0, merkle_1.generateMerkleTree)(claimData);
-                merkleRoot = root;
-            }
-            const ixs = [
-                yield this.program.methods
-                    .createClaimVault({
-                    totalAmount: new anchor_1.BN(totalAmount * Math.pow(10, 6)),
-                    totalUsers: new anchor_1.BN(totalUsers),
-                    name,
-                    isFirstComeFirstServed,
-                    endTs: new anchor_1.BN(endTs),
-                    merkleRoot
-                })
-                    .accounts({
-                    signer: this.program.provider.publicKey,
-                    mint,
-                    tokenProgram: (0, helpers_1.getTokenProgram)(mint)
-                })
-                    .instruction()
-            ];
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
-        });
-    }
-    /**
-     * Update Claim Vault Is Active
-     * @param isActive - Is active
-     * @param claimVault - Claim vault
-     */
-    updateClaimVaultIsActive({ isActive, claimVaultName }) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const ixs = [
-                yield this.program.methods
-                    .updateClaimVaultIsActive(isActive)
-                    .accounts({
-                    signer: this.program.provider.publicKey,
-                    claimVault: (0, pda_1.getClaimVaultPDA)(this.program.programId, claimVaultName)
-                })
-                    .instruction()
-            ];
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
-        });
-    }
-    /**
-     * Update Claim Vault Amount
-     * @param amount - Amount to add
-     * @param newUsers - New users to add
-     * @param claimVaultName - Claim vault name
-     * @param mint - Mint
-     */
-    updateClaimVaultAmount({ amount, newUsers, claimVaultName, mint, claimData }) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let merkleRoot = null;
-            if (claimData) {
-                const { merkleRoot: root } = (0, merkle_1.generateMerkleTree)(claimData);
-                merkleRoot = root;
-            }
-            const ixs = [
-                yield this.program.methods
-                    .updateClaimVaultAmount({
-                    amount: new anchor_1.BN(amount * Math.pow(10, 6)),
-                    newUsers: new anchor_1.BN(newUsers),
-                    merkleRoot
-                })
-                    .accounts({
-                    signer: this.program.provider.publicKey,
-                    mint,
-                    tokenProgram: (0, helpers_1.getTokenProgram)(mint),
-                    claimVault: (0, pda_1.getClaimVaultPDA)(this.program.programId, claimVaultName)
-                })
-                    .instruction()
-            ];
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
-        });
-    }
-    /**
-     * Update Claim Vault End Ts
-     * @param endTs - End ts
-     * @param claimVaultName - Claim vault name
-     */
-    updateClaimVaultEndTs({ endTs, claimVaultName }) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const ixs = [
-                yield this.program.methods
-                    .updateClaimVaultEndTs(new anchor_1.BN(endTs))
-                    .accounts({
-                    signer: this.program.provider.publicKey,
-                    claimVault: (0, pda_1.getClaimVaultPDA)(this.program.programId, claimVaultName)
-                })
-                    .instruction()
-            ];
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
-        });
-    }
-}
-exports.default = Claim;

package/dist/utils/merkle.d.ts

@@ -1,35 +0,0 @@
-import { PublicKey } from '@solana/web3.js';
-import { ClaimData, MerkleProof } from '../types';
-export declare class MerkleTree {
-    private leaves;
-    private tree;
-    private claimData;
-    constructor(claimData: ClaimData[]);
-    private generateLeaves;
-    private buildTree;
-    getRoot(): number[];
-    getProof(userPubkey: PublicKey, amount: number): number[][];
-    getAllProofs(): MerkleProof[];
-    verifyProof(userPubkey: PublicKey, amount: number, proof: number[][]): boolean;
-}
-export declare function generateMerkleTree(claimData: ClaimData[]): {
-    merkleRoot: number[];
-    proofs: MerkleProof[];
-};
-export declare function createClaimData(data: {
-    user: string;
-    amount: number;
-}[]): ClaimData[];
-export declare function debugMerkleProof(userPubkey: PublicKey, amount: number, merkleProof: number[][], merkleRoot: number[]): {
-    isValid: boolean;
-    steps: Array<{
-        step: number;
-        currentHash: string;
-        proofElement: string;
-        isCurrentSmaller: boolean;
-        combined: string;
-        newHash: string;
-    }>;
-    finalHash: string;
-    expectedRoot: string;
-};