@triadxyz/triad-protocol 2.6.6-beta → 2.6.8-beta

package/dist/index.d.ts

@@ -2,7 +2,7 @@ import { Connection, PublicKey, TransactionInstruction } from '@solana/web3.js';
 import { AnchorProvider, Program, Wallet } from '@coral-xyz/anchor';
 import BN from 'bn.js';
 import { TriadProtocol } from './types/triad_protocol';
-import { CreateMarketArgs, OpenOrderArgs, UserTrade, CreateCustomerArgs, MarketBidOrderArgs, CancelBidOrderArgs, CancelAskOrderArgs, PlaceBidOrderArgs, PlaceAskOrderArgs, CreatePoolArgs, BookOrder, MarketAskOrderArgs, RpcOptions, CollectMarketFeeArgs, UpdateCustomerFeeArgs } from './types';
+import { CreateMarketArgs, OpenOrderArgs, UserTrade, CreateCustomerArgs, MarketBidOrderArgs, CancelBidOrderArgs, CancelAskOrderArgs, PlaceBidOrderArgs, PlaceAskOrderArgs, CreatePoolArgs, BookOrder, MarketAskOrderArgs, RpcOptions, UpdateCustomerFeeArgs } from './types';
 import Stake from './stake';
 import Poseidon from './poseidon';
 export * from './types';
@@ -436,18 +436,21 @@ export default class TriadProtocolClient {
     }>;
     /**
      * Collect Market Fee
-     * @param marketId - The ID of the market
+     * @param args.markets - The markets to collect the fee from
      *
      * @param options - RPC options
      */
-    collectMarketFee({ marketId, feeRecipient }: CollectMarketFeeArgs, options?: RpcOptions): Promise<string>;
+    collectMarketFee(markets: {
+        mint: PublicKey;
+        marketAddress: PublicKey;
+    }[], options?: RpcOptions): Promise<string>;
     /**
      * Close Order Book
      * @param marketId - The ID of the market
      *
      * @param options - RPC options
      */
-    closeOrderBook(marketId: number, options?: RpcOptions): Promise<string>;
+    closeOrderBook(marketIds: number[], options?: RpcOptions): Promise<string>;
     /**
      * Create Refer
      * @param id - The ID of the refer

package/dist/index.js

@@ -296,7 +296,8 @@ class TriadProtocolClient {
                 isFast
             })
                 .accounts({
-                signer: this.program.provider.publicKey
+                signer: this.program.provider.publicKey,
+                customer
             })
                 .instruction());
             for (const market of markets) {
@@ -898,6 +899,7 @@ class TriadProtocolClient {
                 const sharesToSell = bn_js_1.default.min(remainingShares, availableShares);
                 if (sharesToSell.lt(new bn_js_1.default(0)))
                     continue;
+                remainingShares = remainingShares.sub(sharesToSell);
                 ixs.push(yield this.program.methods
                     .marketAskOrder({
                     shares: new bn_js_1.default(sharesToSell),
@@ -966,21 +968,24 @@ class TriadProtocolClient {
     }
     /**
      * Collect Market Fee
-     * @param marketId - The ID of the market
+     * @param args.markets - The markets to collect the fee from
      *
      * @param options - RPC options
      */
-    collectMarketFee({ marketId, feeRecipient }, options) {
+    collectMarketFee(markets, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
-            ixs.push(yield this.program.methods
-                .collectMarketFee()
-                .accounts({
-                signer: this.program.provider.publicKey,
-                market: (0, pda_1.getMarketPDA)(this.program.programId, marketId),
-                mint: constants_1.TRD_MINT
-            })
-                .instruction());
+            for (const market of markets) {
+                ixs.push(yield this.program.methods
+                    .collectMarketFee()
+                    .accounts({
+                    signer: this.program.provider.publicKey,
+                    market: market.marketAddress,
+                    mint: market.mint,
+                    tokenProgram: (0, helpers_1.getTokenProgram)(market.mint)
+                })
+                    .instruction());
+            }
             return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
         });
     }
