@typus/typus-perp-sdk 1.1.32-testnet → 1.1.32

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.
Files changed (4) hide show
  1. package/dist/src/index.js +16 -15
  2. package/dist/src/user/history.js +253 -255
  3. package/dist/src/user/orderWithBidReceipt.js +0 -1
  4. package/package.json +3 -3
package/dist/src/index.js CHANGED
@@ -35,58 +35,59 @@ var plugin = (0, transactions_1.namedPackagesPlugin)({ url: mvrPlugin });
35
35
  transactions_1.Transaction.registerGlobalSerializationPlugin("namedPackagesPlugin", plugin);
36
36
  exports.PERP_PACKAGE_ID = exports.NETWORK == "MAINNET"
37
37
  ? "0xe27969a70f93034de9ce16e6ad661b480324574e68d15a64b513fd90eb2423e5"
38
- : "0x585924f160f83ef16f8927ec117e4d740abb6f4e571ecfa89ff3e973042cb1b9";
38
+ : "0x29d1dcc803ec1cc1b4c98a8c818c655ecf432ebd2f85757bffc21806d329e240";
39
39
  exports.PERP_PUBLISHED_AT = exports.NETWORK == "MAINNET" ? "0x9eda9afa0b42bf908766c42d02a549c271d7d0ae02c8c58c5075858f8f4d3b69" : "@typus/perp";
40
40
  exports.PERP_PKG_V1 = exports.NETWORK == "MAINNET"
41
41
  ? "0xe27969a70f93034de9ce16e6ad661b480324574e68d15a64b513fd90eb2423e5"
42
42
  : "0x585924f160f83ef16f8927ec117e4d740abb6f4e571ecfa89ff3e973042cb1b9";
43
43
  exports.STAKE_PACKAGE_ID = exports.NETWORK == "MAINNET"
44
44
  ? "0xc427209145715a00a93d7e674a95c556a7147d79fda1bbaeb1a1cac5f9923966"
45
- : "0x220e7ba8923c0c30b57c0baab3bc15d781a39bb294cf7af318c0fc816b5cf7e6";
45
+ : "0xcfe3d323fec2dde129480328dbcf075bc47bac50f916f33746d74f1c875acd2e";
46
46
  exports.STAKE_PUBLISHED_AT = exports.NETWORK == "MAINNET"
47
47
  ? "0xdf96424bc1ba70a6e53c07b2b55c597eccb8a21f722a917a5b4c9d8514b2d858"
48
- : "0x11f4f072d6472f545a82200ec4bee8a8db006e209f76bcc013178c585ed4b368";
48
+ : "0xcfe3d323fec2dde129480328dbcf075bc47bac50f916f33746d74f1c875acd2e";
49
49
  exports.STAKE_PKG_V1 = exports.NETWORK == "MAINNET"
50
50
  ? "0xc427209145715a00a93d7e674a95c556a7147d79fda1bbaeb1a1cac5f9923966"
51
51
  : "0x220e7ba8923c0c30b57c0baab3bc15d781a39bb294cf7af318c0fc816b5cf7e6";
52
52
  // Registry
53
53
  exports.LP_POOL = exports.NETWORK == "MAINNET"
54
54
  ? "0xfee68e535bf24702be28fa38ea2d5946e617e0035027d5ca29dbed99efd82aaa"
55
- : "0x22bb370cec1ec8fbbf381b151615358946ad0083805ef7940dfd9529fe6eac88";
55
+ : "0x351312d71a8834cd978649ef065dc48928eaf07a279566bc93050a89c2b1edae";
56
56
  exports.LIQUIDITY_POOL = exports.NETWORK == "MAINNET"
57
57
  ? "0x9973b7dd68ab8ba18702d913191a4c62c597847d9cd9f0b5bd97f1b938fc9a0a"
58
- : "0x54447a759a238f93ff847177bd87ace4b6ebc83553080611b93ac394122ecc4d";
58
+ : "0x185f5713a04a01dbb2ef1ca603177b21c26a8a1f7c3b60b0b94c77c31dd4602d";
59
59
  exports.LIQUIDITY_POOL_0 = exports.NETWORK == "MAINNET"
60
60
  ? "0x98110aae0ffaf294259066380a2d35aba74e42860f1e87ee9c201f471eb3ba03"
61
- : "0xc7adb5c9e318690dd43802ff50071aff9ffcc51e48abfe0ee0b5323a8c02c676";
61
+ : "0x310a065075d2d49a09440402fcf8d2238886111c063cddaa4c118b09b1790e5e";
62
62
  // MarketRegistry
63
63
  exports.MARKET = exports.NETWORK == "MAINNET"
64
64
  ? "0xc969d946a2b6b917a83b5fb71765793c4a52149e50d2c8cf5c01d7421fc7cd73"
65
- : "0xed48f046dc88c49eb01d59669e29eb3006173b66445facb88de277bec2913687";
65
+ : "0x00fdefdaa281113998afe29b3b8906a8f7bfdfc031891da3b9d7ddc08a924919";
66
66
  // MARKET_0 = 0x442cc2c27cadaf287a5f4413967b4dacc6532bc9063875efbc7b178e5add3e4e
