@ring-protocol/smart-order-router 0.5.3 → 0.5.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.
|
@@ -4,12 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.shouldWipeoutCachedRoutes = exports.routeAmountsToString = exports.routeToString = exports.poolToString = exports.routeToPools = exports.routeToTokens = void 0;
|
|
7
|
+
const few_v2_sdk_1 = require("@ring-protocol/few-v2-sdk");
|
|
7
8
|
const router_sdk_1 = require("@ring-protocol/router-sdk");
|
|
8
9
|
const sdk_core_1 = require("@ring-protocol/sdk-core");
|
|
9
10
|
const v2_sdk_1 = require("@ring-protocol/v2-sdk");
|
|
10
11
|
const v3_sdk_1 = require("@ring-protocol/v3-sdk");
|
|
11
12
|
const v4_sdk_1 = require("@ring-protocol/v4-sdk");
|
|
12
|
-
const few_v2_sdk_1 = require("@ring-protocol/few-v2-sdk");
|
|
13
13
|
const lodash_1 = __importDefault(require("lodash"));
|
|
14
14
|
const best_swap_route_1 = require("../routers/alpha-router/functions/best-swap-route");
|
|
15
15
|
const addresses_1 = require("./addresses");
|
|
@@ -68,6 +68,7 @@ const routeToString = (route) => {
|
|
|
68
68
|
const tokenPath = lodash_1.default.map(tokens, (token) => `${token.symbol}`);
|
|
69
69
|
const pools = (0, exports.routeToPools)(route);
|
|
70
70
|
const poolFeePath = lodash_1.default.map(pools, (pool) => {
|
|
71
|
+
var _a, _b;
|
|
71
72
|
if (pool instanceof v2_sdk_1.Pair) {
|
|
72
73
|
return ` -- [${v2_sdk_1.Pair.getAddress(pool.token0, pool.token1)}]`;
|
|
73
74
|
}
|
|
@@ -87,9 +88,48 @@ const routeToString = (route) => {
|
|
|
87
88
|
return ` -- ${pool.fee / 10000}% [${v4_sdk_1.Pool.getPoolId(pool.token0, pool.token1, pool.fee, pool.tickSpacing, pool.hooks)}]`;
|
|
88
89
|
}
|
|
89
90
|
else {
|
|
90
|
-
|
|
91
|
+
// Check if this is a serialized Pair object (from cache/API)
|
|
92
|
+
// Try to extract token addresses from serialized Pair structure
|
|
93
|
+
if (pool &&
|
|
94
|
+
typeof pool === 'object' &&
|
|
95
|
+
('liquidityToken' in pool || 'tokenAmounts' in pool)) {
|
|
96
|
+
// This appears to be a serialized Pair object
|
|
97
|
+
// Try to extract token addresses from tokenAmounts
|
|
98
|
+
let token0Address;
|
|
99
|
+
let token1Address;
|
|
100
|
+
const poolObj = pool;
|
|
101
|
+
if (poolObj.tokenAmounts && Array.isArray(poolObj.tokenAmounts)) {
|
|
102
|
+
const token0 = (_a = poolObj.tokenAmounts[0]) === null || _a === void 0 ? void 0 : _a.currency;
|
|
103
|
+
const token1 = (_b = poolObj.tokenAmounts[1]) === null || _b === void 0 ? void 0 : _b.currency;
|
|
104
|
+
token0Address = (token0 === null || token0 === void 0 ? void 0 : token0.address) || (token0 === null || token0 === void 0 ? void 0 : token0.id);
|
|
105
|
+
token1Address = (token1 === null || token1 === void 0 ? void 0 : token1.address) || (token1 === null || token1 === void 0 ? void 0 : token1.id);
|
|
106
|
+
}
|
|
107
|
+
// If we can extract addresses, use them for the route string
|
|
108
|
+
// This allows the route to be logged even with serialized pairs
|
|
109
|
+
if (token0Address && token1Address) {
|
|
110
|
+
// For logging purposes, we'll use the addresses directly
|
|
111
|
+
// This is a fallback when Pair instances are not available
|
|
112
|
+
return ` -- [${token0Address}/${token1Address}]`;
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
// Enhanced error message with more diagnostic information
|
|
116
|
+
const poolType = typeof pool;
|
|
117
|
+
const poolKeys = pool && typeof pool === 'object' ? Object.keys(pool) : [];
|
|
118
|
+
const hasLiquidityToken = pool && typeof pool === 'object' && 'liquidityToken' in pool;
|
|
119
|
+
const hasTokenAmounts = pool && typeof pool === 'object' && 'tokenAmounts' in pool;
|
|
120
|
+
let errorMsg = `Unsupported pool type. `;
|
|
121
|
+
errorMsg += `Pool type: ${poolType}, `;
|
|
122
|
+
errorMsg += `Pool keys: ${poolKeys.join(', ')}, `;
|
|
123
|
+
errorMsg += `Route protocol: ${route.protocol}, `;
|
|
124
|
+
if (hasLiquidityToken || hasTokenAmounts) {
|
|
125
|
+
errorMsg += `Pool appears to be a serialized/deserialized Pair object. `;
|
|
126
|
+
errorMsg += `This may indicate routes are being incorrectly serialized or pools are not being properly instantiated. `;
|
|
127
|
+
errorMsg += `This typically happens when routes are cached and retrieved from external storage (e.g., Redis). `;
|
|
128
|
+
errorMsg += `The API layer should ensure Pair objects are properly reconstructed when deserializing cached routes. `;
|
|
129
|
+
}
|
|
130
|
+
errorMsg += `Pool data: ${JSON.stringify(pool).substring(0, 500)}`;
|
|
131
|
+
throw new Error(errorMsg);
|
|
91
132
|
}
|
|
92
|
-
return `${(0, exports.poolToString)(pool)} --> `;
|
|
93
133
|
});
|
|
94
134
|
for (let i = 0; i < tokenPath.length; i++) {
|
|
95
135
|
routeStr.push(tokenPath[i]);
|
|
@@ -156,4 +196,4 @@ function poolIsInExcludedProtocols(pool, excludedProtocolsFromMixed) {
|
|
|
156
196
|
return false;
|
|
157
197
|
}
|
|
158
198
|
}
|
|
159
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
199
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../../src/util/routes.ts"],"names":[],"mappings":"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"}
|