feat: CoinJoin

.github/workflows/build.yml

@@ -44,6 +44,10 @@ jobs:
       - uses: maxim-lobanov/setup-xcode@v1
         with:
           xcode-version: '15.4'
+      - name: Setup CocoaPods
+        uses: maxim-lobanov/setup-cocoapods@v1
+        with:
+          version: 1.15.2
       - name: Rustup add targets
         run: rustup target add aarch64-apple-ios x86_64-apple-ios aarch64-apple-ios-sim
       - name: Build dependencies
@@ -59,4 +63,4 @@ jobs:
             -scheme "DashSync-Example" \
             -workspace "DashSync.xcworkspace" \
             -destination "platform=$platform,name=iPhone 13" \
-            CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGN_ENTITLEMENTS="" CODE_SIGNING_ALLOWED=NO
+            CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGN_ENTITLEMENTS="" CODE_SIGNING_ALLOWED=NO

.github/workflows/coverage.yml

@@ -43,6 +43,10 @@ jobs:
             ${{ runner.os }}-pods-
       - name: Rustup add targets
         run: rustup target add aarch64-apple-ios x86_64-apple-ios aarch64-apple-ios-sim
+      - name: Setup CocoaPods
+        uses: maxim-lobanov/setup-cocoapods@v1
+        with:
+          version: 1.15.2
       - name: Dependencies
         working-directory: ./dashsync/Example
         run: pod install --repo-update

.github/workflows/e2eTestsTestnet.yml

@@ -45,6 +45,10 @@ jobs:
             ${{ runner.os }}-pods-
       - name: Rustup add targets
         run: rustup target add aarch64-apple-ios x86_64-apple-ios aarch64-apple-ios-sim
+      - name: Setup CocoaPods
+        uses: maxim-lobanov/setup-cocoapods@v1
+        with:
+          version: 1.15.2
       - name: Dependencies
         working-directory: ./dashsync/Example
         run: pod install --repo-update

.github/workflows/lint.yml

@@ -43,6 +43,10 @@ jobs:
           key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
           restore-keys: |
             ${{ runner.os }}-pods-
+      - name: Setup CocoaPods
+        uses: maxim-lobanov/setup-cocoapods@v1
+        with:
+          version: 1.15.2
       - name: Rustup add targets
         run: rustup target add aarch64-apple-ios x86_64-apple-ios aarch64-apple-ios-sim
       - name: Dependencies

.github/workflows/network.yml

@@ -44,6 +44,10 @@ jobs:
         run: cargo install cargo-lipo
       - name: Rustup add targets
         run: rustup target add x86_64-apple-darwin
+      - name: Setup CocoaPods
+        uses: maxim-lobanov/setup-cocoapods@v1
+        with:
+          version: 1.15.2
       - name: Build Dependencies
         working-directory: ./dashsync/Example
         run: pod install --repo-update

.github/workflows/syncTestMainnet.yml

@@ -44,6 +44,10 @@ jobs:
             ${{ runner.os }}-pods-
       - name: Rustup add targets
         run: rustup target add aarch64-apple-ios x86_64-apple-ios aarch64-apple-ios-sim
+      - name: Setup CocoaPods
+        uses: maxim-lobanov/setup-cocoapods@v1
+        with:
+          version: 1.15.2
       - name: Dependencies
         working-directory: ./dashsync/Example
         run: pod install --repo-update

.github/workflows/syncTestTestnet.yml

@@ -45,6 +45,10 @@ jobs:
             ${{ runner.os }}-pods-
       - name: Rustup add targets
         run: rustup target add aarch64-apple-ios x86_64-apple-ios aarch64-apple-ios-sim
+      - name: Setup CocoaPods
+        uses: maxim-lobanov/setup-cocoapods@v1
+        with:
+          version: 1.15.2
       - name: Dependencies
         working-directory: ./dashsync/Example
         run: pod install --repo-update

.github/workflows/test.yml

@@ -52,6 +52,11 @@ jobs:
       - name: Rustup add targets
         run: rustup target add aarch64-apple-ios x86_64-apple-ios aarch64-apple-ios-sim
 
+      - name: Setup CocoaPods
+        uses: maxim-lobanov/setup-cocoapods@v1
+        with:
+          version: 1.15.2
+
       - name: Dependencies
         working-directory: ./dashsync/Example
         run: pod install --repo-update

DashSync.podspec

@@ -34,7 +34,7 @@ Pod::Spec.new do |s|
   s.ios.framework = 'UIKit'
   s.macos.framework = 'Cocoa'
   s.compiler_flags = '-Wno-comma'
-  s.dependency 'DashSharedCore', '0.4.19'
+  s.dependency 'DashSharedCore', '0.5.1'
   s.dependency 'CocoaLumberjack', '3.7.2'
   s.ios.dependency 'DWAlertController', '0.2.1'
   s.dependency 'DSDynamicOptions', '0.1.2'
@@ -43,4 +43,3 @@ Pod::Spec.new do |s|
   s.prefix_header_contents = '#import "DSEnvironment.h"'
 
 end
-

DashSync/shared/DashSync.m

