@triadxyz/triad-protocol 4.2.6 → 4.2.8

package/dist/index.d.ts

@@ -31,6 +31,7 @@ export default class TriadProtocol {
     market: Market;
     constructor(connection: Connection, wallet: Wallet, rpcOptions: RpcOptions);
     getPriorityFee(): Promise<void>;
+    getCentral(): Promise<import("./types").Central>;
     /**
      * Burn Triad
      * @param amount - Amount to burn

package/dist/index.js

@@ -29,6 +29,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const anchor_1 = require("@coral-xyz/anchor");
 const bn_js_1 = __importDefault(require("bn.js"));
 const idl_triad_protocol_json_1 = __importDefault(require("./types/idl_triad_protocol.json"));
+const pda_1 = require("./utils/pda");
+const helpers_1 = require("./utils/helpers");
 const sendVersionedTransaction_1 = __importDefault(require("./utils/sendVersionedTransaction"));
 const stake_1 = __importDefault(require("./stake"));
 const poseidon_1 = __importDefault(require("./poseidon"));
@@ -74,6 +76,13 @@ class TriadProtocol {
             this.rpcOptions.microLamports = yield (0, getPriorityFee_1.default)();
         });
     }
+    getCentral() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const centralPDA = (0, pda_1.getCentralPDA)(this.program.programId);
+            const central = yield this.program.account.central.fetch(centralPDA);
+            return (0, helpers_1.formatCentral)(central, centralPDA);
+        });
+    }
     /**
      * Burn Triad
      * @param amount - Amount to burn

package/dist/market.d.ts

@@ -160,11 +160,4 @@ export default class Market {
      * @param market.poolId - The ID of the pool
      */
     createAndResolveMarket(toResolve: UpdateMarketWinningDirectionArgs['markets'][0], market: CreateMarketArgs['markets'][0], customer: PublicKey): Promise<string | import("@solana/web3.js").VersionedTransaction>;
-    /**
-     *
-     * @param marketId
-     * @param usdcMint
-     * @returns
-     */
-    migrateUSDC(marketIds: number[]): Promise<string | import("@solana/web3.js").VersionedTransaction>;
 }

package/dist/market.js

@@ -567,27 +567,5 @@ class Market {
             return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
-    /**
-     *
-     * @param marketId
-     * @param usdcMint
-     * @returns
-     */
-    migrateUSDC(marketIds) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const ixs = [];
-            for (const marketId of marketIds) {
-                const marketPDA = (0, pda_1.getMarketPDA)(this.program.programId, marketId);
-                ixs.push(yield this.program.methods
-                    .migrateUsdc()
-                    .accounts({
-                    signer: this.program.provider.publicKey,
-                    market: marketPDA
-                })
-                    .instruction());
-            }
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
-        });
-    }
 }
 exports.default = Market;

package/dist/predictor.d.ts

