@triadxyz/triad-protocol 1.9.0-beta → 1.9.2-beta
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/trade.d.ts +10 -1
- package/dist/trade.js +17 -1
- package/dist/types/idl_triad_protocol.json +59 -2
- package/dist/types/trade.d.ts +6 -0
- package/dist/types/triad_protocol.d.ts +59 -2
- package/dist/utils/helpers.js +4 -1
- package/package.json +1 -1
package/dist/trade.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { AnchorProvider, Program } from '@coral-xyz/anchor';
|
|
2
2
|
import { TriadProtocol } from './types/triad_protocol';
|
|
3
3
|
import { PublicKey, TransactionInstruction } from '@solana/web3.js';
|
|
4
|
-
import { CreateMarketArgs, OpenOrderArgs, UserTrade, CreateCustomerArgs, PlaceOrderArgs, CancelOrderArgs, Order, MarketBidOrderArgs } from './types/trade';
|
|
4
|
+
import { CreateMarketArgs, OpenOrderArgs, UserTrade, CreateCustomerArgs, PlaceOrderArgs, CancelOrderArgs, Order, MarketBidOrderArgs, UpdateMarketAdminArgs } from './types/trade';
|
|
5
5
|
import { RpcOptions } from './types';
|
|
6
6
|
import BN from 'bn.js';
|
|
7
7
|
export default class Trade {
|
|
@@ -136,6 +136,7 @@ export default class Trade {
|
|
|
136
136
|
ask: Record<string, never>;
|
|
137
137
|
});
|
|
138
138
|
linkedOrderId: BN;
|
|
139
|
+
linkedAskOrderId: BN;
|
|
139
140
|
createdAt: BN;
|
|
140
141
|
padding: number[];
|
|
141
142
|
}[];
|
|
@@ -323,4 +324,12 @@ export default class Trade {
|
|
|
323
324
|
ask: Order[];
|
|
324
325
|
};
|
|
325
326
|
}>;
|
|
327
|
+
/**
|
|
328
|
+
* Update Market Admin
|
|
329
|
+
* @param args.payoutFee - The payout fee of the market
|
|
330
|
+
* @param args.feeBps - The fee bps of the market
|
|
331
|
+
*
|
|
332
|
+
* @param options - RPC options
|
|
333
|
+
*/
|
|
334
|
+
updateMarketAdmin(args: UpdateMarketAdminArgs, options?: RpcOptions): Promise<string>;
|
|
326
335
|
}
|
package/dist/trade.js
CHANGED
|
@@ -537,7 +537,6 @@ class Trade {
|
|
|
537
537
|
if (order.authority === this.provider.publicKey.toBase58()) {
|
|
538
538
|
continue;
|
|
539
539
|
}
|
|
540
|
-
console.log(order);
|
|
541
540
|
const orderPrice = Number(order.price);
|
|
542
541
|
const maxSharesForPrice = remainingUSDC / orderPrice;
|
|
543
542
|
const availableShares = Number(order.totalShares);
|
|
@@ -616,6 +615,7 @@ class Trade {
|
|
|
616
615
|
ask: []
|
|
617
616
|
}
|
|
618
617
|
};
|
|
618
|
+
filteredOrders.sort((a, b) => Number(a.createdAt) - Number(b.createdAt));
|
|
619
619
|
filteredOrders.forEach((order) => {
|
|
620
620
|
if (order.orderSide === trade_1.OrderSide.BID &&
|
|
621
621
|
order.orderDirection === trade_1.OrderDirection.HYPE) {
|
|
@@ -637,5 +637,21 @@ class Trade {
|
|
|
637
637
|
return orderBook;
|
|
638
638
|
});
|
|
639
639
|
}
|
|
640
|
+
/**
|
|
641
|
+
* Update Market Admin
|
|
642
|
+
* @param args.payoutFee - The payout fee of the market
|
|
643
|
+
* @param args.feeBps - The fee bps of the market
|
|
644
|
+
*
|
|
645
|
+
* @param options - RPC options
|
|
646
|
+
*/
|
|
647
|
+
updateMarketAdmin(args, options) {
|
|
648
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
649
|
+
const marketPDA = (0, trade_2.getMarketPDA)(this.program.programId, args.marketId);
|
|
650
|
+
return (0, sendTransactionWithOptions_1.default)(this.program.methods.updateMarketAdmin(args).accounts({
|
|
651
|
+
signer: this.provider.publicKey,
|
|
652
|
+
market: marketPDA
|
|
653
|
+
}), options);
|
|
654
|
+
});
|
|
655
|
+
}
|
|
640
656
|
}
|
|
641
657
|
exports.default = Trade;
|
|
@@ -1594,6 +1594,35 @@
|
|
|
1594
1594
|
}
|
|
1595
1595
|
]
|
|
1596
1596
|
},
|
|
1597
|
+
{
|
|
1598
|
+
"name": "update_market_admin",
|
|
1599
|
+
"discriminator": [167, 63, 152, 152, 112, 165, 97, 114],
|
|
1600
|
+
"accounts": [
|
|
1601
|
+
{
|
|
1602
|
+
"name": "signer",
|
|
1603
|
+
"writable": true,
|
|
1604
|
+
"signer": true
|
|
1605
|
+
},
|
|
1606
|
+
{
|
|
1607
|
+
"name": "market",
|
|
1608
|
+
"writable": true
|
|
1609
|
+
},
|
|
1610
|
+
{
|
|
1611
|
+
"name": "system_program",
|
|
1612
|
+
"address": "11111111111111111111111111111111"
|
|
1613
|
+
}
|
|
1614
|
+
],
|
|
1615
|
+
"args": [
|
|
1616
|
+
{
|
|
1617
|
+
"name": "args",
|
|
1618
|
+
"type": {
|
|
1619
|
+
"defined": {
|
|
1620
|
+
"name": "UpdateMarketAdminArgs"
|
|
1621
|
+
}
|
|
1622
|
+
}
|
|
1623
|
+
}
|
|
1624
|
+
]
|
|
1625
|
+
},
|
|
1597
1626
|
{
|
|
1598
1627
|
"name": "update_stake_vault",
|
|
1599
1628
|
"discriminator": [84, 171, 100, 153, 126, 215, 229, 68],
|
|
@@ -2617,7 +2646,7 @@
|
|
|
2617
2646
|
},
|
|
2618
2647
|
{
|
|
2619
2648
|
"name": "total_amount",
|
|
2620
|
-
"docs": ["The total amount of TRD committed to this order"],
|
|
2649
|
+
"docs": ["The total amount of TRD/USDC committed to this order"],
|
|
2621
2650
|
"type": "u64"
|
|
2622
2651
|
},
|
|
2623
2652
|
{
|
|
@@ -2657,6 +2686,10 @@
|
|
|
2657
2686
|
"name": "linked_order_id",
|
|
2658
2687
|
"type": "u64"
|
|
2659
2688
|
},
|
|
2689
|
+
{
|
|
2690
|
+
"name": "linked_ask_order_id",
|
|
2691
|
+
"type": "u64"
|
|
2692
|
+
},
|
|
2660
2693
|
{
|
|
2661
2694
|
"name": "created_at",
|
|
2662
2695
|
"type": "i64"
|
|
@@ -2664,7 +2697,7 @@
|
|
|
2664
2697
|
{
|
|
2665
2698
|
"name": "padding",
|
|
2666
2699
|
"type": {
|
|
2667
|
-
"array": ["u8",
|
|
2700
|
+
"array": ["u8", 3]
|
|
2668
2701
|
}
|
|
2669
2702
|
}
|
|
2670
2703
|
]
|
|
@@ -2769,6 +2802,10 @@
|
|
|
2769
2802
|
"name": "linked_order_id",
|
|
2770
2803
|
"type": "u64"
|
|
2771
2804
|
},
|
|
2805
|
+
{
|
|
2806
|
+
"name": "linked_ask_order_id",
|
|
2807
|
+
"type": "u64"
|
|
2808
|
+
},
|
|
2772
2809
|
{
|
|
2773
2810
|
"name": "created_at",
|
|
2774
2811
|
"type": "i64"
|
|
@@ -3115,6 +3152,26 @@
|
|
|
3115
3152
|
]
|
|
3116
3153
|
}
|
|
3117
3154
|
},
|
|
3155
|
+
{
|
|
3156
|
+
"name": "UpdateMarketAdminArgs",
|
|
3157
|
+
"type": {
|
|
3158
|
+
"kind": "struct",
|
|
3159
|
+
"fields": [
|
|
3160
|
+
{
|
|
3161
|
+
"name": "payout_fee",
|
|
3162
|
+
"type": {
|
|
3163
|
+
"option": "u16"
|
|
3164
|
+
}
|
|
3165
|
+
},
|
|
3166
|
+
{
|
|
3167
|
+
"name": "fee_bps",
|
|
3168
|
+
"type": {
|
|
3169
|
+
"option": "u16"
|
|
3170
|
+
}
|
|
3171
|
+
}
|
|
3172
|
+
]
|
|
3173
|
+
}
|
|
3174
|
+
},
|
|
3118
3175
|
{
|
|
3119
3176
|
"name": "UpdateStakeVaultArgs",
|
|
3120
3177
|
"type": {
|
package/dist/types/trade.d.ts
CHANGED
|
@@ -52,6 +52,7 @@ export type Order = {
|
|
|
52
52
|
orderSide: OrderSide;
|
|
53
53
|
userNonce: string;
|
|
54
54
|
linkedOrderId: string;
|
|
55
|
+
linkedAskOrderId: string;
|
|
55
56
|
authority: string;
|
|
56
57
|
createdAt: string;
|
|
57
58
|
};
|
|
@@ -164,3 +165,8 @@ export type MarketBidOrderArgs = {
|
|
|
164
165
|
};
|
|
165
166
|
mint: PublicKey;
|
|
166
167
|
};
|
|
168
|
+
export type UpdateMarketAdminArgs = {
|
|
169
|
+
marketId: number;
|
|
170
|
+
payoutFee: number | null;
|
|
171
|
+
feeBps: number | null;
|
|
172
|
+
};
|
|
@@ -2180,6 +2180,35 @@ export type TriadProtocol = {
|
|
|
2180
2180
|
}
|
|
2181
2181
|
];
|
|
2182
2182
|
},
|
|
2183
|
+
{
|
|
2184
|
+
name: 'updateMarketAdmin';
|
|
2185
|
+
discriminator: [167, 63, 152, 152, 112, 165, 97, 114];
|
|
2186
|
+
accounts: [
|
|
2187
|
+
{
|
|
2188
|
+
name: 'signer';
|
|
2189
|
+
writable: true;
|
|
2190
|
+
signer: true;
|
|
2191
|
+
},
|
|
2192
|
+
{
|
|
2193
|
+
name: 'market';
|
|
2194
|
+
writable: true;
|
|
2195
|
+
},
|
|
2196
|
+
{
|
|
2197
|
+
name: 'systemProgram';
|
|
2198
|
+
address: '11111111111111111111111111111111';
|
|
2199
|
+
}
|
|
2200
|
+
];
|
|
2201
|
+
args: [
|
|
2202
|
+
{
|
|
2203
|
+
name: 'args';
|
|
2204
|
+
type: {
|
|
2205
|
+
defined: {
|
|
2206
|
+
name: 'updateMarketAdminArgs';
|
|
2207
|
+
};
|
|
2208
|
+
};
|
|
2209
|
+
}
|
|
2210
|
+
];
|
|
2211
|
+
},
|
|
2183
2212
|
{
|
|
2184
2213
|
name: 'updateStakeVault';
|
|
2185
2214
|
discriminator: [84, 171, 100, 153, 126, 215, 229, 68];
|
|
@@ -3319,7 +3348,7 @@ export type TriadProtocol = {
|
|
|
3319
3348
|
},
|
|
3320
3349
|
{
|
|
3321
3350
|
name: 'totalAmount';
|
|
3322
|
-
docs: ['The total amount of TRD committed to this order'];
|
|
3351
|
+
docs: ['The total amount of TRD/USDC committed to this order'];
|
|
3323
3352
|
type: 'u64';
|
|
3324
3353
|
},
|
|
3325
3354
|
{
|
|
@@ -3359,6 +3388,10 @@ export type TriadProtocol = {
|
|
|
3359
3388
|
name: 'linkedOrderId';
|
|
3360
3389
|
type: 'u64';
|
|
3361
3390
|
},
|
|
3391
|
+
{
|
|
3392
|
+
name: 'linkedAskOrderId';
|
|
3393
|
+
type: 'u64';
|
|
3394
|
+
},
|
|
3362
3395
|
{
|
|
3363
3396
|
name: 'createdAt';
|
|
3364
3397
|
type: 'i64';
|
|
@@ -3366,7 +3399,7 @@ export type TriadProtocol = {
|
|
|
3366
3399
|
{
|
|
3367
3400
|
name: 'padding';
|
|
3368
3401
|
type: {
|
|
3369
|
-
array: ['u8',
|
|
3402
|
+
array: ['u8', 3];
|
|
3370
3403
|
};
|
|
3371
3404
|
}
|
|
3372
3405
|
];
|
|
@@ -3471,6 +3504,10 @@ export type TriadProtocol = {
|
|
|
3471
3504
|
name: 'linkedOrderId';
|
|
3472
3505
|
type: 'u64';
|
|
3473
3506
|
},
|
|
3507
|
+
{
|
|
3508
|
+
name: 'linkedAskOrderId';
|
|
3509
|
+
type: 'u64';
|
|
3510
|
+
},
|
|
3474
3511
|
{
|
|
3475
3512
|
name: 'createdAt';
|
|
3476
3513
|
type: 'i64';
|
|
@@ -3817,6 +3854,26 @@ export type TriadProtocol = {
|
|
|
3817
3854
|
];
|
|
3818
3855
|
};
|
|
3819
3856
|
},
|
|
3857
|
+
{
|
|
3858
|
+
name: 'updateMarketAdminArgs';
|
|
3859
|
+
type: {
|
|
3860
|
+
kind: 'struct';
|
|
3861
|
+
fields: [
|
|
3862
|
+
{
|
|
3863
|
+
name: 'payoutFee';
|
|
3864
|
+
type: {
|
|
3865
|
+
option: 'u16';
|
|
3866
|
+
};
|
|
3867
|
+
},
|
|
3868
|
+
{
|
|
3869
|
+
name: 'feeBps';
|
|
3870
|
+
type: {
|
|
3871
|
+
option: 'u16';
|
|
3872
|
+
};
|
|
3873
|
+
}
|
|
3874
|
+
];
|
|
3875
|
+
};
|
|
3876
|
+
},
|
|
3820
3877
|
{
|
|
3821
3878
|
name: 'updateStakeVaultArgs';
|
|
3822
3879
|
type: {
|
package/dist/utils/helpers.js
CHANGED
|
@@ -101,7 +101,10 @@ const formatOrder = (order, authority) => {
|
|
|
101
101
|
orderDirection: (0, exports.getOrderDirection)(order.orderDirection),
|
|
102
102
|
orderSide: (0, exports.getOrderSide)(order.orderSide),
|
|
103
103
|
userNonce: order.userNonce.toString(),
|
|
104
|
-
linkedOrderId: order.linkedOrderId,
|
|
104
|
+
linkedOrderId: order.linkedOrderId ? order.linkedOrderId.toString() : '',
|
|
105
|
+
linkedAskOrderId: order.linkedAskOrderId
|
|
106
|
+
? order.linkedAskOrderId.toString()
|
|
107
|
+
: '',
|
|
105
108
|
filledShares: order.filledShares ? order.filledShares.toString() : '',
|
|
106
109
|
authority: authority ? authority : '',
|
|
107
110
|
createdAt: order.createdAt ? order.createdAt.toString() : ''
|