@d8x/perpetuals-sdk 0.7.0 → 0.7.2
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/cjs/abi/IPerpetualManager.json +5 -0
- package/dist/cjs/abi/LimitOrderBook.json +45 -0
- package/dist/cjs/abi/LimitOrderBookFactory.json +75 -1
- package/dist/cjs/accountTrade.d.ts +2 -3
- package/dist/cjs/accountTrade.js +3 -4
- package/dist/cjs/accountTrade.js.map +1 -1
- package/dist/cjs/brokerTool.d.ts +1 -1
- package/dist/cjs/brokerTool.js +2 -2
- package/dist/cjs/brokerTool.js.map +1 -1
- package/dist/cjs/contracts/IPerpetualManager.d.ts +7 -7
- package/dist/cjs/contracts/LimitOrderBook.d.ts +41 -1
- package/dist/cjs/contracts/LimitOrderBookFactory.d.ts +64 -6
- package/dist/cjs/contracts/factories/IPerpetualManager__factory.d.ts +4 -0
- package/dist/cjs/contracts/factories/IPerpetualManager__factory.js +5 -0
- package/dist/cjs/contracts/factories/IPerpetualManager__factory.js.map +1 -1
- package/dist/cjs/contracts/factories/LimitOrderBookFactory__factory.d.ts +59 -1
- package/dist/cjs/contracts/factories/LimitOrderBookFactory__factory.js +75 -1
- package/dist/cjs/contracts/factories/LimitOrderBookFactory__factory.js.map +1 -1
- package/dist/cjs/contracts/factories/LimitOrderBook__factory.d.ts +34 -0
- package/dist/cjs/contracts/factories/LimitOrderBook__factory.js +45 -0
- package/dist/cjs/contracts/factories/LimitOrderBook__factory.js.map +1 -1
- package/dist/cjs/liquidatorTool.d.ts +2 -3
- package/dist/cjs/liquidatorTool.js +3 -4
- package/dist/cjs/liquidatorTool.js.map +1 -1
- package/dist/cjs/liquidityProviderTool.d.ts +2 -3
- package/dist/cjs/liquidityProviderTool.js +3 -4
- package/dist/cjs/liquidityProviderTool.js.map +1 -1
- package/dist/cjs/marketData.js +0 -1
- package/dist/cjs/marketData.js.map +1 -1
- package/dist/cjs/nodeSDKTypes.d.ts +0 -2
- package/dist/cjs/nodeSDKTypes.js.map +1 -1
- package/dist/cjs/orderReferrerTool.d.ts +2 -3
- package/dist/cjs/orderReferrerTool.js +3 -4
- package/dist/cjs/orderReferrerTool.js.map +1 -1
- package/dist/cjs/version.d.ts +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/cjs/writeAccessHandler.d.ts +2 -3
- package/dist/cjs/writeAccessHandler.js +5 -9
- package/dist/cjs/writeAccessHandler.js.map +1 -1
- package/dist/esm/abi/IPerpetualManager.json +5 -0
- package/dist/esm/abi/LimitOrderBook.json +45 -0
- package/dist/esm/abi/LimitOrderBookFactory.json +75 -1
- package/dist/esm/accountTrade.d.ts +2 -3
- package/dist/esm/accountTrade.js +3 -4
- package/dist/esm/accountTrade.js.map +1 -1
- package/dist/esm/brokerTool.d.ts +1 -1
- package/dist/esm/brokerTool.js +2 -2
- package/dist/esm/brokerTool.js.map +1 -1
- package/dist/esm/contracts/IPerpetualManager.d.ts +7 -7
- package/dist/esm/contracts/LimitOrderBook.d.ts +41 -1
- package/dist/esm/contracts/LimitOrderBookFactory.d.ts +64 -6
- package/dist/esm/contracts/factories/IPerpetualManager__factory.d.ts +4 -0
- package/dist/esm/contracts/factories/IPerpetualManager__factory.js +5 -0
- package/dist/esm/contracts/factories/IPerpetualManager__factory.js.map +1 -1
- package/dist/esm/contracts/factories/LimitOrderBookFactory__factory.d.ts +59 -1
- package/dist/esm/contracts/factories/LimitOrderBookFactory__factory.js +75 -1
- package/dist/esm/contracts/factories/LimitOrderBookFactory__factory.js.map +1 -1
- package/dist/esm/contracts/factories/LimitOrderBook__factory.d.ts +34 -0
- package/dist/esm/contracts/factories/LimitOrderBook__factory.js +45 -0
- package/dist/esm/contracts/factories/LimitOrderBook__factory.js.map +1 -1
- package/dist/esm/liquidatorTool.d.ts +2 -3
- package/dist/esm/liquidatorTool.js +3 -4
- package/dist/esm/liquidatorTool.js.map +1 -1
- package/dist/esm/liquidityProviderTool.d.ts +2 -3
- package/dist/esm/liquidityProviderTool.js +3 -4
- package/dist/esm/liquidityProviderTool.js.map +1 -1
- package/dist/esm/marketData.js +0 -1
- package/dist/esm/marketData.js.map +1 -1
- package/dist/esm/nodeSDKTypes.d.ts +0 -2
- package/dist/esm/nodeSDKTypes.js.map +1 -1
- package/dist/esm/orderReferrerTool.d.ts +2 -3
- package/dist/esm/orderReferrerTool.js +3 -4
- package/dist/esm/orderReferrerTool.js.map +1 -1
- package/dist/esm/version.d.ts +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/esm/writeAccessHandler.d.ts +2 -3
- package/dist/esm/writeAccessHandler.js +5 -9
- package/dist/esm/writeAccessHandler.js.map +1 -1
- package/package.json +1 -1
- package/src/abi/IPerpetualManager.json +5 -0
- package/src/abi/LimitOrderBook.json +45 -0
- package/src/abi/LimitOrderBookFactory.json +75 -1
- package/src/accountTrade.ts +3 -4
- package/src/brokerTool.ts +2 -2
- package/src/contracts/IPerpetualManager.ts +7 -2
- package/src/contracts/LimitOrderBook.ts +90 -0
- package/src/contracts/LimitOrderBookFactory.ts +129 -5
- package/src/contracts/factories/IPerpetualManager__factory.ts +5 -0
- package/src/contracts/factories/LimitOrderBookFactory__factory.ts +75 -1
- package/src/contracts/factories/LimitOrderBook__factory.ts +45 -0
- package/src/liquidatorTool.ts +3 -4
- package/src/liquidityProviderTool.ts +3 -4
- package/src/marketData.ts +0 -1
- package/src/nodeSDKTypes.ts +0 -2
- package/src/orderReferrerTool.ts +3 -4
- package/src/version.ts +1 -1
- package/src/writeAccessHandler.ts +5 -8
|
@@ -5394,6 +5394,11 @@
|
|
|
5394
5394
|
"internalType": "struct IPerpetualOrder.Order",
|
|
5395
5395
|
"name": "_order",
|
|
5396
5396
|
"type": "tuple"
|
|
5397
|
+
},
|
|
5398
|
+
{
|
|
5399
|
+
"internalType": "bool",
|
|
5400
|
+
"name": "_isApprovedExecutor",
|
|
5401
|
+
"type": "bool"
|
|
5397
5402
|
}
|
|
5398
5403
|
],
|
|
5399
5404
|
"name": "tradeViaOrderBook",
|
|
@@ -165,6 +165,19 @@
|
|
|
165
165
|
"name": "PerpetualLimitOrderCreated",
|
|
166
166
|
"type": "event"
|
|
167
167
|
},
|
|
168
|
+
{
|
|
169
|
+
"inputs": [
|
|
170
|
+
{
|
|
171
|
+
"internalType": "address",
|
|
172
|
+
"name": "_executor",
|
|
173
|
+
"type": "address"
|
|
174
|
+
}
|
|
175
|
+
],
|
|
176
|
+
"name": "addExecutor",
|
|
177
|
+
"outputs": [],
|
|
178
|
+
"stateMutability": "nonpayable",
|
|
179
|
+
"type": "function"
|
|
180
|
+
},
|
|
168
181
|
{
|
|
169
182
|
"inputs": [
|
|
170
183
|
{
|
|
@@ -208,6 +221,25 @@
|
|
|
208
221
|
"stateMutability": "view",
|
|
209
222
|
"type": "function"
|
|
210
223
|
},
|
|
224
|
+
{
|
|
225
|
+
"inputs": [
|
|
226
|
+
{
|
|
227
|
+
"internalType": "address",
|
|
228
|
+
"name": "",
|
|
229
|
+
"type": "address"
|
|
230
|
+
}
|
|
231
|
+
],
|
|
232
|
+
"name": "approvedExecutor",
|
|
233
|
+
"outputs": [
|
|
234
|
+
{
|
|
235
|
+
"internalType": "bool",
|
|
236
|
+
"name": "",
|
|
237
|
+
"type": "bool"
|
|
238
|
+
}
|
|
239
|
+
],
|
|
240
|
+
"stateMutability": "view",
|
|
241
|
+
"type": "function"
|
|
242
|
+
},
|
|
211
243
|
{
|
|
212
244
|
"inputs": [
|
|
213
245
|
{
|
|
@@ -1058,5 +1090,18 @@
|
|
|
1058
1090
|
],
|
|
1059
1091
|
"stateMutability": "view",
|
|
1060
1092
|
"type": "function"
|
|
1093
|
+
},
|
|
1094
|
+
{
|
|
1095
|
+
"inputs": [
|
|
1096
|
+
{
|
|
1097
|
+
"internalType": "address",
|
|
1098
|
+
"name": "_executor",
|
|
1099
|
+
"type": "address"
|
|
1100
|
+
}
|
|
1101
|
+
],
|
|
1102
|
+
"name": "removeExecutor",
|
|
1103
|
+
"outputs": [],
|
|
1104
|
+
"stateMutability": "nonpayable",
|
|
1105
|
+
"type": "function"
|
|
1061
1106
|
}
|
|
1062
1107
|
]
|
|
@@ -1,4 +1,23 @@
|
|
|
1
1
|
[
|
|
2
|
+
{
|
|
3
|
+
"anonymous": false,
|
|
4
|
+
"inputs": [
|
|
5
|
+
{
|
|
6
|
+
"indexed": true,
|
|
7
|
+
"internalType": "uint24",
|
|
8
|
+
"name": "perpetualId",
|
|
9
|
+
"type": "uint24"
|
|
10
|
+
},
|
|
11
|
+
{
|
|
12
|
+
"indexed": false,
|
|
13
|
+
"internalType": "address",
|
|
14
|
+
"name": "executor",
|
|
15
|
+
"type": "address"
|
|
16
|
+
}
|
|
17
|
+
],
|
|
18
|
+
"name": "AddExecutor",
|
|
19
|
+
"type": "event"
|
|
20
|
+
},
|
|
2
21
|
{
|
|
3
22
|
"anonymous": false,
|
|
4
23
|
"inputs": [
|
|
@@ -43,6 +62,25 @@
|
|
|
43
62
|
"name": "PerpetualLimitOrderBookDeployed",
|
|
44
63
|
"type": "event"
|
|
45
64
|
},
|
|
65
|
+
{
|
|
66
|
+
"anonymous": false,
|
|
67
|
+
"inputs": [
|
|
68
|
+
{
|
|
69
|
+
"indexed": true,
|
|
70
|
+
"internalType": "uint24",
|
|
71
|
+
"name": "perpetualId",
|
|
72
|
+
"type": "uint24"
|
|
73
|
+
},
|
|
74
|
+
{
|
|
75
|
+
"indexed": false,
|
|
76
|
+
"internalType": "address",
|
|
77
|
+
"name": "executor",
|
|
78
|
+
"type": "address"
|
|
79
|
+
}
|
|
80
|
+
],
|
|
81
|
+
"name": "RemoveExecutor",
|
|
82
|
+
"type": "event"
|
|
83
|
+
},
|
|
46
84
|
{
|
|
47
85
|
"inputs": [],
|
|
48
86
|
"name": "CANCEL_DELAY_SEC",
|
|
@@ -69,6 +107,24 @@
|
|
|
69
107
|
"stateMutability": "view",
|
|
70
108
|
"type": "function"
|
|
71
109
|
},
|
|
110
|
+
{
|
|
111
|
+
"inputs": [
|
|
112
|
+
{
|
|
113
|
+
"internalType": "uint24",
|
|
114
|
+
"name": "_iPerpetualId",
|
|
115
|
+
"type": "uint24"
|
|
116
|
+
},
|
|
117
|
+
{
|
|
118
|
+
"internalType": "address",
|
|
119
|
+
"name": "_executor",
|
|
120
|
+
"type": "address"
|
|
121
|
+
}
|
|
122
|
+
],
|
|
123
|
+
"name": "addExecutor",
|
|
124
|
+
"outputs": [],
|
|
125
|
+
"stateMutability": "nonpayable",
|
|
126
|
+
"type": "function"
|
|
127
|
+
},
|
|
72
128
|
{
|
|
73
129
|
"inputs": [
|
|
74
130
|
{
|
|
@@ -91,7 +147,7 @@
|
|
|
91
147
|
"inputs": [
|
|
92
148
|
{
|
|
93
149
|
"internalType": "uint24",
|
|
94
|
-
"name": "
|
|
150
|
+
"name": "_iPerpetualId",
|
|
95
151
|
"type": "uint24"
|
|
96
152
|
}
|
|
97
153
|
],
|
|
@@ -138,6 +194,24 @@
|
|
|
138
194
|
"stateMutability": "view",
|
|
139
195
|
"type": "function"
|
|
140
196
|
},
|
|
197
|
+
{
|
|
198
|
+
"inputs": [
|
|
199
|
+
{
|
|
200
|
+
"internalType": "uint24",
|
|
201
|
+
"name": "_iPerpetualId",
|
|
202
|
+
"type": "uint24"
|
|
203
|
+
},
|
|
204
|
+
{
|
|
205
|
+
"internalType": "address",
|
|
206
|
+
"name": "_executor",
|
|
207
|
+
"type": "address"
|
|
208
|
+
}
|
|
209
|
+
],
|
|
210
|
+
"name": "removeExecutor",
|
|
211
|
+
"outputs": [],
|
|
212
|
+
"stateMutability": "nonpayable",
|
|
213
|
+
"type": "function"
|
|
214
|
+
},
|
|
141
215
|
{
|
|
142
216
|
"inputs": [],
|
|
143
217
|
"name": "renounceOwnership",
|
|
@@ -30,10 +30,9 @@ export default class AccountTrade extends WriteAccessHandler {
|
|
|
30
30
|
* }
|
|
31
31
|
* main();
|
|
32
32
|
*
|
|
33
|
-
* @param {string}
|
|
34
|
-
* @param {Signer} signer Signer that trades (ignored if a private key is provided)
|
|
33
|
+
* @param {string | Signer} signer Private key or ethers Signer of the account
|
|
35
34
|
*/
|
|
36
|
-
constructor(config: NodeSDKConfig,
|
|
35
|
+
constructor(config: NodeSDKConfig, signer: string | Signer);
|
|
37
36
|
/**
|
|
38
37
|
* Cancels an existing order on the exchange.
|
|
39
38
|
* @param {string} symbol Symbol of the form ETH-USD-MATIC.
|
package/dist/cjs/accountTrade.js
CHANGED
|
@@ -34,11 +34,10 @@ var AccountTrade = /** @class */ (function (_super) {
|
|
|
34
34
|
* }
|
|
35
35
|
* main();
|
|
36
36
|
*
|
|
37
|
-
* @param {string}
|
|
38
|
-
* @param {Signer} signer Signer that trades (ignored if a private key is provided)
|
|
37
|
+
* @param {string | Signer} signer Private key or ethers Signer of the account
|
|
39
38
|
*/
|
|
40
|
-
function AccountTrade(config,
|
|
41
|
-
var _this = _super.call(this, config,
|
|
39
|
+
function AccountTrade(config, signer) {
|
|
40
|
+
var _this = _super.call(this, config, signer) || this;
|
|
42
41
|
_this.digestTool = new traderDigests_1.default();
|
|
43
42
|
return _this;
|
|
44
43
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accountTrade.js","sourceRoot":"","sources":["../../src/accountTrade.ts"],"names":[],"mappings":";;;AAEA,iCAAgC;AAEhC,qCAA6D;AAC7D,oEAAsC;AACtC,+CAQwB;AACxB,wFAA0D;AAC1D,0EAA4C;AAC5C,oFAAsD;AAEtD;;;;;GAKG;AACH;IAA0C,wCAAkB;IAG1D
|
|
1
|
+
{"version":3,"file":"accountTrade.js","sourceRoot":"","sources":["../../src/accountTrade.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/brokerTool.d.ts
CHANGED
|
@@ -30,7 +30,7 @@ export default class BrokerTool extends WriteAccessHandler {
|
|
|
30
30
|
* main();
|
|
31
31
|
*
|
|
32
32
|
*/
|
|
33
|
-
constructor(config: NodeSDKConfig,
|
|
33
|
+
constructor(config: NodeSDKConfig, signer: string | Signer);
|
|
34
34
|
/**
|
|
35
35
|
* Determine the exchange fee based on lots, traded volume, and D8X balance of this broker.
|
|
36
36
|
* This is the final exchange fee that this broker can offer to traders that trade through him.
|
package/dist/cjs/brokerTool.js
CHANGED
|
@@ -37,8 +37,8 @@ var BrokerTool = /** @class */ (function (_super) {
|
|
|
37
37
|
* main();
|
|
38
38
|
*
|
|
39
39
|
*/
|
|
40
|
-
function BrokerTool(config,
|
|
41
|
-
return _super.call(this, config,
|
|
40
|
+
function BrokerTool(config, signer) {
|
|
41
|
+
return _super.call(this, config, signer) || this;
|
|
42
42
|
}
|
|
43
43
|
// Fee getters
|
|
44
44
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"brokerTool.js","sourceRoot":"","sources":["../../src/brokerTool.ts"],"names":[],"mappings":";;;AAAA,0CAAqD;AAGrD,sDAAqD;AACrD,qCAA4C;AAE5C,wFAA0D;AAC1D,oFAAsD;AAEtD,iCAAgC;AAChC,wEAA0C;AAC1C;;;;;GAKG;AACH;IAAwC,sCAAkB;IACxD;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,oBAAmB,MAAqB,EAAE,
|
|
1
|
+
{"version":3,"file":"brokerTool.js","sourceRoot":"","sources":["../../src/brokerTool.ts"],"names":[],"mappings":"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"}
|
|
@@ -526,7 +526,7 @@ export interface IPerpetualManagerInterface extends utils.Interface {
|
|
|
526
526
|
"settleNextTraderInPool(uint8)": FunctionFragment;
|
|
527
527
|
"splitProtocolFee(uint16)": FunctionFragment;
|
|
528
528
|
"togglePerpEmergencyState(uint24)": FunctionFragment;
|
|
529
|
-
"tradeViaOrderBook((uint16,uint16,uint24,address,uint32,address,uint32,uint32,uint32,address,int128,int128,int128,bytes))": FunctionFragment;
|
|
529
|
+
"tradeViaOrderBook((uint16,uint16,uint24,address,uint32,address,uint32,uint32,uint32,address,int128,int128,int128,bytes),bool)": FunctionFragment;
|
|
530
530
|
"transferBrokerLots(uint8,address,uint32)": FunctionFragment;
|
|
531
531
|
"transferBrokerOwnership(uint8,address)": FunctionFragment;
|
|
532
532
|
"transferEarningsToTreasury(uint8,int128)": FunctionFragment;
|
|
@@ -749,7 +749,7 @@ export interface IPerpetualManagerInterface extends utils.Interface {
|
|
|
749
749
|
encodeFunctionData(functionFragment: "settleNextTraderInPool", values: [BigNumberish]): string;
|
|
750
750
|
encodeFunctionData(functionFragment: "splitProtocolFee", values: [BigNumberish]): string;
|
|
751
751
|
encodeFunctionData(functionFragment: "togglePerpEmergencyState", values: [BigNumberish]): string;
|
|
752
|
-
encodeFunctionData(functionFragment: "tradeViaOrderBook", values: [IPerpetualOrder.OrderStruct]): string;
|
|
752
|
+
encodeFunctionData(functionFragment: "tradeViaOrderBook", values: [IPerpetualOrder.OrderStruct, boolean]): string;
|
|
753
753
|
encodeFunctionData(functionFragment: "transferBrokerLots", values: [BigNumberish, string, BigNumberish]): string;
|
|
754
754
|
encodeFunctionData(functionFragment: "transferBrokerOwnership", values: [BigNumberish, string]): string;
|
|
755
755
|
encodeFunctionData(functionFragment: "transferEarningsToTreasury", values: [BigNumberish, BigNumberish]): string;
|
|
@@ -1807,7 +1807,7 @@ export interface IPerpetualManager extends BaseContract {
|
|
|
1807
1807
|
togglePerpEmergencyState(_perpetualId: BigNumberish, overrides?: Overrides & {
|
|
1808
1808
|
from?: string;
|
|
1809
1809
|
}): Promise<ContractTransaction>;
|
|
1810
|
-
tradeViaOrderBook(_order: IPerpetualOrder.OrderStruct, overrides?: Overrides & {
|
|
1810
|
+
tradeViaOrderBook(_order: IPerpetualOrder.OrderStruct, _isApprovedExecutor: boolean, overrides?: Overrides & {
|
|
1811
1811
|
from?: string;
|
|
1812
1812
|
}): Promise<ContractTransaction>;
|
|
1813
1813
|
transferBrokerLots(_poolId: BigNumberish, _transferToAddr: string, _lots: BigNumberish, overrides?: Overrides & {
|
|
@@ -2089,7 +2089,7 @@ export interface IPerpetualManager extends BaseContract {
|
|
|
2089
2089
|
togglePerpEmergencyState(_perpetualId: BigNumberish, overrides?: Overrides & {
|
|
2090
2090
|
from?: string;
|
|
2091
2091
|
}): Promise<ContractTransaction>;
|
|
2092
|
-
tradeViaOrderBook(_order: IPerpetualOrder.OrderStruct, overrides?: Overrides & {
|
|
2092
|
+
tradeViaOrderBook(_order: IPerpetualOrder.OrderStruct, _isApprovedExecutor: boolean, overrides?: Overrides & {
|
|
2093
2093
|
from?: string;
|
|
2094
2094
|
}): Promise<ContractTransaction>;
|
|
2095
2095
|
transferBrokerLots(_poolId: BigNumberish, _transferToAddr: string, _lots: BigNumberish, overrides?: Overrides & {
|
|
@@ -2273,7 +2273,7 @@ export interface IPerpetualManager extends BaseContract {
|
|
|
2273
2273
|
settleNextTraderInPool(_id: BigNumberish, overrides?: CallOverrides): Promise<boolean>;
|
|
2274
2274
|
splitProtocolFee(fee: BigNumberish, overrides?: CallOverrides): Promise<[BigNumber, BigNumber]>;
|
|
2275
2275
|
togglePerpEmergencyState(_perpetualId: BigNumberish, overrides?: CallOverrides): Promise<void>;
|
|
2276
|
-
tradeViaOrderBook(_order: IPerpetualOrder.OrderStruct, overrides?: CallOverrides): Promise<boolean>;
|
|
2276
|
+
tradeViaOrderBook(_order: IPerpetualOrder.OrderStruct, _isApprovedExecutor: boolean, overrides?: CallOverrides): Promise<boolean>;
|
|
2277
2277
|
transferBrokerLots(_poolId: BigNumberish, _transferToAddr: string, _lots: BigNumberish, overrides?: CallOverrides): Promise<void>;
|
|
2278
2278
|
transferBrokerOwnership(_poolId: BigNumberish, _transferToAddr: string, overrides?: CallOverrides): Promise<void>;
|
|
2279
2279
|
transferEarningsToTreasury(_poolId: BigNumberish, _fAmount: BigNumberish, overrides?: CallOverrides): Promise<void>;
|
|
@@ -2613,7 +2613,7 @@ export interface IPerpetualManager extends BaseContract {
|
|
|
2613
2613
|
togglePerpEmergencyState(_perpetualId: BigNumberish, overrides?: Overrides & {
|
|
2614
2614
|
from?: string;
|
|
2615
2615
|
}): Promise<BigNumber>;
|
|
2616
|
-
tradeViaOrderBook(_order: IPerpetualOrder.OrderStruct, overrides?: Overrides & {
|
|
2616
|
+
tradeViaOrderBook(_order: IPerpetualOrder.OrderStruct, _isApprovedExecutor: boolean, overrides?: Overrides & {
|
|
2617
2617
|
from?: string;
|
|
2618
2618
|
}): Promise<BigNumber>;
|
|
2619
2619
|
transferBrokerLots(_poolId: BigNumberish, _transferToAddr: string, _lots: BigNumberish, overrides?: Overrides & {
|
|
@@ -2889,7 +2889,7 @@ export interface IPerpetualManager extends BaseContract {
|
|
|
2889
2889
|
togglePerpEmergencyState(_perpetualId: BigNumberish, overrides?: Overrides & {
|
|
2890
2890
|
from?: string;
|
|
2891
2891
|
}): Promise<PopulatedTransaction>;
|
|
2892
|
-
tradeViaOrderBook(_order: IPerpetualOrder.OrderStruct, overrides?: Overrides & {
|
|
2892
|
+
tradeViaOrderBook(_order: IPerpetualOrder.OrderStruct, _isApprovedExecutor: boolean, overrides?: Overrides & {
|
|
2893
2893
|
from?: string;
|
|
2894
2894
|
}): Promise<PopulatedTransaction>;
|
|
2895
2895
|
transferBrokerLots(_poolId: BigNumberish, _transferToAddr: string, _lots: BigNumberish, overrides?: Overrides & {
|
|
@@ -102,8 +102,10 @@ export declare namespace IClientOrder {
|
|
|
102
102
|
}
|
|
103
103
|
export interface LimitOrderBookInterface extends utils.Interface {
|
|
104
104
|
functions: {
|
|
105
|
+
"addExecutor(address)": FunctionFragment;
|
|
105
106
|
"allDigests(uint256)": FunctionFragment;
|
|
106
107
|
"allLimitDigests(uint256,uint256)": FunctionFragment;
|
|
108
|
+
"approvedExecutor(address)": FunctionFragment;
|
|
107
109
|
"cancelOrder(bytes32,bytes,bytes[],uint64[])": FunctionFragment;
|
|
108
110
|
"digestsOfTrader(address,uint256)": FunctionFragment;
|
|
109
111
|
"executeOrder(bytes32,address,bytes[],uint64[])": FunctionFragment;
|
|
@@ -129,10 +131,13 @@ export interface LimitOrderBookInterface extends utils.Interface {
|
|
|
129
131
|
"postOrder((uint24,int128,uint16,uint32,uint32,uint32,address,int128,int128,bytes32,address,bytes32,uint16,bytes),bytes)": FunctionFragment;
|
|
130
132
|
"postOrders((uint24,int128,uint16,uint32,uint32,uint32,address,int128,int128,bytes32,address,bytes32,uint16,bytes)[],bytes[])": FunctionFragment;
|
|
131
133
|
"prevOrderHash(bytes32)": FunctionFragment;
|
|
134
|
+
"removeExecutor(address)": FunctionFragment;
|
|
132
135
|
};
|
|
133
|
-
getFunction(nameOrSignatureOrTopic: "allDigests" | "allLimitDigests" | "cancelOrder" | "digestsOfTrader" | "executeOrder" | "executeOrders" | "getOrderStatus" | "getOrders" | "getSignature" | "getTrader" | "lastOrderHash" | "limitDigestsOfTrader" | "marketCloseSwitchTimestamp" | "nextOrderHash" | "numberOfAllDigests" | "numberOfDigestsOfTrader" | "numberOfOrderBookDigests" | "orderCount" | "orderDependency" | "orderOfDigest" | "orderSignature" | "perpManager" | "perpetualId" | "pollLimitOrders" | "postOrder" | "postOrders" | "prevOrderHash"): FunctionFragment;
|
|
136
|
+
getFunction(nameOrSignatureOrTopic: "addExecutor" | "allDigests" | "allLimitDigests" | "approvedExecutor" | "cancelOrder" | "digestsOfTrader" | "executeOrder" | "executeOrders" | "getOrderStatus" | "getOrders" | "getSignature" | "getTrader" | "lastOrderHash" | "limitDigestsOfTrader" | "marketCloseSwitchTimestamp" | "nextOrderHash" | "numberOfAllDigests" | "numberOfDigestsOfTrader" | "numberOfOrderBookDigests" | "orderCount" | "orderDependency" | "orderOfDigest" | "orderSignature" | "perpManager" | "perpetualId" | "pollLimitOrders" | "postOrder" | "postOrders" | "prevOrderHash" | "removeExecutor"): FunctionFragment;
|
|
137
|
+
encodeFunctionData(functionFragment: "addExecutor", values: [string]): string;
|
|
134
138
|
encodeFunctionData(functionFragment: "allDigests", values: [BigNumberish]): string;
|
|
135
139
|
encodeFunctionData(functionFragment: "allLimitDigests", values: [BigNumberish, BigNumberish]): string;
|
|
140
|
+
encodeFunctionData(functionFragment: "approvedExecutor", values: [string]): string;
|
|
136
141
|
encodeFunctionData(functionFragment: "cancelOrder", values: [BytesLike, BytesLike, BytesLike[], BigNumberish[]]): string;
|
|
137
142
|
encodeFunctionData(functionFragment: "digestsOfTrader", values: [string, BigNumberish]): string;
|
|
138
143
|
encodeFunctionData(functionFragment: "executeOrder", values: [BytesLike, string, BytesLike[], BigNumberish[]]): string;
|
|
@@ -158,8 +163,11 @@ export interface LimitOrderBookInterface extends utils.Interface {
|
|
|
158
163
|
encodeFunctionData(functionFragment: "postOrder", values: [IClientOrder.ClientOrderStruct, BytesLike]): string;
|
|
159
164
|
encodeFunctionData(functionFragment: "postOrders", values: [IClientOrder.ClientOrderStruct[], BytesLike[]]): string;
|
|
160
165
|
encodeFunctionData(functionFragment: "prevOrderHash", values: [BytesLike]): string;
|
|
166
|
+
encodeFunctionData(functionFragment: "removeExecutor", values: [string]): string;
|
|
167
|
+
decodeFunctionResult(functionFragment: "addExecutor", data: BytesLike): Result;
|
|
161
168
|
decodeFunctionResult(functionFragment: "allDigests", data: BytesLike): Result;
|
|
162
169
|
decodeFunctionResult(functionFragment: "allLimitDigests", data: BytesLike): Result;
|
|
170
|
+
decodeFunctionResult(functionFragment: "approvedExecutor", data: BytesLike): Result;
|
|
163
171
|
decodeFunctionResult(functionFragment: "cancelOrder", data: BytesLike): Result;
|
|
164
172
|
decodeFunctionResult(functionFragment: "digestsOfTrader", data: BytesLike): Result;
|
|
165
173
|
decodeFunctionResult(functionFragment: "executeOrder", data: BytesLike): Result;
|
|
@@ -185,6 +193,7 @@ export interface LimitOrderBookInterface extends utils.Interface {
|
|
|
185
193
|
decodeFunctionResult(functionFragment: "postOrder", data: BytesLike): Result;
|
|
186
194
|
decodeFunctionResult(functionFragment: "postOrders", data: BytesLike): Result;
|
|
187
195
|
decodeFunctionResult(functionFragment: "prevOrderHash", data: BytesLike): Result;
|
|
196
|
+
decodeFunctionResult(functionFragment: "removeExecutor", data: BytesLike): Result;
|
|
188
197
|
events: {
|
|
189
198
|
"ExecutionFailed(uint24,address,bytes32,string)": EventFragment;
|
|
190
199
|
"PerpetualLimitOrderCreated(uint24,address,address,tuple,bytes32)": EventFragment;
|
|
@@ -235,8 +244,12 @@ export interface LimitOrderBook extends BaseContract {
|
|
|
235
244
|
once: OnEvent<this>;
|
|
236
245
|
removeListener: OnEvent<this>;
|
|
237
246
|
functions: {
|
|
247
|
+
addExecutor(_executor: string, overrides?: Overrides & {
|
|
248
|
+
from?: string;
|
|
249
|
+
}): Promise<ContractTransaction>;
|
|
238
250
|
allDigests(arg0: BigNumberish, overrides?: CallOverrides): Promise<[string]>;
|
|
239
251
|
allLimitDigests(page: BigNumberish, limit: BigNumberish, overrides?: CallOverrides): Promise<[string[]]>;
|
|
252
|
+
approvedExecutor(arg0: string, overrides?: CallOverrides): Promise<[boolean]>;
|
|
240
253
|
cancelOrder(_digest: BytesLike, _signature: BytesLike, _updateData: BytesLike[], _publishTimes: BigNumberish[], overrides?: PayableOverrides & {
|
|
241
254
|
from?: string;
|
|
242
255
|
}): Promise<ContractTransaction>;
|
|
@@ -322,9 +335,16 @@ export interface LimitOrderBook extends BaseContract {
|
|
|
322
335
|
from?: string;
|
|
323
336
|
}): Promise<ContractTransaction>;
|
|
324
337
|
prevOrderHash(arg0: BytesLike, overrides?: CallOverrides): Promise<[string]>;
|
|
338
|
+
removeExecutor(_executor: string, overrides?: Overrides & {
|
|
339
|
+
from?: string;
|
|
340
|
+
}): Promise<ContractTransaction>;
|
|
325
341
|
};
|
|
342
|
+
addExecutor(_executor: string, overrides?: Overrides & {
|
|
343
|
+
from?: string;
|
|
344
|
+
}): Promise<ContractTransaction>;
|
|
326
345
|
allDigests(arg0: BigNumberish, overrides?: CallOverrides): Promise<string>;
|
|
327
346
|
allLimitDigests(page: BigNumberish, limit: BigNumberish, overrides?: CallOverrides): Promise<string[]>;
|
|
347
|
+
approvedExecutor(arg0: string, overrides?: CallOverrides): Promise<boolean>;
|
|
328
348
|
cancelOrder(_digest: BytesLike, _signature: BytesLike, _updateData: BytesLike[], _publishTimes: BigNumberish[], overrides?: PayableOverrides & {
|
|
329
349
|
from?: string;
|
|
330
350
|
}): Promise<ContractTransaction>;
|
|
@@ -402,9 +422,14 @@ export interface LimitOrderBook extends BaseContract {
|
|
|
402
422
|
from?: string;
|
|
403
423
|
}): Promise<ContractTransaction>;
|
|
404
424
|
prevOrderHash(arg0: BytesLike, overrides?: CallOverrides): Promise<string>;
|
|
425
|
+
removeExecutor(_executor: string, overrides?: Overrides & {
|
|
426
|
+
from?: string;
|
|
427
|
+
}): Promise<ContractTransaction>;
|
|
405
428
|
callStatic: {
|
|
429
|
+
addExecutor(_executor: string, overrides?: CallOverrides): Promise<void>;
|
|
406
430
|
allDigests(arg0: BigNumberish, overrides?: CallOverrides): Promise<string>;
|
|
407
431
|
allLimitDigests(page: BigNumberish, limit: BigNumberish, overrides?: CallOverrides): Promise<string[]>;
|
|
432
|
+
approvedExecutor(arg0: string, overrides?: CallOverrides): Promise<boolean>;
|
|
408
433
|
cancelOrder(_digest: BytesLike, _signature: BytesLike, _updateData: BytesLike[], _publishTimes: BigNumberish[], overrides?: CallOverrides): Promise<void>;
|
|
409
434
|
digestsOfTrader(arg0: string, arg1: BigNumberish, overrides?: CallOverrides): Promise<string>;
|
|
410
435
|
executeOrder(_digest: BytesLike, _referrerAddr: string, _updateData: BytesLike[], _publishTimes: BigNumberish[], overrides?: CallOverrides): Promise<void>;
|
|
@@ -472,6 +497,7 @@ export interface LimitOrderBook extends BaseContract {
|
|
|
472
497
|
postOrder(_order: IClientOrder.ClientOrderStruct, _signature: BytesLike, overrides?: CallOverrides): Promise<void>;
|
|
473
498
|
postOrders(_orders: IClientOrder.ClientOrderStruct[], _signatures: BytesLike[], overrides?: CallOverrides): Promise<void>;
|
|
474
499
|
prevOrderHash(arg0: BytesLike, overrides?: CallOverrides): Promise<string>;
|
|
500
|
+
removeExecutor(_executor: string, overrides?: CallOverrides): Promise<void>;
|
|
475
501
|
};
|
|
476
502
|
filters: {
|
|
477
503
|
"ExecutionFailed(uint24,address,bytes32,string)"(perpetualId?: BigNumberish | null, trader?: string | null, digest?: null, reason?: null): ExecutionFailedEventFilter;
|
|
@@ -480,8 +506,12 @@ export interface LimitOrderBook extends BaseContract {
|
|
|
480
506
|
PerpetualLimitOrderCreated(perpetualId?: BigNumberish | null, trader?: string | null, brokerAddr?: null, order?: null, digest?: null): PerpetualLimitOrderCreatedEventFilter;
|
|
481
507
|
};
|
|
482
508
|
estimateGas: {
|
|
509
|
+
addExecutor(_executor: string, overrides?: Overrides & {
|
|
510
|
+
from?: string;
|
|
511
|
+
}): Promise<BigNumber>;
|
|
483
512
|
allDigests(arg0: BigNumberish, overrides?: CallOverrides): Promise<BigNumber>;
|
|
484
513
|
allLimitDigests(page: BigNumberish, limit: BigNumberish, overrides?: CallOverrides): Promise<BigNumber>;
|
|
514
|
+
approvedExecutor(arg0: string, overrides?: CallOverrides): Promise<BigNumber>;
|
|
485
515
|
cancelOrder(_digest: BytesLike, _signature: BytesLike, _updateData: BytesLike[], _publishTimes: BigNumberish[], overrides?: PayableOverrides & {
|
|
486
516
|
from?: string;
|
|
487
517
|
}): Promise<BigNumber>;
|
|
@@ -517,10 +547,17 @@ export interface LimitOrderBook extends BaseContract {
|
|
|
517
547
|
from?: string;
|
|
518
548
|
}): Promise<BigNumber>;
|
|
519
549
|
prevOrderHash(arg0: BytesLike, overrides?: CallOverrides): Promise<BigNumber>;
|
|
550
|
+
removeExecutor(_executor: string, overrides?: Overrides & {
|
|
551
|
+
from?: string;
|
|
552
|
+
}): Promise<BigNumber>;
|
|
520
553
|
};
|
|
521
554
|
populateTransaction: {
|
|
555
|
+
addExecutor(_executor: string, overrides?: Overrides & {
|
|
556
|
+
from?: string;
|
|
557
|
+
}): Promise<PopulatedTransaction>;
|
|
522
558
|
allDigests(arg0: BigNumberish, overrides?: CallOverrides): Promise<PopulatedTransaction>;
|
|
523
559
|
allLimitDigests(page: BigNumberish, limit: BigNumberish, overrides?: CallOverrides): Promise<PopulatedTransaction>;
|
|
560
|
+
approvedExecutor(arg0: string, overrides?: CallOverrides): Promise<PopulatedTransaction>;
|
|
524
561
|
cancelOrder(_digest: BytesLike, _signature: BytesLike, _updateData: BytesLike[], _publishTimes: BigNumberish[], overrides?: PayableOverrides & {
|
|
525
562
|
from?: string;
|
|
526
563
|
}): Promise<PopulatedTransaction>;
|
|
@@ -556,5 +593,8 @@ export interface LimitOrderBook extends BaseContract {
|
|
|
556
593
|
from?: string;
|
|
557
594
|
}): Promise<PopulatedTransaction>;
|
|
558
595
|
prevOrderHash(arg0: BytesLike, overrides?: CallOverrides): Promise<PopulatedTransaction>;
|
|
596
|
+
removeExecutor(_executor: string, overrides?: Overrides & {
|
|
597
|
+
from?: string;
|
|
598
|
+
}): Promise<PopulatedTransaction>;
|
|
559
599
|
};
|
|
560
600
|
}
|