@triadxyz/triad-protocol 1.8.3-beta → 1.8.5-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.js
CHANGED
|
@@ -545,7 +545,8 @@ class Trade {
|
|
|
545
545
|
ixs.push(yield this.program.methods
|
|
546
546
|
.marketBidOrder({
|
|
547
547
|
amount: new bn_js_1.default(usdcAmount),
|
|
548
|
-
orderDirection: direction
|
|
548
|
+
orderDirection: direction,
|
|
549
|
+
askOrderId: new bn_js_1.default(order.orderId)
|
|
549
550
|
})
|
|
550
551
|
.accounts({
|
|
551
552
|
signer: this.provider.publicKey,
|
|
@@ -856,8 +856,11 @@
|
|
|
856
856
|
},
|
|
857
857
|
{
|
|
858
858
|
"name": "squads",
|
|
859
|
-
"writable": true
|
|
860
|
-
|
|
859
|
+
"writable": true
|
|
860
|
+
},
|
|
861
|
+
{
|
|
862
|
+
"name": "seller_authority",
|
|
863
|
+
"writable": true
|
|
861
864
|
},
|
|
862
865
|
{
|
|
863
866
|
"name": "buyer_trade",
|
|
@@ -931,10 +934,6 @@
|
|
|
931
934
|
}
|
|
932
935
|
}
|
|
933
936
|
},
|
|
934
|
-
{
|
|
935
|
-
"name": "seller_authority",
|
|
936
|
-
"writable": true
|
|
937
|
-
},
|
|
938
937
|
{
|
|
939
938
|
"name": "seller_to_ata",
|
|
940
939
|
"writable": true,
|
|
@@ -2250,7 +2249,7 @@
|
|
|
2250
2249
|
},
|
|
2251
2250
|
{
|
|
2252
2251
|
"name": "fee_bps",
|
|
2253
|
-
"type": "
|
|
2252
|
+
"type": "u16"
|
|
2254
2253
|
},
|
|
2255
2254
|
{
|
|
2256
2255
|
"name": "payout_fee",
|
|
@@ -2348,6 +2347,10 @@
|
|
|
2348
2347
|
"name": "amount",
|
|
2349
2348
|
"type": "u64"
|
|
2350
2349
|
},
|
|
2350
|
+
{
|
|
2351
|
+
"name": "ask_order_id",
|
|
2352
|
+
"type": "u64"
|
|
2353
|
+
},
|
|
2351
2354
|
{
|
|
2352
2355
|
"name": "order_direction",
|
|
2353
2356
|
"type": {
|
package/dist/types/index.d.ts
CHANGED
package/dist/types/trade.d.ts
CHANGED
|
@@ -1182,7 +1182,10 @@ export type TriadProtocol = {
|
|
|
1182
1182
|
{
|
|
1183
1183
|
name: 'squads';
|
|
1184
1184
|
writable: true;
|
|
1185
|
-
|
|
1185
|
+
},
|
|
1186
|
+
{
|
|
1187
|
+
name: 'sellerAuthority';
|
|
1188
|
+
writable: true;
|
|
1186
1189
|
},
|
|
1187
1190
|
{
|
|
1188
1191
|
name: 'buyerTrade';
|
|
@@ -1314,10 +1317,6 @@ export type TriadProtocol = {
|
|
|
1314
1317
|
};
|
|
1315
1318
|
};
|
|
1316
1319
|
},
|
|
1317
|
-
{
|
|
1318
|
-
name: 'sellerAuthority';
|
|
1319
|
-
writable: true;
|
|
1320
|
-
},
|
|
1321
1320
|
{
|
|
1322
1321
|
name: 'sellerToAta';
|
|
1323
1322
|
writable: true;
|
|
@@ -3010,7 +3009,7 @@ export type TriadProtocol = {
|
|
|
3010
3009
|
},
|
|
3011
3010
|
{
|
|
3012
3011
|
name: 'feeBps';
|
|
3013
|
-
type: '
|
|
3012
|
+
type: 'u16';
|
|
3014
3013
|
},
|
|
3015
3014
|
{
|
|
3016
3015
|
name: 'payoutFee';
|
|
@@ -3108,6 +3107,10 @@ export type TriadProtocol = {
|
|
|
3108
3107
|
name: 'amount';
|
|
3109
3108
|
type: 'u64';
|
|
3110
3109
|
},
|
|
3110
|
+
{
|
|
3111
|
+
name: 'askOrderId';
|
|
3112
|
+
type: 'u64';
|
|
3113
|
+
},
|
|
3111
3114
|
{
|
|
3112
3115
|
name: 'orderDirection';
|
|
3113
3116
|
type: {
|
package/dist/utils/helpers.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Stake, StakeVault } from './../types/stake';
|
|
2
2
|
import { Market, Order, OrderDirection, OrderSide, OrderStatus, OrderType, UserTrade } from '../types/trade';
|
|
3
|
-
import { PublicKey } from '@solana/web3.js';
|
|
3
|
+
import { PublicKey, AddressLookupTableAccount } from '@solana/web3.js';
|
|
4
4
|
export declare const encodeString: (value: string, alloc?: number) => number[];
|
|
5
5
|
export declare const decodeString: (bytes: number[]) => string;
|
|
6
6
|
export declare const formatStakeVault: (stakeVault: any) => StakeVault;
|
|
@@ -38,3 +38,4 @@ export declare const getOrderStatus: (status: {
|
|
|
38
38
|
} | {
|
|
39
39
|
waiting: {};
|
|
40
40
|
}) => OrderStatus;
|
|
41
|
+
export declare const defaultLookupTable: AddressLookupTableAccount;
|
package/dist/utils/helpers.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
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;
|
|
3
|
+
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;
|
|
4
4
|
const trade_1 = require("../types/trade");
|
|
5
|
+
const web3_js_1 = require("@solana/web3.js");
|
|
5
6
|
const constants_1 = require("./constants");
|
|
6
7
|
const spl_token_1 = require("@solana/spl-token");
|
|
7
8
|
const spl_token_2 = require("@solana/spl-token");
|
|
@@ -190,3 +191,19 @@ const getOrderStatus = (status) => {
|
|
|
190
191
|
}
|
|
191
192
|
};
|
|
192
193
|
exports.getOrderStatus = getOrderStatus;
|
|
194
|
+
exports.defaultLookupTable = {
|
|
195
|
+
isActive: () => true,
|
|
196
|
+
key: new web3_js_1.PublicKey('A2wLWeXEHjmeRvSAyijS9ofv87N1GzFyQfdYPgPoQhZf'),
|
|
197
|
+
state: {
|
|
198
|
+
deactivationSlot: BigInt(18446744073709551615),
|
|
199
|
+
lastExtendedSlot: 328789868,
|
|
200
|
+
lastExtendedSlotStartIndex: 0,
|
|
201
|
+
authority: new web3_js_1.PublicKey('82ppCojm3yrEKgdpH8B5AmBJTU1r1uAWXFWhxvPs9UCR'),
|
|
202
|
+
addresses: [
|
|
203
|
+
new web3_js_1.PublicKey('t3DohmswhKk94PPbPYwA6ZKACyY3y5kbcqeQerAJjmV'),
|
|
204
|
+
new web3_js_1.PublicKey('6fcSf6qfwPNR9AUUNC1UWYZDy5cQ4TzTb2aaipN2zFdq'),
|
|
205
|
+
new web3_js_1.PublicKey('TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb'),
|
|
206
|
+
new web3_js_1.PublicKey('ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL')
|
|
207
|
+
]
|
|
208
|
+
}
|
|
209
|
+
};
|