From 905bf90139a371249fa924918b3521eb75a7a16f Mon Sep 17 00:00:00 2001
From: Jeremy Lee <37092291+yogurtandjam@users.noreply.github.com>
Date: Thu, 12 Sep 2024 15:36:41 -0400
Subject: [PATCH] chore: remove evm swaps ff [OTE-801] (#648)

---
 build.gradle.kts                                  |  2 +-
 .../state/manager/Environment.kt                  |  1 -
 .../state/v2/supervisor/OnboardingSupervisor.kt   | 15 ++-------------
 .../processor/router/skip/SkipProcessorTests.kt   |  2 --
 v4_abacus.podspec                                 |  2 +-
 5 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 8ac8883fa..e95a6ab7a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -52,7 +52,7 @@ allprojects {
 }
 
 group = "exchange.dydx.abacus"
-version = "1.11.1"
+version = "1.11.2"
 
 repositories {
     google()
diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/Environment.kt b/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/Environment.kt
index 258c16c65..626daa8ca 100644
--- a/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/Environment.kt
+++ b/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/Environment.kt
@@ -547,7 +547,6 @@ class V4Environment(
 @JsExport
 @Suppress("PropertyName")
 data object StatsigConfig {
-    var ff_enable_evm_swaps: Boolean = true
     var dc_max_safe_bridge_fees: Float = Float.POSITIVE_INFINITY
     var ff_enable_limit_close: Boolean = false
 }
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 35d89d275..50a2468d6 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
@@ -25,7 +25,6 @@ import exchange.dydx.abacus.state.manager.HumanReadableTransferPayload
 import exchange.dydx.abacus.state.manager.HumanReadableWithdrawPayload
 import exchange.dydx.abacus.state.manager.Platform
 import exchange.dydx.abacus.state.manager.RpcConfigs
-import exchange.dydx.abacus.state.manager.StatsigConfig
 import exchange.dydx.abacus.state.manager.SystemUtils
 import exchange.dydx.abacus.state.manager.pendingCctpWithdraw
 import exchange.dydx.abacus.state.model.TradingStateMachine
@@ -114,9 +113,7 @@ internal class OnboardingSupervisor(
             retrieveSkipTransferChains()
         }
         retrieveSkipTransferTokens()
-        if (StatsigConfig.ff_enable_evm_swaps) {
-            retrieveSkipEvmSwapVenues()
-        }
+        retrieveSkipEvmSwapVenues()
         retrieveCctpChainIds()
     }
 
@@ -272,7 +269,7 @@ internal class OnboardingSupervisor(
         )
         val evmSwapVenues = stateMachine.internalState.input.transfer.evmSwapVenues
         val swapVenues = evmSwapVenues + nonEvmSwapVenues
-        val evmSwapEnabledOptions = mapOf(
+        val options = mapOf(
             "bridges" to listOf(
                 IBC_BRIDGE_ID,
                 AXELAR_BRIDGE_ID,
@@ -281,14 +278,6 @@ internal class OnboardingSupervisor(
             "smart_swap_options" to SMART_SWAP_OPTIONS,
             "swap_venues" to swapVenues,
         )
-        val evmSwapDisabledOptions = mapOf(
-            "bridges" to listOf(
-                IBC_BRIDGE_ID,
-                AXELAR_BRIDGE_ID,
-            ),
-            "swap_venues" to nonEvmSwapVenues,
-        )
-        val options = if (StatsigConfig.ff_enable_evm_swaps) evmSwapEnabledOptions else evmSwapDisabledOptions
         if (fromAmount != null && fromAmount > 0) {
             val body: Map<String, Any> = mapOf(
                 "amount_in" to fromAmountString,
diff --git a/src/commonTest/kotlin/exchange.dydx.abacus/processor/router/skip/SkipProcessorTests.kt b/src/commonTest/kotlin/exchange.dydx.abacus/processor/router/skip/SkipProcessorTests.kt
index 9dc828076..2c55ac4b2 100644
--- a/src/commonTest/kotlin/exchange.dydx.abacus/processor/router/skip/SkipProcessorTests.kt
+++ b/src/commonTest/kotlin/exchange.dydx.abacus/processor/router/skip/SkipProcessorTests.kt
@@ -5,7 +5,6 @@ import exchange.dydx.abacus.output.input.TransferInputChainResource
 import exchange.dydx.abacus.output.input.TransferInputTokenResource
 import exchange.dydx.abacus.state.internalstate.InternalTransferInputState
 import exchange.dydx.abacus.state.manager.RpcConfigs
-import exchange.dydx.abacus.state.manager.StatsigConfig
 import exchange.dydx.abacus.tests.payloads.RpcMock
 import exchange.dydx.abacus.tests.payloads.SkipChainsMock
 import exchange.dydx.abacus.tests.payloads.SkipRouteMock
@@ -421,7 +420,6 @@ class SkipProcessorTests {
 
     @Test
     fun receivedEvmSwapVenuesEvmSwaps() {
-        StatsigConfig.ff_enable_evm_swaps = true
         skipProcessor.receivedEvmSwapVenues(
             existing = mapOf(),
             payload = templateToMap(SkipVenuesMock.venues),
diff --git a/v4_abacus.podspec b/v4_abacus.podspec
index 89e27a464..decd99549 100644
--- a/v4_abacus.podspec
+++ b/v4_abacus.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'v4_abacus'
-    spec.version                  = '1.11.1'
+    spec.version                  = '1.11.2'
     spec.homepage                 = 'https://github.com/dydxprotocol/v4-abacus'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''