@triadxyz/triad-protocol 1.9.6-beta → 1.9.8-beta

package/dist/index.js

@@ -43,20 +43,17 @@ class TriadProtocolClient {
     transferPoseidon(args, verifier, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
-            const PoseidonCollectionPDA = (0, pda_1.getCollectionPDA)(this.program.programId, constants_1.POSEIDON_COLLECTION_SYMBOL);
-            const TicketCollectionPDA = (0, pda_1.getCollectionPDA)(this.program.programId, constants_1.TICKET_COLLECTION_SYMBOL);
             for (const arg of args) {
-                const NftPDA = (0, pda_1.getNftPDA)(this.program.programId, arg.ticketNumber);
                 ixs.push(yield this.program.methods
                     .transferPoseidon()
                     .accounts({
                     signer: this.provider.wallet.publicKey,
-                    nft: NftPDA,
+                    nft: (0, pda_1.getNftPDA)(this.program.programId, arg.ticketNumber),
                     poseidonAsset: arg.poseidonAsset,
                     ticketAsset: arg.ticketAsset,
                     verifier: constants_1.VERIFIER,
-                    poseidonCollection: PoseidonCollectionPDA,
-                    ticketCollection: TicketCollectionPDA,
+                    poseidonCollection: (0, pda_1.getCollectionPDA)(this.program.programId, constants_1.POSEIDON_COLLECTION_SYMBOL),
+                    ticketCollection: (0, pda_1.getCollectionPDA)(this.program.programId, constants_1.TICKET_COLLECTION_SYMBOL),
                     coreTicketCollection: constants_1.TICKET_CORE_COLLECTION,
                     corePoseidonCollection: constants_1.POSEIDON_CORE_COLLECTION
                 })
@@ -73,17 +70,13 @@ class TriadProtocolClient {
      * @param options - RPC options
      */
     withdrawPoseidon({ poseidonAsset, nft }, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const PoseidonCollectionPDA = (0, pda_1.getCollectionPDA)(this.program.programId, constants_1.POSEIDON_COLLECTION_SYMBOL);
-            const NftPDA = (0, pda_1.getPoseidonPDA)(this.program.programId, nft);
-            return (0, sendTransactionWithOptions_1.default)(this.program.methods.withdrawPoseidon().accounts({
-                signer: this.provider.wallet.publicKey,
-                nft: NftPDA,
-                poseidonAsset,
-                poseidonCollection: PoseidonCollectionPDA,
-                corePoseidonCollection: constants_1.POSEIDON_CORE_COLLECTION
-            }), options);
-        });
+        return (0, sendTransactionWithOptions_1.default)(this.program.methods.withdrawPoseidon().accounts({
+            signer: this.provider.wallet.publicKey,
+            nft: (0, pda_1.getPoseidonPDA)(this.program.programId, nft),
+            poseidonAsset,
+            poseidonCollection: (0, pda_1.getCollectionPDA)(this.program.programId, constants_1.POSEIDON_COLLECTION_SYMBOL),
+            corePoseidonCollection: constants_1.POSEIDON_CORE_COLLECTION
+        }), options);
     }
     /**
      * Collect Royalty
@@ -92,13 +85,10 @@ class TriadProtocolClient {
      * @param options - RPC options
      */
     collectRoyalty(collection, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const collectionPDA = (0, pda_1.getCollectionPDA)(this.program.programId, collection);
-            return (0, sendTransactionWithOptions_1.default)(this.program.methods.collectRoyalty().accounts({
-                signer: this.provider.wallet.publicKey,
-                collection: collectionPDA
-            }), options);
-        });
+        return (0, sendTransactionWithOptions_1.default)(this.program.methods.collectRoyalty().accounts({
+            signer: this.provider.wallet.publicKey,
+            collection: (0, pda_1.getCollectionPDA)(this.program.programId, collection)
+        }), options);
     }
     /**
      * Add Trader Poseidon
@@ -108,16 +98,12 @@ class TriadProtocolClient {
      * @param options - RPC options
      */
     addTraderPoseidon({ user, poseidonAsset }, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const UserTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, user);
-            const PoseidonCollectionPDA = (0, pda_1.getCollectionPDA)(this.program.programId, constants_1.POSEIDON_COLLECTION_SYMBOL);
-            return (0, sendTransactionWithOptions_1.default)(this.program.methods.addTraderPoseidon().accounts({
-                poseidonAsset,
-                userTrade: UserTradePDA,
-                corePoseidonCollection: constants_1.POSEIDON_CORE_COLLECTION,
-                poseidonCollection: PoseidonCollectionPDA
-            }), options);
-        });
+        return (0, sendTransactionWithOptions_1.default)(this.program.methods.addTraderPoseidon().accounts({
+            poseidonAsset,
+            userTrade: (0, trade_2.getUserTradePDA)(this.program.programId, user),
+            corePoseidonCollection: constants_1.POSEIDON_CORE_COLLECTION,
+            poseidonCollection: (0, pda_1.getCollectionPDA)(this.program.programId, constants_1.POSEIDON_COLLECTION_SYMBOL)
+        }), options);
     }
     /**
      * Remove Trader Poseidon
@@ -126,16 +112,12 @@ class TriadProtocolClient {
      * @param options - RPC options
      */
     removeTraderPoseidon({ user, poseidonAsset }, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const UserTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, user);
