Apollo: Release source code for 53.1

android/CHANGELOG.md

@@ -6,6 +6,17 @@ follow [https://changelog.md/](https://changelog.md/) guidelines.
 
 ## [Unreleased]
 
+## [53.1] - 2025-02-21
+
+### ADDED
+
+- Revamped real time fees calculation
+- Background notification processing reliability improvements
+
+### FIXED
+
+- Non deterministic bug regarding hardened key derivation
+
 ## [52.7] - 2025-01-30
 
 ### ADDED

android/apollo/src/main/java/io/muun/apollo/data/di/DataModule.java

@@ -18,6 +18,7 @@
 import io.muun.apollo.data.os.execution.ExecutionTransformerFactory;
 import io.muun.apollo.data.os.execution.JobExecutor;
 import io.muun.apollo.data.preferences.RepositoryRegistry;
+import io.muun.apollo.data.preferences.UserRepository;
 import io.muun.apollo.domain.action.NotificationActions;
 import io.muun.apollo.domain.action.NotificationPoller;
 import io.muun.apollo.domain.libwallet.GoLibwalletService;
@@ -47,7 +48,7 @@ public class DataModule {
     private final Func3<
             Context,
             ExecutionTransformerFactory,
-            RepositoryRegistry,
+            UserRepository,
             NotificationService
             >
             notificationServiceFactory;
@@ -64,7 +65,7 @@ public DataModule(
             Func3<
                     Context,
                     ExecutionTransformerFactory,
-                    RepositoryRegistry,
+                    UserRepository,
                     NotificationService
                     > notificationServiceFactory,
             Func1<Context, AppStandbyBucketProvider> appStandbyBucketProviderFactory,
@@ -127,9 +128,13 @@ DaoManager provideDaoManager(
     NotificationService provideNotificationService(
             Context context,
             ExecutionTransformerFactory executionTransformerFactory,
-            RepositoryRegistry repoRegistry
+            UserRepository userRepository
     ) {
-        return notificationServiceFactory.call(context, executionTransformerFactory, repoRegistry);
+        return notificationServiceFactory.call(
+                context,
+                executionTransformerFactory,
+                userRepository
+        );
     }
 
     @Provides

android/apollo/src/main/java/io/muun/apollo/data/external/Gen.kt

@@ -4,6 +4,7 @@ import io.muun.apollo.data.preferences.stored.StoredEkVerificationCodes
 import io.muun.apollo.domain.model.BitcoinAmount
 import io.muun.apollo.domain.model.Contact
 import io.muun.apollo.domain.model.ExchangeRateWindow
+import io.muun.apollo.domain.model.FeeBumpFunctions
 import io.muun.apollo.domain.model.FeeWindow
 import io.muun.apollo.domain.model.ForwardingPolicy
 import io.muun.apollo.domain.model.IncomingSwap
@@ -273,9 +274,12 @@ object Gen {
      * Get a FeeBumpFunctions vector
      */
     fun feeBumpFunctions() =
-        listOf(
-            "QsgAAAAAAAAAAAAAf4AAAD+AAABAAAAA", // [[100, 0, 0], [+Inf, 1, 2]]
-            "f4AAAD+AAAAAAAAA"                  // [[+Inf, 1, 0]]]
+        FeeBumpFunctions(
+            "idTest",
+            listOf(
+                "QsgAAAAAAAAAAAAAf4AAAD+AAABAAAAA", // [[100, 0, 0], [+Inf, 1, 2]]
+                "f4AAAD+AAAAAAAAA"                  // [[+Inf, 1, 0]]]
+            )
         )
     /**
      * Get a Transaction Hash.

android/apollo/src/main/java/io/muun/apollo/data/net/ApiObjectsMapper.java

@@ -7,6 +7,7 @@
 import io.muun.apollo.data.os.GooglePlayServicesHelper;
 import io.muun.apollo.data.os.PackageManagerInfoProvider;
 import io.muun.apollo.data.serialization.dates.ApolloZonedDateTime;
+import io.muun.apollo.domain.libwallet.FeeBumpRefreshPolicy;
 import io.muun.apollo.domain.libwallet.Invoice;
 import io.muun.apollo.domain.model.BackgroundEvent;
 import io.muun.apollo.domain.model.BitcoinAmount;
@@ -44,9 +45,9 @@
 import io.muun.common.api.PhoneNumberJson;
 import io.muun.common.api.PublicKeyJson;
 import io.muun.common.api.PublicProfileJson;
+import io.muun.common.api.RealTimeFeesRequestJson;
 import io.muun.common.api.StartEmailSetupJson;
 import io.muun.common.api.SubmarineSwapRequestJson;
-import io.muun.common.api.UnconfirmedOutpointsJson;
 import io.muun.common.api.UserInvoiceJson;
 import io.muun.common.api.UserProfileJson;
 import io.muun.common.crypto.ChallengePublicKey;
@@ -232,7 +233,9 @@ public ClientJson mapClient(
             final long appSize,
             final List<String> hardwareAddresses,
             final String vbMeta,
-            final String efsCreationTimeInSeconds
+            final String efsCreationTimeInSeconds,
+            final Boolean isLowRamDevice,
+            final Long firstInstallTimeInMs
     ) {
         return new ClientJson(
                 ClientTypeJson.APOLLO,
@@ -278,7 +281,9 @@ public ClientJson mapClient(
                 appSize,
                 hardwareAddresses,
                 vbMeta,
-                efsCreationTimeInSeconds
+                efsCreationTimeInSeconds,
+                isLowRamDevice,
+                firstInstallTimeInMs
         );
     }
 
@@ -415,7 +420,9 @@ public CreateFirstSessionJson mapCreateFirstSession(
             final Long appSize,
             final List<String> hardwareAddresses,
             final String vbMeta,
-            final String efsCreationTimeInSeconds
+            final String efsCreationTimeInSeconds,
+            final Boolean isLowRamDevice,
+            final Long firstInstallTimeInMs
     ) {
 
         return new CreateFirstSessionJson(
@@ -442,7 +449,10 @@ public CreateFirstSessionJson mapCreateFirstSession(
                         appSize,
                         hardwareAddresses,
                         vbMeta,
-                        efsCreationTimeInSeconds
+                        efsCreationTimeInSeconds,
+                        isLowRamDevice,
+                        firstInstallTimeInMs
+
                 ),
                 gcmToken,
                 primaryCurrency,
@@ -479,7 +489,9 @@ public CreateLoginSessionJson mapCreateLoginSession(
             final Long appSize,
             final List<String> hardwareAddresses,
             final String vbMeta,
-            final String efsCreationTimeInSeconds
+            final String efsCreationTimeInSeconds,
+            final Boolean isLowRamDevice,
+            final Long firstInstallTimeInMs
     ) {
 
         return new CreateLoginSessionJson(
@@ -506,7 +518,9 @@ public CreateLoginSessionJson mapCreateLoginSession(
                         appSize,
                         hardwareAddresses,
                         vbMeta,
-                        efsCreationTimeInSeconds
+                        efsCreationTimeInSeconds,
+                        isLowRamDevice,
+                        firstInstallTimeInMs
                 ),
                 gcmToken,
                 email
@@ -541,7 +555,9 @@ public CreateRcLoginSessionJson mapCreateRcLoginSession(
             final Long appSize,
             final List<String> hardwareAddresses,
             final String vbMeta,
-            final String efsCreationTimeInSeconds
+            final String efsCreationTimeInSeconds,
+            final Boolean isLowRamDevice,
+            final Long firstInstallTimeInMs
     ) {
 
         return new CreateRcLoginSessionJson(
@@ -568,7 +584,9 @@ public CreateRcLoginSessionJson mapCreateRcLoginSession(
                         appSize,
                         hardwareAddresses,
                         vbMeta,
-                        efsCreationTimeInSeconds
+                        efsCreationTimeInSeconds,
+                        isLowRamDevice,
+                        firstInstallTimeInMs
                 ),
                 gcmToken,
                 new ChallengeKeyJson(
@@ -771,11 +789,12 @@ private ExportEmergencyKitJson.Method mapExportMethod(
     }
 
     /**
-     *  Creates a UnconfirmedOutpointsJson.
+     *  Creates a RealTimeFeesRequestJson.
      */
     @NotNull
-    public UnconfirmedOutpointsJson mapUnconfirmedOutpointsJson(
-            @NotNull List<SizeForAmount> sizeProgression
+    public RealTimeFeesRequestJson mapRealTimeFeesRequestJson(
+            @NotNull List<SizeForAmount> sizeProgression,
+            @NotNull FeeBumpRefreshPolicy feeBumpRefreshPolicy
     ) {
         final List<String> unconfirmedUtxos = new ArrayList<>();
 
@@ -784,7 +803,28 @@ public UnconfirmedOutpointsJson mapUnconfirmedOutpointsJson(
                 unconfirmedUtxos.add(sizeForAmount.outpoint);
             }
         }
+        ;
+        return new RealTimeFeesRequestJson(
+                unconfirmedUtxos,
+                mapFeeBumpRefreshPolicy(feeBumpRefreshPolicy)
+        );
+    }
 
-        return new UnconfirmedOutpointsJson(unconfirmedUtxos);
+    @NotNull
+    private RealTimeFeesRequestJson.FeeBumpRefreshPolicy mapFeeBumpRefreshPolicy(
+            @NotNull FeeBumpRefreshPolicy feeBumpRefreshPolicy
+    ) {
+        switch (feeBumpRefreshPolicy) {
+            case PERIODIC:
+                return RealTimeFeesRequestJson.FeeBumpRefreshPolicy.PERIODIC;
+            case FOREGROUND:
+                return RealTimeFeesRequestJson.FeeBumpRefreshPolicy.FOREGROUND;
+            case NTS_CHANGED:
+                return RealTimeFeesRequestJson.FeeBumpRefreshPolicy.CHANGED_NEXT_TRANSACTION_SIZE;
+            case NEW_OP_BLOCKINGLY:
+                return RealTimeFeesRequestJson.FeeBumpRefreshPolicy.NEW_OPERATION;
+            default:
+                throw new MissingCaseError(feeBumpRefreshPolicy);
+        }
     }
 }

android/apollo/src/main/java/io/muun/apollo/data/net/HoustonClient.java

@@ -2,6 +2,7 @@
 
 import io.muun.apollo.data.net.base.BaseClient;
 import io.muun.apollo.data.net.okio.ContentUriRequestBody;
+import io.muun.apollo.data.os.ActivityManagerInfoProvider;
 import io.muun.apollo.data.os.BuildInfoProvider;
 import io.muun.apollo.data.os.CpuInfoProvider;
 import io.muun.apollo.data.os.FileInfoProvider;
@@ -22,13 +23,15 @@
 import io.muun.apollo.domain.errors.newop.NoPaymentRouteException;
 import io.muun.apollo.domain.errors.newop.SwapFailedException;
 import io.muun.apollo.domain.errors.newop.UnreachableNodeException;
+import io.muun.apollo.domain.libwallet.FeeBumpRefreshPolicy;
 import io.muun.apollo.domain.libwallet.Invoice;
 import io.muun.apollo.domain.model.ChallengeKeyUpdateMigration;
 import io.muun.apollo.domain.model.Contact;
 import io.muun.apollo.domain.model.CreateFirstSessionOk;
 import io.muun.apollo.domain.model.CreateSessionOk;
 import io.muun.apollo.domain.model.CreateSessionRcOk;
 import io.muun.apollo.domain.model.EmergencyKitExport;
+import io.muun.apollo.domain.model.FulfillmentPushedResult;
 import io.muun.apollo.domain.model.IncomingSwapFulfillmentData;
 import io.muun.apollo.domain.model.NextTransactionSize;
 import io.muun.apollo.domain.model.NotificationReport;
@@ -126,6 +129,8 @@ public class HoustonClient extends BaseClient<HoustonService> {
 
     private final SystemCapabilitiesProvider systemCapabilitiesProvider;
 
+    private final ActivityManagerInfoProvider activityManagerInfoProvider;
+
     /**
      * Constructor.
      */
@@ -140,7 +145,8 @@ public HoustonClient(
             BuildInfoProvider buildInfoProvider,
             PackageManagerInfoProvider packageManagerInfoProvider,
             FileInfoProvider fileInfoProvider,
-            SystemCapabilitiesProvider systemCapabilitiesProvider
+            SystemCapabilitiesProvider systemCapabilitiesProvider,
+            ActivityManagerInfoProvider activityManagerInfoProvider
     ) {
 
         super(HoustonService.class);
@@ -155,6 +161,7 @@ public HoustonClient(
         this.packageManagerInfoProvider = packageManagerInfoProvider;
         this.fileInfoProvider = fileInfoProvider;
         this.systemCapabilitiesProvider = systemCapabilitiesProvider;
+        this.activityManagerInfoProvider = activityManagerInfoProvider;
     }
 
     /**
@@ -194,7 +201,9 @@ public Observable<CreateFirstSessionOk> createFirstSession(
                 fileInfoProvider.getAppSize(),
                 hardwareCapabilitiesProvider.getHardwareAddresses(),
                 systemCapabilitiesProvider.getVbMeta(),
-                fileInfoProvider.getEfsCreationTimeInSeconds()
+                fileInfoProvider.getEfsCreationTimeInSeconds(),
+                activityManagerInfoProvider.isLowRamDevice(),
+                packageManagerInfoProvider.getFirstInstallTimeInMs()
         );
 
         return getService().createFirstSession(params)
@@ -236,7 +245,9 @@ public Observable<CreateSessionOk> createLoginSession(
                 fileInfoProvider.getAppSize(),
                 hardwareCapabilitiesProvider.getHardwareAddresses(),
                 systemCapabilitiesProvider.getVbMeta(),
-                fileInfoProvider.getEfsCreationTimeInSeconds()
+                fileInfoProvider.getEfsCreationTimeInSeconds(),
+                activityManagerInfoProvider.isLowRamDevice(),
+                packageManagerInfoProvider.getFirstInstallTimeInMs()
         );
 
         return getService().createLoginSession(params)
@@ -278,8 +289,9 @@ public Observable<Challenge> createRcLoginSession(
                 fileInfoProvider.getAppSize(),
                 hardwareCapabilitiesProvider.getHardwareAddresses(),
                 systemCapabilitiesProvider.getVbMeta(),
-                fileInfoProvider.getEfsCreationTimeInSeconds()
-
+                fileInfoProvider.getEfsCreationTimeInSeconds(),
+                activityManagerInfoProvider.isLowRamDevice(),
+                packageManagerInfoProvider.getFirstInstallTimeInMs()
         );
 
         return getService().createRecoveryCodeLoginSession(session)
@@ -714,10 +726,13 @@ public Observable<RealTimeData> fetchRealTimeData() {
      * @param sizeProgression from NTS
      */
     public Observable<RealTimeFees> fetchRealTimeFees(
-            List<SizeForAmount> sizeProgression
+            List<SizeForAmount> sizeProgression,
+            FeeBumpRefreshPolicy feeBumpRefreshPolicy
     ) {
         return getService()
-                .fetchRealTimeFees(apiMapper.mapUnconfirmedOutpointsJson(sizeProgression))
+                .fetchRealTimeFees(
+                        apiMapper.mapRealTimeFeesRequestJson(sizeProgression, feeBumpRefreshPolicy)
+                )
                 .map(modelMapper::mapRealTimeFees);
     }
 
@@ -834,12 +849,13 @@ public Single<IncomingSwapFulfillmentData> fetchFulfillmentData(final String inc
     /**
      * Push the fulfillment TX for an incoming swap.
      */
-    public Completable pushFulfillmentTransaction(
+    public Single<FulfillmentPushedResult> pushFulfillmentTransaction(
             final String incomingSwap,
             final RawTransaction rawTransaction
     ) {
 
-        return getService().pushFulfillmentTransaction(incomingSwap, rawTransaction);
+        return getService().pushFulfillmentTransaction(incomingSwap, rawTransaction)
+                .map(modelMapper::mapFulfillmentPushed);
     }
 
     /**