@triadxyz/triad-protocol 4.2.4 → 4.2.6

package/dist/market.d.ts

@@ -160,4 +160,11 @@ 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,5 +567,27 @@ 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,6 +13,11 @@ 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
@@ -49,7 +54,7 @@ export default class Predictor {
      * Withdraw
      * @param args.authority - Authority of the withdraw
      * @param args.amount - Amount to deposit
-     * @param args.customerId - Customer ID (optional) defaults to 7 from Triadmarkets
+     * @param args.customerId - Customer ID
      */
     withdraw({ authority, amount, customerId }: WithdrawArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**

package/dist/predictor.js

@@ -12,6 +12,7 @@ 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"));
@@ -47,6 +48,24 @@ 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
@@ -107,7 +126,8 @@ class Predictor {
             const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, wallet, customerId);
             return orders
                 .map((order) => (0, helpers_1.formatBookOrder)(order, marketId))
-                .filter((order) => order.authority === predictorPDA.toBase58() &&
+                .filter((order) => (order.authority === predictorPDA.toBase58() ||
+                order.authority === wallet.toBase58()) &&
                 order.linkedBookOrderId === constants_1.BOOK_ORDER_NULL.toString());
         });
     }
@@ -151,7 +171,7 @@ class Predictor {
      * Withdraw
      * @param args.authority - Authority of the withdraw
      * @param args.amount - Amount to deposit
-     * @param args.customerId - Customer ID (optional) defaults to 7 from Triadmarkets
+     * @param args.customerId - Customer ID
      */
     withdraw({ authority, amount, customerId }) {
         return __awaiter(this, void 0, void 0, function* () {

package/dist/trade.js

@@ -85,7 +85,7 @@ class Trade {
                     predictor: predictorPDA,
                     market: (0, pda_1.getMarketPDA)(this.program.programId, order.marketId),
                     orderBook: (0, pda_1.getOrderBookPDA)(this.program.programId, order.marketId),
-                    predictorOrder: (0, pda_1.getOrderPDA)(this.program.programId, predictorPDA, order.marketId, (0, helpers_1.getOrderDirection)(order.orderDirection))
+                    predictorOrder: (0, pda_1.getPredictorOrderPDA)(this.program.programId, predictorPDA, order.marketId, (0, helpers_1.getOrderDirection)(order.orderDirection))
                 })
                     .instruction());
             }
@@ -115,7 +115,7 @@ class Trade {
                     signer: this.program.provider.publicKey,
                     market: (0, pda_1.getMarketPDA)(this.program.programId, order.marketId),
                     predictor: predictorPDA,
-                    predictorOrder: (0, pda_1.getOrderPDA)(this.program.programId, predictorPDA, order.marketId, (0, helpers_1.getOrderDirection)(order.orderDirection)),
+                    predictorOrder: (0, pda_1.getPredictorOrderPDA)(this.program.programId, predictorPDA, order.marketId, (0, helpers_1.getOrderDirection)(order.orderDirection)),
                     orderBook: (0, pda_1.getOrderBookPDA)(this.program.programId, order.marketId)
                 })
                     .instruction());
@@ -174,7 +174,7 @@ class Trade {
                     predictor: predictorPDA,
                     market: (0, pda_1.getMarketPDA)(this.program.programId, order.marketId),
                     orderBook: (0, pda_1.getOrderBookPDA)(this.program.programId, order.marketId),
-                    predictorOrder: (0, pda_1.getOrderPDA)(this.program.programId, predictorPDA, order.marketId, (0, helpers_1.getOrderDirection)(order.orderDirection))
+                    predictorOrder: (0, pda_1.getPredictorOrderPDA)(this.program.programId, predictorPDA, order.marketId, (0, helpers_1.getOrderDirection)(order.orderDirection))
                 })
                     .instruction());
             }
@@ -220,6 +220,7 @@ 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),
@@ -232,13 +233,13 @@ class Trade {
                     signer: this.program.provider.publicKey,
                     payer: this.rpcOptions.payer,
                     predictor: predictorPDA,
-                    oppositePredictor: (0, pda_1.getPredictorPDA)(this.program.programId, new web3_js_1.PublicKey(order.authority), customer.id),
+                    oppositePredictor: oppositePredictorPDA,
                     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.getOrderPDA)(this.program.programId, predictorPDA, marketId, (0, helpers_1.getOrderDirection)(orderDirection)),
-                    oppositePredictorOrder: (0, pda_1.getOrderPDA)(this.program.programId, new web3_js_1.PublicKey(order.authority), marketId, (0, helpers_1.getOrderDirection)(oppositeOrderDirection))
+                    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))
                 })
                     .instruction());
                 remainingUSDC = remainingUSDC.sub(usdcAmount);
@@ -285,6 +286,7 @@ 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),
@@ -294,12 +296,13 @@ class Trade {
                     .accounts({
                     signer: this.program.provider.publicKey,
                     predictor: predictorPDA,
+                    oppositePredictor: oppositePredictorPDA,
                     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.getOrderPDA)(this.program.programId, predictorPDA, marketId, (0, helpers_1.getOrderDirection)(orderDirection)),
-                    oppositePredictorOrder: (0, pda_1.getOrderPDA)(this.program.programId, new web3_js_1.PublicKey(order.authority), marketId, (0, helpers_1.getOrderDirection)(orderDirection))
+                    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))
                 })
                     .instruction());
             }
