TRCL-3695 Add configs for notification provider types

build.gradle.kts

@@ -52,7 +52,7 @@ allprojects {
 }
 
 group = "exchange.dydx.abacus"
-version = "1.11.7"
+version = "1.11.8"
 
 repositories {
     google()

src/commonMain/kotlin/exchange.dydx.abacus/state/manager/notification/NotificationsProvider.kt

@@ -6,51 +6,77 @@ import exchange.dydx.abacus.state.manager.V4Environment
 import exchange.dydx.abacus.state.manager.notification.providers.BlockRewardNotificationProvider
 import exchange.dydx.abacus.state.manager.notification.providers.OrderStatusChangesNotificationProvider
 import exchange.dydx.abacus.state.model.TradingStateMachine
+import exchange.dydx.abacus.state.v2.supervisor.NotificationProviderType
 import exchange.dydx.abacus.utils.IMap
 import exchange.dydx.abacus.utils.JsonEncoder
 import exchange.dydx.abacus.utils.ParsingHelper
 import exchange.dydx.abacus.utils.UIImplementations
 import kollections.toIMap
 
-interface NotificationsProviderProtocol {
+internal interface NotificationsProviderProtocol {
     fun buildNotifications(
         subaccountNumber: Int
     ): IMap<String, Notification>
 }
 
-class NotificationsProvider(
+internal class NotificationsProvider(
     private val stateMachine: TradingStateMachine,
     private val uiImplementations: UIImplementations,
     private val environment: V4Environment,
     private val parser: ParserProtocol,
     private val jsonEncoder: JsonEncoder,
     private val useParentSubaccount: Boolean = false,
-    private val providers: List<NotificationsProviderProtocol> = listOf(
-        BlockRewardNotificationProvider(
-            stateMachine,
-            uiImplementations,
-            environment,
-            jsonEncoder,
-        ),
-        FillsNotificationProvider(
-            stateMachine,
-            uiImplementations,
-            parser,
-            jsonEncoder,
-        ),
-        PositionsNotificationProvider(
-            stateMachine,
-            uiImplementations,
-            parser,
-            jsonEncoder,
-            useParentSubaccount,
-        ),
-        OrderStatusChangesNotificationProvider(
-            stateMachine,
-            uiImplementations,
-            parser,
-            jsonEncoder,
-        ),
+    val notifications: List<NotificationProviderType> = listOf(
+        NotificationProviderType.BlackReward,
+        NotificationProviderType.Fills,
+        NotificationProviderType.Positions,
+        NotificationProviderType.OrderStatusChange,
+    ),
+    private val providers: List<NotificationsProviderProtocol> = listOfNotNull(
+        if (notifications.contains(NotificationProviderType.BlackReward)) {
+            BlockRewardNotificationProvider(
+                stateMachine,
+                uiImplementations,
+                environment,
+                jsonEncoder,
+            )
+        } else {
+            null
+        },
+
+        if (notifications.contains(NotificationProviderType.Fills)) {
+            FillsNotificationProvider(
+                stateMachine,
+                uiImplementations,
+                parser,
+                jsonEncoder,
+            )
+        } else {
+            null
+        },
+
+        if (notifications.contains(NotificationProviderType.Positions)) {
+            PositionsNotificationProvider(
+                stateMachine,
+                uiImplementations,
+                parser,
+                jsonEncoder,
+                useParentSubaccount,
+            )
+        } else {
+            null
+        },
+
+        if (notifications.contains(NotificationProviderType.OrderStatusChange)) {
+            OrderStatusChangesNotificationProvider(
+                stateMachine,
+                uiImplementations,
+                parser,
+                jsonEncoder,
+            )
+        } else {
+            null
+        },
     ),
 ) : NotificationsProviderProtocol {
 

src/commonMain/kotlin/exchange.dydx.abacus/state/manager/notification/providers/FillsNotificationProvider.kt

@@ -134,15 +134,15 @@ class FillsNotificationProvider(
 
         val notificationId = "order:$orderId"
         return Notification(
-            notificationId,
-            NotificationType.INFO,
-            NotificationPriority.NORMAL,
-            marketImageUrl,
-            title,
-            text,
-            "/orders/$orderId",
-            paramsAsJson,
-            fill.createdAtMilliseconds,
+            id = notificationId,
+            type = NotificationType.INFO,
+            priority = NotificationPriority.NORMAL,
+            image = marketImageUrl,
+            title = title,
+            text = text,
+            link = "/orders/$orderId",
+            data = paramsAsJson,
+            updateTimeInMilliseconds = fill.createdAtMilliseconds,
         )
     }
 

src/commonMain/kotlin/exchange.dydx.abacus/state/manager/notification/providers/PositionsNotificationProvider.kt

@@ -117,15 +117,15 @@ class PositionsNotificationProvider(
 
                         val notificationId = "position:$marketId"
                         notifications[notificationId] = Notification(
-                            notificationId,
-                            NotificationType.INFO,
-                            NotificationPriority.NORMAL,
-                            marketImageUrl,
-                            title,
-                            text,
-                            null,
-                            paramsAsJson,
-                            closedAt.toEpochMilliseconds().toDouble(),
+                            id = notificationId,
+                            type = NotificationType.INFO,
+                            priority = NotificationPriority.NORMAL,
+                            image = marketImageUrl,
+                            title = title,
+                            text = text,
+                            link = null,
+                            data = paramsAsJson,
+                            updateTimeInMilliseconds = closedAt.toEpochMilliseconds().toDouble(),
                         )
                     }
                 }

src/commonMain/kotlin/exchange.dydx.abacus/state/v2/supervisor/Configs.kt

@@ -79,19 +79,20 @@ data class MarketsConfigs(
     }
 }
 
-enum class SubaccountSubscriptionType {
-    SUBACCOUNT,
-    PARENT_SUBACCOUNT,
-    NONE,
-}
-
 @JsExport
 data class SubaccountConfigs(
     val retrieveFills: Boolean,
     val retrieveTransfers: Boolean,
     val retrieveHistoricalPnls: Boolean,
     val subscribeToSubaccount: Boolean,
     val useParentSubaccount: Boolean,
+    var notifications: List<NotificationProviderType> =
+        listOf(
+            NotificationProviderType.BlackReward,
+            NotificationProviderType.Fills,
+            NotificationProviderType.OrderStatusChange,
+            NotificationProviderType.Positions,
+        ),
 ) {
     companion object {
         val forApp = SubaccountConfigs(
@@ -173,7 +174,6 @@ data class OnboardingConfigs(
         V2WithdrawalOnly,
     }
 
-    var squidVersion: SquidVersion = SquidVersion.V2
     var alchemyApiKey: String? = null
 
     companion object {
@@ -186,6 +186,14 @@ data class OnboardingConfigs(
     }
 }
 
+@JsExport
+enum class NotificationProviderType {
+    BlackReward,
+    Fills,
+    OrderStatusChange,
+    Positions
+}
+
 @JsExport
 data class AppConfigsV2(
     val systemConfigs: SystemConfigs,

src/commonMain/kotlin/exchange.dydx.abacus/state/v2/supervisor/SubaccountSupervisor.kt

@@ -111,12 +111,13 @@ internal class SubaccountSupervisor(
         }
 
     private val notificationsProvider = NotificationsProvider(
-        stateMachine,
-        helper.uiImplementations,
-        helper.environment,
-        helper.parser,
-        helper.jsonEncoder,
-        configs.useParentSubaccount,
+        stateMachine = stateMachine,
+        uiImplementations = helper.uiImplementations,
+        environment = helper.environment,
+        parser = helper.parser,
+        jsonEncoder = helper.jsonEncoder,
+        useParentSubaccount = configs.useParentSubaccount,
+        notifications = configs.notifications,
     )
 
     internal var notifications: IMap<String, Notification> = iMapOf()

src/commonMain/kotlin/exchange.dydx.abacus/state/v2/supervisor/account/PushNotificationRegistrationHandler.kt

@@ -42,7 +42,7 @@ internal class PushNotificationRegistrationHandler(
             if (helper.success(httpCode) && response != null) {
                 Logger.d { "Push notification token registered successfully" }
             } else {
-                Logger.e { "Push notification token registration failed" }
+                Logger.e { "Push notification token registration failed: $response" }
             }
         }
     }

v4_abacus.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'v4_abacus'
-    spec.version                  = '1.11.7'
+    spec.version                  = '1.11.8'
     spec.homepage                 = 'https://github.com/dydxprotocol/v4-abacus'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''