@triadxyz/triad-protocol 4.0.2 → 4.0.3

package/dist/predictor.d.ts

@@ -1,25 +1,32 @@
 /// <reference types="@coral-xyz/anchor/node_modules/@solana/web3.js" />
+import { PublicKey } from '@solana/web3.js';
 import { Program } from '@coral-xyz/anchor';
 import { TriadProtocol } from './types/triad_protocol';
 import { RpcOptions } from './types';
-import { DepositArgs, WithdrawArgs } from './types/predictor';
+import { DepositArgs, WithdrawArgs, Predictor as PredictorType } from './types/predictor';
 export default class Predictor {
     private program;
     private rpcOptions;
     constructor(program: Program<TriadProtocol>, rpcOptions: RpcOptions);
+    /**
+     * Get predictor
+     * @param authority - Authority public key
+     * @param customerId - Customer ID (optional) defaults to 7 from Triadmarkets
+     */
+    getPredictor(authority: PublicKey, customerId?: number): Promise<PredictorType>;
     /**
      * Deposit
      * @param args.authority - Authority of the deposit
      * @param args.amount - Amount to deposit
      * @param args.refer - Referral public key (optional) defaults to Triadmarkets public key
-     * @param args.customer - Customer ID (optional) defaults to 7 from Triadmarkets
+     * @param args.customerId - Customer ID (optional) defaults to 7 from Triadmarkets
      */
-    deposit({ authority, amount, refer, customer }: DepositArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    deposit({ authority, amount, refer, customerId }: DepositArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Withdraw
      * @param args.authority - Authority of the withdraw
      * @param args.amount - Amount to deposit
-     * @param args.customer - Customer ID (optional) defaults to 7 from Triadmarkets
+     * @param args.customerId - Customer ID (optional) defaults to 7 from Triadmarkets
      */
-    withdraw({ authority, amount, customer }: WithdrawArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    withdraw({ authority, amount, customerId }: WithdrawArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
 }

package/dist/predictor.js

@@ -17,29 +17,54 @@ const bn_js_1 = __importDefault(require("bn.js"));
 const constants_1 = require("./utils/constants");
 const pda_1 = require("./utils/pda");
 const sendVersionedTransaction_1 = __importDefault(require("./utils/sendVersionedTransaction"));
+const helpers_1 = require("./utils/helpers");
 class Predictor {
     constructor(program, rpcOptions) {
         this.program = program;
         this.rpcOptions = rpcOptions;
     }
+    /**
+     * Get predictor
+     * @param authority - Authority public key
+     * @param customerId - Customer ID (optional) defaults to 7 from Triadmarkets
+     */
+    getPredictor(authority, customerId = 7) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, authority, customerId);
+            try {
+                const predictor = yield this.program.account.predictor.fetch(predictorPDA);
+                const balance = yield this.program.provider.connection.getTokenAccountBalance((0, pda_1.getTokenATA)(authority, constants_1.UNIT_MINT, this.program.programId));
+                return (0, helpers_1.formatPredictor)(predictor, predictorPDA, new bn_js_1.default(balance.value.amount));
+            }
+            catch (e) {
+                return {
+                    address: predictorPDA.toBase58(),
+                    authority: authority.toBase58(),
+                    balance: 0,
+                    customerId,
+                    refer: '11111111111111111111111111111111'
+                };
+            }
+        });
+    }
     /**
      * Deposit
      * @param args.authority - Authority of the deposit
      * @param args.amount - Amount to deposit
      * @param args.refer - Referral public key (optional) defaults to Triadmarkets public key
-     * @param args.customer - Customer ID (optional) defaults to 7 from Triadmarkets
+     * @param args.customerId - Customer ID (optional) defaults to 7 from Triadmarkets
      */
-    deposit({ authority, amount, refer = new web3_js_1.PublicKey('DqL77dzdTruyY9qssbU1aQNeDDywxL587k9FquxVv6iX'), customer = 7 }) {
+    deposit({ authority, amount, refer = new web3_js_1.PublicKey('DqL77dzdTruyY9qssbU1aQNeDDywxL587k9FquxVv6iX'), customerId = 7 }) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
-            const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, authority, customer);
+            const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, authority, customerId);
             try {
                 yield this.program.account.predictor.fetch(predictorPDA);
             }
             catch (e) {
                 ixs.push(yield this.program.methods
                     .createPredictor({
-                    customer,
+                    customerId,
                     refer
                 })
                     .accounts({
@@ -63,12 +88,12 @@ class Predictor {
      * Withdraw
      * @param args.authority - Authority of the withdraw
      * @param args.amount - Amount to deposit
-     * @param args.customer - Customer ID (optional) defaults to 7 from Triadmarkets
+     * @param args.customerId - Customer ID (optional) defaults to 7 from Triadmarkets
      */
-    withdraw({ authority, amount, customer = 7 }) {
+    withdraw({ authority, amount, customerId = 7 }) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
-            const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, authority, customer);
+            const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, authority, customerId);
             ixs.push(yield this.program.methods
                 .withdraw(new bn_js_1.default(amount * Math.pow(10, constants_1.BASE_DECIMALS)))
                 .accounts({

package/dist/trade.js

@@ -215,7 +215,7 @@ class Trade {
                 }
                 const orderPrice = new bn_js_1.default(order.price);
                 const availableShares = new bn_js_1.default(order.totalShares).sub(new bn_js_1.default(order.filledShares));
-                const effectivePriceDecimal = (0, feeCalculator_1.applyBuyFee)(orderPrice.toNumber() / 1000000, 700);
+                const effectivePriceDecimal = (0, feeCalculator_1.applyBuyFee)(orderPrice.toNumber() / 1000000, 500);
                 const adjustedPrice = new bn_js_1.default(Math.floor(effectivePriceDecimal * 1000000));
                 const maxSharesForPrice = remainingUSDC
                     .mul(new bn_js_1.default(Math.pow(10, constants_1.BASE_DECIMALS)))
@@ -287,7 +287,7 @@ class Trade {
                     continue;
                 remainingShares = remainingShares.sub(sharesToSell);
                 const orderPrice = new bn_js_1.default(order.price);
-                const effectivePriceDecimal = (0, feeCalculator_1.applySellFee)(orderPrice.toNumber() / 1000000, 700);
+                const effectivePriceDecimal = (0, feeCalculator_1.applySellFee)(orderPrice.toNumber() / 1000000, 500);
                 const adjustedPrice = new bn_js_1.default(Math.floor(effectivePriceDecimal * 1000000));
                 amountOfUSDC = amountOfUSDC.add(sharesToSell.mul(adjustedPrice).div(new bn_js_1.default(Math.pow(10, constants_1.BASE_DECIMALS))));
                 ixs.push(yield this.program.methods

package/dist/types/idl_triad_protocol.json

@@ -847,7 +847,7 @@
                             },
                             {
                                 "kind": "arg",
-                                "path": "args.customer"
+                                "path": "args.customer_id"
                             }
                         ]
                     }
@@ -3106,7 +3106,7 @@
                         "type": "pubkey"
                     },
                     {
-                        "name": "customer",
+                        "name": "customer_id",
                         "type": "u16"
                     }
                 ]
@@ -3886,7 +3886,7 @@
                         "type": "pubkey"
                     },
                     {
-                        "name": "customer",
+                        "name": "customer_id",
                         "type": "u16"
                     },
                     {

package/dist/types/predictor.d.ts

@@ -1,13 +1,20 @@
 /// <reference types="@coral-xyz/anchor/node_modules/@solana/web3.js" />
 import { PublicKey } from '@solana/web3.js';
+export type Predictor = {
+    address: string;
+    authority: string;
+    refer: string;
+    customerId: number;
+    balance: number;
+};
 export type DepositArgs = {
     authority: PublicKey;
     amount: number;
     refer?: PublicKey;
-    customer?: number;
+    customerId?: number;
 };
 export type WithdrawArgs = {
     authority: PublicKey;
     amount: number;
-    customer?: number;
+    customerId?: number;
 };

package/dist/types/triad_protocol.d.ts

@@ -1167,7 +1167,7 @@ export type TriadProtocol = {
                             },
                             {
                                 kind: 'arg';
-                                path: 'args.customer';
+                                path: 'args.customer_id';
                             }
                         ];
                     };
@@ -3994,7 +3994,7 @@ export type TriadProtocol = {
                         type: 'pubkey';
                     },
                     {
-                        name: 'customer';
+                        name: 'customerId';
                         type: 'u16';
                     }
                 ];
@@ -4774,7 +4774,7 @@ export type TriadProtocol = {
                         type: 'pubkey';
                     },
                     {
-                        name: 'customer';
+                        name: 'customerId';
                         type: 'u16';
                     },
                     {

package/dist/utils/constants.d.ts

@@ -2,6 +2,7 @@
 import { PublicKey } from '@solana/web3.js';
 export declare const USDC_MINT: PublicKey;
 export declare const TRD_MINT: PublicKey;
+export declare const UNIT_MINT: PublicKey;
 export declare const TRIAD_ADMIN: PublicKey;
 export declare const TICKET_CORE_COLLECTION: PublicKey;
 export declare const POSEIDON_CORE_COLLECTION: PublicKey;

package/dist/utils/constants.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BOOK_ORDER_NULL = exports.BASE_DECIMALS = exports.TICKET_COLLECTION_SYMBOL = exports.POSEIDON_COLLECTION_SYMBOL = exports.POSEIDON_CORE_COLLECTION = exports.TICKET_CORE_COLLECTION = exports.TRIAD_ADMIN = exports.TRD_MINT = exports.USDC_MINT = void 0;
+exports.BOOK_ORDER_NULL = exports.BASE_DECIMALS = exports.TICKET_COLLECTION_SYMBOL = exports.POSEIDON_COLLECTION_SYMBOL = exports.POSEIDON_CORE_COLLECTION = exports.TICKET_CORE_COLLECTION = exports.TRIAD_ADMIN = exports.UNIT_MINT = exports.TRD_MINT = exports.USDC_MINT = void 0;
 const web3_js_1 = require("@solana/web3.js");
 exports.USDC_MINT = new web3_js_1.PublicKey('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v');
 exports.TRD_MINT = new web3_js_1.PublicKey('t3DohmswhKk94PPbPYwA6ZKACyY3y5kbcqeQerAJjmV');
+exports.UNIT_MINT = new web3_js_1.PublicKey('75wzVU6j9U6oZVJjQYLtiN7Z5Ah97it1UyWZN29HgE4m');
 exports.TRIAD_ADMIN = new web3_js_1.PublicKey('82ppCojm3yrEKgdpH8B5AmBJTU1r1uAWXFWhxvPs9UCR');
 exports.TICKET_CORE_COLLECTION = new web3_js_1.PublicKey('BaqopH1VXYUCT6VsojbTibVcd3k5jpGGT6296HFb6fVa');
 exports.POSEIDON_CORE_COLLECTION = new web3_js_1.PublicKey('69CLccefLRmvDSAJP7Er632dvn878qkpdcnvq5ZUspSm');

package/dist/utils/feeCalculator.js

@@ -7,7 +7,7 @@ exports.simulateSellOrder = exports.simulateBuyOrder = exports.applySellFee = ex
  */
 function calculateDynamicFeeBps(price, feeBps) {
     const internalPrice = price * Math.pow(10, 6);
-    if (internalPrice <= 900000) {
+    if (internalPrice < 900000) {
         return feeBps;
     }
     return Math.floor(((990000 - internalPrice) * 1900) / price);

package/dist/utils/helpers.d.ts

@@ -1,9 +1,10 @@
 import { PublicKey } from '@solana/web3.js';
-import { IdlAccounts } from '@coral-xyz/anchor';
+import { BN, IdlAccounts } from '@coral-xyz/anchor';
 import { Market, Order, OrderDirection, OrderSide, OrderStatus, OrderType, OrderDirectionEncoded, OrderTypeEncoded, OrderSideEncoded, OrderStatusEncoded, Pool, BookOrder } from '../types';
 import { Stake, StakeVault, Unstake } from '../types/stake';
 import { Customer } from '../types/customer';
 import { TriadProtocol } from '../types/triad_protocol';
+import { Predictor } from '../types/predictor';
 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;
@@ -25,3 +26,4 @@ export declare const getOrderStatus: (status: OrderStatusEncoded) => OrderStatus
 export declare const getOrderDirectionEncoded: (orderDirection: OrderDirection) => OrderDirectionEncoded;
 export declare const getOppositeOrderDirection: (orderDirection: OrderDirection) => OrderDirection;
 export declare const getOppositeOrderDirectionEncoded: (orderDirection: OrderDirectionEncoded) => OrderDirectionEncoded;
+export declare const formatPredictor: (account: IdlAccounts<TriadProtocol>['predictor'], publicKey: PublicKey, balance: BN) => Predictor;

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.formatCustomer = exports.formatBookOrder = exports.formatOrder = exports.formatMarket = exports.formatPool = exports.formatUnstake = exports.formatStake = exports.formatStakeVault = exports.decodeString = exports.encodeString = void 0;
+exports.formatPredictor = 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");
@@ -245,3 +245,13 @@ const getOppositeOrderDirectionEncoded = (orderDirection) => {
     return { hype: {} };
 };
 exports.getOppositeOrderDirectionEncoded = getOppositeOrderDirectionEncoded;
+const formatPredictor = (account, publicKey, balance) => {
+    return {
+        address: publicKey.toBase58(),
+        authority: publicKey.toString(),
+        refer: account.refer.toString(),
+        customerId: account.customerId,
+        balance: balance.toNumber() / 1e6
+    };
+};
+exports.formatPredictor = formatPredictor;

package/dist/utils/pda.d.ts

@@ -13,5 +13,5 @@ export declare const getPoseidonPDA: (programId: PublicKey, number: number) => P
 export declare const getClaimVaultPDA: (programId: PublicKey, name: string) => PublicKey;
 export declare const getClaimedUserPDA: (programId: PublicKey, claimVault: PublicKey, user: PublicKey) => PublicKey;
 export declare const getOrderPDA: (programId: PublicKey, authority: PublicKey, marketId: number, orderDirection: OrderDirection) => PublicKey;
-export declare const getPredictorPDA: (programId: PublicKey, authority: PublicKey, customer: number) => PublicKey;
+export declare const getPredictorPDA: (programId: PublicKey, authority: PublicKey, customerId: number) => PublicKey;
 export declare const getCentralPDA: (programId: PublicKey) => PublicKey;

package/dist/utils/pda.js

@@ -64,11 +64,11 @@ const getOrderPDA = (programId, authority, marketId, orderDirection) => {
     ], programId)[0];
 };
 exports.getOrderPDA = getOrderPDA;
-const getPredictorPDA = (programId, authority, customer) => {
+const getPredictorPDA = (programId, authority, customerId) => {
     return web3_js_1.PublicKey.findProgramAddressSync([
         Buffer.from('predictor'),
         authority.toBuffer(),
-        new bn_js_1.default(customer).toArrayLike(Buffer, 'le', 2)
+        new bn_js_1.default(customerId).toArrayLike(Buffer, 'le', 2)
     ], programId)[0];
 };
 exports.getPredictorPDA = getPredictorPDA;

package/package.json

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