aftermath-ts-sdk 1.1.94-staging.2 → 1.1.94-staging.4
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/packages/router/api/routerApi.d.ts.map +1 -1
- package/dist/packages/router/api/routerApi.js +9 -18
- package/dist/packages/router/api/routerApiCasting.d.ts +3 -6
- package/dist/packages/router/api/routerApiCasting.d.ts.map +1 -1
- package/dist/packages/router/api/routerApiCasting.js +44 -37
- package/dist/packages/router/api/routerApiCastingTypes.d.ts +1 -1
- package/dist/packages/router/api/routerApiCastingTypes.d.ts.map +1 -1
- package/dist/packages/router/routerTypes.d.ts +22 -18
- package/dist/packages/router/routerTypes.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routerApi.d.ts","sourceRoot":"","sources":["../../../../src/packages/router/api/routerApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EACN,OAAO,EACP,QAAQ,EACR,WAAW,EACX,wBAAwB,EACxB,QAAQ,EACR,gBAAgB,EAChB,UAAU,EAIV,gBAAgB,EAChB,aAAa,EACb,eAAe,EAMf,kBAAkB,EAClB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACN,yBAAyB,EACzB,WAAW,EACX,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,yBAAyB,EAAE,MAAM,qCAAqC,CAAC;AAQhF,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,yBAAyB,IAAI,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;AACvG,OAAO,EACN,UAAU,EACV,mBAAmB,EACnB,MAAM,4CAA4C,CAAC;AAGpD;;;GAGG;AACH,qBAAa,SAAU,YAAW,mBAAmB;IAqCxC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAhCrC,gBAAuB,SAAS;;;;;;;;;;;MAW9B;IAMF,SAAgB,SAAS,EAAE,eAAe,CAAC;IAC3C,SAAgB,UAAU,EAAE;QAC3B,WAAW,EAAE,aAAa,CAAC;KAC3B,CAAC;IACF,SAAgB,UAAU,EAAE,UAAU,CAAC;IAMvC;;;;OAIG;gBAC0B,QAAQ,EAAE,YAAY;IAoDnD;;;;OAIG;IACI,WAAW,WAAkB;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,wCAKxD;IAMK,cAAc,QAAO,QAAQ,QAAQ,EAAE,CAAC,CAS7C;IAEK,oBAAoB,WAAkB;QAC5C,MAAM,EAAE,MAAM,CAAC;KACf,KAAG,QAAQ,QAAQ,EAAE,CAAC,CA0BrB;IAMF;;;;OAIG;IACI,oCAAoC,WAClC;QACP,UAAU,EAAE,QAAQ,CAAC;QACrB,YAAY,EAAE,OAAO,CAAC;QACtB,WAAW,EAAE,QAAQ,CAAC;QACtB,QAAQ,CAAC,EAAE,UAAU,CAAC;QACtB,WAAW,CAAC,EAAE,WAAW,CAAC;KAC1B,GAAG,CACD;QACA,iBAAiB,CAAC,EAAE,kBAAkB,EAAE,CAAC;KACxC,GACD;QACA,iBAAiB,CAAC,EAAE,kBAAkB,EAAE,CAAC;KACxC,CACH,KACC,QAAQ,wBAAwB,CAAC,
|
|
1
|
+
{"version":3,"file":"routerApi.d.ts","sourceRoot":"","sources":["../../../../src/packages/router/api/routerApi.ts"],"names":[],"mappings":"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"}
|
|
@@ -81,18 +81,15 @@ class RouterApi {
|
|
|
81
81
|
// NOTE: is this conversion safe ?
|
|
82
82
|
input_amount: Number(coinInAmount), referred: referrer !== undefined }, ("protocolBlacklist" in inputs
|
|
83
83
|
? {
|
|
84
|
-
protocol_blacklist: (_a = inputs.protocolBlacklist) === null || _a === void 0 ? void 0 : _a.map(routerApiCasting_1.RouterApiCasting.
|
|
84
|
+
protocol_blacklist: (_a = inputs.protocolBlacklist) === null || _a === void 0 ? void 0 : _a.map(routerApiCasting_1.RouterApiCasting.routerProtocolNameToRouterServiceProtocol),
|
|
85
85
|
}
|
|
86
86
|
: "protocolWhitelist" in inputs
|
|
87
87
|
? {
|
|
88
|
-
protocol_whitelist: (_b = inputs.protocolWhitelist) === null || _b === void 0 ? void 0 : _b.map(routerApiCasting_1.RouterApiCasting.
|
|
88
|
+
protocol_whitelist: (_b = inputs.protocolWhitelist) === null || _b === void 0 ? void 0 : _b.map(routerApiCasting_1.RouterApiCasting.routerProtocolNameToRouterServiceProtocol),
|
|
89
89
|
}
|
|
90
90
|
: {})), undefined, undefined, undefined, true);
|
|
91
91
|
const completeRoute = yield this.fetchAddNetTradeFeePercentageToCompleteTradeRoute({
|
|
92
|
-
completeRoute: __1.Casting.router.routerCompleteTradeRouteFromServicePaths(
|
|
93
|
-
paths,
|
|
94
|
-
outputAmount: output_amount,
|
|
95
|
-
}),
|
|
92
|
+
completeRoute: __1.Casting.router.routerCompleteTradeRouteFromServicePaths(paths),
|
|
96
93
|
});
|
|
97
94
|
return Object.assign(Object.assign({}, completeRoute), {
|
|
98
95
|
// NOTE: should these be here ?
|
|
@@ -112,18 +109,15 @@ class RouterApi {
|
|
|
112
109
|
output_amount: Math.ceil((1 + slippage + ((_c = externalFee === null || externalFee === void 0 ? void 0 : externalFee.feePercentage) !== null && _c !== void 0 ? _c : 0)) *
|
|
113
110
|
Number(coinOutAmount)), referred: referrer !== undefined }, ("protocolBlacklist" in inputs
|
|
114
111
|
? {
|
|
115
|
-
protocol_blacklist: (_d = inputs.protocolBlacklist) === null || _d === void 0 ? void 0 : _d.map(routerApiCasting_1.RouterApiCasting.
|
|
112
|
+
protocol_blacklist: (_d = inputs.protocolBlacklist) === null || _d === void 0 ? void 0 : _d.map(routerApiCasting_1.RouterApiCasting.routerProtocolNameToRouterServiceProtocol),
|
|
116
113
|
}
|
|
117
114
|
: "protocolWhitelist" in inputs
|
|
118
115
|
? {
|
|
119
|
-
protocol_whitelist: (_e = inputs.protocolWhitelist) === null || _e === void 0 ? void 0 : _e.map(routerApiCasting_1.RouterApiCasting.
|
|
116
|
+
protocol_whitelist: (_e = inputs.protocolWhitelist) === null || _e === void 0 ? void 0 : _e.map(routerApiCasting_1.RouterApiCasting.routerProtocolNameToRouterServiceProtocol),
|
|
120
117
|
}
|
|
121
118
|
: {})), undefined, undefined, undefined, true);
|
|
122
119
|
const completeRoute = yield this.fetchAddNetTradeFeePercentageToCompleteTradeRoute({
|
|
123
|
-
completeRoute: __1.Casting.router.routerCompleteTradeRouteFromServicePaths(
|
|
124
|
-
paths,
|
|
125
|
-
outputAmount: Number(coinOutAmount),
|
|
126
|
-
}),
|
|
120
|
+
completeRoute: __1.Casting.router.routerCompleteTradeRouteFromServicePaths(paths),
|
|
127
121
|
});
|
|
128
122
|
return Object.assign(Object.assign({}, completeRoute), {
|
|
129
123
|
// NOTE: should these be here ?
|
|
@@ -164,11 +158,11 @@ class RouterApi {
|
|
|
164
158
|
? Number(__1.Casting.numberToFixedBigInt(externalFee.feePercentage))
|
|
165
159
|
: undefined }, ("protocolBlacklist" in inputs
|
|
166
160
|
? {
|
|
167
|
-
protocol_blacklist: (_g = inputs.protocolBlacklist) === null || _g === void 0 ? void 0 : _g.map(routerApiCasting_1.RouterApiCasting.
|
|
161
|
+
protocol_blacklist: (_g = inputs.protocolBlacklist) === null || _g === void 0 ? void 0 : _g.map(routerApiCasting_1.RouterApiCasting.routerProtocolNameToRouterServiceProtocol),
|
|
168
162
|
}
|
|
169
163
|
: "protocolWhitelist" in inputs
|
|
170
164
|
? {
|
|
171
|
-
protocol_whitelist: (_h = inputs.protocolWhitelist) === null || _h === void 0 ? void 0 : _h.map(routerApiCasting_1.RouterApiCasting.
|
|
165
|
+
protocol_whitelist: (_h = inputs.protocolWhitelist) === null || _h === void 0 ? void 0 : _h.map(routerApiCasting_1.RouterApiCasting.routerProtocolNameToRouterServiceProtocol),
|
|
172
166
|
}
|
|
173
167
|
: {})), undefined, undefined, undefined, true);
|
|
174
168
|
const tx = transactions_1.Transaction.fromKind(tx_kind);
|
|
@@ -183,10 +177,7 @@ class RouterApi {
|
|
|
183
177
|
tx.transferObjects([coinOut], walletAddress);
|
|
184
178
|
}
|
|
185
179
|
const completeRoute = yield this.fetchAddNetTradeFeePercentageToCompleteTradeRoute({
|
|
186
|
-
completeRoute: __1.Casting.router.routerCompleteTradeRouteFromServicePaths(
|
|
187
|
-
paths,
|
|
188
|
-
outputAmount: output_amount,
|
|
189
|
-
}),
|
|
180
|
+
completeRoute: __1.Casting.router.routerCompleteTradeRouteFromServicePaths(paths),
|
|
190
181
|
});
|
|
191
182
|
return {
|
|
192
183
|
tx,
|
|
@@ -1,12 +1,9 @@
|
|
|
1
1
|
import { RouterCompleteTradeRoute, RouterProtocolName, RouterServicePaths, RouterTradeEvent } from "../routerTypes";
|
|
2
|
-
import {
|
|
2
|
+
import { RouterServiceProtocol, RouterTradeEventOnChain } from "./routerApiCastingTypes";
|
|
3
3
|
export declare class RouterApiCasting {
|
|
4
4
|
static routerTradeEventFromOnChain: (eventOnChain: RouterTradeEventOnChain) => RouterTradeEvent;
|
|
5
|
-
static routerCompleteTradeRouteFromServicePaths: (
|
|
6
|
-
paths: RouterServicePaths;
|
|
7
|
-
outputAmount: number;
|
|
8
|
-
}) => Omit<RouterCompleteTradeRoute, "netTradeFeePercentage">;
|
|
5
|
+
static routerCompleteTradeRouteFromServicePaths: (paths: RouterServicePaths) => Omit<RouterCompleteTradeRoute, "netTradeFeePercentage">;
|
|
9
6
|
static routerServicePathsFromCompleteTradeRoute: (completeTradeRoute: RouterCompleteTradeRoute) => RouterServicePaths;
|
|
10
|
-
static
|
|
7
|
+
static routerProtocolNameToRouterServiceProtocol: (routerProtocolName: RouterProtocolName) => RouterServiceProtocol;
|
|
11
8
|
}
|
|
12
9
|
//# sourceMappingURL=routerApiCasting.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routerApiCasting.d.ts","sourceRoot":"","sources":["../../../../src/packages/router/api/routerApiCasting.ts"],"names":[],"mappings":"AACA,OAAO,EACN,wBAAwB,EACxB,kBAAkB,EAElB,kBAAkB,EAClB,gBAAgB,EAEhB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACN,
|
|
1
|
+
{"version":3,"file":"routerApiCasting.d.ts","sourceRoot":"","sources":["../../../../src/packages/router/api/routerApiCasting.ts"],"names":[],"mappings":"AACA,OAAO,EACN,wBAAwB,EACxB,kBAAkB,EAElB,kBAAkB,EAClB,gBAAgB,EAEhB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACN,qBAAqB,EACrB,uBAAuB,EACvB,MAAM,yBAAyB,CAAC;AAEjC,qBAAa,gBAAgB;IAK5B,OAAc,2BAA2B,6CAEtC,gBAAgB,CAYjB;IAEF,OAAc,wCAAwC,UAC9C,kBAAkB,KACvB,KAAK,wBAAwB,EAAE,uBAAuB,CAAC,CA8DxD;IAEF,OAAc,wCAAwC,uBACjC,wBAAwB,KAC1C,kBAAkB,CAiCnB;IAEF,OAAc,yCAAyC,uBAClC,kBAAkB,KACpC,qBAAqB,CAoBtB;CACF"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.RouterApiCasting = void 0;
|
|
4
|
-
const __1 = require("../../..");
|
|
5
4
|
class RouterApiCasting {
|
|
6
5
|
}
|
|
7
6
|
exports.RouterApiCasting = RouterApiCasting;
|
|
@@ -21,83 +20,91 @@ RouterApiCasting.routerTradeEventFromOnChain = (eventOnChain) => {
|
|
|
21
20
|
type: eventOnChain.type,
|
|
22
21
|
};
|
|
23
22
|
};
|
|
24
|
-
RouterApiCasting.routerCompleteTradeRouteFromServicePaths = (
|
|
25
|
-
const
|
|
26
|
-
const routes = paths.data.map((path) => ({
|
|
23
|
+
RouterApiCasting.routerCompleteTradeRouteFromServicePaths = (paths) => {
|
|
24
|
+
const routes = paths.paths.map((path) => ({
|
|
27
25
|
// TODO: add spot price
|
|
26
|
+
portion: BigInt(path.portion),
|
|
28
27
|
paths: path.path.data.map((hop) => ({
|
|
29
|
-
protocolName: hop.
|
|
30
|
-
|
|
28
|
+
protocolName: hop.protocol.protocol,
|
|
29
|
+
poolId: hop.pool,
|
|
30
|
+
poolMetadata: {
|
|
31
|
+
protocol: hop.protocol,
|
|
32
|
+
tbData: hop.tb_data,
|
|
33
|
+
},
|
|
31
34
|
coinIn: {
|
|
32
35
|
type: hop.input,
|
|
33
|
-
amount: BigInt(
|
|
34
|
-
tradeFee: BigInt(
|
|
36
|
+
amount: BigInt(hop.input_amount),
|
|
37
|
+
tradeFee: BigInt(hop.swap_fee.input_fee_amount),
|
|
35
38
|
},
|
|
36
39
|
coinOut: {
|
|
37
40
|
type: hop.output,
|
|
38
|
-
amount: BigInt(
|
|
39
|
-
tradeFee: BigInt(
|
|
41
|
+
amount: BigInt(hop.output_amount),
|
|
42
|
+
tradeFee: BigInt(hop.swap_fee.output_fee_amount),
|
|
40
43
|
},
|
|
41
|
-
spotPrice: Number(BigInt(
|
|
42
|
-
Number(BigInt(
|
|
44
|
+
spotPrice: Number(BigInt(hop.input_amount)) /
|
|
45
|
+
Number(BigInt(hop.output_amount)),
|
|
43
46
|
})),
|
|
44
47
|
coinIn: {
|
|
45
48
|
type: path.path.data[0].input,
|
|
46
|
-
amount: BigInt(
|
|
47
|
-
tradeFee: BigInt(
|
|
49
|
+
amount: BigInt(path.path.data[0].input_amount),
|
|
50
|
+
tradeFee: BigInt(path.path.data[0].swap_fee.input_fee_amount),
|
|
48
51
|
},
|
|
49
52
|
coinOut: {
|
|
50
53
|
type: path.path.data[path.path.data.length - 1].output,
|
|
51
|
-
amount: BigInt(
|
|
52
|
-
tradeFee: BigInt(
|
|
53
|
-
.output_fee_amount)
|
|
54
|
+
amount: BigInt(path.path.data[path.path.data.length - 1].output_amount),
|
|
55
|
+
tradeFee: BigInt(path.path.data[path.path.data.length - 1].swap_fee
|
|
56
|
+
.output_fee_amount),
|
|
54
57
|
},
|
|
55
|
-
spotPrice: Number(BigInt(
|
|
56
|
-
Number(BigInt(
|
|
57
|
-
.output_amount))),
|
|
58
|
+
spotPrice: Number(BigInt(path.path.data[0].input_amount)) /
|
|
59
|
+
Number(BigInt(path.path.data[path.path.data.length - 1].output_amount)),
|
|
58
60
|
}));
|
|
59
|
-
const coinInAmount = __1.Helpers.sumBigInt(routes.map((route) => route.coinIn.amount));
|
|
60
61
|
return {
|
|
61
62
|
routes,
|
|
62
63
|
coinIn: {
|
|
63
64
|
type: routes[0].coinIn.type,
|
|
64
|
-
amount:
|
|
65
|
-
tradeFee: BigInt(
|
|
65
|
+
amount: BigInt(paths.amount_in),
|
|
66
|
+
tradeFee: BigInt(paths.protocol_fee.input_fee_amount),
|
|
66
67
|
},
|
|
67
68
|
coinOut: {
|
|
68
69
|
type: routes[routes.length - 1].coinOut.type,
|
|
69
|
-
amount: BigInt(
|
|
70
|
-
tradeFee: BigInt(
|
|
70
|
+
amount: BigInt(paths.amount_out),
|
|
71
|
+
tradeFee: BigInt(paths.protocol_fee.output_fee_amount),
|
|
71
72
|
},
|
|
72
|
-
spotPrice: Number(
|
|
73
|
+
spotPrice: Number(paths.amount_in) / Number(paths.amount_out),
|
|
73
74
|
};
|
|
74
75
|
};
|
|
75
76
|
RouterApiCasting.routerServicePathsFromCompleteTradeRoute = (completeTradeRoute) => {
|
|
76
|
-
const
|
|
77
|
-
|
|
77
|
+
const paths = completeTradeRoute.routes.map((route) => ({
|
|
78
|
+
portion: route.portion.toString(),
|
|
78
79
|
path: {
|
|
79
80
|
data: route.paths.map((path) => ({
|
|
80
|
-
pool: path.
|
|
81
|
+
pool: path.poolId,
|
|
82
|
+
protocol: path.poolMetadata.protocol,
|
|
83
|
+
tb_data: path.poolMetadata.tbData,
|
|
81
84
|
input: path.coinIn.type,
|
|
82
85
|
output: path.coinOut.type,
|
|
83
|
-
input_amount:
|
|
84
|
-
output_amount:
|
|
86
|
+
input_amount: path.coinIn.amount.toString(),
|
|
87
|
+
output_amount: path.coinOut.amount.toString(),
|
|
88
|
+
acceptable_price_impact: true,
|
|
85
89
|
swap_fee: {
|
|
86
|
-
input_fee_amount:
|
|
87
|
-
output_fee_amount:
|
|
90
|
+
input_fee_amount: path.coinIn.tradeFee.toString(),
|
|
91
|
+
output_fee_amount: path.coinOut.tradeFee.toString(),
|
|
88
92
|
},
|
|
89
93
|
})),
|
|
90
94
|
},
|
|
91
95
|
}));
|
|
92
96
|
return {
|
|
93
|
-
|
|
97
|
+
paths,
|
|
98
|
+
amount_in: completeTradeRoute.coinIn.amount.toString(),
|
|
99
|
+
amount_out: completeTradeRoute.coinOut.amount.toString(),
|
|
100
|
+
acceptable_price_impact: true,
|
|
94
101
|
protocol_fee: {
|
|
95
|
-
input_fee_amount:
|
|
96
|
-
output_fee_amount:
|
|
102
|
+
input_fee_amount: completeTradeRoute.coinIn.tradeFee.toString(),
|
|
103
|
+
output_fee_amount: completeTradeRoute.coinOut.tradeFee.toString(),
|
|
97
104
|
},
|
|
98
105
|
};
|
|
99
106
|
};
|
|
100
|
-
RouterApiCasting.
|
|
107
|
+
RouterApiCasting.routerProtocolNameToRouterServiceProtocol = (routerProtocolName) => {
|
|
101
108
|
if (routerProtocolName === "Aftermath") {
|
|
102
109
|
return {
|
|
103
110
|
protocol: routerProtocolName,
|
|
@@ -10,7 +10,7 @@ export type RouterTradeEventOnChain = EventOnChain<{
|
|
|
10
10
|
router_fee_recipient: SuiAddress;
|
|
11
11
|
}>;
|
|
12
12
|
type IndexerPoolType = "Both" | "Stable" | "Uncorrelated";
|
|
13
|
-
export type
|
|
13
|
+
export type RouterServiceProtocol = {
|
|
14
14
|
protocol: Exclude<RouterProtocolName, "Aftermath" | "Kriya" | "SuiSwap" | "BlueMove">;
|
|
15
15
|
} | {
|
|
16
16
|
protocol: "Aftermath";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routerApiCastingTypes.d.ts","sourceRoot":"","sources":["../../../../src/packages/router/api/routerApiCastingTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,cAAc,EACd,QAAQ,EACR,kBAAkB,EAClB,UAAU,EACV,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAMnE,MAAM,MAAM,uBAAuB,GAAG,YAAY,CAAC;IAClD,OAAO,EAAE,UAAU,CAAC;IACpB,OAAO,EAAE,QAAQ,CAAC;IAClB,SAAS,EAAE,cAAc,CAAC;IAC1B,QAAQ,EAAE,QAAQ,CAAC;IACnB,UAAU,EAAE,cAAc,CAAC;IAE3B,UAAU,EAAE,cAAc,CAAC;IAC3B,oBAAoB,EAAE,UAAU,CAAC;CACjC,CAAC,CAAC;AAOH,KAAK,eAAe,GAAG,MAAM,GAAG,QAAQ,GAAG,cAAc,CAAC;AAE1D,MAAM,MAAM,
|
|
1
|
+
{"version":3,"file":"routerApiCastingTypes.d.ts","sourceRoot":"","sources":["../../../../src/packages/router/api/routerApiCastingTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,cAAc,EACd,QAAQ,EACR,kBAAkB,EAClB,UAAU,EACV,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAMnE,MAAM,MAAM,uBAAuB,GAAG,YAAY,CAAC;IAClD,OAAO,EAAE,UAAU,CAAC;IACpB,OAAO,EAAE,QAAQ,CAAC;IAClB,SAAS,EAAE,cAAc,CAAC;IAC1B,QAAQ,EAAE,QAAQ,CAAC;IACnB,UAAU,EAAE,cAAc,CAAC;IAE3B,UAAU,EAAE,cAAc,CAAC;IAC3B,oBAAoB,EAAE,UAAU,CAAC;CACjC,CAAC,CAAC;AAOH,KAAK,eAAe,GAAG,MAAM,GAAG,QAAQ,GAAG,cAAc,CAAC;AAE1D,MAAM,MAAM,qBAAqB,GAC9B;IACA,QAAQ,EAAE,OAAO,CAChB,kBAAkB,EAClB,WAAW,GAAG,OAAO,GAAG,SAAS,GAAG,UAAU,CAC9C,CAAC;CACD,GACD;IACA,QAAQ,EAAE,WAAW,CAAC;IACtB,SAAS,EAAE,eAAe,CAAC;IAE3B,SAAS,EAAE,KAAK,GAAG,QAAQ,GAAG,QAAQ,CAAC;CACtC,GACD;IACA,QAAQ,EAAE,OAAO,GAAG,SAAS,GAAG,UAAU,CAAC;IAC3C,SAAS,EAAE,eAAe,CAAC;CAC1B,CAAC"}
|
|
@@ -1,14 +1,15 @@
|
|
|
1
|
-
import { AnyObjectType, Balance, Percentage, Event, Slippage, ApiEventsBody, ObjectId, SuiAddress, TxBytes, BigIntAsString, SerializedTransaction, ExternalFee } from "../../general/types/generalTypes";
|
|
1
|
+
import { AnyObjectType, Balance, Percentage, Event, Slippage, ApiEventsBody, ObjectId, SuiAddress, TxBytes, BigIntAsString, SerializedTransaction, ExternalFee, IFixedAsString, IFixed } from "../../general/types/generalTypes";
|
|
2
2
|
import { CoinType, ServiceCoinData } from "../coin/coinTypes";
|
|
3
3
|
import { TransactionObjectArgument } from "@mysten/sui/transactions";
|
|
4
4
|
import { TransactionObjectArgument as TransactionObjectArgumentV0 } from "@mysten/sui.js/transactions";
|
|
5
|
+
import { RouterServiceProtocol } from "./api/routerApiCastingTypes";
|
|
5
6
|
export type UniqueId = string;
|
|
6
7
|
/**
|
|
7
8
|
* Fee info for third party packages wanting to fee route transactions
|
|
8
9
|
* @deprecated please use `ExternalFee` instead
|
|
9
10
|
*/
|
|
10
11
|
export type RouterExternalFee = ExternalFee;
|
|
11
|
-
export type RouterProtocolName = "Aftermath" | "BlueMove" | "Cetus" | "DeepBook" | "DeepBookV3" | "DoubleUpPump" | "FlowX" | "FlowXClmm" | "
|
|
12
|
+
export type RouterProtocolName = "Aftermath" | "BlueMove" | "Cetus" | "DeepBook" | "DeepBookV3" | "DoubleUpPump" | "FlowX" | "FlowXClmm" | "Kriya" | "KriyaClmm" | "MovePump" | "SuiSwap" | "Turbos";
|
|
12
13
|
export type RouterCompleteTradeRoute = RouterTradeInfo & {
|
|
13
14
|
routes: RouterTradeRoute[];
|
|
14
15
|
netTradeFeePercentage: Percentage;
|
|
@@ -22,10 +23,15 @@ export type RouterCompleteTradeRoute = RouterTradeInfo & {
|
|
|
22
23
|
export type RouterCompleteTradeRouteWithFee = RouterCompleteTradeRoute;
|
|
23
24
|
export type RouterTradeRoute = RouterTradeInfo & {
|
|
24
25
|
paths: RouterTradePath[];
|
|
26
|
+
portion: IFixed;
|
|
25
27
|
};
|
|
26
28
|
export type RouterTradePath = RouterTradeInfo & {
|
|
27
29
|
protocolName: RouterProtocolName;
|
|
28
|
-
|
|
30
|
+
poolId: ObjectId;
|
|
31
|
+
poolMetadata: {
|
|
32
|
+
tbData: any;
|
|
33
|
+
protocol: RouterServiceProtocol;
|
|
34
|
+
};
|
|
29
35
|
};
|
|
30
36
|
export interface RouterTradeInfo {
|
|
31
37
|
coinIn: RouterTradeCoin;
|
|
@@ -128,33 +134,31 @@ export interface ApiRouterDynamicGasBody {
|
|
|
128
134
|
referrer?: SuiAddress;
|
|
129
135
|
}
|
|
130
136
|
export interface RouterServicePaths {
|
|
131
|
-
|
|
137
|
+
amount_in: BigIntAsString;
|
|
138
|
+
amount_out: BigIntAsString;
|
|
139
|
+
paths: RouterServicePath[];
|
|
140
|
+
acceptable_price_impact: boolean;
|
|
132
141
|
protocol_fee: RouterServiceSwapFee;
|
|
133
142
|
}
|
|
134
143
|
export interface RouterServicePath {
|
|
135
|
-
|
|
144
|
+
portion: IFixedAsString;
|
|
136
145
|
path: {
|
|
137
146
|
data: RouterServiceHop[];
|
|
138
147
|
};
|
|
139
148
|
}
|
|
140
149
|
export interface RouterServiceHop {
|
|
141
|
-
pool:
|
|
150
|
+
pool: ObjectId;
|
|
151
|
+
protocol: RouterServiceProtocol;
|
|
152
|
+
tb_data: any;
|
|
142
153
|
input: CoinType;
|
|
143
154
|
output: CoinType;
|
|
144
|
-
input_amount:
|
|
145
|
-
output_amount:
|
|
155
|
+
input_amount: BigIntAsString;
|
|
156
|
+
output_amount: BigIntAsString;
|
|
157
|
+
acceptable_price_impact: boolean;
|
|
146
158
|
swap_fee: RouterServiceSwapFee;
|
|
147
159
|
}
|
|
148
160
|
export interface RouterServiceSwapFee {
|
|
149
|
-
input_fee_amount:
|
|
150
|
-
output_fee_amount:
|
|
151
|
-
}
|
|
152
|
-
export interface RouterServicePoolMetadata {
|
|
153
|
-
protocol: {
|
|
154
|
-
protocol: RouterProtocolName;
|
|
155
|
-
};
|
|
156
|
-
pool_id: ObjectId;
|
|
157
|
-
tb_data: any;
|
|
158
|
-
assets: [CoinType, CoinType];
|
|
161
|
+
input_fee_amount: BigIntAsString;
|
|
162
|
+
output_fee_amount: BigIntAsString;
|
|
159
163
|
}
|
|
160
164
|
//# sourceMappingURL=routerTypes.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routerTypes.d.ts","sourceRoot":"","sources":["../../../src/packages/router/routerTypes.ts"],"names":[],"mappings":"AACA,OAAO,EACN,aAAa,EACb,OAAO,EACP,UAAU,EACV,KAAK,EACL,QAAQ,EACR,aAAa,EACb,QAAQ,EACR,UAAU,EACV,OAAO,EACP,cAAc,EACd,qBAAqB,EACrB,WAAW,EACX,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAC9D,OAAO,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AACrE,OAAO,EAAE,yBAAyB,IAAI,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"routerTypes.d.ts","sourceRoot":"","sources":["../../../src/packages/router/routerTypes.ts"],"names":[],"mappings":"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"}
|