@triadxyz/triad-protocol 1.8.2-beta → 1.8.4-beta

package/dist/trade.js

@@ -522,11 +522,16 @@ class Trade {
             const { userTradePDA: buyerTrade, ixs: userTradeIxs } = yield this.getUserTradeIxs();
             const orderBook = yield this.getOrderBook(marketId);
             let remainingUSDC = amount * Math.pow(10, this.decimals);
-            const orders = direction[0].hype ? orderBook.hype.ask : orderBook.flop.ask;
+            const orders = Object.keys(direction)[0] === 'hype'
+                ? orderBook.hype.ask
+                : orderBook.flop.ask;
             const sortedOrders = orders.sort((a, b) => Number(a.price) - Number(b.price));
             for (const order of sortedOrders) {
                 if (remainingUSDC <= 0)
                     break;
+                if (order.authority === this.provider.publicKey.toBase58()) {
+                    continue;
+                }
                 const orderPrice = Number(order.price);
                 const maxSharesForPrice = remainingUSDC / orderPrice;
                 const availableShares = Number(order.totalShares);
@@ -540,7 +545,8 @@ class Trade {
                 ixs.push(yield this.program.methods
                     .marketBidOrder({
                     amount: new bn_js_1.default(usdcAmount),
-                    orderDirection: direction
+                    orderDirection: direction,
+                    askOrderId: new bn_js_1.default(order.orderId)
                 })
                     .accounts({
                     signer: this.provider.publicKey,
@@ -548,7 +554,8 @@ class Trade {
                     buyerTrade,
                     sellerTrade: sellerTradePDA,
                     mint,
-                    tokenProgram: (0, helpers_1.getTokenProgram)(mint)
+                    tokenProgram: (0, helpers_1.getTokenProgram)(mint),
+                    sellerAuthority: new web3_js_1.PublicKey(order.authority)
                 })
                     .instruction());
                 remainingUSDC -= usdcAmount;

package/dist/types/idl_triad_protocol.json

@@ -856,8 +856,11 @@
                 },
                 {
                     "name": "squads",
-                    "writable": true,
-                    "address": "6fcSf6qfwPNR9AUUNC1UWYZDy5cQ4TzTb2aaipN2zFdq"
+                    "writable": true
+                },
+                {
+                    "name": "seller_authority",
+                    "writable": true
                 },
                 {
                     "name": "buyer_trade",
@@ -931,10 +934,6 @@
                         }
                     }
                 },
-                {
-                    "name": "seller_authority",
-                    "writable": true
-                },
                 {
                     "name": "seller_to_ata",
                     "writable": true,
@@ -2250,7 +2249,7 @@
                     },
                     {
                         "name": "fee_bps",
-                        "type": "u8"
+                        "type": "u16"
                     },
                     {
                         "name": "payout_fee",
@@ -2348,6 +2347,10 @@
                         "name": "amount",
                         "type": "u64"
                     },
+                    {
+                        "name": "ask_order_id",
+                        "type": "u64"
+                    },
                     {
                         "name": "order_direction",
                         "type": {

package/dist/types/index.d.ts

@@ -2,6 +2,7 @@ import { PublicKey } from '@solana/web3.js';
 export type RpcOptions = {
     skipPreflight?: boolean;
     microLamports?: number;
+    computeBudget?: number;
 };
 export type MintTicketArgs = {
     discount: number;

package/dist/types/triad_protocol.d.ts

@@ -1182,7 +1182,10 @@ export type TriadProtocol = {
                 {
                     name: 'squads';
                     writable: true;
-                    address: '6fcSf6qfwPNR9AUUNC1UWYZDy5cQ4TzTb2aaipN2zFdq';
+                },
+                {
+                    name: 'sellerAuthority';
+                    writable: true;
                 },
                 {
                     name: 'buyerTrade';
@@ -1314,10 +1317,6 @@ export type TriadProtocol = {
                         };
                     };
                 },
-                {
-                    name: 'sellerAuthority';
-                    writable: true;
-                },
                 {
                     name: 'sellerToAta';
                     writable: true;
@@ -3010,7 +3009,7 @@ export type TriadProtocol = {
                     },
                     {
                         name: 'feeBps';
-                        type: 'u8';
+                        type: 'u16';
                     },
                     {
                         name: 'payoutFee';
@@ -3108,6 +3107,10 @@ export type TriadProtocol = {
                         name: 'amount';
                         type: 'u64';
                     },
+                    {
+                        name: 'askOrderId';
+                        type: 'u64';
+                    },
                     {
                         name: 'orderDirection';
                         type: {

package/dist/utils/helpers.d.ts

@@ -1,6 +1,6 @@
 import { Stake, StakeVault } from './../types/stake';
 import { Market, Order, OrderDirection, OrderSide, OrderStatus, OrderType, UserTrade } from '../types/trade';
-import { PublicKey } from '@solana/web3.js';
+import { PublicKey, AddressLookupTableAccount } from '@solana/web3.js';
 export declare const encodeString: (value: string, alloc?: number) => number[];
 export declare const decodeString: (bytes: number[]) => string;
 export declare const formatStakeVault: (stakeVault: any) => StakeVault;
@@ -38,3 +38,4 @@ export declare const getOrderStatus: (status: {
 } | {
     waiting: {};
 }) => OrderStatus;
+export declare const defaultLookupTable: AddressLookupTableAccount;

package/dist/utils/helpers.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getOrderStatus = exports.getOrderSide = exports.getOrderType = exports.getOrderDirection = exports.getTokenProgram = exports.calculateStakeRewards = exports.formatUserTrade = exports.formatOrder = exports.formatMarket = exports.formatStake = exports.formatStakeVault = exports.decodeString = exports.encodeString = void 0;
+exports.defaultLookupTable = exports.getOrderStatus = exports.getOrderSide = exports.getOrderType = exports.getOrderDirection = exports.getTokenProgram = exports.calculateStakeRewards = exports.formatUserTrade = exports.formatOrder = exports.formatMarket = exports.formatStake = exports.formatStakeVault = exports.decodeString = exports.encodeString = void 0;
 const trade_1 = require("../types/trade");
+const web3_js_1 = require("@solana/web3.js");
 const constants_1 = require("./constants");
 const spl_token_1 = require("@solana/spl-token");
 const spl_token_2 = require("@solana/spl-token");
@@ -190,3 +191,19 @@ const getOrderStatus = (status) => {
     }
 };
 exports.getOrderStatus = getOrderStatus;
+exports.defaultLookupTable = {
+    isActive: () => true,
+    key: new web3_js_1.PublicKey('A2wLWeXEHjmeRvSAyijS9ofv87N1GzFyQfdYPgPoQhZf'),
+    state: {
+        deactivationSlot: BigInt(18446744073709551615),
+        lastExtendedSlot: 328789868,
+        lastExtendedSlotStartIndex: 0,
+        authority: new web3_js_1.PublicKey('82ppCojm3yrEKgdpH8B5AmBJTU1r1uAWXFWhxvPs9UCR'),
+        addresses: [
+            new web3_js_1.PublicKey('t3DohmswhKk94PPbPYwA6ZKACyY3y5kbcqeQerAJjmV'),
+            new web3_js_1.PublicKey('6fcSf6qfwPNR9AUUNC1UWYZDy5cQ4TzTb2aaipN2zFdq'),
+            new web3_js_1.PublicKey('TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb'),
+            new web3_js_1.PublicKey('ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL')
+        ]
+    }
+};

package/package.json

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