-            const PoseidonCollectionPDA = (0, pda_1.getCollectionPDA)(this.program.programId, constants_1.POSEIDON_COLLECTION_SYMBOL);
-            return (0, sendTransactionWithOptions_1.default)(this.program.methods.removeTraderPoseidon().accounts({
-                userTrade: UserTradePDA,
-                poseidonAsset,
-                corePoseidonCollection: constants_1.POSEIDON_CORE_COLLECTION,
-                poseidonCollection: PoseidonCollectionPDA
-            }), options);
-        });
+        return (0, sendTransactionWithOptions_1.default)(this.program.methods.removeTraderPoseidon().accounts({
+            userTrade: (0, trade_2.getUserTradePDA)(this.program.programId, user),
+            poseidonAsset,
+            corePoseidonCollection: constants_1.POSEIDON_CORE_COLLECTION,
+            poseidonCollection: (0, pda_1.getCollectionPDA)(this.program.programId, constants_1.POSEIDON_COLLECTION_SYMBOL)
+        }), options);
     }
 }
 exports.default = TriadProtocolClient;

package/dist/trade.d.ts

@@ -220,12 +220,12 @@ export default class Trade {
      * @param options - RPC options
      *
      */
-    payoutOrder({ marketId, orderId, userNonce, mint }: {
+    payoutOrder(orders: {
         marketId: number;
         orderId: number;
         userNonce: number;
         mint: PublicKey;
-    }, options?: RpcOptions): Promise<string>;
+    }[], options?: RpcOptions): Promise<string>;
     /**
      * Allow Market to Payout
      * @param marketId - The ID of the market

package/dist/trade.js

@@ -248,21 +248,31 @@ class Trade {
      * @param options - RPC options
      *
      */
-    payoutOrder({ marketId, orderId, userNonce, mint }, options) {
+    payoutOrder(orders, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const marketPDA = (0, trade_2.getMarketPDA)(this.program.programId, marketId);
-            let userTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, this.provider.publicKey);
-            if (userNonce !== 0) {
-                const subUserTradePDA = (0, trade_2.getSubUserTradePDA)(this.program.programId, this.provider.publicKey, userNonce);
-                userTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, subUserTradePDA);
+            const ixs = [];
+            if (orders.length > 10) {
+                throw new Error('Max 10 orders per transaction');
             }
-            return (0, sendTransactionWithOptions_1.default)(this.program.methods.payoutOrder(new bn_js_1.default(orderId)).accounts({
-                signer: this.provider.publicKey,
-                userTrade: userTradePDA,
-                market: marketPDA,
-                mint,
-                tokenProgram: (0, helpers_1.getTokenProgram)(mint)
-            }), options);
+            for (const order of orders) {
+                const marketPDA = (0, trade_2.getMarketPDA)(this.program.programId, order.marketId);
+                let userTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, this.provider.publicKey);
+                if (order.userNonce !== 0) {
+                    const subUserTradePDA = (0, trade_2.getSubUserTradePDA)(this.program.programId, this.provider.publicKey, order.userNonce);
+                    userTradePDA = (0, trade_2.getUserTradePDA)(this.program.programId, subUserTradePDA);
+                }
+                ixs.push(yield this.program.methods
+                    .payoutOrder(new bn_js_1.default(order.orderId))
+                    .accounts({
+                    signer: this.provider.publicKey,
+                    userTrade: userTradePDA,
+                    market: marketPDA,
+                    mint: order.mint,
+                    tokenProgram: (0, helpers_1.getTokenProgram)(order.mint)
+                })
+                    .instruction());
+            }
+            return (0, sendVersionedTransaction_1.default)(this.provider, ixs, options);
         });
     }
     /**

package/dist/types/idl_triad_protocol.json

@@ -2452,11 +2452,11 @@
                         "type": "u16"
                     },
                     {
-                        "name": "creator_fee_available",
+                        "name": "payout_fee_available",
                         "type": "u64"
                     },
                     {
-                        "name": "creator_fee_claimed",
+                        "name": "payout_fee_claimed",
                         "type": "u64"
                     },
                     {

package/dist/types/index.d.ts

@@ -4,36 +4,6 @@ export type RpcOptions = {
     microLamports?: number;
     computeBudget?: number;
 };
-export type MintTicketArgs = {
-    discount: number;
-    isBoosted: boolean;
-    rarity: {
-        common: {};
-    } | {
-        uncommon: {};
-    } | {
-        rare: {};
-    } | {
-        legendary: {};
-    } | {
-        epic: {};
-    } | {
-        mythic: {};
-    };
-    verifier: string;
-    nftMint: PublicKey;
-};
-export type OrderStatus = {
-    init: {};
-} | {
-    open: {};
-} | {
-    closed: {};
-} | {
-    claimed: {};
-} | {
-    liquidated: {};
-};
 export type TransferPoseidonArgs = {
     poseidonAsset: PublicKey;
     ticketAsset: PublicKey;

package/dist/types/stake.d.ts

@@ -1,24 +1,10 @@
 import { PublicKey } from '@solana/web3.js';
 import BN from 'bn.js';
-export type Collection = 'alligators' | 'coleta' | 'undead' | 'pyth';
-export type StakeNftArgs = {
-    wallet: PublicKey;
-    items: {
-        mint: PublicKey;
-        name: string;
-    }[];
-};
 export type StakeTokenArgs = {
     name: string;
     wallet: PublicKey;
     amount: number;
 };
-export type InitializeStakeArgs = {
-    name: string;
-    slots: BN;
-    amount: BN;
-    collection: string;
-};
 export type UpdateStakeVaultArgs = {
     amount?: BN;
     isLocked?: boolean;
@@ -39,30 +25,6 @@ export type ClaimStakeRewardsArgs = {
     stake: Stake;
     collections: number;
 };
-export type UpdateBoostArgs = {
-    wallet: PublicKey;
-    nfts: {
-        name: string;
-        wallet: string;
-    }[];
-};
-export type UpdateStakeRewardsArgs = {
-    day: number;
-    wallet: PublicKey;
-    items: {
-        rewards: BN;
-        apr: number;
-        nftName: string;
-    }[];
-};
-export declare enum RARITY_WEIGHT {
-    COMMON = 1,
-    UNCOMMON = 2,
-    RARE = 3,
-    EPIC = 4,
-    LEGENDARY = 5,
-    MYTHIC = 6
-}
 export type StakeVault = {
     name: string;
     collection: string;

package/dist/types/stake.js

@@ -1,12 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RARITY_WEIGHT = void 0;
-var RARITY_WEIGHT;
-(function (RARITY_WEIGHT) {
-    RARITY_WEIGHT[RARITY_WEIGHT["COMMON"] = 1] = "COMMON";
-    RARITY_WEIGHT[RARITY_WEIGHT["UNCOMMON"] = 2] = "UNCOMMON";
-    RARITY_WEIGHT[RARITY_WEIGHT["RARE"] = 3] = "RARE";
-    RARITY_WEIGHT[RARITY_WEIGHT["EPIC"] = 4] = "EPIC";
-    RARITY_WEIGHT[RARITY_WEIGHT["LEGENDARY"] = 5] = "LEGENDARY";
-    RARITY_WEIGHT[RARITY_WEIGHT["MYTHIC"] = 6] = "MYTHIC";
-})(RARITY_WEIGHT || (exports.RARITY_WEIGHT = RARITY_WEIGHT = {}));

package/dist/types/trade.d.ts

@@ -17,8 +17,8 @@ export type Market = {
     nextOrderId: string;
     feeBps: number;
     isAllowedToPayout: boolean;
-    creatorFeeAvailable: string;
-    creatorFeeClaimed: string;
+    payoutFeeAvailable: string;
+    payoutFeeClaimed: string;
     marketFeeAvailable: string;
     marketFeeClaimed: string;
     marketStart: string;
@@ -92,8 +92,6 @@ export type PlaceBidOrderArgs = {
         flop: {};
     };
     mint: PublicKey;
-    bidOrderId: number | null;
-    bidNonce: number | null;
 };
 export type PlaceAskOrderArgs = {
     marketId: number;
@@ -115,19 +113,6 @@ export type InitializeMarketArgs = {
     feeBps: number;
     customer: PublicKey | null;
 };
-export type UpdateMarketArgs = {
-    marketId: number;
-    marketEnd?: number;
-    winningDirection?: {
-        hype: {};
-    } | {
-        flop: {};
-    } | {
-        none: {};
-    } | {
-        draw: {};
-    };
-};
 export type CreateCustomerArgs = {
     id: number;
     name: string;

package/dist/types/triad_protocol.d.ts

@@ -3154,11 +3154,11 @@ export type TriadProtocol = {
                         type: 'u16';
                     },
                     {
-                        name: 'creatorFeeAvailable';
+                        name: 'payoutFeeAvailable';
                         type: 'u64';
                     },
                     {
-                        name: 'creatorFeeClaimed';
+                        name: 'payoutFeeClaimed';
                         type: 'u64';
                     },
                     {

package/dist/utils/helpers.js

@@ -74,8 +74,8 @@ const formatMarket = (account, address) => {
         marketStart: account.marketStart.toString(),
         marketEnd: account.marketEnd.toString(),
         question: Buffer.from(account.question).toString().replace(/\0+$/, ''),
-        creatorFeeAvailable: account.creatorFeeAvailable.toString(),
-        creatorFeeClaimed: account.creatorFeeClaimed.toString(),
+        payoutFeeAvailable: account.payoutFeeAvailable.toString(),
+        payoutFeeClaimed: account.payoutFeeClaimed.toString(),
         marketFeeAvailable: account.marketFeeAvailable.toString(),
         marketFeeClaimed: account.marketFeeClaimed.toString(),
         winningDirection: trade_1.WinningDirection[Object.keys(account.winningDirection)[0].toUpperCase()],

package/package.json

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