Merge pull request #505 from dashpay/develop

chore: Merge develop into master

Author: pankcuf

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.8'
+  s.dependency 'DashSharedCore', '0.4.10'
   s.dependency 'CocoaLumberjack', '3.7.2'
   s.ios.dependency 'DWAlertController', '0.2.1'
   s.dependency 'DSDynamicOptions', '0.1.2'

DashSync/shared/Models/Derivation Paths/DSDerivationPath.m

@@ -274,7 +274,6 @@ - (OpaqueKey *)extendedPublicKey {
         if (self.wallet && (self.length || self.reference == DSDerivationPathReference_Root)) {
             NSData *extendedPublicKeyData = getKeychainData([self walletBasedExtendedPublicKeyLocationString], nil);
             if (extendedPublicKeyData) {
-                NoTimeLog(@"_extendedPublicKey (%d) = %@", self.signingAlgorithm, extendedPublicKeyData.hexString);
                 _extendedPublicKey = key_create_from_extended_public_key_data(extendedPublicKeyData.bytes, extendedPublicKeyData.length, (int16_t) self.signingAlgorithm);
                 [self maybeRevertBLSMigration:extendedPublicKeyData];
                 NSAssert(_extendedPublicKey, @"extended public key not set");
@@ -301,7 +300,6 @@ - (OpaqueKey *)extendedPublicKey {
                 }
             }
 #endif
-            NoTimeLog(@"_extendedPublicKey (%d) = %@", self.signingAlgorithm, extendedPublicKeyData.hexString);
             _extendedPublicKey = key_create_from_extended_public_key_data(extendedPublicKeyData.bytes, extendedPublicKeyData.length, (int16_t) self.signingAlgorithm);
             [self maybeRevertBLSMigration:extendedPublicKeyData];
         }

DashSync/shared/Models/Keys/NSData+Encryption.mm

@@ -273,14 +273,12 @@ - (nullable NSData *)decryptWithDHKey:(OpaqueKey *)dhKey {
 }
 
 - (nullable NSData *)encapsulatedDHDecryptionWithKeys:(NSArray<NSValue *> *)keys usingIVSize:(NSUInteger)ivSize {
-    NoTimeLog(@"encapsulatedDHDecryptionWithKeys: %lu using: %lu", keys.count, ivSize);
     NSAssert(keys.count > 1, @"There should be at least two key (first pair)");
     if ([keys count] < 2) return self;
 
     OpaqueKey *firstKey = (OpaqueKey *)[keys firstObject].pointerValue;
     OpaqueKey *secondKey = (OpaqueKey *)[keys objectAtIndex:1].pointerValue;
     NSData *encryptedData = [self decryptWithSecretKey:secondKey fromPublicKey:firstKey usingIVSize:ivSize];
-    NoTimeLog(@"encapsulatedDHEncryptionWithKeys: encrypted: %@", encryptedData.hexString);
     if (keys.count == 2) { //not really necessary but easier to read
         return encryptedData;
     } else {
@@ -289,12 +287,10 @@ - (nullable NSData *)encapsulatedDHDecryptionWithKeys:(NSArray<NSValue *> *)keys
 }
 
 - (nullable NSData *)encapsulatedDHDecryptionWithKeys:(NSArray<NSValue *> *)keys {
-    NoTimeLog(@"encapsulatedDHDecryptionWithKeys: %lu", keys.count);
     NSAssert(keys.count > 0, @"There should be at least one key");
     if (![keys count]) return self;
     OpaqueKey *firstKey = (OpaqueKey *) [keys firstObject].pointerValue;
     NSData *encryptedData = [self decryptWithDHKey:firstKey];
-    NoTimeLog(@"encapsulatedDHDecryptionWithKeys: decrypted: %@", encryptedData.hexString);
     if (keys.count == 1) { //not really necessary but easier to read
         return encryptedData;
     } else {
@@ -303,12 +299,10 @@ - (nullable NSData *)encapsulatedDHDecryptionWithKeys:(NSArray<NSValue *> *)keys
 }
 
 - (nullable NSData *)encapsulatedDHEncryptionWithKeys:(NSArray<NSValue *> *)keys {
-    NoTimeLog(@"encapsulatedDHEncryptionWithKeys: %lu", keys.count);
     NSAssert(keys.count > 0, @"There should be at least one key");
     if (![keys count]) return self;
     OpaqueKey *firstKey = (OpaqueKey *) [keys firstObject].pointerValue;
     NSData *encryptedData = [self encryptWithDHKey:firstKey];
-    NoTimeLog(@"encapsulatedDHEncryptionWithKeys: encrypted: %@", encryptedData.hexString);
     if (keys.count == 1) { //not really necessary but easier to read
         return encryptedData;
     } else {
@@ -317,15 +311,13 @@ - (nullable NSData *)encapsulatedDHEncryptionWithKeys:(NSArray<NSValue *> *)keys
 }
 
 - (nullable NSData *)encapsulatedDHEncryptionWithKeys:(NSArray<NSValue *> *)keys usingInitializationVector:(NSData *)initializationVector {
-    NoTimeLog(@"encapsulatedDHEncryptionWithKeys: %lu using: %@", keys.count, initializationVector.hexString);
     NSAssert(keys.count > 1, @"There should be at least two key (first pair)");
     if ([keys count] < 2) return self;
 
     OpaqueKey *firstKey = (OpaqueKey *) [keys firstObject].pointerValue;
     OpaqueKey *secondKey = (OpaqueKey *) [keys objectAtIndex:1].pointerValue;
 
     NSData *encryptedData = [self encryptWithSecretKey:firstKey forPublicKey:secondKey usingInitializationVector:initializationVector];
-    NoTimeLog(@"encapsulatedDHEncryptionWithKeys: encrypted: %@", encryptedData.hexString);
     if (keys.count == 2) { //not really necessary but easier to read
         return encryptedData;
     } else {

DashSync/shared/Models/Network/DSPeer.m

@@ -327,8 +327,7 @@ - (void)disconnectWithError:(NSError *)error {
     if (!self.runLoop) return;
     [self.inputStream close];
     [self.outputStream close];
-    [self.inputStream removeFromRunLoop:self.runLoop forMode:NSRunLoopCommonModes];
-    [self.outputStream removeFromRunLoop:self.runLoop forMode:NSRunLoopCommonModes];
+    
     CFRunLoopStop([self.runLoop getCFRunLoop]);
 
     _status = DSPeerStatus_Disconnected;
@@ -856,9 +855,9 @@ - (void)acceptVersionMessage:(NSData *)message {
     }
     _lastBlockHeight = [message UInt32AtOffset:80 + l.unsignedIntegerValue];
 
-    if (self.version < self.chain.minProtocolVersion) {
+    if (self.version < self.chain.minProtocolVersion || self.version > self.chain.protocolVersion) {
 #if MESSAGE_LOGGING
-        DSLog(@"%@:%u protocol version %u not supported, useragent:\"%@\"", self.host, self.port, self.version, self.useragent);
+        DSLog(@"%@:%u protocol version %u not supported, valid versions are: [%u, %u], useragent:\"%@\", ", self.host, self.port, self.version, self.chain.minProtocolVersion, self.chain.protocolVersion, self.useragent);
 #endif
         [self error:@"protocol version %u not supported", self.version];
         return;

Example/Podfile.lock

@@ -586,11 +586,11 @@ PODS:
     - "!ProtoCompiler-gRPCPlugin (~> 1.0)"
     - DAPI-GRPC/Messages
     - gRPC-ProtoRPC
-  - DashSharedCore (0.4.8)
+  - DashSharedCore (0.4.10)
   - DashSync (0.1.0):
     - CocoaLumberjack (= 3.7.2)
     - DAPI-GRPC (= 0.22.0-dev.8)
-    - DashSharedCore (= 0.4.8)
+    - DashSharedCore (= 0.4.10)
     - DSDynamicOptions (= 0.1.2)
     - DWAlertController (= 0.2.1)
     - TinyCborObjc (= 0.4.6)
@@ -712,8 +712,8 @@ SPEC CHECKSUMS:
   CocoaImageHashing: 8656031d0899abe6c1c415827de43e9798189c53
   CocoaLumberjack: b7e05132ff94f6ae4dfa9d5bce9141893a21d9da
   DAPI-GRPC: 138d62523bbfe7e88a39896f1053c0bc12390d9f
-  DashSharedCore: cc87193cfc09b816c5f472b50174cc76e41668b1
-  DashSync: d53609a65e3965d246f68244883062093c0bbee6
+  DashSharedCore: d107a64758acebc53edacc160ad450f539ff33ee
+  DashSync: 4a9504583105eb2ace98f38f377cb44fe62f5021
   DSDynamicOptions: 347cc5d2c4e080eb3de6a86719ad3d861b82adfc
   DWAlertController: 5f4cd8adf90336331c054857f709f5f8d4b16a5b
   gRPC: 64f36d689b2ecd99c4351f74e6f91347cdc65d9f