@triadxyz/triad-protocol 4.2.8 → 4.3.0

package/dist/market.js

@@ -367,9 +367,7 @@ class Market {
                 ixs.push(yield this.program.methods
                     .closeIdleMarket(new bn_js_1.default(market.id))
                     .accounts({
-                    signer: this.program.provider.publicKey,
-                    mint: market.mint,
-                    tokenProgram: (0, helpers_1.getTokenProgram)(market.mint)
+                    signer: this.program.provider.publicKey
                 })
                     .instruction());
             }

package/dist/predictor.d.ts

@@ -2,7 +2,7 @@ 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, CollectRewardsArgs, Predictor as PredictorType } from './types/predictor';
+import { DepositArgs, DepositExtArgs, WithdrawArgs, WithdrawExtArgs, CollectRewardsArgs, Predictor as PredictorType } from './types/predictor';
 export default class Predictor {
     private program;
     private rpcOptions;
@@ -13,6 +13,11 @@ export default class Predictor {
      * @param customerId - Customer ID
      */
     getPredictor(authority: PublicKey, customerId: number): Promise<PredictorType>;
+    /**
+     * Get predictor by address
+     * @param address - Predictor address
+     */
+    getPredictorByAddress(address: string): Promise<PredictorType>;
     /**
      * Get User Orders
      * @param wallet - User wallet PublicKey
@@ -52,6 +57,26 @@ export default class Predictor {
      * @param args.customerId - Customer ID
      */
     withdraw({ authority, amount, customerId }: WithdrawArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    /**
+     * Deposit Ext
+     * Idempotent deposit with an optional external deposit record.
+     * @param args.authority - Authority of the deposit
+     * @param args.amount - Amount to deposit
+     * @param args.refer - Referral public key (used only when creating the predictor)
+     * @param args.customerId - Customer ID
+     * @param args.depositId - Optional 12-byte deposit ID used as idempotency key
+     */
+    depositExt({ authority, amount, refer, customerId, depositId }: DepositExtArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    /**
+     * Withdraw Ext
+     * Withdraws to an external ATA owned by the caller-provided account.
+     * @param args.authority - Authority of the withdraw
+     * @param args.amount - Amount to withdraw
+     * @param args.customerId - Customer ID
+     * @param args.key - External withdraw key (idempotency / off-chain reference)
+     * @param args.extAta - External ATA destination
+     */
+    withdrawExt({ authority, amount, customerId, key, extAta }: WithdrawExtArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Collect Rewards
      * Claims accumulated TRIAD token rewards for the predictor.

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,16 @@ class Predictor {
             }
         });
     }
+    /**
+     * Get predictor by address
+     * @param address - Predictor address
+     */
+    getPredictorByAddress(address) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const predictor = yield this.program.account.predictor.fetch(new web3_js_1.PublicKey(address), this.rpcOptions.commitment);
+            return (0, helpers_1.formatPredictor)(predictor, new web3_js_1.PublicKey(address));
+        });
+    }
     /**
      * Get User Orders
      * @param wallet - User wallet PublicKey
@@ -170,6 +181,76 @@ class Predictor {
             return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
+    /**
+     * Deposit Ext
+     * Idempotent deposit with an optional external deposit record.
+     * @param args.authority - Authority of the deposit
+     * @param args.amount - Amount to deposit
+     * @param args.refer - Referral public key (used only when creating the predictor)
+     * @param args.customerId - Customer ID
+     * @param args.depositId - Optional 12-byte deposit ID used as idempotency key
+     */
+    depositExt({ authority, amount, refer, customerId, depositId }) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            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({
+                    customerId,
+                    refer
+                })
+                    .accounts({
+                    signer: authority,
+                    payer: this.rpcOptions.payer
+                })
+                    .instruction());
+            }
+            ixs.push(yield this.program.methods
+                .depositExt({
+                amount: new bn_js_1.default(amount * Math.pow(10, constants_1.BASE_DECIMALS)),
+                depositId: Array.from(Buffer.from(depositId, 'hex'))
+            })
+                .accounts({
+                signer: authority,
+                predictor: predictorPDA,
+                predictorDeposit: (0, pda_1.getPredictorDepositPDA)(this.program.programId, depositId)
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
+        });
+    }
+    /**
+     * Withdraw Ext
+     * Withdraws to an external ATA owned by the caller-provided account.
+     * @param args.authority - Authority of the withdraw
+     * @param args.amount - Amount to withdraw
+     * @param args.customerId - Customer ID
+     * @param args.key - External withdraw key (idempotency / off-chain reference)
+     * @param args.extAta - External ATA destination
+     */
+    withdrawExt({ authority, amount, customerId, key, extAta }) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, authority, customerId);
+            const ixs = [
+                yield this.program.methods
+                    .withdrawExt({
+                    amount: new bn_js_1.default(amount * Math.pow(10, constants_1.BASE_DECIMALS)),
+                    key
+                })
+                    .accounts({
+                    signer: authority,
+                    predictor: predictorPDA,
+                    extAta
+                })
+                    .instruction()
+            ];
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
+        });
+    }
     /**
      * Collect Rewards
      * Claims accumulated TRIAD token rewards for the predictor.

package/dist/trade.d.ts

@@ -33,7 +33,7 @@ export default class Trade {
      * @param args.orders.price - The price of the Order
      * @param args.orders.orderDirection - The direction of the Order
      */