67
+ // testnet MARKET_0 = 0x7f427b15136ab0f5919e66612ff343f9c34d2733e636c95f6d9563a596a4b6ac
67
68
  exports.PERP_VERSION = exports.NETWORK == "MAINNET"
68
69
  ? "0xa12c282a068328833ec4a9109fc77803ec1f523f8da1bb0f82bac8450335f0c9"
69
- : "0x80f739d013b365055540346d3b081b19369d6ba83d1ed6291be7a066e0a3c25f";
70
+ : "0xfd3699c86cda99e542e4517dc3ad4d9164806664fcbcc23981ad0d5101b87abd";
70
71
  // LpRegistry
71
72
  exports.TLP = exports.NETWORK == "MAINNET"
72
73
  ? "0xc0a8cc0201d202321cd40b3f19fcf4cc88d6b63ceac0de55b08a2ab16f8a721e"
73
- : "0x6554d13aa8152c0d5b1c11cbe2c927a2612afb5c5d9fd0323643fcf6ff92aa4c";
74
+ : ""; // deprecated in new version TLP
74
75
  exports.TLP_TOKEN = exports.NETWORK == "MAINNET"
75
76
  ? "0xe27969a70f93034de9ce16e6ad661b480324574e68d15a64b513fd90eb2423e5::tlp::TLP"
76
- : "0x585924f160f83ef16f8927ec117e4d740abb6f4e571ecfa89ff3e973042cb1b9::tlp::TLP";
77
+ : "0xc44ba56ee8f91195facaf7a5a39b5522e0e8268a21b324275757ecc8baaa4e11::itlp_typus::ITLP_TYPUS";
77
78
  exports.TLP_TREASURY_CAP = exports.NETWORK == "MAINNET"
78
79
  ? "0x77c75fb1d78cca25b5e2d69decfe2837abf95c4ef44b809868e6ca20f42b63bc"
79
- : "0xda520f3d9127d1b2b2c6c4d386d9d4640d7db7625a127e5880106b27964c88ec";
80
+ : "0x118bd86c1885a02c2c8f8bb017b40b4a928d5dad1aa68802158171427f4c19c9";
80
81
  // StakePoolRegistry
81
82
  exports.STAKE_POOL = exports.NETWORK == "MAINNET"
82
83
  ? "0x2cdf93717f87a8a7aeb98b27777b3b643f0ae2b277f44e6bcda0fc655a47d3e0"
83
- : "0x36d3dbde4236a40464220bfee930a4267312e16120f3a3e4c714f20fb8810402";
84
+ : "0xc48d38a6cd76ac6628ba98f1bdad7ade8d4b5273066aa4408a81e5e00a92363e";
84
85
  exports.STAKE_POOL_0 = exports.NETWORK == "MAINNET"
85
86
  ? "0x5c984987380805fbaaf78f41d8ff1973807b6c85176aa87cf5a58518e0a87418"
86
- : "0x0288a12a5447bc2fd9bc102e7a5b31a4cc61eaa7d1d7cb2d21cbe2782a1147e6";
87
+ : "0xce188b7277324a817a91ce1953dd1d71f2dbb4685364caa90eb430c9ac453dc8";
87
88
  exports.STAKE_POOL_VERSION = exports.NETWORK == "MAINNET"
88
89
  ? "0xdf3ed1599218b2415b2cd7fa06296f7f647676019b2873ec18e55a626c584f1b"
89
- : "0xafb81680b9ac3d627eb733154c43d34e3ec758cf8e00a55c384df2c8150f7881";
90
+ : "0x138583562f9f8fc6261e8fd752a105eb42c8887f83efaba87b42a757f3d98765";
90
91
  exports.COMPETITION_CONFIG = exports.NETWORK == "MAINNET"
91
92
  ? "0x36056abf9adde86f81667dad680a8ac98868c9fc1cb4d519fd2222d5d4522906"
92
- : "0xbc3914cd777d009afc05e81cd6d006428ce742569c795b0bac493c1b0ef58559";
93
+ : "0xbb246d6ee24d7c751777d81cbf95ffcfcda26910fecfdcfedab81b2b8e48dfe5";
package/dist/src/user/history.js CHANGED
@@ -91,267 +91,265 @@ function parseUserHistory(raw_events) {
91
91
  }
92
92
  var json = event.contents.json;
93
93
  var timestamp = event.timestamp;
94
- var tx_digest = event.transaction.digest;
94
+ var tx_digest = event.transactionBlock.digest;
95
95
  // console.log(type);
96
96
  // console.log(tx_digest);
97
97
  // console.log(json);
98
98
  // console.log(timestamp);
99
99
  var _g = __read(type.split("::"), 3), pkg = _g[0], mod = _g[1], name = _g[2];
