From fbf610c7543ec2d6eea97994a86374fa252c82c9 Mon Sep 17 00:00:00 2001 From: Jeremy Lee <37092291+yogurtandjam@users.noreply.github.com> Date: Wed, 29 May 2024 14:35:21 -0400 Subject: [PATCH] chore: remove squidV1 codepaths (#396) Co-authored-by: mobile-build-bot-git --- build.gradle.kts | 2 +- .../manager/V4StateManagerAdaptor+Transfer.kt | 4 +- .../state/manager/V4StateManagerAdaptor.kt | 46 +------------- .../state/manager/utils/Settings.kt | 3 +- .../state/v2/supervisor/Configs.kt | 3 +- .../v2/supervisor/OnboardingSupervisor.kt | 49 ++------------- .../app/manager/V4ForegroundCycleTests.kt | 36 +++++------ .../app/manager/v2/V4ForegroundCycleTests.kt | 63 +++++++------------ 8 files changed, 53 insertions(+), 153 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index b9c1df508..34be59b1e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -51,7 +51,7 @@ allprojects { } group = "exchange.dydx.abacus" -version = "1.7.36" +version = "1.7.37" repositories { google() diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/V4StateManagerAdaptor+Transfer.kt b/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/V4StateManagerAdaptor+Transfer.kt index 3be6e2222..ab54bed1b 100644 --- a/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/V4StateManagerAdaptor+Transfer.kt +++ b/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/V4StateManagerAdaptor+Transfer.kt @@ -73,7 +73,7 @@ internal fun V4StateManagerAdaptor.retrieveDepositExchanges() { internal fun V4StateManagerAdaptor.retrieveDepositRoute(state: PerpetualState?) { val isCctp = state?.input?.transfer?.isCctp ?: false when (appConfigs.squidVersion) { - AppConfigs.SquidVersion.V1, AppConfigs.SquidVersion.V2WithdrawalOnly -> retrieveDepositRouteV1( + AppConfigs.SquidVersion.V2WithdrawalOnly -> retrieveDepositRouteV1( state, ) @@ -273,7 +273,7 @@ internal fun V4StateManagerAdaptor.retrieveWithdrawalRoute( val isCctp = cctpChainIds?.any { it.isCctpEnabled(state?.input?.transfer) } ?: false val isExchange = state?.input?.transfer?.exchange != null when (appConfigs.squidVersion) { - AppConfigs.SquidVersion.V1, AppConfigs.SquidVersion.V2DepositOnly -> retrieveWithdrawalRouteV1( + AppConfigs.SquidVersion.V2DepositOnly -> retrieveWithdrawalRouteV1( state, decimals, gas, diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/V4StateManagerAdaptor.kt b/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/V4StateManagerAdaptor.kt index 38db5c706..9841162fe 100644 --- a/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/V4StateManagerAdaptor.kt +++ b/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/V4StateManagerAdaptor.kt @@ -27,8 +27,6 @@ import exchange.dydx.abacus.state.model.onChainRewardTokenPrice import exchange.dydx.abacus.state.model.onChainRewardsParams import exchange.dydx.abacus.state.model.onChainUserFeeTier import exchange.dydx.abacus.state.model.onChainUserStats -import exchange.dydx.abacus.state.model.squidChains -import exchange.dydx.abacus.state.model.squidTokens import exchange.dydx.abacus.state.model.squidV2SdkInfo import exchange.dydx.abacus.state.model.updateHeight import exchange.dydx.abacus.utils.CoroutineTimer @@ -294,20 +292,8 @@ class V4StateManagerAdaptor( override fun didSetReadyToConnect(readyToConnect: Boolean) { super.didSetReadyToConnect(readyToConnect) if (readyToConnect) { - when (appConfigs.squidVersion) { - AppConfigs.SquidVersion.V1 -> { - retrieveTransferChains() - retrieveTransferTokens() - } - - AppConfigs.SquidVersion.V2, - AppConfigs.SquidVersion.V2DepositOnly, - AppConfigs.SquidVersion.V2WithdrawalOnly -> { - retrieveTransferAssets() - retrieveCctpChainIds() - } - } - + retrieveTransferAssets() + retrieveCctpChainIds() retrieveDepositExchanges() bestEffortConnectChain() retrieveLaunchIncentiveSeasons() @@ -734,20 +720,6 @@ class V4StateManagerAdaptor( } } - private fun retrieveTransferChains() { - val oldState = stateMachine.state - val url = configs.squidChains() - val squidIntegratorId = environment.squidIntegratorId - if (url != null && squidIntegratorId != null) { - val header = iMapOf("x-integrator-id" to squidIntegratorId) - get(url, null, header) { _, response, httpCode, _ -> - if (success(httpCode) && response != null) { - update(stateMachine.squidChains(response), oldState) - } - } - } - } - private fun retrieveTransferAssets() { val oldState = stateMachine.state val url = configs.squidV2Assets() @@ -762,20 +734,6 @@ class V4StateManagerAdaptor( } } - private fun retrieveTransferTokens() { - val oldState = stateMachine.state - val url = configs.squidToken() - val squidIntegratorId = environment.squidIntegratorId - if (url != null && squidIntegratorId != null) { - val header = iMapOf("x-integrator-id" to squidIntegratorId) - get(url, null, header) { _, response, httpCode, _ -> - if (success(httpCode) && response != null) { - update(stateMachine.squidTokens(response), oldState) - } - } - } - } - private fun parseHeight(response: String) { val json = parser.decodeJsonObject(response) if (json != null && json["error"] != null) { diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/utils/Settings.kt b/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/utils/Settings.kt index 1744f02c9..8eed0e3ba 100644 --- a/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/utils/Settings.kt +++ b/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/utils/Settings.kt @@ -10,12 +10,11 @@ class AppConfigs( var enableLogger: Boolean = false, ) { enum class SquidVersion { - V1, V2, V2DepositOnly, V2WithdrawalOnly, } - var squidVersion: SquidVersion = SquidVersion.V1 + var squidVersion: SquidVersion = SquidVersion.V2 companion object { val forApp = AppConfigs(subscribeToCandles = true, loadRemote = true) diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/state/v2/supervisor/Configs.kt b/src/commonMain/kotlin/exchange.dydx.abacus/state/v2/supervisor/Configs.kt index e1317f371..7fdabee38 100644 --- a/src/commonMain/kotlin/exchange.dydx.abacus/state/v2/supervisor/Configs.kt +++ b/src/commonMain/kotlin/exchange.dydx.abacus/state/v2/supervisor/Configs.kt @@ -164,13 +164,12 @@ data class OnboardingConfigs( val retrieveSquidRoutes: Boolean, ) { enum class SquidVersion { - V1, V2, V2DepositOnly, V2WithdrawalOnly, } - var squidVersion: SquidVersion = SquidVersion.V1 + var squidVersion: SquidVersion = SquidVersion.V2 companion object { val forApp = OnboardingConfigs( diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/state/v2/supervisor/OnboardingSupervisor.kt b/src/commonMain/kotlin/exchange.dydx.abacus/state/v2/supervisor/OnboardingSupervisor.kt index 1ba83abd1..8fc8caf1b 100644 --- a/src/commonMain/kotlin/exchange.dydx.abacus/state/v2/supervisor/OnboardingSupervisor.kt +++ b/src/commonMain/kotlin/exchange.dydx.abacus/state/v2/supervisor/OnboardingSupervisor.kt @@ -24,11 +24,9 @@ import exchange.dydx.abacus.state.manager.HumanReadableWithdrawPayload import exchange.dydx.abacus.state.manager.pendingCctpWithdraw import exchange.dydx.abacus.state.model.TradingStateMachine import exchange.dydx.abacus.state.model.TransferInputField -import exchange.dydx.abacus.state.model.squidChains import exchange.dydx.abacus.state.model.squidRoute import exchange.dydx.abacus.state.model.squidRouteV2 import exchange.dydx.abacus.state.model.squidStatus -import exchange.dydx.abacus.state.model.squidTokens import exchange.dydx.abacus.state.model.squidV2SdkInfo import exchange.dydx.abacus.state.model.transfer import exchange.dydx.abacus.utils.AnalyticsUtils @@ -67,33 +65,8 @@ internal class OnboardingSupervisor( } private fun retrieveSquidRoutes() { - when (configs.squidVersion) { - OnboardingConfigs.SquidVersion.V1 -> { - retrieveTransferChains() - retrieveTransferTokens() - } - - OnboardingConfigs.SquidVersion.V2, - OnboardingConfigs.SquidVersion.V2DepositOnly, - OnboardingConfigs.SquidVersion.V2WithdrawalOnly -> { - retrieveTransferAssets() - retrieveCctpChainIds() - } - } - } - - private fun retrieveTransferChains() { - val oldState = stateMachine.state - val url = helper.configs.squidChains() - val squidIntegratorId = helper.environment.squidIntegratorId - if (url != null && squidIntegratorId != null) { - val header = iMapOf("x-integrator-id" to squidIntegratorId) - helper.get(url, null, header) { _, response, httpCode, _ -> - if (helper.success(httpCode) && response != null) { - update(stateMachine.squidChains(response), oldState) - } - } - } + retrieveTransferAssets() + retrieveCctpChainIds() } private fun retrieveTransferAssets() { @@ -110,20 +83,6 @@ internal class OnboardingSupervisor( } } - private fun retrieveTransferTokens() { - val oldState = stateMachine.state - val url = helper.configs.squidToken() - val squidIntegratorId = helper.environment.squidIntegratorId - if (url != null && squidIntegratorId != null) { - val header = iMapOf("x-integrator-id" to squidIntegratorId) - helper.get(url, null, header) { _, response, httpCode, _ -> - if (helper.success(httpCode) && response != null) { - update(stateMachine.squidTokens(response), oldState) - } - } - } - } - private fun retrieveCctpChainIds() { val url = "${helper.deploymentUri}/configs/cctp.json" helper.get(url) { _, response, _, _ -> @@ -176,7 +135,7 @@ internal class OnboardingSupervisor( ) { val isCctp = state?.input?.transfer?.isCctp ?: false when (configs.squidVersion) { - OnboardingConfigs.SquidVersion.V1, OnboardingConfigs.SquidVersion.V2WithdrawalOnly -> retrieveDepositRouteV1( + OnboardingConfigs.SquidVersion.V2WithdrawalOnly -> retrieveDepositRouteV1( state, accountAddress, sourceAddress, @@ -530,7 +489,7 @@ internal class OnboardingSupervisor( CctpConfig.cctpChainIds?.any { it.isCctpEnabled(state?.input?.transfer) } ?: false val isExchange = state?.input?.transfer?.exchange != null when (configs.squidVersion) { - OnboardingConfigs.SquidVersion.V1, OnboardingConfigs.SquidVersion.V2DepositOnly -> retrieveWithdrawalRouteV1( + OnboardingConfigs.SquidVersion.V2DepositOnly -> retrieveWithdrawalRouteV1( state, decimals, gas, diff --git a/src/commonTest/kotlin/exchange.dydx.abacus/app/manager/V4ForegroundCycleTests.kt b/src/commonTest/kotlin/exchange.dydx.abacus/app/manager/V4ForegroundCycleTests.kt index 329cfa37a..c01fa1639 100644 --- a/src/commonTest/kotlin/exchange.dydx.abacus/app/manager/V4ForegroundCycleTests.kt +++ b/src/commonTest/kotlin/exchange.dydx.abacus/app/manager/V4ForegroundCycleTests.kt @@ -86,8 +86,8 @@ class V4ForegroundCycleTests : NetworkTests() { "https://indexer.v4staging.dydx.exchange/v4/time", "https://api.examples.com/configs/markets.json", "https://api.dydx.exchange/v4/geo", - "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/chains", - "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/tokens", + "https://testnet.v2.api.squidrouter.com/v2/sdk-info", + "https://api.examples.com/configs/cctp.json", "https://api.examples.com/configs/exchanges.json", "https://indexer.v4staging.dydx.exchange/v4/height", "https://dydx.exchange/v4-launch-incentive/query/ccar-perpetuals" @@ -169,8 +169,8 @@ class V4ForegroundCycleTests : NetworkTests() { "https://indexer.v4staging.dydx.exchange/v4/time", "https://api.examples.com/configs/markets.json", "https://api.dydx.exchange/v4/geo", - "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/chains", - "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/tokens", + "https://testnet.v2.api.squidrouter.com/v2/sdk-info", + "https://api.examples.com/configs/cctp.json", "https://api.examples.com/configs/exchanges.json", "https://indexer.v4staging.dydx.exchange/v4/height", "https://dydx.exchange/v4-launch-incentive/query/ccar-perpetuals", @@ -221,8 +221,8 @@ class V4ForegroundCycleTests : NetworkTests() { "https://indexer.v4staging.dydx.exchange/v4/time", "https://api.examples.com/configs/markets.json", "https://api.dydx.exchange/v4/geo", - "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/chains", - "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/tokens", + "https://testnet.v2.api.squidrouter.com/v2/sdk-info", + "https://api.examples.com/configs/cctp.json", "https://api.examples.com/configs/exchanges.json", "https://indexer.v4staging.dydx.exchange/v4/height", "https://dydx.exchange/v4-launch-incentive/query/ccar-perpetuals", @@ -261,8 +261,8 @@ class V4ForegroundCycleTests : NetworkTests() { "https://indexer.v4staging.dydx.exchange/v4/time", "https://api.examples.com/configs/markets.json", "https://api.dydx.exchange/v4/geo", - "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/chains", - "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/tokens", + "https://testnet.v2.api.squidrouter.com/v2/sdk-info", + "https://api.examples.com/configs/cctp.json", "https://api.examples.com/configs/exchanges.json", "https://indexer.v4staging.dydx.exchange/v4/height", "https://dydx.exchange/v4-launch-incentive/query/ccar-perpetuals", @@ -325,8 +325,8 @@ class V4ForegroundCycleTests : NetworkTests() { "https://indexer.v4staging.dydx.exchange/v4/time", "https://api.examples.com/configs/markets.json", "https://api.dydx.exchange/v4/geo", - "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/chains", - "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/tokens", + "https://testnet.v2.api.squidrouter.com/v2/sdk-info", + "https://api.examples.com/configs/cctp.json", "https://api.examples.com/configs/exchanges.json", "https://indexer.v4staging.dydx.exchange/v4/height", "https://dydx.exchange/v4-launch-incentive/query/ccar-perpetuals", @@ -378,8 +378,8 @@ class V4ForegroundCycleTests : NetworkTests() { "https://indexer.v4staging.dydx.exchange/v4/time", "https://api.examples.com/configs/markets.json", "https://api.dydx.exchange/v4/geo", - "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/chains", - "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/tokens", + "https://testnet.v2.api.squidrouter.com/v2/sdk-info", + "https://api.examples.com/configs/cctp.json", "https://api.examples.com/configs/exchanges.json", "https://indexer.v4staging.dydx.exchange/v4/height", "https://dydx.exchange/v4-launch-incentive/query/ccar-perpetuals", @@ -461,8 +461,8 @@ class V4ForegroundCycleTests : NetworkTests() { "https://indexer.v4staging.dydx.exchange/v4/time", "https://api.examples.com/configs/markets.json", "https://api.dydx.exchange/v4/geo", - "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/chains", - "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/tokens", + "https://testnet.v2.api.squidrouter.com/v2/sdk-info", + "https://api.examples.com/configs/cctp.json", "https://api.examples.com/configs/exchanges.json", "https://indexer.v4staging.dydx.exchange/v4/height", "https://dydx.exchange/v4-launch-incentive/query/ccar-perpetuals", @@ -509,8 +509,8 @@ class V4ForegroundCycleTests : NetworkTests() { "https://indexer.v4staging.dydx.exchange/v4/time", "https://api.examples.com/configs/markets.json", "https://api.dydx.exchange/v4/geo", - "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/chains", - "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/tokens", + "https://testnet.v2.api.squidrouter.com/v2/sdk-info", + "https://api.examples.com/configs/cctp.json", "https://api.examples.com/configs/exchanges.json", "https://indexer.v4staging.dydx.exchange/v4/height", "https://dydx.exchange/v4-launch-incentive/query/ccar-perpetuals", @@ -590,8 +590,8 @@ class V4ForegroundCycleTests : NetworkTests() { "https://indexer.v4staging.dydx.exchange/v4/time", "https://api.examples.com/configs/markets.json", "https://api.dydx.exchange/v4/geo", - "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/chains", - "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/tokens", + "https://testnet.v2.api.squidrouter.com/v2/sdk-info", + "https://api.examples.com/configs/cctp.json", "https://api.examples.com/configs/exchanges.json", "https://indexer.v4staging.dydx.exchange/v4/height", "https://dydx.exchange/v4-launch-incentive/query/ccar-perpetuals", diff --git a/src/commonTest/kotlin/exchange.dydx.abacus/app/manager/v2/V4ForegroundCycleTests.kt b/src/commonTest/kotlin/exchange.dydx.abacus/app/manager/v2/V4ForegroundCycleTests.kt index ea722cc71..19ca16e76 100644 --- a/src/commonTest/kotlin/exchange.dydx.abacus/app/manager/v2/V4ForegroundCycleTests.kt +++ b/src/commonTest/kotlin/exchange.dydx.abacus/app/manager/v2/V4ForegroundCycleTests.kt @@ -103,8 +103,8 @@ class V4ForegroundCycleTests : NetworkTests() { // "https://api.examples.com/configs/documentation.json", // "https://indexer.v4staging.dydx.exchange/v4/time", // "https://api.examples.com/configs/markets.json", -// "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/chains", -// "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/tokens", +// "https://testnet.v2.api.squidrouter.com/v2/sdk-info", +// "https://api.examples.com/configs/cctp.json", // "https://api.examples.com/configs/exchanges.json", // "https://indexer.v4staging.dydx.exchange/v4/height", // "https://dydx.exchange/v4-launch-incentive/query/ccar-perpetuals" @@ -117,8 +117,8 @@ class V4ForegroundCycleTests : NetworkTests() { "https://indexer.v4staging.dydx.exchange/v4/height", "https://api.examples.com/configs/markets.json", "https://dydx.exchange/v4-launch-incentive/query/ccar-perpetuals", - "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/chains", - "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/tokens", + "https://testnet.v2.api.squidrouter.com/v2/sdk-info", + "https://api.examples.com/configs/cctp.json", "https://api.examples.com/configs/exchanges.json", "https://api.dydx.exchange/v4/geo" ] @@ -193,21 +193,6 @@ class V4ForegroundCycleTests : NetworkTests() { ) compareExpectedRequests( -// """ -// [ -// "https://api.examples.com/configs/documentation.json", -// "https://indexer.v4staging.dydx.exchange/v4/time", -// "https://api.examples.com/configs/markets.json", -// "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/chains", -// "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/tokens", -// "https://api.examples.com/configs/exchanges.json", -// "https://indexer.v4staging.dydx.exchange/v4/height", -// "https://dydx.exchange/v4-launch-incentive/query/ccar-perpetuals", -// "https://indexer.v4staging.dydx.exchange/v4/sparklines?timePeriod=ONE_DAY", -// "https://indexer.v4staging.dydx.exchange/v4/historicalFunding/ETH-USD", -// "https://indexer.v4staging.dydx.exchange/v4/candles/perpetualMarkets/ETH-USD?resolution=1DAY" -// ] -// """.trimIndent(), """ [ "https://api.examples.com/configs/documentation.json", @@ -215,8 +200,8 @@ class V4ForegroundCycleTests : NetworkTests() { "https://indexer.v4staging.dydx.exchange/v4/height", "https://api.examples.com/configs/markets.json", "https://dydx.exchange/v4-launch-incentive/query/ccar-perpetuals", - "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/chains", - "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/tokens", + "https://testnet.v2.api.squidrouter.com/v2/sdk-info", + "https://api.examples.com/configs/cctp.json", "https://api.examples.com/configs/exchanges.json", "https://api.dydx.exchange/v4/geo", "https://indexer.v4staging.dydx.exchange/v4/sparklines?timePeriod=ONE_DAY", @@ -265,8 +250,8 @@ class V4ForegroundCycleTests : NetworkTests() { // "https://api.examples.com/configs/documentation.json", // "https://indexer.v4staging.dydx.exchange/v4/time", // "https://api.examples.com/configs/markets.json", -// "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/chains", -// "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/tokens", +// "https://testnet.v2.api.squidrouter.com/v2/sdk-info", +// "https://api.examples.com/configs/cctp.json", // "https://api.examples.com/configs/exchanges.json", // "https://indexer.v4staging.dydx.exchange/v4/height", // "https://dydx.exchange/v4-launch-incentive/query/ccar-perpetuals", @@ -285,8 +270,8 @@ class V4ForegroundCycleTests : NetworkTests() { "https://indexer.v4staging.dydx.exchange/v4/height", "https://api.examples.com/configs/markets.json", "https://dydx.exchange/v4-launch-incentive/query/ccar-perpetuals", - "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/chains", - "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/tokens", + "https://testnet.v2.api.squidrouter.com/v2/sdk-info", + "https://api.examples.com/configs/cctp.json", "https://api.examples.com/configs/exchanges.json", "https://api.dydx.exchange/v4/geo", "https://indexer.v4staging.dydx.exchange/v4/sparklines?timePeriod=ONE_DAY", @@ -323,8 +308,8 @@ class V4ForegroundCycleTests : NetworkTests() { // "https://api.examples.com/configs/documentation.json", // "https://indexer.v4staging.dydx.exchange/v4/time", // "https://api.examples.com/configs/markets.json", -// "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/chains", -// "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/tokens", +// "https://testnet.v2.api.squidrouter.com/v2/sdk-info", +// "https://api.examples.com/configs/cctp.json", // "https://api.examples.com/configs/exchanges.json", // "https://indexer.v4staging.dydx.exchange/v4/height", // "https://dydx.exchange/v4-launch-incentive/query/ccar-perpetuals", @@ -340,8 +325,8 @@ class V4ForegroundCycleTests : NetworkTests() { "https://indexer.v4staging.dydx.exchange/v4/height", "https://api.examples.com/configs/markets.json", "https://dydx.exchange/v4-launch-incentive/query/ccar-perpetuals", - "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/chains", - "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/tokens", + "https://testnet.v2.api.squidrouter.com/v2/sdk-info", + "https://api.examples.com/configs/cctp.json", "https://api.examples.com/configs/exchanges.json", "https://api.dydx.exchange/v4/geo", "https://indexer.v4staging.dydx.exchange/v4/sparklines?timePeriod=ONE_DAY", @@ -404,8 +389,8 @@ class V4ForegroundCycleTests : NetworkTests() { "https://indexer.v4staging.dydx.exchange/v4/height", "https://api.examples.com/configs/markets.json", "https://dydx.exchange/v4-launch-incentive/query/ccar-perpetuals", - "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/chains", - "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/tokens", + "https://testnet.v2.api.squidrouter.com/v2/sdk-info", + "https://api.examples.com/configs/cctp.json", "https://api.examples.com/configs/exchanges.json", "https://api.dydx.exchange/v4/geo", "https://indexer.v4staging.dydx.exchange/v4/screen?address=0xsecondaryFakeAddress", @@ -457,8 +442,8 @@ class V4ForegroundCycleTests : NetworkTests() { "https://indexer.v4staging.dydx.exchange/v4/height", "https://api.examples.com/configs/markets.json", "https://dydx.exchange/v4-launch-incentive/query/ccar-perpetuals", - "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/chains", - "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/tokens", + "https://testnet.v2.api.squidrouter.com/v2/sdk-info", + "https://api.examples.com/configs/cctp.json", "https://api.examples.com/configs/exchanges.json", "https://api.dydx.exchange/v4/geo", "https://indexer.v4staging.dydx.exchange/v4/screen?address=cosmos1fq8q55896ljfjj7v3x0qd0z3sr78wmes940uhm", @@ -566,8 +551,8 @@ class V4ForegroundCycleTests : NetworkTests() { "https://indexer.v4staging.dydx.exchange/v4/height", "https://api.examples.com/configs/markets.json", "https://dydx.exchange/v4-launch-incentive/query/ccar-perpetuals", - "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/chains", - "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/tokens", + "https://testnet.v2.api.squidrouter.com/v2/sdk-info", + "https://api.examples.com/configs/cctp.json", "https://api.examples.com/configs/exchanges.json", "https://api.dydx.exchange/v4/geo", "https://indexer.v4staging.dydx.exchange/v4/screen?address=cosmos1fq8q55896ljfjj7v3x0qd0z3sr78wmes940uhm", @@ -614,8 +599,8 @@ class V4ForegroundCycleTests : NetworkTests() { "https://indexer.v4staging.dydx.exchange/v4/height", "https://api.examples.com/configs/markets.json", "https://dydx.exchange/v4-launch-incentive/query/ccar-perpetuals", - "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/chains", - "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/tokens", + "https://testnet.v2.api.squidrouter.com/v2/sdk-info", + "https://api.examples.com/configs/cctp.json", "https://api.examples.com/configs/exchanges.json", "https://api.dydx.exchange/v4/geo", "https://indexer.v4staging.dydx.exchange/v4/screen?address=cosmos1fq8q55896ljfjj7v3x0qd0z3sr78wmes940uhm", @@ -695,8 +680,8 @@ class V4ForegroundCycleTests : NetworkTests() { "https://indexer.v4staging.dydx.exchange/v4/height", "https://api.examples.com/configs/markets.json", "https://dydx.exchange/v4-launch-incentive/query/ccar-perpetuals", - "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/chains", - "https://squid-api-git-main-cosmos-testnet-0xsquid.vercel.app/v1/tokens", + "https://testnet.v2.api.squidrouter.com/v2/sdk-info", + "https://api.examples.com/configs/cctp.json", "https://api.examples.com/configs/exchanges.json", "https://api.dydx.exchange/v4/geo", "https://indexer.v4staging.dydx.exchange/v4/screen?address=cosmos1fq8q55896ljfjj7v3x0qd0z3sr78wmes940uhm",