@@ -13,11 +13,6 @@ export default class Predictor {
      * @param customerId - Customer ID
      */
     getPredictor(authority: PublicKey, customerId: number): Promise<PredictorType>;
-    createPredictor(users: {
-        authority: PublicKey;
-        refer: string;
-        customerId: number;
-    }[]): Promise<void>;
     /**
      * Get User Orders
      * @param wallet - User wallet PublicKey

package/dist/predictor.js

@@ -12,7 +12,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const web3_js_1 = require("@solana/web3.js");
 const bn_js_1 = __importDefault(require("bn.js"));
 const constants_1 = require("./utils/constants");
 const sendVersionedTransaction_1 = __importDefault(require("./utils/sendVersionedTransaction"));
@@ -48,24 +47,6 @@ class Predictor {
             }
         });
     }
-    createPredictor(users) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let ixs = [];
-            for (const user of users) {
-                ixs.push(yield this.program.methods
-                    .createPredictor({
-                    customerId: user.customerId,
-                    refer: new web3_js_1.PublicKey(user.refer)
-                })
-                    .accounts({
-                    signer: user.authority,
-                    payer: this.rpcOptions.payer
-                })
-                    .instruction());
-            }
-            yield (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
-        });
-    }
     /**
      * Get User Orders
      * @param wallet - User wallet PublicKey

package/dist/trade.js

@@ -220,7 +220,6 @@ class Trade {
                 if (usdcAmount.lte(new bn_js_1.default(0)))
                     continue;
                 const oppositeOrderDirection = (0, helpers_1.getOppositeOrderDirectionEncoded)(orderDirection);
-                const oppositePredictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, new web3_js_1.PublicKey(order.authority), customer.id);
                 ixs.push(yield this.program.methods
                     .marketBidOrder({
                     amount: new bn_js_1.default(usdcAmount),
@@ -233,13 +232,13 @@ class Trade {
                     signer: this.program.provider.publicKey,
                     payer: this.rpcOptions.payer,
                     predictor: predictorPDA,
-                    oppositePredictor: oppositePredictorPDA,
+                    oppositePredictor: new web3_js_1.PublicKey(order.authority),
                     central: (0, pda_1.getCentralPDA)(this.program.programId),
                     market: marketPDA,
                     orderBook: (0, pda_1.getOrderBookPDA)(this.program.programId, marketId),
                     customer: customer.address,
                     predictorOrder: (0, pda_1.getPredictorOrderPDA)(this.program.programId, predictorPDA, marketId, (0, helpers_1.getOrderDirection)(orderDirection)),
-                    oppositePredictorOrder: (0, pda_1.getPredictorOrderPDA)(this.program.programId, oppositePredictorPDA, marketId, (0, helpers_1.getOrderDirection)(oppositeOrderDirection))
+                    oppositePredictorOrder: (0, pda_1.getPredictorOrderPDA)(this.program.programId, new web3_js_1.PublicKey(order.authority), marketId, (0, helpers_1.getOrderDirection)(oppositeOrderDirection))
                 })
                     .instruction());
                 remainingUSDC = remainingUSDC.sub(usdcAmount);
@@ -286,7 +285,6 @@ class Trade {
                 const effectivePriceDecimal = (0, feeCalculator_1.applySellFee)(orderPrice.toNumber() / 1000000, 500, customer.marketFeeBps);
                 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))));
-                const oppositePredictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, new web3_js_1.PublicKey(order.authority), customer.id);
                 ixs.push(yield this.program.methods
                     .marketAskOrder({
                     shares: new bn_js_1.default(sharesToSell),
@@ -296,13 +294,13 @@ class Trade {
                     .accounts({
                     signer: this.program.provider.publicKey,
                     predictor: predictorPDA,
-                    oppositePredictor: oppositePredictorPDA,
+                    oppositePredictor: new web3_js_1.PublicKey(order.authority),
                     market: marketPDA,
                     orderBook: (0, pda_1.getOrderBookPDA)(this.program.programId, marketId),
                     customer: customer.address,
                     central: (0, pda_1.getCentralPDA)(this.program.programId),
                     predictorOrder: (0, pda_1.getPredictorOrderPDA)(this.program.programId, predictorPDA, marketId, (0, helpers_1.getOrderDirection)(orderDirection)),
-                    oppositePredictorOrder: (0, pda_1.getPredictorOrderPDA)(this.program.programId, oppositePredictorPDA, marketId, (0, helpers_1.getOrderDirection)(orderDirection))
+                    oppositePredictorOrder: (0, pda_1.getPredictorOrderPDA)(this.program.programId, new web3_js_1.PublicKey(order.authority), marketId, (0, helpers_1.getOrderDirection)(orderDirection))
                 })
                     .instruction());
             }

package/dist/types/idl_triad_protocol.json

@@ -1360,113 +1360,6 @@
             ],
             "args": []
         },
-        {
-            "name": "migrate_usdc",
-            "discriminator": [8, 131, 126, 107, 248, 44, 154, 73],
-            "accounts": [
-                {
-                    "name": "signer",
-                    "writable": true,
-                    "signer": true
-                },
-                {
-                    "name": "central",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [99, 101, 110, 116, 114, 97, 108]
-                            },
-                            {
-                                "kind": "const",
-                                "value": [
-                                    116, 114, 105, 97, 100, 109, 97, 114, 107, 101, 116, 115
-                                ]
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "market",
-                    "writable": true
-                },
-                {
-                    "name": "mint",
-                    "writable": true,
-                    "address": "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v"
-                },
-                {
-                    "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": "central_ata",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "account",
-                                "path": "central"
-                            },
-                            {
-                                "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": "payout_order",
             "discriminator": [247, 233, 158, 228, 63, 32, 236, 113],

package/dist/types/index.d.ts

@@ -55,6 +55,13 @@ export type PredictorOrder = {
     orderDirection: OrderDirection;
     predictor: string;
 };
+export type Central = {
+    address: string;
+    isLocked: boolean;
+    feeAvailable: number;
+    feeClaimed: number;
+    rewardsPaid: number;
+};
 export type BookOrder = {
     id: string;
     price: string;

package/dist/types/triad_protocol.d.ts

@@ -1788,182 +1788,6 @@ export type TriadProtocol = {
             ];
             args: [];
         },
-        {
-            name: 'migrateUsdc';
-            discriminator: [8, 131, 126, 107, 248, 44, 154, 73];
-            accounts: [
-                {
-                    name: 'signer';
-                    writable: true;
-                    signer: true;
-                },
-                {
-                    name: 'central';
-                    writable: true;
-                    pda: {
-                        seeds: [
-                            {
-                                kind: 'const';
-                                value: [99, 101, 110, 116, 114, 97, 108];
-                            },
-                            {
-                                kind: 'const';
-                                value: [
-                                    116,
-                                    114,
-                                    105,
-                                    97,
-                                    100,
-                                    109,
-                                    97,
-                                    114,
-                                    107,
-                                    101,
-                                    116,
-                                    115
-                                ];
-                            }
-                        ];
-                    };
-                },
-                {
-                    name: 'market';
-                    writable: true;
-                },
-                {
-                    name: 'mint';
-                    writable: true;
-                    address: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v';
-                },
-                {
-                    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: 'centralAta';
-                    writable: true;
-                    pda: {
-                        seeds: [
-                            {
-                                kind: 'account';
-                                path: 'central';
-                            },
-                            {
-                                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: 'payoutOrder';
             discriminator: [247, 233, 158, 228, 63, 32, 236, 113];

package/dist/utils/helpers.d.ts

@@ -1,6 +1,6 @@
 import { PublicKey } from '@solana/web3.js';
 import { IdlAccounts, Program } from '@coral-xyz/anchor';
-import { Market, PredictorOrder, OrderDirection, OrderSide, OrderStatus, OrderType, OrderDirectionEncoded, OrderTypeEncoded, OrderSideEncoded, OrderStatusEncoded, Pool, BookOrder } from '../types';
+import { Market, PredictorOrder, OrderDirection, OrderSide, OrderStatus, OrderType, OrderDirectionEncoded, OrderTypeEncoded, OrderSideEncoded, OrderStatusEncoded, Pool, BookOrder, Central } from '../types';
 import { Stake, StakeVault, Unstake } from '../types/stake';
 import { Customer } from '../types/customer';
 import { TriadProtocol } from '../types/triad_protocol';
@@ -27,6 +27,7 @@ export declare const getOrderDirectionEncoded: (orderDirection: OrderDirection)
 export declare const getOppositeOrderDirection: (orderDirection: OrderDirection) => OrderDirection;
 export declare const getOppositeOrderDirectionEncoded: (orderDirection: OrderDirectionEncoded) => OrderDirectionEncoded;
 export declare const formatPredictor: (account: IdlAccounts<TriadProtocol>['predictor'], publicKey: PublicKey) => Predictor;
+export declare const formatCentral: (account: IdlAccounts<TriadProtocol>['central'], publicKey: PublicKey) => Central;
 export declare const getPriceFeedAccountForProgram: (priceFeedId: string) => PublicKey;
 export declare const getFeedIdFromHex: (input?: string) => PublicKey | null;
 export declare const getCustomerById: (program: Program<TriadProtocol>, customerId: number) => Promise<Customer>;

package/dist/utils/helpers.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCustomerById = exports.getFeedIdFromHex = exports.getPriceFeedAccountForProgram = 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.formatPredictorOrder = exports.formatMarket = exports.formatPool = exports.formatUnstake = exports.formatStake = exports.formatStakeVault = exports.decodeString = exports.encodeString = void 0;
+exports.getCustomerById = exports.getFeedIdFromHex = exports.getPriceFeedAccountForProgram = exports.formatCentral = 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.formatPredictorOrder = 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");
@@ -146,7 +146,7 @@ exports.formatBookOrder = formatBookOrder;
 const formatCustomer = (account, publicKey) => {
     return {
         id: account.id,
-        authority: publicKey.toString(),
+        authority: account.authority.toString(),
         name: account.name,
         feeRecipient: account.feeRecipient.toString(),
         feeBps: account.feeBps,
@@ -271,6 +271,16 @@ const formatPredictor = (account, publicKey) => {
     };
 };
 exports.formatPredictor = formatPredictor;
+const formatCentral = (account, publicKey) => {
+    return {
+        address: publicKey.toBase58(),
+        isLocked: account.isLocked,
+        feeAvailable: account.feeAvailable.toNumber() / 1e6,
+        feeClaimed: account.feeClaimed.toNumber() / 1e6,
+        rewardsPaid: account.rewardsPaid.toNumber() / 1e6
+    };
+};
+exports.formatCentral = formatCentral;
 const getPriceFeedAccountForProgram = (priceFeedId) => {
     let buffer = null;
     if (typeof priceFeedId == 'string') {

package/package.json

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