@@ -19,6 +19,7 @@
 #import "DSPeerEntity+CoreDataClass.h"
 #import "DSPeerManager+Protected.h"
 #import "DSSyncState.h"
+#import "DSCoinJoinManager.h"
 #import "DSQuorumEntryEntity+CoreDataClass.h"
 #import "DSQuorumSnapshotEntity+CoreDataClass.h"
 #import "DSSporkManager+Protected.h"
@@ -122,13 +123,14 @@ - (void)startSyncForChain:(DSChain *)chain {
 - (void)stopSyncAllChains {
     NSArray *chains = [[DSChainsManager sharedInstance] chains];
     for (DSChain *chain in chains) {
+        [[DSCoinJoinManager sharedInstanceForChain:chain] stop];
         [[[DSChainsManager sharedInstance] chainManagerForChain:chain].peerManager disconnect: DSDisconnectReason_ChainWipe];
     }
 }
 
 - (void)stopSyncForChain:(DSChain *)chain {
     NSParameterAssert(chain);
-
+    [[DSCoinJoinManager sharedInstanceForChain:chain] stop];
     [[[DSChainsManager sharedInstance] chainManagerForChain:chain] stopSync];
 }
 

DashSync/shared/Libraries/DSLogger.m

@@ -16,6 +16,7 @@
 //
 
 #import "DSLogger.h"
+#import "CompressingLogFileManager.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -49,33 +50,37 @@ - (instancetype)init {
     if (self) {
         [DDLog addLogger:[DDOSLogger sharedInstance]]; // os_log
 
-        DDFileLogger *fileLogger = [[DDFileLogger alloc] init];
-        fileLogger.rollingFrequency = 60 * 60 * 24;            // 24 hour rolling
-        fileLogger.logFileManager.maximumNumberOfLogFiles = 3; // keep a 3 days worth of log files
-        //[fileLogger setLogFormatter:[[NoTimestampLogFormatter alloc] init]]; // Use the custom formatter
+        unsigned long long maxFileSize = 1024 * 1024 * 5; // 5 MB max. Then log files are ziped
+        CompressingLogFileManager *logFileManager = [[CompressingLogFileManager alloc] initWithFileSize:maxFileSize];
+        DDFileLogger *fileLogger = [[DDFileLogger alloc] initWithLogFileManager:logFileManager];
+        fileLogger.rollingFrequency = 60 * 60 * 24;     // 24 hour rolling
+        fileLogger.maximumFileSize = maxFileSize;
+        fileLogger.logFileManager.maximumNumberOfLogFiles = 10;
+
         [DDLog addLogger:fileLogger];
         _fileLogger = fileLogger;
     }
     return self;
 }
 
 - (NSArray<NSURL *> *)logFiles {
-    NSArray<DDLogFileInfo *> *logFileInfos = [self.fileLogger.logFileManager unsortedLogFileInfos];
-    NSMutableArray<NSURL *> *logFiles = [NSMutableArray array];
-    for (DDLogFileInfo *fileInfo in logFileInfos) {
-        NSURL *fileURL = [NSURL fileURLWithPath:fileInfo.filePath];
-        if (fileURL) {
-            [logFiles addObject:fileURL];
-        }
-    }
-    // add rust log file located at $CACHE/Logs/processor.log
-    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
-    NSString *cacheDirectory = [paths objectAtIndex:0];
-    NSString *rustLogPath = [cacheDirectory stringByAppendingPathComponent:@"Logs/processor.log"];
+    NSString *logsDirectory = [self.fileLogger.logFileManager logsDirectory];
+    NSArray *fileNames = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:logsDirectory error:nil];
+    NSMutableArray *logFiles = [NSMutableArray arrayWithCapacity:[fileNames count]];
 
-    if ([[NSFileManager defaultManager] fileExistsAtPath:rustLogPath]) {
-        [logFiles addObject:[NSURL fileURLWithPath:rustLogPath]];
+    for (NSString *fileName in fileNames) {
+        BOOL hasProperSuffix = [fileName hasSuffix:@".log"] || [fileName hasSuffix:@".gz"];
+
+        if (hasProperSuffix) {
+            NSString *filePath = [logsDirectory stringByAppendingPathComponent:fileName];
+            NSURL *fileURL = [NSURL fileURLWithPath:filePath];
+
+            if (fileURL) {
+                [logFiles addObject:fileURL];
+            }
+        }
     }
+
     return [logFiles copy];
 }
 

DashSync/shared/Libraries/Logs/CompressingLogFileManager.h

@@ -0,0 +1,20 @@
+//
+//  CompressingLogFileManager.h
+//  LogFileCompressor
+//
+//  CocoaLumberjack Demos
+//
+
+#import <Foundation/Foundation.h>
+#import <CocoaLumberjack/CocoaLumberjack.h>
+
+@interface CompressingLogFileManager : DDLogFileManagerDefault
+{
+    BOOL upToDate;
+    BOOL isCompressing;
+}
+
+@property (nonatomic, assign) unsigned long long maxFileSize;
+- (instancetype)initWithFileSize:(unsigned long long)maxFileSize;
+
+@end