@triadxyz/triad-protocol 1.7.1-beta → 1.7.3-beta

package/dist/local-test/index.js

@@ -50,7 +50,6 @@ const getStakeByWallet = () => __awaiter(void 0, void 0, void 0, function* () {
     }
     console.log(sum);
 });
-getStakeByWallet();
 const getAllStakes = () => __awaiter(void 0, void 0, void 0, function* () {
     const stakes = yield triadProtocol.stake.getStakes();
     console.log(stakes.length);
@@ -120,7 +119,8 @@ const getAllMarkets = () => __awaiter(void 0, void 0, void 0, function* () {
         }
         let liquidity = (Number(market.hypeLiquidity) + Number(market.flopLiquidity)) /
             Math.pow(10, 6);
-        liquidity = liquidity - Number(market.marketLiquidityAtStart) / Math.pow(10, 6);
+        liquidity =
+            liquidity - Number(market.marketLiquidityAtStart) / Math.pow(10, 6);
         console.log('Market ID:', market.question);
         console.log('Liquidity:', liquidity);
         console.log('Hype Shares:', Number(market.hypeShares) / Math.pow(10, 6));
@@ -367,12 +367,13 @@ const collectRoyalties = () => __awaiter(void 0, void 0, void 0, function* () {
     console.log(response);
 });
 const collectRemainingLiquidity = () => __awaiter(void 0, void 0, void 0, function* () {
-    const markets = [34];
+    const markets = [160, 162, 164];
     for (const market of markets) {
         const response = yield triadProtocol.trade.collectRemainingLiquidity(market);
         console.log(response);
     }
 });
+collectRemainingLiquidity();
 const allowMarketToPayout = () => __awaiter(void 0, void 0, void 0, function* () {
     const markets = [163, 164, 165];
     for (const market of markets) {

package/dist/local-test/init-market.js

@@ -29,7 +29,7 @@ class InitMarket {
                         endTime: market.endTime,
                         feeBps: 0,
                         customer: null,
-                        liquidityAtStart: 12000
+                        mint: new web3_js_1.PublicKey('2222222222222222222222222222222222222222')
                     });
                     if (market.image) {
                         yield this.deployImage(market.image);

package/dist/trade.d.ts

@@ -130,7 +130,7 @@ export default class Trade {
      * @param options - RPC options
      *
      */
-    createMarket({ marketId, startTime, endTime, question, feeBps, customer, liquidityAtStart }: CreateMarketArgs, options?: RpcOptions): Promise<string>;
+    createMarket({ marketId, startTime, endTime, question, feeBps, customer, mint }: CreateMarketArgs, options?: RpcOptions): Promise<string>;
     /**
      * Get User Trade Nonce With Slots
      * @param userTrades - User Trades
@@ -199,10 +199,11 @@ export default class Trade {
      * @param options - RPC options
      *
      */
-    payoutOrder({ marketId, orderId, userNonce }: {
+    payoutOrder({ marketId, orderId, userNonce, mint }: {
         marketId: number;
         orderId: number;
         userNonce: number;
+        mint: PublicKey;
     }, options?: RpcOptions): Promise<string>;
     /**
      * Allow Market to Payout

package/dist/trade.js

@@ -114,7 +114,7 @@ class Trade {
      * @param options - RPC options
      *
      */
-    createMarket({ marketId, startTime, endTime, question, feeBps, customer, liquidityAtStart }, options) {
+    createMarket({ marketId, startTime, endTime, question, feeBps, customer, mint }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             if (question.length > 80) {
                 throw new Error('Question must be less than 80 characters');
@@ -125,13 +125,12 @@ class Trade {
                 question: (0, helpers_1.encodeString)(question, 80),
                 marketStart: new bn_js_1.default(startTime),
                 marketEnd: new bn_js_1.default(endTime),
-                liquidityAtStart: new bn_js_1.default(liquidityAtStart * Math.pow(10, constants_1.TRD_DECIMALS)),
                 feeBps
             })
                 .accounts({
                 signer: this.provider.publicKey,
-                mint: this.mint,
-                tokenProgram: (0, helpers_1.getTokenProgram)(this.mint),
+                mint,
+                tokenProgram: (0, helpers_1.getTokenProgram)(mint),
                 customer
             }), options);
         });
@@ -297,10 +296,14 @@ class Trade {
     collectRemainingLiquidity(marketId, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const marketPDA = (0, trade_1.getMarketPDA)(this.program.programId, marketId);
+            const market = yield this.getMarketByAddress(marketPDA);
+            if (market.isAllowedToPayout) {
+                return;
+            }
             return (0, sendTransactionWithOptions_1.default)(this.program.methods.collectRemainingLiquidity().accounts({
                 signer: this.provider.publicKey,
                 market: marketPDA,
-                mint: this.mint
+                mint: market.mint
             }), options);
         });
     }
@@ -313,7 +316,7 @@ class Trade {
      * @param options - RPC options
      *
      */
-    payoutOrder({ marketId, orderId, userNonce }, options) {
+    payoutOrder({ marketId, orderId, userNonce, mint }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const marketPDA = (0, trade_1.getMarketPDA)(this.program.programId, marketId);
             let userTradePDA = (0, trade_1.getUserTradePDA)(this.program.programId, this.provider.publicKey);
@@ -325,7 +328,7 @@ class Trade {
                 signer: this.provider.publicKey,
                 userTrade: userTradePDA,
                 market: marketPDA,
-                mint: this.mint
+                mint
             }), options);
         });
     }

package/dist/types/idl_triad_protocol.json

@@ -1706,10 +1706,6 @@
                     {
                         "name": "fee_bps",
                         "type": "u8"
-                    },
-                    {
-                        "name": "liquidity_at_start",
-                        "type": "u64"
                     }
                 ]
             }

package/dist/types/trade.d.ts

@@ -86,7 +86,7 @@ export type CreateMarketArgs = {
     question: string;
     feeBps: number;
     customer: PublicKey;
-    liquidityAtStart: number;
+    mint: PublicKey;
 };
 export type CreateCustomerArgs = {
     id: number;

package/dist/types/triad_protocol.d.ts

@@ -2205,10 +2205,6 @@ export type TriadProtocol = {
                     {
                         name: 'feeBps';
                         type: 'u8';
-                    },
-                    {
-                        name: 'liquidityAtStart';
-                        type: 'u64';
                     }
                 ];
             };

package/package.json

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