@@ -990,17 +995,19 @@ class TriadProtocolClient {
      *
      * @param options - RPC options
      */
-    closeOrderBook(marketId, options) {
+    closeOrderBook(marketIds, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
-            ixs.push(yield this.program.methods
-                .closeOrderBook()
-                .accounts({
-                signer: this.program.provider.publicKey,
-                market: (0, pda_1.getMarketPDA)(this.program.programId, marketId),
-                orderBook: (0, pda_1.getOrderBookPDA)(this.program.programId, marketId)
-            })
-                .instruction());
+            for (const marketId of marketIds) {
+                ixs.push(yield this.program.methods
+                    .closeOrderBook()
+                    .accounts({
+                    signer: this.program.provider.publicKey,
+                    market: (0, pda_1.getMarketPDA)(this.program.programId, marketId),
+                    orderBook: (0, pda_1.getOrderBookPDA)(this.program.programId, marketId)
+                })
+                    .instruction());
+            }
             return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
         });
     }

package/dist/types/idl_triad_protocol.json

@@ -678,34 +678,6 @@
                 }
             ]
         },
-        {
-            "name": "create_global",
-            "discriminator": [84, 131, 250, 135, 241, 203, 79, 0],
-            "accounts": [
-                {
-                    "name": "signer",
-                    "writable": true,
-                    "signer": true
-                },
-                {
-                    "name": "global",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [103, 108, 111, 98, 97, 108]
-                            }
-                        ]
-                    }
-                },
-                {
-                    "name": "system_program",
-                    "address": "11111111111111111111111111111111"
-                }
-            ],
-            "args": []
-        },
         {
             "name": "create_market",
             "discriminator": [103, 226, 97, 235, 200, 188, 251, 254],

package/dist/types/index.d.ts

@@ -227,10 +227,6 @@ export type MarketAskOrderArgs = {
     };
     mint: PublicKey;
 };
-export type CollectMarketFeeArgs = {
-    marketId: number;
-    feeRecipient: PublicKey;
-};
 export type Refer = {
     id: number;
     authority: string;

package/dist/types/triad_protocol.d.ts

@@ -986,34 +986,6 @@ export type TriadProtocol = {
                 }
             ];
         },
-        {
-            name: 'createGlobal';
-            discriminator: [84, 131, 250, 135, 241, 203, 79, 0];
-            accounts: [
-                {
-                    name: 'signer';
-                    writable: true;
-                    signer: true;
-                },
-                {
-                    name: 'global';
-                    writable: true;
-                    pda: {
-                        seeds: [
-                            {
-                                kind: 'const';
-                                value: [103, 108, 111, 98, 97, 108];
-                            }
-                        ];
-                    };
-                },
-                {
-                    name: 'systemProgram';
-                    address: '11111111111111111111111111111111';
-                }
-            ];
-            args: [];
-        },
         {
             name: 'createMarket';
             discriminator: [103, 226, 97, 235, 200, 188, 251, 254];

package/dist/utils/constants.d.ts

@@ -1,5 +1,6 @@
 import { PublicKey } from '@solana/web3.js';
 export declare const TRD_DECIMALS = 6;
+export declare const USDC_MINT: PublicKey;
 export declare const TRD_MINT: PublicKey;
 export declare const TRIAD_ADMIN: PublicKey;
 export declare const SOL_MINT: PublicKey;

package/dist/utils/constants.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TICKET_COLLECTION_SYMBOL = exports.POSEIDON_CORE_COLLECTION = exports.POSEIDON_COLLECTION_SYMBOL = exports.TICKET_CORE_COLLECTION = exports.SOL_MINT = exports.TRIAD_ADMIN = exports.TRD_MINT = exports.TRD_DECIMALS = void 0;
+exports.TICKET_COLLECTION_SYMBOL = exports.POSEIDON_CORE_COLLECTION = exports.POSEIDON_COLLECTION_SYMBOL = exports.TICKET_CORE_COLLECTION = exports.SOL_MINT = exports.TRIAD_ADMIN = exports.TRD_MINT = exports.USDC_MINT = exports.TRD_DECIMALS = void 0;
 const web3_js_1 = require("@solana/web3.js");
 exports.TRD_DECIMALS = 6;
+exports.USDC_MINT = new web3_js_1.PublicKey('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v');
 exports.TRD_MINT = new web3_js_1.PublicKey('t3DohmswhKk94PPbPYwA6ZKACyY3y5kbcqeQerAJjmV');
 exports.TRIAD_ADMIN = new web3_js_1.PublicKey('82ppCojm3yrEKgdpH8B5AmBJTU1r1uAWXFWhxvPs9UCR');
 exports.SOL_MINT = new web3_js_1.PublicKey('So11111111111111111111111111111111111111112');

package/package.json

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