@triadxyz/triad-protocol 4.0.2 → 4.0.4-beta.1

package/dist/customer.d.ts

@@ -16,12 +16,12 @@ export default class Customer {
      * Get Costumer By Wallet Address
      * @param wallet - The wallet address of the customer
      */
-    getCustomerByWallet(wallet: PublicKey): Promise<import("@triadxyz/triad-protocol").Customer>;
+    getCustomerByWallet(wallet: PublicKey): Promise<import("./types/customer").Customer>;
     /**
      * Get Customer By ID
      * @param customerId - The ID of the customer
      */
-    getCustomerById(customerId: number): Promise<import("@triadxyz/triad-protocol").Customer>;
+    getCustomerById(customerId: number): Promise<import("./types/customer").Customer>;
     /**
      * Create Customer
      * @param args.id - The ID of the customer

package/dist/customer.js

@@ -13,7 +13,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const sendVersionedTransaction_1 = __importDefault(require("./utils/sendVersionedTransaction"));
-const triad_protocol_1 = require("@triadxyz/triad-protocol");
+const helpers_1 = require("./utils/helpers");
+const pda_1 = require("./utils/pda");
 class Customer {
     constructor(program, rpcOptions) {
         this.program = program;
@@ -42,7 +43,7 @@ class Customer {
                     }
                 }
             ]);
-            return (0, triad_protocol_1.formatCustomer)(customer.account, customer.publicKey);
+            return (0, helpers_1.formatCustomer)(customer.account, customer.publicKey);
         });
     }
     /**
@@ -51,9 +52,9 @@ class Customer {
      */
     getCustomerById(customerId) {
         return __awaiter(this, void 0, void 0, function* () {
-            const customerPDA = (0, triad_protocol_1.getCustomerPDA)(this.program.programId, customerId);
+            const customerPDA = (0, pda_1.getCustomerPDA)(this.program.programId, customerId);
             const customer = yield this.program.account.customer.fetch(customerPDA, this.rpcOptions.commitment);
-            return (0, triad_protocol_1.formatCustomer)(customer, customerPDA);
+            return (0, helpers_1.formatCustomer)(customer, customerPDA);
         });
     }
     /**

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,55 @@ 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");
+const spl_token_1 = require("@solana/spl-token");
 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)(predictorPDA, constants_1.UNIT_MINT, spl_token_1.TOKEN_PROGRAM_ID));
+                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 +89,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/customer.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@coral-xyz/anchor/node_modules/@solana/web3.js" />
 import { PublicKey } from '@solana/web3.js';
 export type Customer = {
     id: number;

package/dist/types/idl_triad_protocol.json

@@ -422,9 +422,8 @@
                     "signer": true
                 },
                 {
-                    "name": "squads",
-                    "writable": true,
-                    "address": "Hk1r2NUL4LbUhx1agg1w44tyZiNr72mbeLsg6suF5MA4"
+                    "name": "authority",
+                    "writable": true
                 },
                 {
                     "name": "market",
@@ -847,7 +846,7 @@
                             },
                             {
                                 "kind": "arg",
-                                "path": "args.customer"
+                                "path": "args.customer_id"
                             }
                         ]
                     }
@@ -1509,6 +1508,116 @@
                 }
             ]
         },
+        {
+            "name": "place_order_v0",
+            "discriminator": [100, 204, 57, 226, 245, 228, 61, 187],
+            "accounts": [
+                {
+                    "name": "signer",
+                    "writable": true,
+                    "signer": true
+                },
+                {
+                    "name": "payer",
+                    "writable": true,
+                    "signer": true
+                },
+                {
+                    "name": "market",
+                    "writable": true
+                },
+                {
+                    "name": "order_book",
+                    "writable": true
+                },
+                {
+                    "name": "order",
+                    "writable": true
+                },
+                {
+                    "name": "mint",
+                    "address": "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v"
+                },
+                {
+                    "name": "user_ata",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "account",
+                                "path": "signer"
+                            },
+                            {
+                                "kind": "account",
+                                "path": "token_program"
+                            },
+                            {
+                                "kind": "account",
+                                "path": "mint"
+                            }
+                        ],
+                        "program": {
+                            "kind": "const",
+                            "value": [
+                                140, 151, 37, 143, 78, 36, 137, 241, 187, 61, 16, 41, 20, 142,
+                                13, 131, 11, 90, 19, 153, 218, 255, 16, 132, 4, 142, 123, 216,
+                                219, 233, 248, 89
+                            ]
+                        }
+                    }
+                },
+                {
+                    "name": "market_ata",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "account",
+                                "path": "market"
+                            },
+                            {
+                                "kind": "account",
+                                "path": "token_program"
+                            },
+                            {
+                                "kind": "account",
+                                "path": "mint"
+                            }
+                        ],
+                        "program": {
+                            "kind": "const",
+                            "value": [
+                                140, 151, 37, 143, 78, 36, 137, 241, 187, 61, 16, 41, 20, 142,
+                                13, 131, 11, 90, 19, 153, 218, 255, 16, 132, 4, 142, 123, 216,
+                                219, 233, 248, 89
+                            ]
+                        }
+                    }
+                },
+                {
+                    "name": "token_program",
+                    "address": "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
+                },
+                {
+                    "name": "associated_token_program",
+                    "address": "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
+                },
+                {
+                    "name": "system_program",
+                    "address": "11111111111111111111111111111111"
+                }
+            ],
+            "args": [
+                {
+                    "name": "args",
+                    "type": {
+                        "defined": {
+                            "name": "PlaceOrderV0Args"
+                        }
+                    }
+                }
+            ]
+        },
         {
             "name": "remove_trader_poseidon",
             "discriminator": [150, 5, 46, 188, 189, 13, 246, 11],
@@ -2369,10 +2478,6 @@
             "name": "ActivityEvent",
             "discriminator": [231, 225, 142, 104, 209, 97, 39, 202]
         },
-        {
-            "name": "BookOrderEvent",
-            "discriminator": [175, 216, 61, 224, 98, 215, 181, 62]
-        },
         {
             "name": "ClaimTokenEvent",
             "discriminator": [127, 10, 14, 49, 47, 171, 31, 127]
@@ -2744,66 +2849,6 @@
                 ]
             }
         },
-        {
-            "name": "BookOrderEvent",
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "market_id",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "timestamp",
-                        "type": "i64"
-                    },
-                    {
-                        "name": "price",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "total_shares",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "filled_shares",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "authority",
-                        "type": "pubkey"
-                    },
-                    {
-                        "name": "user_nonce",
-                        "type": "u32"
-                    },
-                    {
-                        "name": "id",
-                        "type": "u8"
-                    },
-                    {
-                        "name": "linked_book_order_id",
-                        "type": "u8"
-                    },
-                    {
-                        "name": "order_direction",
-                        "type": {
-                            "defined": {
-                                "name": "OrderDirection"
-                            }
-                        }
-                    },
-                    {
-                        "name": "order_side",
-                        "type": {
-                            "defined": {
-                                "name": "OrderSide"
-                            }
-                        }
-                    }
-                ]
-            }
-        },
         {
             "name": "CancelOrderArgs",
             "type": {
@@ -3106,7 +3151,7 @@
                         "type": "pubkey"
                     },
                     {
-                        "name": "customer",
+                        "name": "customer_id",
                         "type": "u16"
                     }
                 ]
@@ -3806,6 +3851,38 @@
                 ]
             }
         },
+        {
+            "name": "PlaceOrderV0Args",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "shares",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "price",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "order_direction",
+                        "type": {
+                            "defined": {
+                                "name": "OrderDirection"
+                            }
+                        }
+                    },
+                    {
+                        "name": "order_side",
+                        "type": {
+                            "defined": {
+                                "name": "OrderSide"
+                            }
+                        }
+                    }
+                ]
+            }
+        },
         {
             "name": "Pool",
             "type": {
@@ -3886,7 +3963,7 @@
                         "type": "pubkey"
                     },
                     {
-                        "name": "customer",
+                        "name": "customer_id",
                         "type": "u16"
                     },
                     {

package/dist/types/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@coral-xyz/anchor/node_modules/@solana/web3.js" />
 import { Commitment, PublicKey } from '@solana/web3.js';
 export type RpcOptions = {
     skipPreflight?: boolean;

package/dist/types/predictor.d.ts

@@ -1,13 +1,19 @@
-/// <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/trade.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@coral-xyz/anchor/node_modules/@solana/web3.js" />
 import { PublicKey } from '@solana/web3.js';
 import { OrderDirectionEncoded } from './';
 export type PlaceBidOrderArgs = {

package/dist/types/triad_protocol.d.ts

@@ -626,9 +626,8 @@ export type TriadProtocol = {
                     signer: true;
                 },
                 {
-                    name: 'squads';
+                    name: 'authority';
                     writable: true;
-                    address: 'Hk1r2NUL4LbUhx1agg1w44tyZiNr72mbeLsg6suF5MA4';
                 },
                 {
                     name: 'market';
@@ -1167,7 +1166,7 @@ export type TriadProtocol = {
                             },
                             {
                                 kind: 'arg';
-                                path: 'args.customer';
+                                path: 'args.customer_id';
                             }
                         ];
                     };
@@ -2159,6 +2158,174 @@ export type TriadProtocol = {
                 }
             ];
         },
+        {
+            name: 'placeOrderV0';
+            discriminator: [100, 204, 57, 226, 245, 228, 61, 187];
+            accounts: [
+                {
+                    name: 'signer';
+                    writable: true;
+                    signer: true;
+                },
+                {
+                    name: 'payer';
+                    writable: true;
+                    signer: true;
+                },
+                {
+                    name: 'market';
+                    writable: true;
+                },
+                {
+                    name: 'orderBook';
+                    writable: true;
+                },
+                {
+                    name: 'order';
+                    writable: true;
+                },
+                {
+                    name: 'mint';
+                    address: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v';
+                },
+                {
+                    name: 'userAta';
+                    writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: 'account';
+                                path: 'signer';
+                            },
+                            {
+                                kind: 'account';
+                                path: 'tokenProgram';
+                            },
+                            {
+                                kind: 'account';
+                                path: 'mint';
+                            }
+                        ];
+                        program: {
+                            kind: 'const';
+                            value: [
+                                140,
+                                151,
+                                37,
+                                143,
+                                78,
+                                36,
+                                137,
+                                241,
+                                187,
+                                61,
+                                16,
+                                41,
+                                20,
+                                142,
+                                13,
+                                131,
+                                11,
+                                90,
+                                19,
+                                153,
+                                218,
+                                255,
+                                16,
+                                132,
+                                4,
+                                142,
+                                123,
+                                216,
+                                219,
+                                233,
+                                248,
+                                89
+                            ];
+                        };
+                    };
+                },
+                {
+                    name: 'marketAta';
+                    writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: 'account';
+                                path: 'market';
+                            },
+                            {
+                                kind: 'account';
+                                path: 'tokenProgram';
+                            },
+                            {
+                                kind: 'account';
+                                path: 'mint';
+                            }
+                        ];
+                        program: {
+                            kind: 'const';
+                            value: [
+                                140,
+                                151,
+                                37,
+                                143,
+                                78,
+                                36,
+                                137,
+                                241,
+                                187,
+                                61,
+                                16,
+                                41,
+                                20,
+                                142,
+                                13,
+                                131,
+                                11,
+                                90,
+                                19,
+                                153,
+                                218,
+                                255,
+                                16,
+                                132,
+                                4,
+                                142,
+                                123,
+                                216,
+                                219,
+                                233,
+                                248,
+                                89
+                            ];
+                        };
+                    };
+                },
+                {
+                    name: 'tokenProgram';
+                    address: 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA';
+                },
+                {
+                    name: 'associatedTokenProgram';
+                    address: 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL';
+                },
+                {
+                    name: 'systemProgram';
+                    address: '11111111111111111111111111111111';
+                }
+            ];
+            args: [
+                {
+                    name: 'args';
+                    type: {
+                        defined: {
+                            name: 'placeOrderV0Args';
+                        };
+                    };
+                }
+            ];
+        },
         {
             name: 'removeTraderPoseidon';
             discriminator: [150, 5, 46, 188, 189, 13, 246, 11];
@@ -3257,10 +3424,6 @@ export type TriadProtocol = {
             name: 'activityEvent';
             discriminator: [231, 225, 142, 104, 209, 97, 39, 202];
         },
-        {
-            name: 'bookOrderEvent';
-            discriminator: [175, 216, 61, 224, 98, 215, 181, 62];
-        },
         {
             name: 'claimTokenEvent';
             discriminator: [127, 10, 14, 49, 47, 171, 31, 127];
@@ -3632,66 +3795,6 @@ export type TriadProtocol = {
                 ];
             };
         },
-        {
-            name: 'bookOrderEvent';
-            type: {
-                kind: 'struct';
-                fields: [
-                    {
-                        name: 'marketId';
-                        type: 'u64';
-                    },
-                    {
-                        name: 'timestamp';
-                        type: 'i64';
-                    },
-                    {
-                        name: 'price';
-                        type: 'u64';
-                    },
-                    {
-                        name: 'totalShares';
-                        type: 'u64';
-                    },
-                    {
-                        name: 'filledShares';
-                        type: 'u64';
-                    },
-                    {
-                        name: 'authority';
-                        type: 'pubkey';
-                    },
-                    {
-                        name: 'userNonce';
-                        type: 'u32';
-                    },
-                    {
-                        name: 'id';
-                        type: 'u8';
-                    },
-                    {
-                        name: 'linkedBookOrderId';
-                        type: 'u8';
-                    },
-                    {
-                        name: 'orderDirection';
-                        type: {
-                            defined: {
-                                name: 'orderDirection';
-                            };
-                        };
-                    },
-                    {
-                        name: 'orderSide';
-                        type: {
-                            defined: {
-                                name: 'orderSide';
-                            };
-                        };
-                    }
-                ];
-            };
-        },
         {
             name: 'cancelOrderArgs';
             type: {
@@ -3994,7 +4097,7 @@ export type TriadProtocol = {
                         type: 'pubkey';
                     },
                     {
-                        name: 'customer';
+                        name: 'customerId';
                         type: 'u16';
                     }
                 ];
@@ -4694,6 +4797,38 @@ export type TriadProtocol = {
                 ];
             };
         },
+        {
+            name: 'placeOrderV0Args';
+            type: {
+                kind: 'struct';
+                fields: [
+                    {
+                        name: 'shares';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'price';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'orderDirection';
+                        type: {
+                            defined: {
+                                name: 'orderDirection';
+                            };
+                        };
+                    },
+                    {
+                        name: 'orderSide';
+                        type: {
+                            defined: {
+                                name: 'orderSide';
+                            };
+                        };
+                    }
+                ];
+            };
+        },
         {
             name: 'pool';
             type: {
@@ -4774,7 +4909,7 @@ export type TriadProtocol = {
                         type: 'pubkey';
                     },
                     {
-                        name: 'customer';
+                        name: 'customerId';
                         type: 'u16';
                     },
                     {

package/dist/utils/constants.d.ts

@@ -1,7 +1,7 @@
-/// <reference types="@coral-xyz/anchor/node_modules/@solana/web3.js" />
 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/getPriorityFee.js

@@ -8,16 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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 axios_1 = __importDefault(require("axios"));
 const getPriorityFee = () => __awaiter(void 0, void 0, void 0, function* () {
     let fee = 1000;
     try {
-        const response = yield axios_1.default.get('https://solanacompass.com/api/fees');
-        fee = response.data[1].priorityTx;
+        const response = yield fetch('https://solanacompass.com/api/fees');
+        const data = yield response.json();
+        fee = data[1].priorityTx;
     }
     catch (_a) { }
     return fee;

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

@@ -1,4 +1,3 @@
-/// <reference types="@coral-xyz/anchor/node_modules/@solana/web3.js" />
 import { PublicKey } from '@solana/web3.js';
 import { OrderDirection } from '../types';
 export declare const getTokenATA: (address: PublicKey, Mint: PublicKey, program?: PublicKey) => PublicKey;
@@ -13,5 +12,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,12 +1,13 @@
 {
   "name": "@triadxyz/triad-protocol",
-  "version": "4.0.2",
+  "version": "4.0.4-beta.1",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "scripts": {
     "clean": "rimraf dist",
     "build": "yarn run clean && tsc",
+    "docs": "typedoc",
     "prepublishOnly": "yarn build"
   },
   "publishConfig": {
@@ -34,20 +35,12 @@
     "@coral-xyz/anchor": "0.30.1",
     "@solana/spl-token": "0.4.8",
     "@solana/web3.js": "1.95.3",
-    "axios": "1.9.0",
-    "bn.js": "5.2.2",
+    "bn.js": "5.2.3",
     "bs58": "6.0.0"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "6.7.3",
-    "@typescript-eslint/parser": "6.7.3",
     "@types/bn.js": "^5.1.0",
-    "eslint": "8.50.0",
-    "eslint-config-prettier": "9.0.0",
-    "eslint-plugin-prettier": "5.0.0",
-    "prettier": "3.2.4",
-    "rimraf": "^5.0.5",
-    "typedoc": "0.25.1",
+    "rimraf": "6.1.3",
     "typescript": "5.2.2"
   }
 }