@ring-protocol/smart-order-router 0.5.31 → 0.5.33
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/build/main/providers/fewV2/ring-static-subgraph-provider.js +3 -3
- package/build/main/providers/token-provider.d.ts +1 -0
- package/build/main/providers/token-provider.js +4 -3
- package/build/main/routers/alpha-router/functions/get-candidate-pools.js +5 -1
- package/build/main/routers/alpha-router/gas-models/ring-gas-model.js +2 -2
- package/build/main/routers/legacy-router/bases.js +5 -2
- package/build/main/tsconfig.tsbuildinfo +1 -1
- package/build/main/util/chains.js +4 -1
- package/build/main/util/fewAddress.d.ts +2 -0
- package/build/main/util/fewAddress.js +8 -4
- package/build/module/providers/fewV2/ring-static-subgraph-provider.js +5 -5
- package/build/module/providers/token-provider.d.ts +1 -0
- package/build/module/providers/token-provider.js +2 -1
- package/build/module/routers/alpha-router/functions/get-candidate-pools.js +6 -2
- package/build/module/routers/alpha-router/gas-models/ring-gas-model.js +3 -3
- package/build/module/routers/legacy-router/bases.js +6 -3
- package/build/module/tsconfig.module.tsbuildinfo +1 -1
- package/build/module/util/chains.js +4 -1
- package/build/module/util/fewAddress.d.ts +2 -0
- package/build/module/util/fewAddress.js +7 -3
- package/package.json +12 -8
|
@@ -47,7 +47,7 @@ exports.ringUsdGasTokensByChain = {
|
|
|
47
47
|
[sdk_core_1.ChainId.SONEIUM]: [token_provider_1.USDC_SONEIUM],
|
|
48
48
|
[sdk_core_1.ChainId.STORY_MAINNET]: [token_provider_1.FEW_USDC_STORY_MAINNET],
|
|
49
49
|
[sdk_core_1.ChainId.XLAYER_MAINNET]: [token_provider_1.USDC_XLAYER_MAINNET],
|
|
50
|
-
[sdk_core_1.ChainId.MEGAETH_MAINNET]: [token_provider_1.
|
|
50
|
+
[sdk_core_1.ChainId.MEGAETH_MAINNET]: [token_provider_1.FEW_USDM_MEGAETH_MAINNET],
|
|
51
51
|
};
|
|
52
52
|
exports.onlySupportV2NetworkUsdGasTokensByChain = {
|
|
53
53
|
[sdk_core_1.ChainId.HYPER_MAINNET]: [token_provider_1.USDT_HYPER_MAINNET],
|
|
@@ -168,4 +168,4 @@ const getRingQuoteThroughNativePool = (chainId, nativeTokenAmount, nativeTokenPo
|
|
|
168
168
|
return nativeTokenPrice != null ? nativeTokenPrice.quote(nativeTokenAmount) : amounts_1.CurrencyAmount.fromRawAmount(nativeTokenAmount.currency instanceof sdk_core_1.Token ? nativeTokenAmount.currency : nativeCurrency, 0);
|
|
169
169
|
};
|
|
170
170
|
exports.getRingQuoteThroughNativePool = getRingQuoteThroughNativePool;
|
|
171
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
171
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmluZy1nYXMtbW9kZWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvcm91dGVycy9hbHBoYS1yb3V0ZXIvZ2FzLW1vZGVscy9yaW5nLWdhcy1tb2RlbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSxzREFJaUM7QUFPakMsc0VBdUQyQztBQUszQyx3Q0FBNEQ7QUFDNUQsbURBQXVEO0FBU3ZELGdFQUFnRTtBQUNoRSxxRUFBcUU7QUFDckUsNEVBQTRFO0FBQy9ELFFBQUEsdUJBQXVCLEdBQXVDO0lBQ3pFLENBQUMsa0JBQU8sQ0FBQyxhQUFhLENBQUMsRUFBRSxDQUFDLHVDQUFzQixDQUFDO0lBQ2pELENBQUMsa0JBQU8sQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDLGdDQUFlLEVBQUUsaUNBQWdCLEVBQUUsaUNBQWdCLEVBQUUsZ0NBQWUsQ0FBQztJQUN6RixDQUFDLGtCQUFPLENBQUMsWUFBWSxDQUFDLEVBQUUsQ0FBQyxpQ0FBZ0IsRUFBRSxrQ0FBaUIsRUFBRSxrQ0FBaUIsQ0FBQztJQUNoRixDQUFDLGtCQUFPLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQyw2QkFBWSxFQUFFLDhCQUFhLEVBQUUsOEJBQWEsQ0FBQztJQUNoRSxDQUFDLGtCQUFPLENBQUMsZUFBZSxDQUFDLEVBQUU7UUFDekIsb0NBQW1CO1FBQ25CLHFDQUFvQjtRQUNwQixxQ0FBb0I7S0FDckI7SUFDRCxDQUFDLGtCQUFPLENBQUMsZ0JBQWdCLENBQUMsRUFBRTtRQUMxQixxQ0FBb0I7UUFDcEIsc0NBQXFCO1FBQ3JCLHNDQUFxQjtLQUN0QjtJQUNELENBQUMsa0JBQU8sQ0FBQyxlQUFlLENBQUMsRUFBRSxDQUFDLHFDQUFvQixDQUFDO0lBQ2pELENBQUMsa0JBQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxFQUFFLENBQUMsb0NBQW1CLENBQUM7SUFDakQsQ0FBQyxrQkFBTyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsMkJBQVUsRUFB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
|
|
@@ -46,7 +46,10 @@ const BASES_TO_CHECK_TRADES_AGAINST = (_tokenProvider) => {
|
|
|
46
46
|
[sdk_core_1.ChainId.POLYGON]: [token_provider_1.WMATIC_POLYGON],
|
|
47
47
|
[sdk_core_1.ChainId.POLYGON_MUMBAI]: [token_provider_1.WMATIC_POLYGON_MUMBAI],
|
|
48
48
|
[sdk_core_1.ChainId.XLAYER_MAINNET]: [chains_1.WRAPPED_NATIVE_CURRENCY[sdk_core_1.ChainId.XLAYER_MAINNET]],
|
|
49
|
-
[sdk_core_1.ChainId.MEGAETH_MAINNET]: [
|
|
49
|
+
[sdk_core_1.ChainId.MEGAETH_MAINNET]: [
|
|
50
|
+
chains_1.FEW_WRAPPED_NATIVE_CURRENCY[sdk_core_1.ChainId.MEGAETH_MAINNET],
|
|
51
|
+
token_provider_1.FEW_USDM_MEGAETH_MAINNET,
|
|
52
|
+
],
|
|
50
53
|
[sdk_core_1.ChainId.CELO]: [chains_1.WRAPPED_NATIVE_CURRENCY[sdk_core_1.ChainId.CELO]],
|
|
51
54
|
[sdk_core_1.ChainId.CELO_ALFAJORES]: [chains_1.WRAPPED_NATIVE_CURRENCY[sdk_core_1.ChainId.CELO_ALFAJORES]],
|
|
52
55
|
[sdk_core_1.ChainId.GNOSIS]: [chains_1.WRAPPED_NATIVE_CURRENCY[sdk_core_1.ChainId.GNOSIS]],
|
|
@@ -131,4 +134,4 @@ const CUSTOM_BASES = async (tokenProvider) => {
|
|
|
131
134
|
};
|
|
132
135
|
};
|
|
133
136
|
exports.CUSTOM_BASES = CUSTOM_BASES;
|
|
134
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
137
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvcm91dGVycy9sZWdhY3ktcm91dGVyL2Jhc2VzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDZEQUE2RDtBQUM3RCxzREFBeUQ7QUFFekQsbUVBK0J3QztBQUN4Qyw4Q0FBeUY7QUFNbEYsTUFBTSw2QkFBNkIsR0FBRyxDQUMzQyxjQUE4QixFQUNkLEVBQUU7SUFDbEIsT0FBTztRQUNMLENBQUMsa0JBQU8sQ0FBQyxhQUFhLENBQUMsRUFBRTtZQUN2QixvQ0FBMkIsQ0FBQyxrQkFBTyxDQUFDLGFBQWEsQ0FBRTtZQUNuRCx1Q0FBc0I7U0FDdkI7UUFDRCxDQUFDLGtCQUFPLENBQUMsT0FBTyxDQUFDLEVBQUU7WUFDakIsZ0NBQXVCLENBQUMsa0JBQU8sQ0FBQyxPQUFPLENBQUU7WUFDekMsNEJBQVc7WUFDWCw2QkFBWTtZQUNaLDZCQUFZO1lBQ1osNkJBQVk7U0FDYjtRQUNELENBQUMsa0JBQU8sQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLGdDQUF1QixDQUFDLGtCQUFPLENBQUMsTUFBTSxDQUFFLENBQUM7UUFDNUQsQ0FBQyxrQkFBTyxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUMsZ0NBQXVCLENBQUMsa0JBQU8sQ0FBQyxPQUFPLENBQUUsQ0FBQztRQUM5RCxDQUFDLGtCQUFPLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQyxnQ0FBdUIsQ0FBQyxrQkFBTyxDQUFDLFFBQVEsQ0FBRSxDQUFDO1FBQ2hFLENBQUMsa0JBQU8sQ0FBQyxlQUFlLENBQUMsRUFBRTtZQUN6QixnQ0FBdUIsQ0FBQyxrQkFBTyxDQUFDLGVBQWUsQ0FBRTtTQUNsRDtRQUNELENBQUMsa0JBQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxFQUFFO1lBQzFCLGdDQUF1QixDQUFDLGtCQUFPLENBQUMsZ0JBQWdCLENBQUU7U0FDbkQ7UUFDRCxDQUFDLGtCQUFPLENBQUMsYUFBYSxDQUFDLEVB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
|