@triadxyz/triad-protocol 2.4.7-beta → 2.4.9-beta

package/dist/index.js

@@ -827,11 +827,13 @@ class TriadProtocolClient {
                     .marketAskOrder({
                     shares: new bn_js_1.default(sharesToSell),
                     orderDirection: direction,
-                    bidOrderId: new bn_js_1.default(bidOrderId)
+                    bidOrderId: new bn_js_1.default(bidOrderId),
+                    bookOrderBidId: new bn_js_1.default(order.id)
                 })
                     .accounts({
                     signer: this.program.provider.publicKey,
                     market: marketPDA,
+                    buyerAuthority: new web3_js_1.PublicKey(order.authority),
                     buyerTrade: this.getUserPDA(new web3_js_1.PublicKey(order.authority), Number(order.userNonce)),
                     orderBook: (0, pda_1.getOrderBookPDA)(this.program.programId, marketId),
                     mint,

package/dist/types/idl_triad_protocol.json

@@ -2059,12 +2059,12 @@
             "discriminator": [175, 216, 61, 224, 98, 215, 181, 62]
         },
         {
-            "name": "MarketEvent",
-            "discriminator": [212, 67, 145, 23, 58, 104, 52, 83]
+            "name": "BookOrderFilledEvent",
+            "discriminator": [143, 95, 119, 33, 30, 15, 222, 175]
         },
         {
-            "name": "OrderBookFilledEvent",
-            "discriminator": [245, 59, 174, 245, 216, 23, 188, 165]
+            "name": "MarketEvent",
+            "discriminator": [212, 67, 145, 23, 58, 104, 52, 83]
         },
         {
             "name": "OrderEvent",
@@ -2206,26 +2206,21 @@
         },
         {
             "code": 6024,
-            "name": "Overflow",
-            "msg": "Overflow"
-        },
-        {
-            "code": 6025,
             "name": "LinkedBidOrderNotFound",
             "msg": "Linked bid order not found"
         },
         {
-            "code": 6026,
+            "code": 6025,
             "name": "CurrentFastPoolMarketStillActive",
             "msg": "Current fast pool market still active"
         },
         {
-            "code": 6027,
+            "code": 6026,
             "name": "MarketAlreadyAggregated",
             "msg": "Market already aggregated"
         },
         {
-            "code": 6028,
+            "code": 6027,
             "name": "MarketAlreadyPaidOut",
             "msg": "Market already paid out"
         }
@@ -2415,6 +2410,46 @@
                 ]
             }
         },
+        {
+            "name": "BookOrderFilledEvent",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "market_id",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "authority",
+                        "type": "pubkey"
+                    },
+                    {
+                        "name": "shares",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "price",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "order_direction",
+                        "type": {
+                            "defined": {
+                                "name": "OrderDirection"
+                            }
+                        }
+                    },
+                    {
+                        "name": "rewards",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "timestamp",
+                        "type": "i64"
+                    }
+                ]
+            }
+        },
         {
             "name": "CancelOrderArgs",
             "type": {
@@ -2624,6 +2659,10 @@
                         "name": "bid_order_id",
                         "type": "u64"
                     },
+                    {
+                        "name": "book_order_bid_id",
+                        "type": "u64"
+                    },
                     {
                         "name": "order_direction",
                         "type": {
@@ -3096,46 +3135,6 @@
                 ]
             }
         },
-        {
-            "name": "OrderBookFilledEvent",
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "market_id",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "authority",
-                        "type": "pubkey"
-                    },
-                    {
-                        "name": "shares",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "price",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "order_direction",
-                        "type": {
-                            "defined": {
-                                "name": "OrderDirection"
-                            }
-                        }
-                    },
-                    {
-                        "name": "rewards",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "timestamp",
-                        "type": "i64"
-                    }
-                ]
-            }
-        },
         {
             "name": "OrderDirection",
             "type": {

package/dist/types/triad_protocol.d.ts

@@ -2838,12 +2838,12 @@ export type TriadProtocol = {
             discriminator: [175, 216, 61, 224, 98, 215, 181, 62];
         },
         {
-            name: 'marketEvent';
-            discriminator: [212, 67, 145, 23, 58, 104, 52, 83];
+            name: 'bookOrderFilledEvent';
+            discriminator: [143, 95, 119, 33, 30, 15, 222, 175];
         },
         {
-            name: 'orderBookFilledEvent';
-            discriminator: [245, 59, 174, 245, 216, 23, 188, 165];
+            name: 'marketEvent';
+            discriminator: [212, 67, 145, 23, 58, 104, 52, 83];
         },
         {
             name: 'orderEvent';
@@ -2985,26 +2985,21 @@ export type TriadProtocol = {
         },
         {
             code: 6024;
-            name: 'overflow';
-            msg: 'overflow';
-        },
-        {
-            code: 6025;
             name: 'linkedBidOrderNotFound';
             msg: 'Linked bid order not found';
         },
         {
-            code: 6026;
+            code: 6025;
             name: 'currentFastPoolMarketStillActive';
             msg: 'Current fast pool market still active';
         },
         {
-            code: 6027;
+            code: 6026;
             name: 'marketAlreadyAggregated';
             msg: 'Market already aggregated';
         },
         {
-            code: 6028;
+            code: 6027;
             name: 'marketAlreadyPaidOut';
             msg: 'Market already paid out';
         }
@@ -3194,6 +3189,46 @@ export type TriadProtocol = {
                 ];
             };
         },
+        {
+            name: 'bookOrderFilledEvent';
+            type: {
+                kind: 'struct';
+                fields: [
+                    {
+                        name: 'marketId';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'authority';
+                        type: 'pubkey';
+                    },
+                    {
+                        name: 'shares';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'price';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'orderDirection';
+                        type: {
+                            defined: {
+                                name: 'orderDirection';
+                            };
+                        };
+                    },
+                    {
+                        name: 'rewards';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'timestamp';
+                        type: 'i64';
+                    }
+                ];
+            };
+        },
         {
             name: 'cancelOrderArgs';
             type: {
@@ -3403,6 +3438,10 @@ export type TriadProtocol = {
                         name: 'bidOrderId';
                         type: 'u64';
                     },
+                    {
+                        name: 'bookOrderBidId';
+                        type: 'u64';
+                    },
                     {
                         name: 'orderDirection';
                         type: {
@@ -3875,46 +3914,6 @@ export type TriadProtocol = {
                 ];
             };
         },
-        {
-            name: 'orderBookFilledEvent';
-            type: {
-                kind: 'struct';
-                fields: [
-                    {
-                        name: 'marketId';
-                        type: 'u64';
-                    },
-                    {
-                        name: 'authority';
-                        type: 'pubkey';
-                    },
-                    {
-                        name: 'shares';
-                        type: 'u64';
-                    },
-                    {
-                        name: 'price';
-                        type: 'u64';
-                    },
-                    {
-                        name: 'orderDirection';
-                        type: {
-                            defined: {
-                                name: 'orderDirection';
-                            };
-                        };
-                    },
-                    {
-                        name: 'rewards';
-                        type: 'u64';
-                    },
-                    {
-                        name: 'timestamp';
-                        type: 'i64';
-                    }
-                ];
-            };
-        },
         {
             name: 'orderDirection';
             type: {

package/package.json

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