@triadxyz/triad-protocol 4.2.5 → 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

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

package/dist/trade.js

@@ -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.getPredictorOrderPDA)(this.program.programId, predictorPDA, 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)(oppositeOrderDirection))
+                    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.getPredictorOrderPDA)(this.program.programId, predictorPDA, 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))
+                    oppositePredictorOrder: (0, pda_1.getPredictorOrderPDA)(this.program.programId, oppositePredictorPDA, marketId, (0, helpers_1.getOrderDirection)(orderDirection))
                 })
                     .instruction());
             }

package/package.json

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