@ring-protocol/smart-order-router 0.5.4 → 0.5.5
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.
|
@@ -37,6 +37,7 @@ export const routeToPools = (route) => {
|
|
|
37
37
|
}
|
|
38
38
|
};
|
|
39
39
|
export const poolToString = (pool) => {
|
|
40
|
+
var _a, _b;
|
|
40
41
|
if (pool instanceof V4Pool) {
|
|
41
42
|
return ` -- ${pool.fee / 10000}% [${V4Pool.getPoolId(pool.token0, pool.token1, pool.fee, pool.tickSpacing, pool.hooks)}]`;
|
|
42
43
|
}
|
|
@@ -50,7 +51,31 @@ export const poolToString = (pool) => {
|
|
|
50
51
|
return ` -- [${RingV2Pair.getAddress(pool.token0, pool.token1)}]`;
|
|
51
52
|
}
|
|
52
53
|
else {
|
|
53
|
-
|
|
54
|
+
// Fallback handling for cases where the pool is a "plain object" V2 pair
|
|
55
|
+
// This happens in some environments (e.g. Lambda / different bundlers)
|
|
56
|
+
// where Pair comes from a different copy of the SDK or has been
|
|
57
|
+
// serialized / deserialized.
|
|
58
|
+
if (pool &&
|
|
59
|
+
typeof pool === 'object' &&
|
|
60
|
+
('liquidityToken' in pool || 'tokenAmounts' in pool)) {
|
|
61
|
+
const poolObj = pool;
|
|
62
|
+
let token0Address;
|
|
63
|
+
let token1Address;
|
|
64
|
+
if (poolObj.tokenAmounts && Array.isArray(poolObj.tokenAmounts)) {
|
|
65
|
+
const token0 = (_a = poolObj.tokenAmounts[0]) === null || _a === void 0 ? void 0 : _a.currency;
|
|
66
|
+
const token1 = (_b = poolObj.tokenAmounts[1]) === null || _b === void 0 ? void 0 : _b.currency;
|
|
67
|
+
token0Address = (token0 === null || token0 === void 0 ? void 0 : token0.address) || (token0 === null || token0 === void 0 ? void 0 : token0.id);
|
|
68
|
+
token1Address = (token1 === null || token1 === void 0 ? void 0 : token1.address) || (token1 === null || token1 === void 0 ? void 0 : token1.id);
|
|
69
|
+
}
|
|
70
|
+
if (token0Address && token1Address) {
|
|
71
|
+
// For logging purposes we just show the two addresses. This avoids
|
|
72
|
+
// throwing while still giving useful debug information.
|
|
73
|
+
return ` -- [${token0Address}/${token1Address}]`;
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
// As a last resort, avoid throwing – just show an opaque placeholder so
|
|
77
|
+
// route logging never breaks the main quote flow.
|
|
78
|
+
return ' -- [UnknownPool]';
|
|
54
79
|
}
|
|
55
80
|
};
|
|
56
81
|
export const routeToString = (route) => {
|
|
@@ -79,47 +104,27 @@ export const routeToString = (route) => {
|
|
|
79
104
|
return ` -- ${pool.fee / 10000}% [${V4Pool.getPoolId(pool.token0, pool.token1, pool.fee, pool.tickSpacing, pool.hooks)}]`;
|
|
80
105
|
}
|
|
81
106
|
else {
|
|
82
|
-
//
|
|
83
|
-
//
|
|
107
|
+
// Same fallback logic as poolToString: tolerate serialized / plain-object
|
|
108
|
+
// V2 pairs so that logging never causes a hard failure.
|
|
84
109
|
if (pool &&
|
|
85
110
|
typeof pool === 'object' &&
|
|
86
111
|
('liquidityToken' in pool || 'tokenAmounts' in pool)) {
|
|
87
|
-
|
|
88
|
-
// Try to extract token addresses from tokenAmounts
|
|
112
|
+
const poolObj = pool;
|
|
89
113
|
let token0Address;
|
|
90
114
|
let token1Address;
|
|
91
|
-
const poolObj = pool;
|
|
92
115
|
if (poolObj.tokenAmounts && Array.isArray(poolObj.tokenAmounts)) {
|
|
93
116
|
const token0 = (_a = poolObj.tokenAmounts[0]) === null || _a === void 0 ? void 0 : _a.currency;
|
|
94
117
|
const token1 = (_b = poolObj.tokenAmounts[1]) === null || _b === void 0 ? void 0 : _b.currency;
|
|
95
118
|
token0Address = (token0 === null || token0 === void 0 ? void 0 : token0.address) || (token0 === null || token0 === void 0 ? void 0 : token0.id);
|
|
96
119
|
token1Address = (token1 === null || token1 === void 0 ? void 0 : token1.address) || (token1 === null || token1 === void 0 ? void 0 : token1.id);
|
|
97
120
|
}
|
|
98
|
-
// If we can extract addresses, use them for the route string
|
|
99
|
-
// This allows the route to be logged even with serialized pairs
|
|
100
121
|
if (token0Address && token1Address) {
|
|
101
|
-
// For logging purposes, we'll use the addresses directly
|
|
102
|
-
// This is a fallback when Pair instances are not available
|
|
103
122
|
return ` -- [${token0Address}/${token1Address}]`;
|
|
104
123
|
}
|
|
105
124
|
}
|
|
106
|
-
//
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
const hasLiquidityToken = pool && typeof pool === 'object' && 'liquidityToken' in pool;
|
|
110
|
-
const hasTokenAmounts = pool && typeof pool === 'object' && 'tokenAmounts' in pool;
|
|
111
|
-
let errorMsg = `Unsupported pool type. `;
|
|
112
|
-
errorMsg += `Pool type: ${poolType}, `;
|
|
113
|
-
errorMsg += `Pool keys: ${poolKeys.join(', ')}, `;
|
|
114
|
-
errorMsg += `Route protocol: ${route.protocol}, `;
|
|
115
|
-
if (hasLiquidityToken || hasTokenAmounts) {
|
|
116
|
-
errorMsg += `Pool appears to be a serialized/deserialized Pair object. `;
|
|
117
|
-
errorMsg += `This may indicate routes are being incorrectly serialized or pools are not being properly instantiated. `;
|
|
118
|
-
errorMsg += `This typically happens when routes are cached and retrieved from external storage (e.g., Redis). `;
|
|
119
|
-
errorMsg += `The API layer should ensure Pair objects are properly reconstructed when deserializing cached routes. `;
|
|
120
|
-
}
|
|
121
|
-
errorMsg += `Pool data: ${JSON.stringify(pool).substring(0, 500)}`;
|
|
122
|
-
throw new Error(errorMsg);
|
|
125
|
+
// Last-resort fallback: don't throw, just emit an opaque marker so
|
|
126
|
+
// routeToString always succeeds.
|
|
127
|
+
return ' -- [UnknownPool]';
|
|
123
128
|
}
|
|
124
129
|
});
|
|
125
130
|
for (let i = 0; i < tokenPath.length; i++) {
|
|
@@ -184,4 +189,4 @@ function poolIsInExcludedProtocols(pool, excludedProtocolsFromMixed) {
|
|
|
184
189
|
return false;
|
|
185
190
|
}
|
|
186
191
|
}
|
|
187
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
192
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../../src/util/routes.ts"],"names":[],"mappings":"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"}
|