@triadxyz/triad-protocol 2.1.4-beta → 2.1.6-beta

package/dist/trade.d.ts

@@ -172,11 +172,12 @@ export default class Trade {
      * @param args.amount - The amount of the Order
      * @param args.direction - The direction of the Order
      * @param args.mint - The mint of the Order
+     * @param args.token - The token to use for the Order
      *
      * @param options - RPC options
      *
      */
-    openOrder({ marketId, amount, direction, mint }: OpenOrderArgs, options?: RpcOptions): Promise<string>;
+    openOrder({ marketId, amount, direction, mint, token }: OpenOrderArgs, options?: RpcOptions): Promise<string>;
     /**
      * Close Order
      * @param args.marketId - The ID of the Market

package/dist/trade.js

@@ -21,6 +21,7 @@ const pda_1 = require("./utils/pda");
 const sendVersionedTransaction_1 = __importDefault(require("./utils/sendVersionedTransaction"));
 const bytes_1 = require("@coral-xyz/anchor/dist/cjs/utils/bytes");
 const pda_2 = require("./utils/pda");
+const swap_1 = require("./utils/swap");
 class Trade {
     constructor(program) {
         this.program = program;
@@ -197,11 +198,12 @@ class Trade {
      * @param args.amount - The amount of the Order
      * @param args.direction - The direction of the Order
      * @param args.mint - The mint of the Order
+     * @param args.token - The token to use for the Order
      *
      * @param options - RPC options
      *
      */
-    openOrder({ marketId, amount, direction, mint }, options) {
+    openOrder({ marketId, amount, direction, mint, token }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
             const addressLookupTableAccounts = [];
@@ -209,6 +211,22 @@ class Trade {
             if (userTradeIxs.length > 0) {
                 ixs.push(...userTradeIxs);
             }
+            let amountInTRD = amount * Math.pow(10, constants_1.TRD_DECIMALS);
+            if (token !== constants_1.TRD_MINT.toBase58()) {
+                const { setupInstructions, swapIxs, addressLookupTableAccounts, trdAmount } = yield (0, swap_1.swap)({
+                    connection: this.program.provider.connection,
+                    wallet: this.program.provider.publicKey.toBase58(),
+                    inToken: token,
+                    amount
+                });
+                amountInTRD = trdAmount;
+                if (swapIxs.length === 0) {
+                    return;
+                }
+                ixs.push(...setupInstructions);
+                ixs.push(...swapIxs);
+                addressLookupTableAccounts.push(...addressLookupTableAccounts);
+            }
             ixs.push(yield this.program.methods
                 .openOrder({
                 amount: new bn_js_1.default(amount * Math.pow(10, constants_1.TRD_DECIMALS)),
@@ -667,20 +685,6 @@ class Trade {
                 if (order.authority === this.program.provider.publicKey.toBase58()) {
                     return;
                 }
-                let linkedSellerBidTradePDA = null;
-                if (order.linkedBidOrderId !== '0') {
-                    const userOrders = yield this.getUserOrders(new web3_js_1.PublicKey(order.authority));
-                    linkedSellerBidTradePDA = (0, pda_1.getUserTradePDA)(this.program.programId, new web3_js_1.PublicKey(order.authority));
-                    const linkedBidOrder = userOrders.find((item) => item.orderId === order.linkedBidOrderId &&
-                        item.marketId === marketId.toString());
-                    if (!linkedBidOrder) {
-                        throw new Error('Linked bid order not found');
-                    }
-                    if (linkedBidOrder.userNonce !== '0') {
-                        const subUserTradePDA = (0, pda_1.getSubUserTradePDA)(this.program.programId, new web3_js_1.PublicKey(order.authority), Number(linkedBidOrder.userNonce));
-                        linkedSellerBidTradePDA = (0, pda_1.getUserTradePDA)(this.program.programId, subUserTradePDA);
-                    }
-                }
                 const orderPrice = new bn_js_1.default(order.price);
                 const availableShares = new bn_js_1.default(order.totalShares);
                 let adjustedPrice = orderPrice;
@@ -719,8 +723,7 @@ class Trade {
                     tokenProgram,
                     sellerAuthority: new web3_js_1.PublicKey(order.authority),
                     marketAta: (0, pda_2.getTokenATA)(marketPDA, mint, tokenProgram),
-                    buyerAta: (0, pda_2.getTokenATA)(this.program.provider.publicKey, mint, tokenProgram),
-                    linkedSellerBidTrade: linkedSellerBidTradePDA
+                    buyerAta: (0, pda_2.getTokenATA)(this.program.provider.publicKey, mint, tokenProgram)
                 })
                     .instruction());
                 remainingUSDC = remainingUSDC.sub(usdcAmount);

package/dist/types/idl_triad_protocol.json

@@ -54,15 +54,15 @@
                     "signer": true
                 },
                 {
-                    "name": "bid_user_trade",
+                    "name": "market",
                     "writable": true
                 },
                 {
-                    "name": "ask_user_trade",
+                    "name": "bid_user_trade",
                     "writable": true
                 },
                 {
-                    "name": "market",
+                    "name": "ask_user_trade",
                     "writable": true
                 },
                 {
@@ -836,16 +836,7 @@
                     "address": "11111111111111111111111111111111"
                 }
             ],
-            "args": [
-                {
-                    "name": "args",
-                    "type": {
-                        "defined": {
-                            "name": "MarketAskOrderArgs"
-                        }
-                    }
-                }
-            ]
+            "args": []
         },
         {
             "name": "market_bid_order",
@@ -856,6 +847,10 @@
                     "writable": true,
                     "signer": true
                 },
+                {
+                    "name": "market",
+                    "writable": true
+                },
                 {
                     "name": "squads",
                     "writable": true,
@@ -873,15 +868,6 @@
                     "name": "seller_trade",
                     "writable": true
                 },
-                {
-                    "name": "linked_seller_bid_trade",
-                    "writable": true,
-                    "optional": true
-                },
-                {
-                    "name": "market",
-                    "writable": true
-                },
                 {
                     "name": "mint",
                     "writable": true
@@ -2279,26 +2265,6 @@
                 ]
             }
         },
-        {
-            "name": "MarketAskOrderArgs",
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "shares",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "order_direction",
-                        "type": {
-                            "defined": {
-                                "name": "OrderDirection"
-                            }
-                        }
-                    }
-                ]
-            }
-        },
         {
             "name": "MarketBidOrderArgs",
             "type": {

package/dist/types/trade.d.ts

@@ -28,6 +28,7 @@ export type Market = {
     payoutFee: number;
     customer: string;
     version: number;
+    poolId: number;
 };
 export type UserTrade = {
     user: string;
@@ -121,6 +122,7 @@ export type CreateCustomerArgs = {
 export type OpenOrderArgs = {
     marketId: number;
     amount: number;
+    token: string;
     direction: {
         hype: {};
     } | {

package/dist/types/triad_protocol.d.ts

@@ -60,15 +60,15 @@ export type TriadProtocol = {
                     signer: true;
                 },
                 {
-                    name: 'bidUserTrade';
+                    name: 'market';
                     writable: true;
                 },
                 {
-                    name: 'askUserTrade';
+                    name: 'bidUserTrade';
                     writable: true;
                 },
                 {
-                    name: 'market';
+                    name: 'askUserTrade';
                     writable: true;
                 },
                 {
@@ -1144,16 +1144,7 @@ export type TriadProtocol = {
                     address: '11111111111111111111111111111111';
                 }
             ];
-            args: [
-                {
-                    name: 'args';
-                    type: {
-                        defined: {
-                            name: 'marketAskOrderArgs';
-                        };
-                    };
-                }
-            ];
+            args: [];
         },
         {
             name: 'marketBidOrder';
@@ -1164,6 +1155,10 @@ export type TriadProtocol = {
                     writable: true;
                     signer: true;
                 },
+                {
+                    name: 'market';
+                    writable: true;
+                },
                 {
                     name: 'squads';
                     writable: true;
@@ -1181,15 +1176,6 @@ export type TriadProtocol = {
                     name: 'sellerTrade';
                     writable: true;
                 },
-                {
-                    name: 'linkedSellerBidTrade';
-                    writable: true;
-                    optional: true;
-                },
-                {
-                    name: 'market';
-                    writable: true;
-                },
                 {
                     name: 'mint';
                     writable: true;
@@ -3000,26 +2986,6 @@ export type TriadProtocol = {
                 ];
             };
         },
-        {
-            name: 'marketAskOrderArgs';
-            type: {
-                kind: 'struct';
-                fields: [
-                    {
-                        name: 'shares';
-                        type: 'u64';
-                    },
-                    {
-                        name: 'orderDirection';
-                        type: {
-                            defined: {
-                                name: 'orderDirection';
-                            };
-                        };
-                    }
-                ];
-            };
-        },
         {
             name: 'marketBidOrderArgs';
             type: {

package/dist/utils/helpers.js

@@ -83,7 +83,8 @@ const formatMarket = (account, address) => {
             : '0',
         payoutFee: account.payoutFee,
         customer: account.customerId === 0 ? 'Triad' : account.customerId.toString(),
-        version: account.version.toNumber()
+        version: account.version.toNumber(),
+        poolId: account.poolId.toNumber()
     };
 };
 exports.formatMarket = formatMarket;

package/dist/utils/swap.d.ts

@@ -0,0 +1,14 @@
+import { AddressLookupTableAccount, Connection, TransactionInstruction } from '@solana/web3.js';
+export declare const swap: ({ connection, wallet, inToken, amount }: {
+    connection: Connection;
+    wallet: string;
+    inToken: string;
+    amount: number;
+}) => Promise<{
+    swapIxs: TransactionInstruction[];
+    addressLookupTableAccounts: AddressLookupTableAccount[];
+    setupInstructions: any;
+    cleanupInstruction: TransactionInstruction;
+    trdAmount: any;
+}>;
+export declare const getAddressLookupTableAccounts: (connection: Connection, keys: string[]) => Promise<AddressLookupTableAccount[]>;

package/dist/utils/swap.js

@@ -0,0 +1,82 @@
+"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 });
+exports.getAddressLookupTableAccounts = exports.swap = void 0;
+const axios_1 = __importDefault(require("axios"));
+const web3_js_1 = require("@solana/web3.js");
+const constants_1 = require("./constants");
+const swap = ({ connection, wallet, inToken, amount }) => __awaiter(void 0, void 0, void 0, function* () {
+    const token = TOKENS[inToken];
+    if (!token) {
+        throw new Error('Token not found');
+    }
+    const formattedAmountIn = amount * Math.pow(10, token.decimals);
+    const quoteResponse = yield axios_1.default.get(`https://quote-api.jup.ag/v6/quote?inputMint=${inToken}&outputMint=${constants_1.TRD_MINT.toBase58()}&amount=${formattedAmountIn}&slippageBps=100`);
+    const { data: quoteData } = quoteResponse;
+    const swapResponse = yield axios_1.default.post('https://quote-api.jup.ag/v6/swap-instructions', {
+        userPublicKey: wallet,
+        wrapAndUnwrapSol: true,
+        quoteResponse: quoteData
+    });
+    const { setupInstructions, swapInstruction, addressLookupTableAddresses, cleanupInstruction } = swapResponse.data;
+    return {
+        swapIxs: [
+            deserializeInstruction(swapInstruction),
+            web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
+                units: 500000
+            })
+        ],
+        addressLookupTableAccounts: yield (0, exports.getAddressLookupTableAccounts)(connection, addressLookupTableAddresses),
+        setupInstructions: setupInstructions.map(deserializeInstruction),
+        cleanupInstruction: deserializeInstruction(cleanupInstruction),
+        trdAmount: quoteData.outAmount
+    };
+});
+exports.swap = swap;
+const deserializeInstruction = (instruction) => {
+    return new web3_js_1.TransactionInstruction({
+        programId: new web3_js_1.PublicKey(instruction.programId),
+        keys: instruction.accounts.map((key) => ({
+            pubkey: new web3_js_1.PublicKey(key.pubkey),
+            isSigner: key.isSigner,
+            isWritable: key.isWritable
+        })),
+        data: Buffer.from(instruction.data, 'base64')
+    });
+};
+const getAddressLookupTableAccounts = (connection, keys) => __awaiter(void 0, void 0, void 0, function* () {
+    const addressLookupTableAccountInfos = yield connection.getMultipleAccountsInfo(keys.map((key) => new web3_js_1.PublicKey(key)));
+    return addressLookupTableAccountInfos.reduce((acc, accountInfo, index) => {
+        const addressLookupTableAddress = keys[index];
+        if (accountInfo) {
+            const addressLookupTableAccount = new web3_js_1.AddressLookupTableAccount({
+                key: new web3_js_1.PublicKey(addressLookupTableAddress),
+                state: web3_js_1.AddressLookupTableAccount.deserialize(accountInfo.data)
+            });
+            acc.push(addressLookupTableAccount);
+        }
+        return acc;
+    }, new Array());
+});
+exports.getAddressLookupTableAccounts = getAddressLookupTableAccounts;
+const TOKENS = {
+    So11111111111111111111111111111111111111112: {
+        mint: 'So11111111111111111111111111111111111111112',
+        decimals: 9
+    },
+    EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v: {
+        mint: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
+        decimals: 6
+    }
+};

package/package.json

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