@@ -328,7 +331,7 @@ class Trade {
                     predictor: predictorPDA,
                     customer: (0, pda_1.getCustomerPDA)(this.program.programId, order.customerId),
                     central: (0, pda_1.getCentralPDA)(this.program.programId),
-                    predictorOrder: (0, pda_1.getOrderPDA)(this.program.programId, predictorPDA, order.marketId, (0, helpers_1.getOrderDirection)(order.orderDirection))
+                    predictorOrder: (0, pda_1.getPredictorOrderPDA)(this.program.programId, predictorPDA, order.marketId, (0, helpers_1.getOrderDirection)(order.orderDirection))
                 })
                     .instruction());
             }

package/dist/types/customer.d.ts

@@ -9,6 +9,8 @@ export type Customer = {
     address: string;
     marketFeeBps: number;
     payoutFeeBps: number;
+    feeAvailable: number;
+    feeClaimed: number;
 };
 export type CreateCustomerArgs = {
     id: number;

package/dist/types/idl_triad_protocol.json

@@ -1389,20 +1389,7 @@
                 },
                 {
                     "name": "market",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [109, 97, 114, 107, 101, 116]
-                            },
-                            {
-                                "kind": "account",
-                                "path": "market.market_id",
-                                "account": "MarketV2"
-                            }
-                        ]
-                    }
+                    "writable": true
                 },
                 {
                     "name": "mint",

package/dist/types/triad_protocol.d.ts

@@ -1829,19 +1829,6 @@ export type TriadProtocol = {
                 {
                     name: 'market';
                     writable: true;
-                    pda: {
-                        seeds: [
-                            {
-                                kind: 'const';
-                                value: [109, 97, 114, 107, 101, 116];
-                            },
-                            {
-                                kind: 'account';
-                                path: 'market.market_id';
-                                account: 'marketV2';
-                            }
-                        ];
-                    };
                 },
                 {
                     name: 'mint';

package/dist/utils/helpers.js

@@ -153,7 +153,9 @@ const formatCustomer = (account, publicKey) => {
         marketFeeBps: account.marketFeeBps,
         payoutFeeBps: account.payoutFeeBps,
         isVerified: account.isVerified,
-        address: publicKey.toString()
+        address: publicKey.toString(),
+        feeAvailable: account.feeAvailable.toNumber() / Math.pow(10, 6),
+        feeClaimed: account.feeClaimed.toNumber() / Math.pow(10, 6)
     };
 };
 exports.formatCustomer = formatCustomer;

package/dist/utils/pda.d.ts

@@ -11,6 +11,6 @@ export declare const getNftPDA: (programId: PublicKey, number: number) => Public
 export declare const getPoseidonPDA: (programId: PublicKey, number: number) => PublicKey;
 export declare const getClaimVaultPDA: (programId: PublicKey, name: string) => PublicKey;
 export declare const getClaimedUserPDA: (programId: PublicKey, claimVault: PublicKey, user: PublicKey) => PublicKey;
-export declare const getOrderPDA: (programId: PublicKey, authority: PublicKey, marketId: number, orderDirection: OrderDirection) => PublicKey;
+export declare const getPredictorOrderPDA: (programId: PublicKey, predictor: PublicKey, marketId: number, orderDirection: OrderDirection) => PublicKey;
 export declare const getPredictorPDA: (programId: PublicKey, authority: PublicKey, customerId: number) => PublicKey;
 export declare const getCentralPDA: (programId: PublicKey) => PublicKey;

package/dist/utils/pda.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCentralPDA = exports.getPredictorPDA = exports.getOrderPDA = exports.getClaimedUserPDA = exports.getClaimVaultPDA = exports.getPoseidonPDA = exports.getNftPDA = exports.getCollectionPDA = exports.getStakePDA = exports.getPoolPDA = exports.getCustomerPDA = exports.getOrderBookPDA = exports.getMarketPDA = exports.getTokenATA = void 0;
+exports.getCentralPDA = exports.getPredictorPDA = exports.getPredictorOrderPDA = exports.getClaimedUserPDA = exports.getClaimVaultPDA = exports.getPoseidonPDA = exports.getNftPDA = exports.getCollectionPDA = exports.getStakePDA = exports.getPoolPDA = exports.getCustomerPDA = exports.getOrderBookPDA = exports.getMarketPDA = exports.getTokenATA = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const bn_js_1 = __importDefault(require("bn.js"));
 const spl_token_1 = require("@solana/spl-token");
@@ -52,18 +52,18 @@ const getClaimedUserPDA = (programId, claimVault, user) => {
     return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('claimed_user'), claimVault.toBuffer(), user.toBuffer()], programId)[0];
 };
 exports.getClaimedUserPDA = getClaimedUserPDA;
-const getOrderPDA = (programId, authority, marketId, orderDirection) => {
+const getPredictorOrderPDA = (programId, predictor, marketId, orderDirection) => {
     let enumOrderDirection = 0;
     if (orderDirection === types_1.OrderDirection.FLOP)
         enumOrderDirection = 1;
     return web3_js_1.PublicKey.findProgramAddressSync([
-        Buffer.from('order'),
-        authority.toBuffer(),
+        Buffer.from('predictor_order'),
+        predictor.toBuffer(),
         new bn_js_1.default(marketId).toArrayLike(Buffer, 'le', 8),
         new bn_js_1.default(enumOrderDirection).toArrayLike(Buffer, 'le', 1)
     ], programId)[0];
 };
-exports.getOrderPDA = getOrderPDA;
+exports.getPredictorOrderPDA = getPredictorOrderPDA;
 const getPredictorPDA = (programId, authority, customerId) => {
     return web3_js_1.PublicKey.findProgramAddressSync([
         Buffer.from('predictor'),

package/package.json

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