100
- if (mod == 'trading') {
101
- switch (name) {
102
- case structs_2.CreateTradingOrderEvent.$typeName.split("::")[2]:
103
- case structs_2.CreateTradingOrderWithBidReceiptsEvent.$typeName.split("::")[2]:
104
- var base_token = (0, constants_1.typeArgToAsset)(json.base_token.name);
105
- var collateral_token = (0, constants_1.typeArgToAsset)(json.collateral_token.name);
106
- var market = "".concat(base_token, "/USD");
107
- var size = Number(json.size) / Math.pow(10, (0, constants_1.assetToDecimal)(base_token));
108
- var collateral;
109
- if (json.collateral_amount) {
110
- collateral = Number(json.collateral_amount) / Math.pow(10, (0, constants_1.assetToDecimal)(collateral_token));
111
- }
112
- else {
113
- collateral = Number(json.collateral_in_deposit_token) / Math.pow(10, (0, constants_1.assetToDecimal)(collateral_token));
114
- }
115
- var order_type = "Limit";
116
- var price = json.trigger_price;
117
- if (json.filled) {
118
- order_type = "Market";
119
- price = json.filled_price;
120
- }
121
- else if (json.reduce_only && !json.is_stop_order) {
122
- order_type = "Take Profit";
123
- }
124
- else if (json.reduce_only && json.is_stop_order) {
125
- order_type = "Stop Loss";
126
- }
127
- var e = {
128
- action: "Place Order",
129
- typeName: name,
130
- order_id: json.order_id,
131
- position_id: json.linked_position_id,
132
- market: market,
133
- side: json.is_long ? "Long" : "Short",
134
- order_type: order_type,
135
- status: json.filled ? "Filled" : "Open",
136
- size: size,
137
- base_token: base_token,
138
- collateral: collateral,
139
- collateral_token: collateral_token,
140
- price: Number(price) / Math.pow(10, 8), // WARNING: fixed decimal
141
- realized_pnl: undefined,
142
- timestamp: timestamp,
143
- tx_digest: tx_digest,
144
- dov_index: json.dov_index,
145
- reduce_only: json.reduce_only,
146
- is_stop_order: json.is_stop_order,
147
- sender: "user",
148
- };
149
- events.push(e);
150
- break;
151
- case structs_1.OrderFilledEvent.$typeName.split("::")[2]:
152
- var base_token = (0, constants_1.typeArgToAsset)(json.symbol.base_token.name);
153
- var collateral_token = (0, constants_1.typeArgToAsset)(json.collateral_token.name);
154
- var market = "".concat(base_token, "/USD");
155
- var size = Number(json.filled_size) / Math.pow(10, (0, constants_1.assetToDecimal)(base_token));
156
- var price = json.filled_price;
157
- var action;
158
- var related;
159
- var collateral;
160
- var realized_trading_fee = Number(json.realized_trading_fee) + Number(json.realized_borrow_fee);
161
- var realized_fee_in_usd = Number(json.realized_fee_in_usd) / Math.pow(10, 9);
162
- var realized_amount = json.realized_amount_sign ? Number(json.realized_amount) : -Number(json.realized_amount);
163
- // console.log(realized_amount);
164
- var realized_pnl = realized_trading_fee > 0 ? ((realized_amount - realized_trading_fee) * realized_fee_in_usd) / realized_trading_fee : 0;
165
- if (json.linked_position_id != undefined) {
166
- action = "Order Filled (Close Position)";
167
- related = events.findLast(function (e) { return e.position_id === json.linked_position_id && e.market === market; });
168
- // the "Place Order" is emit after Order Filled if filled immediately
169
- var relatedRawEvent = raw_events.find(function (e) {
170
- var type = e.contents.type.repr;
171
- var _a = __read(type.split("::"), 3), pkg = _a[0], mod = _a[1], name = _a[2];
172
- return name === (related === null || related === void 0 ? void 0 : related.typeName) && e.transactionBlock.digest === (related === null || related === void 0 ? void 0 : related.tx_digest) && (related === null || related === void 0 ? void 0 : related.order_id) === json.order_id;
173
- });
174
- if (((_b = (_a = relatedRawEvent === null || relatedRawEvent === void 0 ? void 0 : relatedRawEvent.contents) === null || _a === void 0 ? void 0 : _a.json) === null || _b === void 0 ? void 0 : _b.reduce_only) === false) {
175
- action = "Order Filled (Increase Position)";
176
- }
177
- if (realized_pnl > 0) {
178
- collateral = (realized_amount - realized_trading_fee) / Math.pow(10, (0, constants_1.assetToDecimal)(collateral_token));
179
- }
180
- }
181
- else {
182
- action = "Order Filled (Open Position)";
183
- related = events.findLast(function (e) { return e.order_id === json.order_id && e.market === market; });
184
- collateral = related === null || related === void 0 ? void 0 : related.collateral;
185
- }
186
- var e = {
187
- action: action,
188
- typeName: name,
189
- order_id: json.order_id,
190
- position_id: (_c = json.linked_position_id) !== null && _c !== void 0 ? _c : json.new_position_id,
191
- market: market,
192
- side: json.position_side ? "Long" : "Short",
193
- order_type: related === null || related === void 0 ? void 0 : related.order_type,
194
- status: "Filled",
195
- size: size,
196
- base_token: base_token,
197
- collateral: collateral, // TODO: check for option collateral
198
- collateral_token: collateral_token,
199
- price: Number(price) / Math.pow(10, 8), // WARNING: fixed decimal
200
- realized_pnl: realized_pnl,
201
- timestamp: timestamp,
202
- tx_digest: tx_digest,
203
- dov_index: related === null || related === void 0 ? void 0 : related.dov_index,
204
- sender: "user",
205
- };
206
- events.push(e);
207
- break;
208
- case structs_1.RemovePositionEvent.$typeName.split("::")[2]:
209
- // same tx with order filled
210
- var index = events.findLastIndex(function (e) { return e.tx_digest == tx_digest && e.action == "Order Filled (Close Position)"; });
211
- // console.log(index);
212
- if (index !== -1) {
213
- // true => user paid to pool
214
- var remaining_collateral_amount = json.remaining_collateral_amount / Math.pow(10, (0, constants_1.assetToDecimal)(events[index].collateral_token));
215
- events[index] = __assign(__assign({}, events[index]), { collateral: remaining_collateral_amount + ((_d = events[index].collateral) !== null && _d !== void 0 ? _d : 0) });
216
- }
217
- break;
218
- case structs_1.RealizeFundingEvent.$typeName.split("::")[2]:
219
- var base_token = (0, constants_1.typeArgToAsset)(json.symbol.base_token.name);
220
- var collateral_token = (0, constants_1.typeArgToAsset)(json.collateral_token.name);
221
- var market = "".concat(base_token, "/USD");
222
- var related = events.find(function (e) { return e.position_id === json.position_id && e.market === market; });
223
- // if realized_funding_sign is true, user pays to pool
224
- var realized_funding_fee = json.realized_funding_sign
225
- ? -json.realized_funding_fee / Math.pow(10, (0, constants_1.assetToDecimal)(collateral_token))
226
- : json.realized_funding_fee / Math.pow(10, (0, constants_1.assetToDecimal)(collateral_token));
227
- var realized_funding_fee_usd = json.realized_funding_sign
228
- ? -json.realized_funding_fee_usd / Math.pow(10, 9)
229
- : json.realized_funding_fee_usd / Math.pow(10, 9);
230
- // same tx with order filled
231
- var index = events.findLastIndex(function (e) { return e.tx_digest == tx_digest && e.action == "Order Filled (Close Position)"; });
232
- // console.log(index);
233
- if (index !== -1) {
234
- // true => user paid to pool
235
- events[index] = __assign(__assign({}, events[index]), { collateral: (_e = events[index].collateral) !== null && _e !== void 0 ? _e : 0 - realized_funding_fee, realized_pnl: (_f = events[index].realized_pnl) !== null && _f !== void 0 ? _f : 0 - realized_funding_fee_usd });
236
- }
237
- var e = {
238
- action: "Realize Funding",
239
- typeName: name,
240
- order_id: undefined,
241
- position_id: json.position_id,
242
- market: market,
243
- side: related === null || related === void 0 ? void 0 : related.side,
244
- order_type: related === null || related === void 0 ? void 0 : related.order_type,
245
- status: "Filled",
246
- size: related === null || related === void 0 ? void 0 : related.size,
247
- base_token: base_token,
248
- collateral: realized_funding_fee,
249
- collateral_token: collateral_token,
250
- price: undefined,
251
- realized_pnl: realized_funding_fee_usd,
252
- timestamp: timestamp,
253
- tx_digest: tx_digest,
254
- dov_index: related === null || related === void 0 ? void 0 : related.dov_index,
255
- sender: "user",
256
- };
257
- events.push(e);
258
- break;
259
- case structs_2.CancelTradingOrderEvent.$typeName.split("::")[2]:
260
- var base_token = (0, constants_1.typeArgToAsset)(json.base_token.name);
261
- var collateral_token = (0, constants_1.typeArgToAsset)(json.collateral_token.name);
262
- var market = "".concat(base_token, "/USD");
263
- var related = events.findLast(function (e) { return e.order_id === json.order_id && e.market === market; });
264
- var e = {
265
- action: "Cancel Order",
266
- typeName: name,
267
- order_id: json.order_id,
268
- position_id: related === null || related === void 0 ? void 0 : related.position_id,
269
- market: market,
270
- side: related === null || related === void 0 ? void 0 : related.side,
271
- order_type: related === null || related === void 0 ? void 0 : related.order_type,
272
- status: "Canceled",
273
- size: related === null || related === void 0 ? void 0 : related.size,
274
- base_token: base_token,
275
- collateral: Number(json.released_collateral_amount) / Math.pow(10, (0, constants_1.assetToDecimal)(collateral_token)), // WARNING: fixed decimal
276
- collateral_token: collateral_token,
277
- price: Number(json.trigger_price) / Math.pow(10, 8), // WARNING: fixed decimal
278
- realized_pnl: undefined,
279
- timestamp: timestamp,
280
- tx_digest: tx_digest,
281
- dov_index: related === null || related === void 0 ? void 0 : related.dov_index,
282
- sender: "user",
283
- };
284
- events.push(e);
285
- break;
286
- case structs_2.IncreaseCollateralEvent.$typeName.split("::")[2]:
287
- case structs_2.ReleaseCollateralEvent.$typeName.split("::")[2]:
288
- var base_token = (0, constants_1.typeArgToAsset)(json.base_token.name);
289
- var collateral_token = (0, constants_1.typeArgToAsset)(json.collateral_token.name);
290
- var market = "".concat(base_token, "/USD");
291
- var related = events.find(function (e) { return e.position_id === json.position_id && e.market === market; });
292
- var collateral;
293
- if (json.increased_collateral_amount) {
294
- collateral = Number(json.increased_collateral_amount) * -1;
100
+ switch (name) {
101
+ case structs_2.CreateTradingOrderEvent.$typeName.split("::")[2]:
102
+ case structs_2.CreateTradingOrderWithBidReceiptsEvent.$typeName.split("::")[2]:
103
+ var base_token = (0, constants_1.typeArgToAsset)(json.base_token.name);
104
+ var collateral_token = (0, constants_1.typeArgToAsset)(json.collateral_token.name);
105
+ var market = "".concat(base_token, "/USD");
106
+ var size = Number(json.size) / Math.pow(10, (0, constants_1.assetToDecimal)(base_token));
107
+ var collateral;
108
+ if (json.collateral_amount) {
109
+ collateral = Number(json.collateral_amount) / Math.pow(10, (0, constants_1.assetToDecimal)(collateral_token));
110
+ }
111
+ else {
112
+ collateral = Number(json.collateral_in_deposit_token) / Math.pow(10, (0, constants_1.assetToDecimal)(collateral_token));
113
+ }
114
+ var order_type = "Limit";
115
+ var price = json.trigger_price;
116
+ if (json.filled) {
117
+ order_type = "Market";
118
+ price = json.filled_price;
119
+ }
120
+ else if (json.reduce_only && !json.is_stop_order) {
121
+ order_type = "Take Profit";
122
+ }
123
+ else if (json.reduce_only && json.is_stop_order) {
124
+ order_type = "Stop Loss";
125
+ }
126
+ var e = {
127
+ action: "Place Order",
128
+ typeName: name,
129
+ order_id: json.order_id,
130
+ position_id: json.linked_position_id,
131
+ market: market,
132
+ side: json.is_long ? "Long" : "Short",
133
+ order_type: order_type,
134
+ status: json.filled ? "Filled" : "Open",
135
+ size: size,
136
+ base_token: base_token,
137
+ collateral: collateral,
138
+ collateral_token: collateral_token,
139
+ price: Number(price) / Math.pow(10, 8), // WARNING: fixed decimal
140
+ realized_pnl: undefined,
141
+ timestamp: timestamp,
142
+ tx_digest: tx_digest,
143
+ dov_index: json.dov_index,
144
+ reduce_only: json.reduce_only,
145
+ is_stop_order: json.is_stop_order,
146
+ sender: "user",
147
+ };
148
+ events.push(e);
149
+ break;
150
+ case structs_1.OrderFilledEvent.$typeName.split("::")[2]:
151
+ var base_token = (0, constants_1.typeArgToAsset)(json.symbol.base_token.name);
152
+ var collateral_token = (0, constants_1.typeArgToAsset)(json.collateral_token.name);
153
+ var market = "".concat(base_token, "/USD");
154
+ var size = Number(json.filled_size) / Math.pow(10, (0, constants_1.assetToDecimal)(base_token));
155
+ var price = json.filled_price;
156
+ var action;
157
+ var related;
158
+ var collateral;
159
+ var realized_trading_fee = Number(json.realized_trading_fee) + Number(json.realized_borrow_fee);
160
+ var realized_fee_in_usd = Number(json.realized_fee_in_usd) / Math.pow(10, 9);
161
+ var realized_amount = json.realized_amount_sign ? Number(json.realized_amount) : -Number(json.realized_amount);
162
+ // console.log(realized_amount);
163
+ var realized_pnl = realized_trading_fee > 0 ? ((realized_amount - realized_trading_fee) * realized_fee_in_usd) / realized_trading_fee : 0;
164
+ if (json.linked_position_id != undefined) {
165
+ action = "Order Filled (Close Position)";
166
+ related = events.findLast(function (e) { return e.position_id === json.linked_position_id && e.market === market; });
167
+ // the "Place Order" is emit after Order Filled if filled immediately
168
+ var relatedRawEvent = raw_events.find(function (e) {
169
+ var type = e.contents.type.repr;
170
+ var _a = __read(type.split("::"), 3), pkg = _a[0], mod = _a[1], name = _a[2];
171
+ return name === (related === null || related === void 0 ? void 0 : related.typeName) && e.transactionBlock.digest === (related === null || related === void 0 ? void 0 : related.tx_digest) && (related === null || related === void 0 ? void 0 : related.order_id) === json.order_id;
172
+ });
173
+ if (((_b = (_a = relatedRawEvent === null || relatedRawEvent === void 0 ? void 0 : relatedRawEvent.contents) === null || _a === void 0 ? void 0 : _a.json) === null || _b === void 0 ? void 0 : _b.reduce_only) === false) {
174
+ action = "Order Filled (Increase Position)";
295
175
  }
296
- else {
297
- collateral = Number(json.released_collateral_amount);
176
+ if (realized_pnl > 0) {
177
+ collateral = (realized_amount - realized_trading_fee) / Math.pow(10, (0, constants_1.assetToDecimal)(collateral_token));
298
178
  }
299
- var e = {
300
- action: "Modify Collateral",
301
- typeName: name,
302
- order_id: undefined,
303
- position_id: json.position_id,
304
- market: market,
305
- side: !related
306
- ? undefined
307
- : related.action === "Order Filled (Open Position)"
308
- ? related.side
309
- : related.side === "Long"
310
- ? "Short"
311
- : "Long",
312
- order_type: related === null || related === void 0 ? void 0 : related.order_type,
313
- status: "Filled",
314
- size: related === null || related === void 0 ? void 0 : related.size,
315
- base_token: base_token,
316
- collateral: collateral / Math.pow(10, (0, constants_1.assetToDecimal)(collateral_token)), // WARNING: fixed decimal
317
- collateral_token: collateral_token,
318
- price: related === null || related === void 0 ? void 0 : related.price,
319
- realized_pnl: undefined,
320
- timestamp: timestamp,
321
- tx_digest: tx_digest,
322
- dov_index: related === null || related === void 0 ? void 0 : related.dov_index,
323
- sender: "user",
324
- };
325
- events.push(e);
326
- break;
327
- case structs_3.SwapEvent.$typeName.split("::")[2]:
328
- var from_token = (0, constants_1.typeArgToAsset)(json.from_token_type.name);
329
- var to_token = (0, constants_1.typeArgToAsset)(json.to_token_type.name);
330
- var from_price = Number(json.oracle_price_from_token);
331
- var to_price = Number(json.oracle_price_to_token);
332
- var e = {
333
- action: "Swap",
334
- typeName: name,
335
- order_id: undefined,
336
- position_id: undefined,
337
- market: "".concat(from_token, "/").concat(to_token),
338
- side: undefined,
339
- order_type: "Market",
340
- status: "Filled",
341
- size: Number(json.actual_to_amount) / Math.pow(10, (0, constants_1.assetToDecimal)(to_token)),
342
- base_token: to_token,
343
- collateral: Number(json.from_amount) / Math.pow(10, (0, constants_1.assetToDecimal)(from_token)),
344
- collateral_token: from_token,
345
- price: from_price / to_price,
346
- realized_pnl: -Number(json.fee_amount_usd) / Math.pow(10, 9),
347
- timestamp: timestamp,
348
- tx_digest: tx_digest,
349
- dov_index: undefined,
350
- sender: "user",
351
- };
352
- events.push(e);
353
- break;
354
- }
179
+ }
180
+ else {
181
+ action = "Order Filled (Open Position)";
182
+ related = events.findLast(function (e) { return e.order_id === json.order_id && e.market === market; });
183
+ collateral = related === null || related === void 0 ? void 0 : related.collateral;
184
+ }
185
+ var e = {
186
+ action: action,
187
+ typeName: name,
188
+ order_id: json.order_id,
189
+ position_id: (_c = json.linked_position_id) !== null && _c !== void 0 ? _c : json.new_position_id,
190
+ market: market,
191
+ side: json.position_side ? "Long" : "Short",
192
+ order_type: related === null || related === void 0 ? void 0 : related.order_type,
193
+ status: "Filled",
194
+ size: size,
195
+ base_token: base_token,
196
+ collateral: collateral, // TODO: check for option collateral
197
+ collateral_token: collateral_token,
198
+ price: Number(price) / Math.pow(10, 8), // WARNING: fixed decimal
199
+ realized_pnl: realized_pnl,
200
+ timestamp: timestamp,
201
+ tx_digest: tx_digest,
202
+ dov_index: related === null || related === void 0 ? void 0 : related.dov_index,
203
+ sender: "user",
204
+ };
205
+ events.push(e);
206
+ break;
207
+ case structs_1.RemovePositionEvent.$typeName.split("::")[2]:
208
+ // same tx with order filled
209
+ var index = events.findLastIndex(function (e) { return e.tx_digest == tx_digest && e.action == "Order Filled (Close Position)"; });
210
+ // console.log(index);
211
+ if (index !== -1) {
212
+ // true => user paid to pool
213
+ var remaining_collateral_amount = json.remaining_collateral_amount / Math.pow(10, (0, constants_1.assetToDecimal)(events[index].collateral_token));
214
+ events[index] = __assign(__assign({}, events[index]), { collateral: remaining_collateral_amount + ((_d = events[index].collateral) !== null && _d !== void 0 ? _d : 0) });
215
+ }
216
+ break;
217
+ case structs_1.RealizeFundingEvent.$typeName.split("::")[2]:
218
+ var base_token = (0, constants_1.typeArgToAsset)(json.symbol.base_token.name);
219
+ var collateral_token = (0, constants_1.typeArgToAsset)(json.collateral_token.name);
220
+ var market = "".concat(base_token, "/USD");
221
+ var related = events.find(function (e) { return e.position_id === json.position_id && e.market === market; });
222
+ // if realized_funding_sign is true, user pays to pool
223
+ var realized_funding_fee = json.realized_funding_sign
224
+ ? -json.realized_funding_fee / Math.pow(10, (0, constants_1.assetToDecimal)(collateral_token))
225
+ : json.realized_funding_fee / Math.pow(10, (0, constants_1.assetToDecimal)(collateral_token));
226
+ var realized_funding_fee_usd = json.realized_funding_sign
227
+ ? -json.realized_funding_fee_usd / Math.pow(10, 9)
228
+ : json.realized_funding_fee_usd / Math.pow(10, 9);
229
+ // same tx with order filled
230
+ var index = events.findLastIndex(function (e) { return e.tx_digest == tx_digest && e.action == "Order Filled (Close Position)"; });
231
+ // console.log(index);
232
+ if (index !== -1) {
233
+ // true => user paid to pool
234
+ events[index] = __assign(__assign({}, events[index]), { collateral: (_e = events[index].collateral) !== null && _e !== void 0 ? _e : 0 - realized_funding_fee, realized_pnl: (_f = events[index].realized_pnl) !== null && _f !== void 0 ? _f : 0 - realized_funding_fee_usd });
235
+ }
236
+ var e = {
237
+ action: "Realize Funding",
238
+ typeName: name,
239
+ order_id: undefined,
240
+ position_id: json.position_id,
241
+ market: market,
242
+ side: related === null || related === void 0 ? void 0 : related.side,
243
+ order_type: related === null || related === void 0 ? void 0 : related.order_type,
244
+ status: "Filled",
245
+ size: related === null || related === void 0 ? void 0 : related.size,
246
+ base_token: base_token,
247
+ collateral: realized_funding_fee,
248
+ collateral_token: collateral_token,
249
+ price: undefined,
250
+ realized_pnl: realized_funding_fee_usd,
251
+ timestamp: timestamp,
252
+ tx_digest: tx_digest,
253
+ dov_index: related === null || related === void 0 ? void 0 : related.dov_index,
254
+ sender: "user",
255
+ };
256
+ events.push(e);
257
+ break;
258
+ case structs_2.CancelTradingOrderEvent.$typeName.split("::")[2]:
259
+ var base_token = (0, constants_1.typeArgToAsset)(json.base_token.name);
260
+ var collateral_token = (0, constants_1.typeArgToAsset)(json.collateral_token.name);
261
+ var market = "".concat(base_token, "/USD");
262
+ var related = events.findLast(function (e) { return e.order_id === json.order_id && e.market === market; });
263
+ var e = {
264
+ action: "Cancel Order",
265
+ typeName: name,
266
+ order_id: json.order_id,
267
+ position_id: related === null || related === void 0 ? void 0 : related.position_id,
268
+ market: market,
269
+ side: related === null || related === void 0 ? void 0 : related.side,
270
+ order_type: related === null || related === void 0 ? void 0 : related.order_type,
271
+ status: "Canceled",
272
+ size: related === null || related === void 0 ? void 0 : related.size,
273
+ base_token: base_token,
274
+ collateral: Number(json.released_collateral_amount) / Math.pow(10, (0, constants_1.assetToDecimal)(collateral_token)), // WARNING: fixed decimal
275
+ collateral_token: collateral_token,
276
+ price: Number(json.trigger_price) / Math.pow(10, 8), // WARNING: fixed decimal
277
+ realized_pnl: undefined,
278
+ timestamp: timestamp,
279
+ tx_digest: tx_digest,
280
+ dov_index: related === null || related === void 0 ? void 0 : related.dov_index,
281
+ sender: "user",
282
+ };
283
+ events.push(e);
284
+ break;
285
+ case structs_2.IncreaseCollateralEvent.$typeName.split("::")[2]:
286
+ case structs_2.ReleaseCollateralEvent.$typeName.split("::")[2]:
287
+ var base_token = (0, constants_1.typeArgToAsset)(json.base_token.name);
288
+ var collateral_token = (0, constants_1.typeArgToAsset)(json.collateral_token.name);
289
+ var market = "".concat(base_token, "/USD");
290
+ var related = events.find(function (e) { return e.position_id === json.position_id && e.market === market; });
291
+ var collateral;
292
+ if (json.increased_collateral_amount) {
293
+ collateral = Number(json.increased_collateral_amount) * -1;
294
+ }
295
+ else {
296
+ collateral = Number(json.released_collateral_amount);
297
+ }
298
+ var e = {
299
+ action: "Modify Collateral",
300
+ typeName: name,
301
+ order_id: undefined,
302
+ position_id: json.position_id,
303
+ market: market,
304
+ side: !related
305
+ ? undefined
306
+ : related.action === "Order Filled (Open Position)"
307
+ ? related.side
308
+ : related.side === "Long"
309
+ ? "Short"
310
+ : "Long",
311
+ order_type: related === null || related === void 0 ? void 0 : related.order_type,
312
+ status: "Filled",
313
+ size: related === null || related === void 0 ? void 0 : related.size,
314
+ base_token: base_token,
315
+ collateral: collateral / Math.pow(10, (0, constants_1.assetToDecimal)(collateral_token)), // WARNING: fixed decimal
316
+ collateral_token: collateral_token,
317
+ price: related === null || related === void 0 ? void 0 : related.price,
318
+ realized_pnl: undefined,
319
+ timestamp: timestamp,
320
+ tx_digest: tx_digest,
321
+ dov_index: related === null || related === void 0 ? void 0 : related.dov_index,
322
+ sender: "user",
323
+ };
324
+ events.push(e);
325
+ break;
326
+ case structs_3.SwapEvent.$typeName.split("::")[2]:
327
+ var from_token = (0, constants_1.typeArgToAsset)(json.from_token_type.name);
328
+ var to_token = (0, constants_1.typeArgToAsset)(json.to_token_type.name);
329
+ var from_price = Number(json.oracle_price_from_token);
330
+ var to_price = Number(json.oracle_price_to_token);
331
+ var e = {
332
+ action: "Swap",
333
+ typeName: name,
334
+ order_id: undefined,
335
+ position_id: undefined,
336
+ market: "".concat(from_token, "/").concat(to_token),
337
+ side: undefined,
338
+ order_type: "Market",
339
+ status: "Filled",
340
+ size: Number(json.actual_to_amount) / Math.pow(10, (0, constants_1.assetToDecimal)(to_token)),
341
+ base_token: to_token,
342
+ collateral: Number(json.from_amount) / Math.pow(10, (0, constants_1.assetToDecimal)(from_token)),
343
+ collateral_token: from_token,
344
+ price: from_price / to_price,
345
+ realized_pnl: -Number(json.fee_amount_usd) / Math.pow(10, 9),
346
+ timestamp: timestamp,
347
+ tx_digest: tx_digest,
348
+ dov_index: undefined,
349
+ sender: "user",
350
+ };
351
+ events.push(e);
352
+ break;
355
353
  }
356
354
  });
357
355
  // console.log(events);
@@ -375,7 +373,7 @@ function getGraphQLEvents(module_1, sender_1) {
375
373
  senderFilter = "sender: \"".concat(sender, "\"");
376
374
  }
377
375
  graphql = JSON.stringify({
378
- query: "\n {\n events(\n last: 50,\n ".concat(before, "\n filter: {\n type: \"").concat(module, "\",\n ").concat(senderFilter, "\n }\n ) {\n pageInfo {\n hasPreviousPage\n hasNextPage\n startCursor\n endCursor\n }\n edges { cursor }\n nodes {\n transaction { digest }\n transactionModule {\n name\n package { digest }\n }\n sender { address }\n timestamp\n contents {\n type { repr }\n json\n }\n }\n }}\n "),
376
+ query: "\n {\n events(\n last: 50,\n ".concat(before, "\n filter: {\n eventType: \"").concat(module, "\",\n ").concat(senderFilter, "\n }\n ) {\n pageInfo {\n hasPreviousPage\n hasNextPage\n startCursor\n endCursor\n }\n edges { cursor }\n nodes {\n transactionBlock { digest }\n sendingModule {\n name\n package { digest }\n }\n sender { address }\n timestamp\n contents {\n type { repr }\n json\n }\n }\n }}\n "),
379
377
  });
380
378
  return [4 /*yield*/, fetch("https://graphql.".concat(src_1.NETWORK.toLowerCase(), ".sui.io/graphql"), {
381
379
  method: "POST",
package/dist/src/user/orderWithBidReceipt.js CHANGED
@@ -90,7 +90,6 @@ function createTradingOrderWithBidReceiptByAutoBid(config, tx, pythClient, input
90
90
  signalIndex: input.signalIndex,
91
91
  strategyIndex: input.strategyIndex,
92
92
  user: input.user,
93
- share: input.share,
94
93
  });
95
94
  cToken = constants_1.tokenType[__1.NETWORK][TOKEN];
96
95
  bToken = constants_1.tokenType[__1.NETWORK][input.bToken];
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@typus/typus-perp-sdk",
3
- "version": "1.1.32-testnet",
3
+ "version": "1.1.32",
4
4
  "repository": "https://github.com/Typus-Lab/typus-perp-sdk.git",
5
5
  "author": "Typus",
6
6
  "description": "typus perp sdk",
7
7
  "license": "MIT",
8
8
  "dependencies": {
9
- "@typus/typus-sdk": "1.8.21-testnet"
9
+ "@typus/typus-sdk": "1.8.24"
10
10
  },
11
11
  "devDependencies": {
12
12
  "@types/bs58": "^4.0.1",
@@ -35,4 +35,4 @@
35
35
  },
36
36
  "homepage": "https://github.com/Typus-Lab/typus-perp-sdk#readme",
37
37
  "packageManager": "yarn@4.10.3+sha512.c38cafb5c7bb273f3926d04e55e1d8c9dfa7d9c3ea1f36a4868fa028b9e5f72298f0b7f401ad5eb921749eb012eb1c3bb74bf7503df3ee43fd600d14a018266f"
38
- }
38
+ }