-    placeBidOrder({ orders, customerId }: PlaceBidOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    placeBidOrder({ orders }: PlaceBidOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Place Ask Order
      * @param args.orders - Array of orders to execute
@@ -42,14 +42,14 @@ export default class Trade {
      * @param args.orders.marketId - The Id from the market
      * @param args.orders.orderDirection - The direction of the Order
      */
-    placeAskOrder({ orders, customerId }: PlaceAskOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    placeAskOrder({ orders }: PlaceAskOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Cancel Bid Order
      * @param args.orders.bookOrderId - The ID of the Book Order
      * @param args.orders.marketId - The ID of the Market
      * @param args.orders.orderDirection - The direction of the Order
      */
-    cancelBidOrder({ orders, customerId }: CancelBidOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    cancelBidOrder({ orders }: CancelBidOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Cancel Ask Order
      * @param args.orders.marketId - The ID of the Market
@@ -57,7 +57,7 @@ export default class Trade {
      * @param args.orders.bookOrderId - The ID of the Book Order
      * @param args.orders.orderDirection - The direction of the Order
      */
-    cancelAskOrder({ orders, customerId }: CancelAskOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    cancelAskOrder({ orders }: CancelAskOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Market Bid Order
      * @param args.marketId - The ID of the Market

package/dist/trade.js

@@ -67,11 +67,11 @@ class Trade {
      * @param args.orders.price - The price of the Order
      * @param args.orders.orderDirection - The direction of the Order
      */
-    placeBidOrder({ orders, customerId }) {
+    placeBidOrder({ orders }) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
-            const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, this.program.provider.publicKey, customerId);
             for (const order of orders) {
+                const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, this.program.provider.publicKey, order.customerId);
                 ixs.push(yield this.program.methods
                     .placeBidOrder({
                     amount: new bn_js_1.default(order.amount * Math.pow(10, constants_1.BASE_DECIMALS)),
@@ -100,11 +100,11 @@ class Trade {
      * @param args.orders.marketId - The Id from the market
      * @param args.orders.orderDirection - The direction of the Order
      */
-    placeAskOrder({ orders, customerId }) {
+    placeAskOrder({ orders }) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
-            const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, this.program.provider.publicKey, customerId);
             for (const order of orders) {
+                const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, this.program.provider.publicKey, order.customerId);
                 ixs.push(yield this.program.methods
                     .placeAskOrder({
                     shares: new bn_js_1.default(order.amount * Math.pow(10, constants_1.BASE_DECIMALS)),
@@ -129,7 +129,7 @@ class Trade {
      * @param args.orders.marketId - The ID of the Market
      * @param args.orders.orderDirection - The direction of the Order
      */
-    cancelBidOrder({ orders, customerId }) {
+    cancelBidOrder({ orders }) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
             for (const order of orders) {
@@ -140,8 +140,8 @@ class Trade {
                     orderDirection: order.orderDirection
                 })
                     .accounts({
-                    signer: new web3_js_1.PublicKey(order.authority),
-                    predictor: (0, pda_1.getPredictorPDA)(this.program.programId, new web3_js_1.PublicKey(order.authority), customerId),
+                    signer: order.authority,
+                    predictor: order.predictor,
                     market: (0, pda_1.getMarketPDA)(this.program.programId, order.marketId),
                     orderBook: (0, pda_1.getOrderBookPDA)(this.program.programId, order.marketId)
                 })
@@ -157,10 +157,9 @@ class Trade {
      * @param args.orders.bookOrderId - The ID of the Book Order
      * @param args.orders.orderDirection - The direction of the Order
      */
-    cancelAskOrder({ orders, customerId }) {
+    cancelAskOrder({ orders }) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
-            const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, this.program.provider.publicKey, customerId);
             for (const order of orders) {
                 ixs.push(yield this.program.methods
                     .cancelAskOrder({
@@ -171,10 +170,10 @@ class Trade {
                     .accounts({
                     signer: order.authority,
                     payer: this.rpcOptions.payer,
-                    predictor: predictorPDA,
+                    predictor: order.predictor,
                     market: (0, pda_1.getMarketPDA)(this.program.programId, order.marketId),
                     orderBook: (0, pda_1.getOrderBookPDA)(this.program.programId, order.marketId),
-                    predictorOrder: (0, pda_1.getPredictorOrderPDA)(this.program.programId, predictorPDA, order.marketId, (0, helpers_1.getOrderDirection)(order.orderDirection))
+                    predictorOrder: (0, pda_1.getPredictorOrderPDA)(this.program.programId, order.predictor, order.marketId, (0, helpers_1.getOrderDirection)(order.orderDirection))
                 })
                     .instruction());
             }
@@ -320,7 +319,7 @@ class Trade {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
             for (const order of orders) {
-                const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, this.program.provider.publicKey, order.customerId);
+                const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, order.authority, order.customerId);
                 ixs.push(yield this.program.methods
                     .payoutOrder()
                     .accounts({