@triadxyz/triad-protocol 4.2.7 → 4.2.9
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/index.d.ts +1 -0
- package/dist/index.js +9 -0
- package/dist/market.d.ts +0 -7
- package/dist/market.js +0 -22
- package/dist/predictor.d.ts +5 -5
- package/dist/predictor.js +7 -15
- package/dist/trade.d.ts +4 -4
- package/dist/trade.js +11 -12
- package/dist/types/idl_triad_protocol.json +0 -199
- package/dist/types/index.d.ts +7 -0
- package/dist/types/trade.d.ts +4 -4
- package/dist/types/triad_protocol.d.ts +0 -268
- package/dist/utils/helpers.d.ts +2 -1
- package/dist/utils/helpers.js +12 -2
- package/package.json +1 -1
package/dist/index.d.ts
CHANGED
|
@@ -31,6 +31,7 @@ export default class TriadProtocol {
|
|
|
31
31
|
market: Market;
|
|
32
32
|
constructor(connection: Connection, wallet: Wallet, rpcOptions: RpcOptions);
|
|
33
33
|
getPriorityFee(): Promise<void>;
|
|
34
|
+
getCentral(): Promise<import("./types").Central>;
|
|
34
35
|
/**
|
|
35
36
|
* Burn Triad
|
|
36
37
|
* @param amount - Amount to burn
|
package/dist/index.js
CHANGED
|
@@ -29,6 +29,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
29
29
|
const anchor_1 = require("@coral-xyz/anchor");
|
|
30
30
|
const bn_js_1 = __importDefault(require("bn.js"));
|
|
31
31
|
const idl_triad_protocol_json_1 = __importDefault(require("./types/idl_triad_protocol.json"));
|
|
32
|
+
const pda_1 = require("./utils/pda");
|
|
33
|
+
const helpers_1 = require("./utils/helpers");
|
|
32
34
|
const sendVersionedTransaction_1 = __importDefault(require("./utils/sendVersionedTransaction"));
|
|
33
35
|
const stake_1 = __importDefault(require("./stake"));
|
|
34
36
|
const poseidon_1 = __importDefault(require("./poseidon"));
|
|
@@ -74,6 +76,13 @@ class TriadProtocol {
|
|
|
74
76
|
this.rpcOptions.microLamports = yield (0, getPriorityFee_1.default)();
|
|
75
77
|
});
|
|
76
78
|
}
|
|
79
|
+
getCentral() {
|
|
80
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
81
|
+
const centralPDA = (0, pda_1.getCentralPDA)(this.program.programId);
|
|
82
|
+
const central = yield this.program.account.central.fetch(centralPDA);
|
|
83
|
+
return (0, helpers_1.formatCentral)(central, centralPDA);
|
|
84
|
+
});
|
|
85
|
+
}
|
|
77
86
|
/**
|
|
78
87
|
* Burn Triad
|
|
79
88
|
* @param amount - Amount to burn
|
package/dist/market.d.ts
CHANGED
|
@@ -160,11 +160,4 @@ export default class Market {
|
|
|
160
160
|
* @param market.poolId - The ID of the pool
|
|
161
161
|
*/
|
|
162
162
|
createAndResolveMarket(toResolve: UpdateMarketWinningDirectionArgs['markets'][0], market: CreateMarketArgs['markets'][0], customer: PublicKey): Promise<string | import("@solana/web3.js").VersionedTransaction>;
|
|
163
|
-
/**
|
|
164
|
-
*
|
|
165
|
-
* @param marketId
|
|
166
|
-
* @param usdcMint
|
|
167
|
-
* @returns
|
|
168
|
-
*/
|
|
169
|
-
migrateUSDC(marketIds: number[]): Promise<string | import("@solana/web3.js").VersionedTransaction>;
|
|
170
163
|
}
|
package/dist/market.js
CHANGED
|
@@ -567,27 +567,5 @@ class Market {
|
|
|
567
567
|
return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
|
|
568
568
|
});
|
|
569
569
|
}
|
|
570
|
-
/**
|
|
571
|
-
*
|
|
572
|
-
* @param marketId
|
|
573
|
-
* @param usdcMint
|
|
574
|
-
* @returns
|
|
575
|
-
*/
|
|
576
|
-
migrateUSDC(marketIds) {
|
|
577
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
578
|
-
const ixs = [];
|
|
579
|
-
for (const marketId of marketIds) {
|
|
580
|
-
const marketPDA = (0, pda_1.getMarketPDA)(this.program.programId, marketId);
|
|
581
|
-
ixs.push(yield this.program.methods
|
|
582
|
-
.migrateUsdc()
|
|
583
|
-
.accounts({
|
|
584
|
-
signer: this.program.provider.publicKey,
|
|
585
|
-
market: marketPDA
|
|
586
|
-
})
|
|
587
|
-
.instruction());
|
|
588
|
-
}
|
|
589
|
-
return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
|
|
590
|
-
});
|
|
591
|
-
}
|
|
592
570
|
}
|
|
593
571
|
exports.default = Market;
|
package/dist/predictor.d.ts
CHANGED
|
@@ -13,11 +13,11 @@ export default class Predictor {
|
|
|
13
13
|
* @param customerId - Customer ID
|
|
14
14
|
*/
|
|
15
15
|
getPredictor(authority: PublicKey, customerId: number): Promise<PredictorType>;
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
16
|
+
/**
|
|
17
|
+
* Get predictor by address
|
|
18
|
+
* @param address - Predictor address
|
|
19
|
+
*/
|
|
20
|
+
getPredictorByAddress(address: string): Promise<PredictorType>;
|
|
21
21
|
/**
|
|
22
22
|
* Get User Orders
|
|
23
23
|
* @param wallet - User wallet PublicKey
|
package/dist/predictor.js
CHANGED
|
@@ -48,22 +48,14 @@ class Predictor {
|
|
|
48
48
|
}
|
|
49
49
|
});
|
|
50
50
|
}
|
|
51
|
-
|
|
51
|
+
/**
|
|
52
|
+
* Get predictor by address
|
|
53
|
+
* @param address - Predictor address
|
|
54
|
+
*/
|
|
55
|
+
getPredictorByAddress(address) {
|
|
52
56
|
return __awaiter(this, void 0, void 0, function* () {
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
ixs.push(yield this.program.methods
|
|
56
|
-
.createPredictor({
|
|
57
|
-
customerId: user.customerId,
|
|
58
|
-
refer: new web3_js_1.PublicKey(user.refer)
|
|
59
|
-
})
|
|
60
|
-
.accounts({
|
|
61
|
-
signer: user.authority,
|
|
62
|
-
payer: this.rpcOptions.payer
|
|
63
|
-
})
|
|
64
|
-
.instruction());
|
|
65
|
-
}
|
|
66
|
-
yield (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
|
|
57
|
+
const predictor = yield this.program.account.predictor.fetch(new web3_js_1.PublicKey(address), this.rpcOptions.commitment);
|
|
58
|
+
return (0, helpers_1.formatPredictor)(predictor, new web3_js_1.PublicKey(address));
|
|
67
59
|
});
|
|
68
60
|
}
|
|
69
61
|
/**
|
package/dist/trade.d.ts
CHANGED
|
@@ -33,7 +33,7 @@ export default class Trade {
|
|
|
33
33
|
* @param args.orders.price - The price of the Order
|
|
34
34
|
* @param args.orders.orderDirection - The direction of the Order
|
|
35
35
|
*/
|
|
36
|
-
placeBidOrder({ orders
|
|
36
|
+
placeBidOrder({ orders }: PlaceBidOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
|
|
37
37
|
/**
|
|
38
38
|
* Place Ask Order
|
|
39
39
|
* @param args.orders - Array of orders to execute
|
|
@@ -42,14 +42,14 @@ export default class Trade {
|
|
|
42
42
|
* @param args.orders.marketId - The Id from the market
|
|
43
43
|
* @param args.orders.orderDirection - The direction of the Order
|
|
44
44
|
*/
|
|
45
|
-
placeAskOrder({ orders
|
|
45
|
+
placeAskOrder({ orders }: PlaceAskOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
|
|
46
46
|
/**
|
|
47
47
|
* Cancel Bid Order
|
|
48
48
|
* @param args.orders.bookOrderId - The ID of the Book Order
|
|
49
49
|
* @param args.orders.marketId - The ID of the Market
|
|
50
50
|
* @param args.orders.orderDirection - The direction of the Order
|
|
51
51
|
*/
|
|
52
|
-
cancelBidOrder({ orders
|
|
52
|
+
cancelBidOrder({ orders }: CancelBidOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
|
|
53
53
|
/**
|
|
54
54
|
* Cancel Ask Order
|
|
55
55
|
* @param args.orders.marketId - The ID of the Market
|
|
@@ -57,7 +57,7 @@ export default class Trade {
|
|
|
57
57
|
* @param args.orders.bookOrderId - The ID of the Book Order
|
|
58
58
|
* @param args.orders.orderDirection - The direction of the Order
|
|
59
59
|
*/
|
|
60
|
-
cancelAskOrder({ orders
|
|
60
|
+
cancelAskOrder({ orders }: CancelAskOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
|
|
61
61
|
/**
|
|
62
62
|
* Market Bid Order
|
|
63
63
|
* @param args.marketId - The ID of the Market
|
package/dist/trade.js
CHANGED
|
@@ -67,11 +67,11 @@ class Trade {
|
|
|
67
67
|
* @param args.orders.price - The price of the Order
|
|
68
68
|
* @param args.orders.orderDirection - The direction of the Order
|
|
69
69
|
*/
|
|
70
|
-
placeBidOrder({ orders
|
|
70
|
+
placeBidOrder({ orders }) {
|
|
71
71
|
return __awaiter(this, void 0, void 0, function* () {
|
|
72
72
|
const ixs = [];
|
|
73
|
-
const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, this.program.provider.publicKey, customerId);
|
|
74
73
|
for (const order of orders) {
|
|
74
|
+
const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, this.program.provider.publicKey, order.customerId);
|
|
75
75
|
ixs.push(yield this.program.methods
|
|
76
76
|
.placeBidOrder({
|
|
77
77
|
amount: new bn_js_1.default(order.amount * Math.pow(10, constants_1.BASE_DECIMALS)),
|
|
@@ -100,11 +100,11 @@ class Trade {
|
|
|
100
100
|
* @param args.orders.marketId - The Id from the market
|
|
101
101
|
* @param args.orders.orderDirection - The direction of the Order
|
|
102
102
|
*/
|
|
103
|
-
placeAskOrder({ orders
|
|
103
|
+
placeAskOrder({ orders }) {
|
|
104
104
|
return __awaiter(this, void 0, void 0, function* () {
|
|
105
105
|
const ixs = [];
|
|
106
|
-
const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, this.program.provider.publicKey, customerId);
|
|
107
106
|
for (const order of orders) {
|
|
107
|
+
const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, this.program.provider.publicKey, order.customerId);
|
|
108
108
|
ixs.push(yield this.program.methods
|
|
109
109
|
.placeAskOrder({
|
|
110
110
|
shares: new bn_js_1.default(order.amount * Math.pow(10, constants_1.BASE_DECIMALS)),
|
|
@@ -129,7 +129,7 @@ class Trade {
|
|
|
129
129
|
* @param args.orders.marketId - The ID of the Market
|
|
130
130
|
* @param args.orders.orderDirection - The direction of the Order
|
|
131
131
|
*/
|
|
132
|
-
cancelBidOrder({ orders
|
|
132
|
+
cancelBidOrder({ orders }) {
|
|
133
133
|
return __awaiter(this, void 0, void 0, function* () {
|
|
134
134
|
const ixs = [];
|
|
135
135
|
for (const order of orders) {
|
|
@@ -140,8 +140,8 @@ class Trade {
|
|
|
140
140
|
orderDirection: order.orderDirection
|
|
141
141
|
})
|
|
142
142
|
.accounts({
|
|
143
|
-
signer:
|
|
144
|
-
predictor:
|
|
143
|
+
signer: order.authority,
|
|
144
|
+
predictor: order.predictor,
|
|
145
145
|
market: (0, pda_1.getMarketPDA)(this.program.programId, order.marketId),
|
|
146
146
|
orderBook: (0, pda_1.getOrderBookPDA)(this.program.programId, order.marketId)
|
|
147
147
|
})
|
|
@@ -157,10 +157,9 @@ class Trade {
|
|
|
157
157
|
* @param args.orders.bookOrderId - The ID of the Book Order
|
|
158
158
|
* @param args.orders.orderDirection - The direction of the Order
|
|
159
159
|
*/
|
|
160
|
-
cancelAskOrder({ orders
|
|
160
|
+
cancelAskOrder({ orders }) {
|
|
161
161
|
return __awaiter(this, void 0, void 0, function* () {
|
|
162
162
|
const ixs = [];
|
|
163
|
-
const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, this.program.provider.publicKey, customerId);
|
|
164
163
|
for (const order of orders) {
|
|
165
164
|
ixs.push(yield this.program.methods
|
|
166
165
|
.cancelAskOrder({
|
|
@@ -171,10 +170,10 @@ class Trade {
|
|
|
171
170
|
.accounts({
|
|
172
171
|
signer: order.authority,
|
|
173
172
|
payer: this.rpcOptions.payer,
|
|
174
|
-
predictor:
|
|
173
|
+
predictor: order.predictor,
|
|
175
174
|
market: (0, pda_1.getMarketPDA)(this.program.programId, order.marketId),
|
|
176
175
|
orderBook: (0, pda_1.getOrderBookPDA)(this.program.programId, order.marketId),
|
|
177
|
-
predictorOrder: (0, pda_1.getPredictorOrderPDA)(this.program.programId,
|
|
176
|
+
predictorOrder: (0, pda_1.getPredictorOrderPDA)(this.program.programId, order.predictor, order.marketId, (0, helpers_1.getOrderDirection)(order.orderDirection))
|
|
178
177
|
})
|
|
179
178
|
.instruction());
|
|
180
179
|
}
|
|
@@ -320,7 +319,7 @@ class Trade {
|
|
|
320
319
|
return __awaiter(this, void 0, void 0, function* () {
|
|
321
320
|
const ixs = [];
|
|
322
321
|
for (const order of orders) {
|
|
323
|
-
const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId,
|
|
322
|
+
const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, order.authority, order.customerId);
|
|
324
323
|
ixs.push(yield this.program.methods
|
|
325
324
|
.payoutOrder()
|
|
326
325
|
.accounts({
|
|
@@ -1160,38 +1160,6 @@
|
|
|
1160
1160
|
}
|
|
1161
1161
|
]
|
|
1162
1162
|
},
|
|
1163
|
-
{
|
|
1164
|
-
"name": "migrate_order",
|
|
1165
|
-
"discriminator": [177, 81, 189, 119, 98, 91, 63, 189],
|
|
1166
|
-
"accounts": [
|
|
1167
|
-
{
|
|
1168
|
-
"name": "signer",
|
|
1169
|
-
"writable": true
|
|
1170
|
-
},
|
|
1171
|
-
{
|
|
1172
|
-
"name": "payer",
|
|
1173
|
-
"writable": true,
|
|
1174
|
-
"signer": true
|
|
1175
|
-
},
|
|
1176
|
-
{
|
|
1177
|
-
"name": "order",
|
|
1178
|
-
"writable": true
|
|
1179
|
-
},
|
|
1180
|
-
{
|
|
1181
|
-
"name": "predictor",
|
|
1182
|
-
"writable": true
|
|
1183
|
-
},
|
|
1184
|
-
{
|
|
1185
|
-
"name": "predictor_order",
|
|
1186
|
-
"writable": true
|
|
1187
|
-
},
|
|
1188
|
-
{
|
|
1189
|
-
"name": "system_program",
|
|
1190
|
-
"address": "11111111111111111111111111111111"
|
|
1191
|
-
}
|
|
1192
|
-
],
|
|
1193
|
-
"args": []
|
|
1194
|
-
},
|
|
1195
1163
|
{
|
|
1196
1164
|
"name": "migrate_stake",
|
|
1197
1165
|
"discriminator": [178, 5, 26, 85, 56, 20, 153, 160],
|
|
@@ -1360,113 +1328,6 @@
|
|
|
1360
1328
|
],
|
|
1361
1329
|
"args": []
|
|
1362
1330
|
},
|
|
1363
|
-
{
|
|
1364
|
-
"name": "migrate_usdc",
|
|
1365
|
-
"discriminator": [8, 131, 126, 107, 248, 44, 154, 73],
|
|
1366
|
-
"accounts": [
|
|
1367
|
-
{
|
|
1368
|
-
"name": "signer",
|
|
1369
|
-
"writable": true,
|
|
1370
|
-
"signer": true
|
|
1371
|
-
},
|
|
1372
|
-
{
|
|
1373
|
-
"name": "central",
|
|
1374
|
-
"writable": true,
|
|
1375
|
-
"pda": {
|
|
1376
|
-
"seeds": [
|
|
1377
|
-
{
|
|
1378
|
-
"kind": "const",
|
|
1379
|
-
"value": [99, 101, 110, 116, 114, 97, 108]
|
|
1380
|
-
},
|
|
1381
|
-
{
|
|
1382
|
-
"kind": "const",
|
|
1383
|
-
"value": [
|
|
1384
|
-
116, 114, 105, 97, 100, 109, 97, 114, 107, 101, 116, 115
|
|
1385
|
-
]
|
|
1386
|
-
}
|
|
1387
|
-
]
|
|
1388
|
-
}
|
|
1389
|
-
},
|
|
1390
|
-
{
|
|
1391
|
-
"name": "market",
|
|
1392
|
-
"writable": true
|
|
1393
|
-
},
|
|
1394
|
-
{
|
|
1395
|
-
"name": "mint",
|
|
1396
|
-
"writable": true,
|
|
1397
|
-
"address": "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v"
|
|
1398
|
-
},
|
|
1399
|
-
{
|
|
1400
|
-
"name": "market_ata",
|
|
1401
|
-
"writable": true,
|
|
1402
|
-
"pda": {
|
|
1403
|
-
"seeds": [
|
|
1404
|
-
{
|
|
1405
|
-
"kind": "account",
|
|
1406
|
-
"path": "market"
|
|
1407
|
-
},
|
|
1408
|
-
{
|
|
1409
|
-
"kind": "account",
|
|
1410
|
-
"path": "token_program"
|
|
1411
|
-
},
|
|
1412
|
-
{
|
|
1413
|
-
"kind": "account",
|
|
1414
|
-
"path": "mint"
|
|
1415
|
-
}
|
|
1416
|
-
],
|
|
1417
|
-
"program": {
|
|
1418
|
-
"kind": "const",
|
|
1419
|
-
"value": [
|
|
1420
|
-
140, 151, 37, 143, 78, 36, 137, 241, 187, 61, 16, 41, 20, 142,
|
|
1421
|
-
13, 131, 11, 90, 19, 153, 218, 255, 16, 132, 4, 142, 123, 216,
|
|
1422
|
-
219, 233, 248, 89
|
|
1423
|
-
]
|
|
1424
|
-
}
|
|
1425
|
-
}
|
|
1426
|
-
},
|
|
1427
|
-
{
|
|
1428
|
-
"name": "central_ata",
|
|
1429
|
-
"writable": true,
|
|
1430
|
-
"pda": {
|
|
1431
|
-
"seeds": [
|
|
1432
|
-
{
|
|
1433
|
-
"kind": "account",
|
|
1434
|
-
"path": "central"
|
|
1435
|
-
},
|
|
1436
|
-
{
|
|
1437
|
-
"kind": "account",
|
|
1438
|
-
"path": "token_program"
|
|
1439
|
-
},
|
|
1440
|
-
{
|
|
1441
|
-
"kind": "account",
|
|
1442
|
-
"path": "mint"
|
|
1443
|
-
}
|
|
1444
|
-
],
|
|
1445
|
-
"program": {
|
|
1446
|
-
"kind": "const",
|
|
1447
|
-
"value": [
|
|
1448
|
-
140, 151, 37, 143, 78, 36, 137, 241, 187, 61, 16, 41, 20, 142,
|
|
1449
|
-
13, 131, 11, 90, 19, 153, 218, 255, 16, 132, 4, 142, 123, 216,
|
|
1450
|
-
219, 233, 248, 89
|
|
1451
|
-
]
|
|
1452
|
-
}
|
|
1453
|
-
}
|
|
1454
|
-
},
|
|
1455
|
-
{
|
|
1456
|
-
"name": "token_program",
|
|
1457
|
-
"address": "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
|
|
1458
|
-
},
|
|
1459
|
-
{
|
|
1460
|
-
"name": "associated_token_program",
|
|
1461
|
-
"address": "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
|
|
1462
|
-
},
|
|
1463
|
-
{
|
|
1464
|
-
"name": "system_program",
|
|
1465
|
-
"address": "11111111111111111111111111111111"
|
|
1466
|
-
}
|
|
1467
|
-
],
|
|
1468
|
-
"args": []
|
|
1469
|
-
},
|
|
1470
1331
|
{
|
|
1471
1332
|
"name": "payout_order",
|
|
1472
1333
|
"discriminator": [247, 233, 158, 228, 63, 32, 236, 113],
|
|
@@ -2101,10 +1962,6 @@
|
|
|
2101
1962
|
"name": "OrderBook",
|
|
2102
1963
|
"discriminator": [55, 230, 125, 218, 149, 39, 65, 248]
|
|
2103
1964
|
},
|
|
2104
|
-
{
|
|
2105
|
-
"name": "OrderV2",
|
|
2106
|
-
"discriminator": [150, 42, 80, 18, 62, 128, 236, 76]
|
|
2107
|
-
},
|
|
2108
1965
|
{
|
|
2109
1966
|
"name": "Pool",
|
|
2110
1967
|
"discriminator": [241, 154, 109, 4, 17, 177, 109, 188]
|
|
@@ -3569,62 +3426,6 @@
|
|
|
3569
3426
|
]
|
|
3570
3427
|
}
|
|
3571
3428
|
},
|
|
3572
|
-
{
|
|
3573
|
-
"name": "OrderV2",
|
|
3574
|
-
"type": {
|
|
3575
|
-
"kind": "struct",
|
|
3576
|
-
"fields": [
|
|
3577
|
-
{
|
|
3578
|
-
"name": "authority",
|
|
3579
|
-
"type": "pubkey"
|
|
3580
|
-
},
|
|
3581
|
-
{
|
|
3582
|
-
"name": "market_id",
|
|
3583
|
-
"type": "u64"
|
|
3584
|
-
},
|
|
3585
|
-
{
|
|
3586
|
-
"name": "shares",
|
|
3587
|
-
"type": "u64"
|
|
3588
|
-
},
|
|
3589
|
-
{
|
|
3590
|
-
"name": "price",
|
|
3591
|
-
"type": "u64"
|
|
3592
|
-
},
|
|
3593
|
-
{
|
|
3594
|
-
"name": "order_status",
|
|
3595
|
-
"type": {
|
|
3596
|
-
"defined": {
|
|
3597
|
-
"name": "OrderStatus"
|
|
3598
|
-
}
|
|
3599
|
-
}
|
|
3600
|
-
},
|
|
3601
|
-
{
|
|
3602
|
-
"name": "order_type",
|
|
3603
|
-
"type": {
|
|
3604
|
-
"defined": {
|
|
3605
|
-
"name": "OrderType"
|
|
3606
|
-
}
|
|
3607
|
-
}
|
|
3608
|
-
},
|
|
3609
|
-
{
|
|
3610
|
-
"name": "order_direction",
|
|
3611
|
-
"type": {
|
|
3612
|
-
"defined": {
|
|
3613
|
-
"name": "OrderDirection"
|
|
3614
|
-
}
|
|
3615
|
-
}
|
|
3616
|
-
},
|
|
3617
|
-
{
|
|
3618
|
-
"name": "order_side",
|
|
3619
|
-
"type": {
|
|
3620
|
-
"defined": {
|
|
3621
|
-
"name": "OrderSide"
|
|
3622
|
-
}
|
|
3623
|
-
}
|
|
3624
|
-
}
|
|
3625
|
-
]
|
|
3626
|
-
}
|
|
3627
|
-
},
|
|
3628
3429
|
{
|
|
3629
3430
|
"name": "PlaceAskOrderArgs",
|
|
3630
3431
|
"type": {
|
package/dist/types/index.d.ts
CHANGED
|
@@ -55,6 +55,13 @@ export type PredictorOrder = {
|
|
|
55
55
|
orderDirection: OrderDirection;
|
|
56
56
|
predictor: string;
|
|
57
57
|
};
|
|
58
|
+
export type Central = {
|
|
59
|
+
address: string;
|
|
60
|
+
isLocked: boolean;
|
|
61
|
+
feeAvailable: number;
|
|
62
|
+
feeClaimed: number;
|
|
63
|
+
rewardsPaid: number;
|
|
64
|
+
};
|
|
58
65
|
export type BookOrder = {
|
|
59
66
|
id: string;
|
|
60
67
|
price: string;
|
package/dist/types/trade.d.ts
CHANGED
|
@@ -7,8 +7,8 @@ export type PlaceBidOrderArgs = {
|
|
|
7
7
|
price: number;
|
|
8
8
|
orderDirection: OrderDirectionEncoded;
|
|
9
9
|
marketId: number;
|
|
10
|
+
customerId: number;
|
|
10
11
|
}[];
|
|
11
|
-
customerId: number;
|
|
12
12
|
};
|
|
13
13
|
export type PlaceAskOrderArgs = {
|
|
14
14
|
orders: {
|
|
@@ -16,26 +16,26 @@ export type PlaceAskOrderArgs = {
|
|
|
16
16
|
price: number;
|
|
17
17
|
orderDirection: OrderDirectionEncoded;
|
|
18
18
|
marketId: number;
|
|
19
|
+
customerId: number;
|
|
19
20
|
}[];
|
|
20
|
-
customerId: number;
|
|
21
21
|
};
|
|
22
22
|
export type CancelBidOrderArgs = {
|
|
23
23
|
orders: {
|
|
24
24
|
authority: PublicKey;
|
|
25
|
+
predictor: PublicKey;
|
|
25
26
|
marketId: number;
|
|
26
27
|
bookOrderId: number;
|
|
27
28
|
orderDirection: OrderDirectionEncoded;
|
|
28
29
|
}[];
|
|
29
|
-
customerId: number;
|
|
30
30
|
};
|
|
31
31
|
export type CancelAskOrderArgs = {
|
|
32
32
|
orders: {
|
|
33
33
|
authority: PublicKey;
|
|
34
|
+
predictor: PublicKey;
|
|
34
35
|
marketId: number;
|
|
35
36
|
bookOrderId: number;
|
|
36
37
|
orderDirection: OrderDirectionEncoded;
|
|
37
38
|
}[];
|
|
38
|
-
customerId: number;
|
|
39
39
|
};
|
|
40
40
|
export type MarketBidOrderArgs = {
|
|
41
41
|
marketId: number;
|
|
@@ -1490,38 +1490,6 @@ export type TriadProtocol = {
|
|
|
1490
1490
|
}
|
|
1491
1491
|
];
|
|
1492
1492
|
},
|
|
1493
|
-
{
|
|
1494
|
-
name: 'migrateOrder';
|
|
1495
|
-
discriminator: [177, 81, 189, 119, 98, 91, 63, 189];
|
|
1496
|
-
accounts: [
|
|
1497
|
-
{
|
|
1498
|
-
name: 'signer';
|
|
1499
|
-
writable: true;
|
|
1500
|
-
},
|
|
1501
|
-
{
|
|
1502
|
-
name: 'payer';
|
|
1503
|
-
writable: true;
|
|
1504
|
-
signer: true;
|
|
1505
|
-
},
|
|
1506
|
-
{
|
|
1507
|
-
name: 'order';
|
|
1508
|
-
writable: true;
|
|
1509
|
-
},
|
|
1510
|
-
{
|
|
1511
|
-
name: 'predictor';
|
|
1512
|
-
writable: true;
|
|
1513
|
-
},
|
|
1514
|
-
{
|
|
1515
|
-
name: 'predictorOrder';
|
|
1516
|
-
writable: true;
|
|
1517
|
-
},
|
|
1518
|
-
{
|
|
1519
|
-
name: 'systemProgram';
|
|
1520
|
-
address: '11111111111111111111111111111111';
|
|
1521
|
-
}
|
|
1522
|
-
];
|
|
1523
|
-
args: [];
|
|
1524
|
-
},
|
|
1525
1493
|
{
|
|
1526
1494
|
name: 'migrateStake';
|
|
1527
1495
|
discriminator: [178, 5, 26, 85, 56, 20, 153, 160];
|
|
@@ -1788,182 +1756,6 @@ export type TriadProtocol = {
|
|
|
1788
1756
|
];
|
|
1789
1757
|
args: [];
|
|
1790
1758
|
},
|
|
1791
|
-
{
|
|
1792
|
-
name: 'migrateUsdc';
|
|
1793
|
-
discriminator: [8, 131, 126, 107, 248, 44, 154, 73];
|
|
1794
|
-
accounts: [
|
|
1795
|
-
{
|
|
1796
|
-
name: 'signer';
|
|
1797
|
-
writable: true;
|
|
1798
|
-
signer: true;
|
|
1799
|
-
},
|
|
1800
|
-
{
|
|
1801
|
-
name: 'central';
|
|
1802
|
-
writable: true;
|
|
1803
|
-
pda: {
|
|
1804
|
-
seeds: [
|
|
1805
|
-
{
|
|
1806
|
-
kind: 'const';
|
|
1807
|
-
value: [99, 101, 110, 116, 114, 97, 108];
|
|
1808
|
-
},
|
|
1809
|
-
{
|
|
1810
|
-
kind: 'const';
|
|
1811
|
-
value: [
|
|
1812
|
-
116,
|
|
1813
|
-
114,
|
|
1814
|
-
105,
|
|
1815
|
-
97,
|
|
1816
|
-
100,
|
|
1817
|
-
109,
|
|
1818
|
-
97,
|
|
1819
|
-
114,
|
|
1820
|
-
107,
|
|
1821
|
-
101,
|
|
1822
|
-
116,
|
|
1823
|
-
115
|
|
1824
|
-
];
|
|
1825
|
-
}
|
|
1826
|
-
];
|
|
1827
|
-
};
|
|
1828
|
-
},
|
|
1829
|
-
{
|
|
1830
|
-
name: 'market';
|
|
1831
|
-
writable: true;
|
|
1832
|
-
},
|
|
1833
|
-
{
|
|
1834
|
-
name: 'mint';
|
|
1835
|
-
writable: true;
|
|
1836
|
-
address: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v';
|
|
1837
|
-
},
|
|
1838
|
-
{
|
|
1839
|
-
name: 'marketAta';
|
|
1840
|
-
writable: true;
|
|
1841
|
-
pda: {
|
|
1842
|
-
seeds: [
|
|
1843
|
-
{
|
|
1844
|
-
kind: 'account';
|
|
1845
|
-
path: 'market';
|
|
1846
|
-
},
|
|
1847
|
-
{
|
|
1848
|
-
kind: 'account';
|
|
1849
|
-
path: 'tokenProgram';
|
|
1850
|
-
},
|
|
1851
|
-
{
|
|
1852
|
-
kind: 'account';
|
|
1853
|
-
path: 'mint';
|
|
1854
|
-
}
|
|
1855
|
-
];
|
|
1856
|
-
program: {
|
|
1857
|
-
kind: 'const';
|
|
1858
|
-
value: [
|
|
1859
|
-
140,
|
|
1860
|
-
151,
|
|
1861
|
-
37,
|
|
1862
|
-
143,
|
|
1863
|
-
78,
|
|
1864
|
-
36,
|
|
1865
|
-
137,
|
|
1866
|
-
241,
|
|
1867
|
-
187,
|
|
1868
|
-
61,
|
|
1869
|
-
16,
|
|
1870
|
-
41,
|
|
1871
|
-
20,
|
|
1872
|
-
142,
|
|
1873
|
-
13,
|
|
1874
|
-
131,
|
|
1875
|
-
11,
|
|
1876
|
-
90,
|
|
1877
|
-
19,
|
|
1878
|
-
153,
|
|
1879
|
-
218,
|
|
1880
|
-
255,
|
|
1881
|
-
16,
|
|
1882
|
-
132,
|
|
1883
|
-
4,
|
|
1884
|
-
142,
|
|
1885
|
-
123,
|
|
1886
|
-
216,
|
|
1887
|
-
219,
|
|
1888
|
-
233,
|
|
1889
|
-
248,
|
|
1890
|
-
89
|
|
1891
|
-
];
|
|
1892
|
-
};
|
|
1893
|
-
};
|
|
1894
|
-
},
|
|
1895
|
-
{
|
|
1896
|
-
name: 'centralAta';
|
|
1897
|
-
writable: true;
|
|
1898
|
-
pda: {
|
|
1899
|
-
seeds: [
|
|
1900
|
-
{
|
|
1901
|
-
kind: 'account';
|
|
1902
|
-
path: 'central';
|
|
1903
|
-
},
|
|
1904
|
-
{
|
|
1905
|
-
kind: 'account';
|
|
1906
|
-
path: 'tokenProgram';
|
|
1907
|
-
},
|
|
1908
|
-
{
|
|
1909
|
-
kind: 'account';
|
|
1910
|
-
path: 'mint';
|
|
1911
|
-
}
|
|
1912
|
-
];
|
|
1913
|
-
program: {
|
|
1914
|
-
kind: 'const';
|
|
1915
|
-
value: [
|
|
1916
|
-
140,
|
|
1917
|
-
151,
|
|
1918
|
-
37,
|
|
1919
|
-
143,
|
|
1920
|
-
78,
|
|
1921
|
-
36,
|
|
1922
|
-
137,
|
|
1923
|
-
241,
|
|
1924
|
-
187,
|
|
1925
|
-
61,
|
|
1926
|
-
16,
|
|
1927
|
-
41,
|
|
1928
|
-
20,
|
|
1929
|
-
142,
|
|
1930
|
-
13,
|
|
1931
|
-
131,
|
|
1932
|
-
11,
|
|
1933
|
-
90,
|
|
1934
|
-
19,
|
|
1935
|
-
153,
|
|
1936
|
-
218,
|
|
1937
|
-
255,
|
|
1938
|
-
16,
|
|
1939
|
-
132,
|
|
1940
|
-
4,
|
|
1941
|
-
142,
|
|
1942
|
-
123,
|
|
1943
|
-
216,
|
|
1944
|
-
219,
|
|
1945
|
-
233,
|
|
1946
|
-
248,
|
|
1947
|
-
89
|
|
1948
|
-
];
|
|
1949
|
-
};
|
|
1950
|
-
};
|
|
1951
|
-
},
|
|
1952
|
-
{
|
|
1953
|
-
name: 'tokenProgram';
|
|
1954
|
-
address: 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA';
|
|
1955
|
-
},
|
|
1956
|
-
{
|
|
1957
|
-
name: 'associatedTokenProgram';
|
|
1958
|
-
address: 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL';
|
|
1959
|
-
},
|
|
1960
|
-
{
|
|
1961
|
-
name: 'systemProgram';
|
|
1962
|
-
address: '11111111111111111111111111111111';
|
|
1963
|
-
}
|
|
1964
|
-
];
|
|
1965
|
-
args: [];
|
|
1966
|
-
},
|
|
1967
1759
|
{
|
|
1968
1760
|
name: 'payoutOrder';
|
|
1969
1761
|
discriminator: [247, 233, 158, 228, 63, 32, 236, 113];
|
|
@@ -2725,10 +2517,6 @@ export type TriadProtocol = {
|
|
|
2725
2517
|
name: 'orderBook';
|
|
2726
2518
|
discriminator: [55, 230, 125, 218, 149, 39, 65, 248];
|
|
2727
2519
|
},
|
|
2728
|
-
{
|
|
2729
|
-
name: 'orderV2';
|
|
2730
|
-
discriminator: [150, 42, 80, 18, 62, 128, 236, 76];
|
|
2731
|
-
},
|
|
2732
2520
|
{
|
|
2733
2521
|
name: 'pool';
|
|
2734
2522
|
discriminator: [241, 154, 109, 4, 17, 177, 109, 188];
|
|
@@ -4193,62 +3981,6 @@ export type TriadProtocol = {
|
|
|
4193
3981
|
];
|
|
4194
3982
|
};
|
|
4195
3983
|
},
|
|
4196
|
-
{
|
|
4197
|
-
name: 'orderV2';
|
|
4198
|
-
type: {
|
|
4199
|
-
kind: 'struct';
|
|
4200
|
-
fields: [
|
|
4201
|
-
{
|
|
4202
|
-
name: 'authority';
|
|
4203
|
-
type: 'pubkey';
|
|
4204
|
-
},
|
|
4205
|
-
{
|
|
4206
|
-
name: 'marketId';
|
|
4207
|
-
type: 'u64';
|
|
4208
|
-
},
|
|
4209
|
-
{
|
|
4210
|
-
name: 'shares';
|
|
4211
|
-
type: 'u64';
|
|
4212
|
-
},
|
|
4213
|
-
{
|
|
4214
|
-
name: 'price';
|
|
4215
|
-
type: 'u64';
|
|
4216
|
-
},
|
|
4217
|
-
{
|
|
4218
|
-
name: 'orderStatus';
|
|
4219
|
-
type: {
|
|
4220
|
-
defined: {
|
|
4221
|
-
name: 'orderStatus';
|
|
4222
|
-
};
|
|
4223
|
-
};
|
|
4224
|
-
},
|
|
4225
|
-
{
|
|
4226
|
-
name: 'orderType';
|
|
4227
|
-
type: {
|
|
4228
|
-
defined: {
|
|
4229
|
-
name: 'orderType';
|
|
4230
|
-
};
|
|
4231
|
-
};
|
|
4232
|
-
},
|
|
4233
|
-
{
|
|
4234
|
-
name: 'orderDirection';
|
|
4235
|
-
type: {
|
|
4236
|
-
defined: {
|
|
4237
|
-
name: 'orderDirection';
|
|
4238
|
-
};
|
|
4239
|
-
};
|
|
4240
|
-
},
|
|
4241
|
-
{
|
|
4242
|
-
name: 'orderSide';
|
|
4243
|
-
type: {
|
|
4244
|
-
defined: {
|
|
4245
|
-
name: 'orderSide';
|
|
4246
|
-
};
|
|
4247
|
-
};
|
|
4248
|
-
}
|
|
4249
|
-
];
|
|
4250
|
-
};
|
|
4251
|
-
},
|
|
4252
3984
|
{
|
|
4253
3985
|
name: 'placeAskOrderArgs';
|
|
4254
3986
|
type: {
|
package/dist/utils/helpers.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { PublicKey } from '@solana/web3.js';
|
|
2
2
|
import { IdlAccounts, Program } from '@coral-xyz/anchor';
|
|
3
|
-
import { Market, PredictorOrder, OrderDirection, OrderSide, OrderStatus, OrderType, OrderDirectionEncoded, OrderTypeEncoded, OrderSideEncoded, OrderStatusEncoded, Pool, BookOrder } from '../types';
|
|
3
|
+
import { Market, PredictorOrder, OrderDirection, OrderSide, OrderStatus, OrderType, OrderDirectionEncoded, OrderTypeEncoded, OrderSideEncoded, OrderStatusEncoded, Pool, BookOrder, Central } from '../types';
|
|
4
4
|
import { Stake, StakeVault, Unstake } from '../types/stake';
|
|
5
5
|
import { Customer } from '../types/customer';
|
|
6
6
|
import { TriadProtocol } from '../types/triad_protocol';
|
|
@@ -27,6 +27,7 @@ export declare const getOrderDirectionEncoded: (orderDirection: OrderDirection)
|
|
|
27
27
|
export declare const getOppositeOrderDirection: (orderDirection: OrderDirection) => OrderDirection;
|
|
28
28
|
export declare const getOppositeOrderDirectionEncoded: (orderDirection: OrderDirectionEncoded) => OrderDirectionEncoded;
|
|
29
29
|
export declare const formatPredictor: (account: IdlAccounts<TriadProtocol>['predictor'], publicKey: PublicKey) => Predictor;
|
|
30
|
+
export declare const formatCentral: (account: IdlAccounts<TriadProtocol>['central'], publicKey: PublicKey) => Central;
|
|
30
31
|
export declare const getPriceFeedAccountForProgram: (priceFeedId: string) => PublicKey;
|
|
31
32
|
export declare const getFeedIdFromHex: (input?: string) => PublicKey | null;
|
|
32
33
|
export declare const getCustomerById: (program: Program<TriadProtocol>, customerId: number) => Promise<Customer>;
|
package/dist/utils/helpers.js
CHANGED
|
@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.getCustomerById = exports.getFeedIdFromHex = exports.getPriceFeedAccountForProgram = exports.formatPredictor = exports.getOppositeOrderDirectionEncoded = exports.getOppositeOrderDirection = exports.getOrderDirectionEncoded = exports.getOrderStatus = exports.getOrderSide = exports.getOrderType = exports.getOrderSideFromNumber = exports.getOrderDirectionFromNumber = exports.getOrderDirection = exports.getTokenProgram = exports.calculateStakeRewards = exports.formatCustomer = exports.formatBookOrder = exports.formatPredictorOrder = exports.formatMarket = exports.formatPool = exports.formatUnstake = exports.formatStake = exports.formatStakeVault = exports.decodeString = exports.encodeString = void 0;
|
|
12
|
+
exports.getCustomerById = exports.getFeedIdFromHex = exports.getPriceFeedAccountForProgram = exports.formatCentral = exports.formatPredictor = exports.getOppositeOrderDirectionEncoded = exports.getOppositeOrderDirection = exports.getOrderDirectionEncoded = exports.getOrderStatus = exports.getOrderSide = exports.getOrderType = exports.getOrderSideFromNumber = exports.getOrderDirectionFromNumber = exports.getOrderDirection = exports.getTokenProgram = exports.calculateStakeRewards = exports.formatCustomer = exports.formatBookOrder = exports.formatPredictorOrder = exports.formatMarket = exports.formatPool = exports.formatUnstake = exports.formatStake = exports.formatStakeVault = exports.decodeString = exports.encodeString = void 0;
|
|
13
13
|
const web3_js_1 = require("@solana/web3.js");
|
|
14
14
|
const spl_token_1 = require("@solana/spl-token");
|
|
15
15
|
const types_1 = require("../types");
|
|
@@ -146,7 +146,7 @@ exports.formatBookOrder = formatBookOrder;
|
|
|
146
146
|
const formatCustomer = (account, publicKey) => {
|
|
147
147
|
return {
|
|
148
148
|
id: account.id,
|
|
149
|
-
authority:
|
|
149
|
+
authority: account.authority.toString(),
|
|
150
150
|
name: account.name,
|
|
151
151
|
feeRecipient: account.feeRecipient.toString(),
|
|
152
152
|
feeBps: account.feeBps,
|
|
@@ -271,6 +271,16 @@ const formatPredictor = (account, publicKey) => {
|
|
|
271
271
|
};
|
|
272
272
|
};
|
|
273
273
|
exports.formatPredictor = formatPredictor;
|
|
274
|
+
const formatCentral = (account, publicKey) => {
|
|
275
|
+
return {
|
|
276
|
+
address: publicKey.toBase58(),
|
|
277
|
+
isLocked: account.isLocked,
|
|
278
|
+
feeAvailable: account.feeAvailable.toNumber() / 1e6,
|
|
279
|
+
feeClaimed: account.feeClaimed.toNumber() / 1e6,
|
|
280
|
+
rewardsPaid: account.rewardsPaid.toNumber() / 1e6
|
|
281
|
+
};
|
|
282
|
+
};
|
|
283
|
+
exports.formatCentral = formatCentral;
|
|
274
284
|
const getPriceFeedAccountForProgram = (priceFeedId) => {
|
|
275
285
|
let buffer = null;
|
|
276
286
|
if (typeof priceFeedId == 'string') {
|