From b40f19128acd50e230a64f2528d9c0546f3ef54d Mon Sep 17 00:00:00 2001 From: pankcuf Date: Wed, 12 Jul 2023 18:12:06 +0700 Subject: [PATCH 1/2] chore: remove unnecessary logs --- .../shared/Models/Derivation Paths/DSDerivationPath.m | 2 -- DashSync/shared/Models/Keys/NSData+Encryption.mm | 8 -------- 2 files changed, 10 deletions(-) diff --git a/DashSync/shared/Models/Derivation Paths/DSDerivationPath.m b/DashSync/shared/Models/Derivation Paths/DSDerivationPath.m index 77d8acfb6..ee85bb487 100644 --- a/DashSync/shared/Models/Derivation Paths/DSDerivationPath.m +++ b/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]; } diff --git a/DashSync/shared/Models/Keys/NSData+Encryption.mm b/DashSync/shared/Models/Keys/NSData+Encryption.mm index a29a6fb48..9bd36d597 100644 --- a/DashSync/shared/Models/Keys/NSData+Encryption.mm +++ b/DashSync/shared/Models/Keys/NSData+Encryption.mm @@ -273,14 +273,12 @@ - (nullable NSData *)decryptWithDHKey:(OpaqueKey *)dhKey { } - (nullable NSData *)encapsulatedDHDecryptionWithKeys:(NSArray *)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 *)keys } - (nullable NSData *)encapsulatedDHDecryptionWithKeys:(NSArray *)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 *)keys } - (nullable NSData *)encapsulatedDHEncryptionWithKeys:(NSArray *)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,7 +311,6 @@ - (nullable NSData *)encapsulatedDHEncryptionWithKeys:(NSArray *)keys } - (nullable NSData *)encapsulatedDHEncryptionWithKeys:(NSArray *)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; @@ -325,7 +318,6 @@ - (nullable NSData *)encapsulatedDHEncryptionWithKeys:(NSArray *)keys 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 { From 55aeadca39fc9cf06bb662923723ddd105c4cb87 Mon Sep 17 00:00:00 2001 From: pankcuf Date: Fri, 14 Jul 2023 00:32:58 +0700 Subject: [PATCH 2/2] chore: DashSharedCore 0.4.10 (fixed ed25519 u32 child derivation) --- DashSync.podspec | 2 +- Example/Podfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/DashSync.podspec b/DashSync.podspec index 56a15b2c0..b7351785b 100644 --- a/DashSync.podspec +++ b/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' diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 0b55243e2..97caec045 100644 --- a/Example/Podfile.lock +++ b/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