@triadxyz/triad-protocol 2.1.2-beta → 2.1.3-beta

package/dist/index.js

@@ -19,7 +19,6 @@ const poseidon_1 = require("./utils/pda/poseidon");
 const stake_1 = __importDefault(require("./stake"));
 const sendVersionedTransaction_1 = __importDefault(require("./utils/sendVersionedTransaction"));
 const constants_1 = require("./utils/constants");
-const sendMethod_1 = __importDefault(require("./utils/sendMethod"));
 const pda_1 = require("./utils/pda");
 class TriadProtocolClient {
     constructor(connection, wallet) {
@@ -68,13 +67,20 @@ class TriadProtocolClient {
      * @param options - RPC options
      */
     withdrawPoseidon({ poseidonAsset, nft }, options) {
-        return (0, sendMethod_1.default)(this.program.methods.withdrawPoseidon().accounts({
-            signer: this.provider.wallet.publicKey,
-            nft: (0, poseidon_1.getPoseidonPDA)(this.program.programId, nft),
-            poseidonAsset,
-            poseidonCollection: (0, poseidon_1.getCollectionPDA)(this.program.programId, constants_1.POSEIDON_COLLECTION_SYMBOL),
-            corePoseidonCollection: constants_1.POSEIDON_CORE_COLLECTION
-        }), options);
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            ixs.push(yield this.program.methods
+                .withdrawPoseidon()
+                .accounts({
+                signer: this.provider.wallet.publicKey,
+                nft: (0, poseidon_1.getPoseidonPDA)(this.program.programId, nft),
+                poseidonAsset,
+                poseidonCollection: (0, poseidon_1.getCollectionPDA)(this.program.programId, constants_1.POSEIDON_COLLECTION_SYMBOL),
+                corePoseidonCollection: constants_1.POSEIDON_CORE_COLLECTION
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+        });
     }
     /**
      * Collect Royalty
@@ -83,10 +89,17 @@ class TriadProtocolClient {
      * @param options - RPC options
      */
     collectRoyalty(collection, options) {
-        return (0, sendMethod_1.default)(this.program.methods.collectRoyalty().accounts({
-            signer: this.provider.wallet.publicKey,
-            collection: (0, poseidon_1.getCollectionPDA)(this.program.programId, collection)
-        }), options);
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            ixs.push(yield this.program.methods
+                .collectRoyalty()
+                .accounts({
+                signer: this.provider.wallet.publicKey,
+                collection: (0, poseidon_1.getCollectionPDA)(this.program.programId, collection)
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+        });
     }
     /**
      * Add Trader Poseidon
@@ -96,12 +109,19 @@ class TriadProtocolClient {
      * @param options - RPC options
      */
     addTraderPoseidon({ user, poseidonAsset }, options) {
-        return (0, sendMethod_1.default)(this.program.methods.addTraderPoseidon().accounts({
-            poseidonAsset,
-            userTrade: (0, pda_1.getUserTradePDA)(this.program.programId, user),
-            corePoseidonCollection: constants_1.POSEIDON_CORE_COLLECTION,
-            poseidonCollection: (0, poseidon_1.getCollectionPDA)(this.program.programId, constants_1.POSEIDON_COLLECTION_SYMBOL)
-        }), options);
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            ixs.push(yield this.program.methods
+                .addTraderPoseidon()
+                .accounts({
+                poseidonAsset,
+                userTrade: (0, pda_1.getUserTradePDA)(this.program.programId, user),
+                corePoseidonCollection: constants_1.POSEIDON_CORE_COLLECTION,
+                poseidonCollection: (0, poseidon_1.getCollectionPDA)(this.program.programId, constants_1.POSEIDON_COLLECTION_SYMBOL)
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+        });
     }
     /**
      * Remove Trader Poseidon
@@ -110,12 +130,19 @@ class TriadProtocolClient {
      * @param options - RPC options
      */
     removeTraderPoseidon({ user, poseidonAsset }, options) {
-        return (0, sendMethod_1.default)(this.program.methods.removeTraderPoseidon().accounts({
-            userTrade: (0, pda_1.getUserTradePDA)(this.program.programId, user),
-            poseidonAsset,
-            corePoseidonCollection: constants_1.POSEIDON_CORE_COLLECTION,
-            poseidonCollection: (0, poseidon_1.getCollectionPDA)(this.program.programId, constants_1.POSEIDON_COLLECTION_SYMBOL)
-        }), options);
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            ixs.push(yield this.program.methods
+                .removeTraderPoseidon()
+                .accounts({
+                userTrade: (0, pda_1.getUserTradePDA)(this.program.programId, user),
+                poseidonAsset,
+                corePoseidonCollection: constants_1.POSEIDON_CORE_COLLECTION,
+                poseidonCollection: (0, poseidon_1.getCollectionPDA)(this.program.programId, constants_1.POSEIDON_COLLECTION_SYMBOL)
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+        });
     }
 }
 exports.default = TriadProtocolClient;

package/dist/stake.js

@@ -17,7 +17,6 @@ const helpers_1 = require("./utils/helpers");
 const stake_1 = require("./utils/pda/stake");
 const constants_1 = require("./utils/constants");
 const sendVersionedTransaction_1 = __importDefault(require("./utils/sendVersionedTransaction"));
-const sendMethod_1 = __importDefault(require("./utils/sendMethod"));
 class Stake {
     constructor(program) {
         this.program = program;
@@ -80,15 +79,20 @@ class Stake {
      *
      */
     stakeToken({ name, wallet, amount }, options) {
-        return (0, sendMethod_1.default)(this.program.methods
-            .stakeToken({
-            name,
-            amount: new anchor_1.BN(amount * Math.pow(10, 6))
-        })
-            .accounts({
-            signer: wallet,
-            mint: constants_1.TRD_MINT
-        }), options);
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            ixs.push(yield this.program.methods
+                .stakeToken({
+                name,
+                amount: new anchor_1.BN(amount * Math.pow(10, 6))
+            })
+                .accounts({
+                signer: wallet,
+                mint: constants_1.TRD_MINT
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+        });
     }
     /**
      *  Update Stake Vault
@@ -99,15 +103,20 @@ class Stake {
      *
      */
     updateStakeVault({ amount, isLocked }, options) {
-        return (0, sendMethod_1.default)(this.program.methods
-            .updateStakeVault({
-            amount,
-            isLocked
-        })
-            .accounts({
-            signer: this.program.provider.publicKey,
-            mint: constants_1.TRD_MINT
-        }), options);
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            ixs.push(yield this.program.methods
+                .updateStakeVault({
+                amount,
+                isLocked
+            })
+                .accounts({
+                signer: this.program.provider.publicKey,
+                mint: constants_1.TRD_MINT
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+        });
     }
     /**
      *  Request Withdraw
@@ -142,12 +151,19 @@ class Stake {
      *
      */
     withdrawStake({ wallet, name, mint }, options) {
-        return (0, sendMethod_1.default)(this.program.methods.withdrawStake().accounts({
-            signer: wallet,
-            stake: (0, stake_1.getStakePDA)(this.program.programId, wallet, name),
-            admin: constants_1.TRIAD_ADMIN,
-            mint: mint
-        }), options);
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            ixs.push(yield this.program.methods
+                .withdrawStake()
+                .accounts({
+                signer: wallet,
+                stake: (0, stake_1.getStakePDA)(this.program.programId, wallet, name),
+                admin: constants_1.TRIAD_ADMIN,
+                mint: mint
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+        });
     }
     /**
      *  Claim Stake Rewards

package/dist/trade.js

@@ -19,7 +19,6 @@ const constants_1 = require("./utils/constants");
 const helpers_1 = require("./utils/helpers");
 const pda_1 = require("./utils/pda");
 const sendVersionedTransaction_1 = __importDefault(require("./utils/sendVersionedTransaction"));
-const sendMethod_1 = __importDefault(require("./utils/sendMethod"));
 const bytes_1 = require("@coral-xyz/anchor/dist/cjs/utils/bytes");
 const pda_2 = require("./utils/pda");
 class Trade {
@@ -118,25 +117,30 @@ class Trade {
      *
      */
     createMarket({ marketId, startTime, endTime, question, feeBps, customer, payoutFee, mint }, options) {
-        if (question.length > 80) {
-            throw new Error('Question must be less than 80 characters');
-        }
-        return (0, sendMethod_1.default)(this.program.methods
-            .createMarket({
-            marketId: new bn_js_1.default(marketId),
-            question: (0, helpers_1.encodeString)(question, 80),
-            marketStart: new bn_js_1.default(startTime),
-            marketEnd: new bn_js_1.default(endTime),
-            feeBps,
-            payoutFee
-        })
-            .accounts({
-            signer: this.program.provider.publicKey,
-            mint,
-            tokenProgram: (0, helpers_1.getTokenProgram)(mint),
-            customer,
-            pool: null
-        }), options);
+        return __awaiter(this, void 0, void 0, function* () {
+            if (question.length > 80) {
+                throw new Error('Question must be less than 80 characters');
+            }
+            const ixs = [];
+            ixs.push(yield this.program.methods
+                .createMarket({
+                marketId: new bn_js_1.default(marketId),
+                question: (0, helpers_1.encodeString)(question, 80),
+                marketStart: new bn_js_1.default(startTime),
+                marketEnd: new bn_js_1.default(endTime),
+                feeBps,
+                payoutFee
+            })
+                .accounts({
+                signer: this.program.provider.publicKey,
+                mint,
+                tokenProgram: (0, helpers_1.getTokenProgram)(mint),
+                customer,
+                pool: null
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+        });
     }
     /**
      * Create Pool
@@ -231,17 +235,22 @@ class Trade {
      */
     closeOrder({ marketId, orderId, userNonce }, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
             let userTradePDA = (0, pda_1.getUserTradePDA)(this.program.programId, this.program.provider.publicKey);
             if (userNonce !== 0) {
                 const subUserTradePDA = (0, pda_1.getSubUserTradePDA)(this.program.programId, this.program.provider.publicKey, userNonce);
                 userTradePDA = (0, pda_1.getUserTradePDA)(this.program.programId, subUserTradePDA);
             }
-            return (0, sendMethod_1.default)(this.program.methods.closeOrder(new bn_js_1.default(orderId)).accounts({
+            ixs.push(yield this.program.methods
+                .closeOrder(new bn_js_1.default(orderId))
+                .accounts({
                 signer: this.program.provider.publicKey,
                 market: (0, pda_1.getMarketPDA)(this.program.programId, marketId),
                 mint: constants_1.TRD_MINT,
                 userTrade: userTradePDA
-            }), options);
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
         });
     }
     /**
@@ -253,16 +262,21 @@ class Trade {
      *
      */
     resolveMarket({ marketId, winningDirection }, options) {
-        return (0, sendMethod_1.default)(this.program.methods
-            .updateMarket({
-            winningDirection,
-            allowPayout: null,
-            marketEnd: null
-        })
-            .accounts({
-            signer: this.program.provider.publicKey,
-            market: (0, pda_1.getMarketPDA)(this.program.programId, marketId)
-        }), options);
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            ixs.push(yield this.program.methods
+                .updateMarket({
+                winningDirection,
+                allowPayout: null,
+                marketEnd: null
+            })
+                .accounts({
+                signer: this.program.provider.publicKey,
+                market: (0, pda_1.getMarketPDA)(this.program.programId, marketId)
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+        });
     }
     /**
      * Collect Remaining Liquidity
@@ -273,13 +287,18 @@ class Trade {
      */
     collectRemainingLiquidity(marketId, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
             const marketPDA = (0, pda_1.getMarketPDA)(this.program.programId, marketId);
             const market = yield this.getMarketByAddress(marketPDA);
-            return (0, sendMethod_1.default)(this.program.methods.collectRemainingLiquidity().accounts({
+            ixs.push(yield this.program.methods
+                .collectRemainingLiquidity()
+                .accounts({
                 signer: this.program.provider.publicKey,
                 market: marketPDA,
                 mint: market.mint
-            }), options);
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
         });
     }
     /**
@@ -325,16 +344,21 @@ class Trade {
      *
      */
     allowMarketToPayout(marketId, options) {
-        return (0, sendMethod_1.default)(this.program.methods
-            .updateMarket({
-            winningDirection: null,
-            allowPayout: true,
-            marketEnd: null
-        })
-            .accounts({
-            signer: this.program.provider.publicKey,
-            market: (0, pda_1.getMarketPDA)(this.program.programId, marketId)
-        }), options);
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            ixs.push(yield this.program.methods
+                .updateMarket({
+                winningDirection: null,
+                allowPayout: true,
+                marketEnd: null
+            })
+                .accounts({
+                signer: this.program.provider.publicKey,
+                market: (0, pda_1.getMarketPDA)(this.program.programId, marketId)
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+        });
     }
     /**
      * Create Sub User Trade
@@ -345,11 +369,16 @@ class Trade {
      */
     createSubUserTrade(user, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
             const userTrade = yield this.getUserTrade(user);
             const subUserTradePDA = (0, pda_1.getSubUserTradePDA)(this.program.programId, user, userTrade.nonce + 1);
-            return (0, sendMethod_1.default)(this.program.methods.createSubUserTrade(subUserTradePDA).accounts({
+            ixs.push(yield this.program.methods
+                .createSubUserTrade(subUserTradePDA)
+                .accounts({
                 signer: this.program.provider.publicKey
-            }), options);
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
         });
     }
     /**
@@ -361,16 +390,21 @@ class Trade {
      *
      */
     updateMarket(marketId, marketEnd, options) {
-        return (0, sendMethod_1.default)(this.program.methods
-            .updateMarket({
-            marketEnd: new bn_js_1.default(marketEnd),
-            winningDirection: null,
-            allowPayout: null
-        })
-            .accounts({
-            signer: this.program.provider.publicKey,
-            market: (0, pda_1.getMarketPDA)(this.program.programId, marketId)
-        }), options);
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            ixs.push(yield this.program.methods
+                .updateMarket({
+                marketEnd: new bn_js_1.default(marketEnd),
+                winningDirection: null,
+                allowPayout: null
+            })
+                .accounts({
+                signer: this.program.provider.publicKey,
+                market: (0, pda_1.getMarketPDA)(this.program.programId, marketId)
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+        });
     }
     /**
      * Create Customer
@@ -382,11 +416,16 @@ class Trade {
      *
      */
     createCustomer({ id, name, authority, feeRecipient }, options) {
-        return (0, sendMethod_1.default)(this.program.methods
-            .createCustomer({ id, name, authority, feeRecipient })
-            .accounts({
-            signer: this.program.provider.publicKey
-        }), options);
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            ixs.push(yield this.program.methods
+                .createCustomer({ id, name, authority, feeRecipient })
+                .accounts({
+                signer: this.program.provider.publicKey
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+        });
     }
     /**
      * Get User Trade Nonce With Slots
@@ -549,18 +588,23 @@ class Trade {
      */
     cancelBidOrder({ marketId, orderId, userNonce, mint }, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
             let userTradePDA = (0, pda_1.getUserTradePDA)(this.program.programId, this.program.provider.publicKey);
             if (userNonce !== 0) {
                 const subUserTradePDA = (0, pda_1.getSubUserTradePDA)(this.program.programId, this.program.provider.publicKey, userNonce);
                 userTradePDA = (0, pda_1.getUserTradePDA)(this.program.programId, subUserTradePDA);
             }
-            return (0, sendMethod_1.default)(this.program.methods.cancelBidOrder(new bn_js_1.default(orderId)).accounts({
+            ixs.push(yield this.program.methods
+                .cancelBidOrder(new bn_js_1.default(orderId))
+                .accounts({
                 signer: this.program.provider.publicKey,
                 market: (0, pda_1.getMarketPDA)(this.program.programId, marketId),
                 bidUserTrade: userTradePDA,
                 mint,
                 tokenProgram: (0, helpers_1.getTokenProgram)(mint)
-            }), options);
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
         });
     }
     /**
@@ -574,6 +618,7 @@ class Trade {
      */
     cancelAskOrder({ marketId, orderId, userNonce, userNonceBidOrder }, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
             let askUserTradePDA = (0, pda_1.getUserTradePDA)(this.program.programId, this.program.provider.publicKey);
             if (userNonce !== 0) {
                 const subUserTradePDA = (0, pda_1.getSubUserTradePDA)(this.program.programId, this.program.provider.publicKey, userNonce);
@@ -584,12 +629,16 @@ class Trade {
                 const subUserTradePDA = (0, pda_1.getSubUserTradePDA)(this.program.programId, this.program.provider.publicKey, userNonceBidOrder);
                 bidUserTradePDA = (0, pda_1.getUserTradePDA)(this.program.programId, subUserTradePDA);
             }
-            return (0, sendMethod_1.default)(this.program.methods.cancelAskOrder(new bn_js_1.default(orderId)).accounts({
+            ixs.push(yield this.program.methods
+                .cancelAskOrder(new bn_js_1.default(orderId))
+                .accounts({
                 signer: this.program.provider.publicKey,
                 market: (0, pda_1.getMarketPDA)(this.program.programId, marketId),
                 askUserTrade: askUserTradePDA,
                 bidUserTrade: bidUserTradePDA
-            }), options);
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
         });
     }
     /**

package/dist/types/idl_triad_protocol.json

@@ -54,11 +54,11 @@
                     "signer": true
                 },
                 {
-                    "name": "ask_user_trade",
+                    "name": "bid_user_trade",
                     "writable": true
                 },
                 {
-                    "name": "bid_user_trade",
+                    "name": "ask_user_trade",
                     "writable": true
                 },
                 {

package/dist/types/triad_protocol.d.ts

@@ -60,11 +60,11 @@ export type TriadProtocol = {
                     signer: true;
                 },
                 {
-                    name: 'askUserTrade';
+                    name: 'bidUserTrade';
                     writable: true;
                 },
                 {
-                    name: 'bidUserTrade';
+                    name: 'askUserTrade';
                     writable: true;
                 },
                 {

package/package.json

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

package/dist/utils/sendMethod.d.ts

@@ -1,5 +0,0 @@
-import { RpcOptions } from '../types';
-import { MethodsBuilder } from '@coral-xyz/anchor/dist/cjs/program/namespace/methods';
-import { TriadProtocol } from '../types/triad_protocol';
-declare const sendMethod: (method: MethodsBuilder<TriadProtocol, any, any>, options?: RpcOptions) => Promise<string>;
-export default sendMethod;

package/dist/utils/sendMethod.js

@@ -1,35 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-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 getPriorityFee_1 = __importDefault(require("./getPriorityFee"));
-const sendMethod = (method, options) => __awaiter(void 0, void 0, void 0, function* () {
-    if (options === null || options === void 0 ? void 0 : options.microLamports) {
-        method.postInstructions([
-            web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
-                microLamports: options.microLamports
-            })
-        ]);
-    }
-    if (!(options === null || options === void 0 ? void 0 : options.microLamports)) {
-        const priorityFee = yield (0, getPriorityFee_1.default)();
-        method.postInstructions([
-            web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
-                microLamports: priorityFee
-            })
-        ]);
-    }
-    return method.rpc({ skipPreflight: options === null || options === void 0 ? void 0 : options.skipPreflight });
-});
-exports.default = sendMethod;