feat: merge dashpay / coinjoin

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "dashsync/crypto/secp256k1"]
 	path = dashsync/crypto/secp256k1
 	url = https://github.com/bitcoin-core/secp256k1.git
-[submodule "platform"]
-	path = platform
-	url = https://github.com/dashevo/platform.git

DashSync.podspec

@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
   s.homepage         = 'https://github.com/dashevo/dashsync-ios.git'
   s.license          = { :type => 'MIT', :file => 'LICENSE' }
   s.author           = { 'quantumexplorer' => 'quantum@dash.org' }
-  s.source           = { :git => 'https://github.com/dashevo/dashsync-iOS.git', :tag => s.version.to_s }
+  s.source           = { :git => 'https://github.com/dashpay/dashsync-iOS.git', :tag => s.version.to_s }
 
   s.ios.deployment_target = '13.0'
   s.osx.deployment_target = '10.15'
@@ -38,8 +38,6 @@ Pod::Spec.new do |s|
   s.dependency 'CocoaLumberjack', '3.7.2'
   s.ios.dependency 'DWAlertController', '0.2.1'
   s.dependency 'DSDynamicOptions', '0.1.2'
-  s.dependency 'DAPI-GRPC', '0.22.0-dev.8'
-  s.dependency 'TinyCborObjc', '0.4.6'
   s.prefix_header_contents = '#import "DSEnvironment.h"'
 
 end

DashSync/iOS/Models/Managers/Service Managers/Auth/Controllers/DSBasePinViewController.m

@@ -29,7 +29,7 @@ @interface DSBasePinViewController ()
 @implementation DSBasePinViewController
 
 + (NSString *)defaultTitle {
-    return [NSString stringWithFormat:DSLocalizedString(@"PIN for %@", nil), DISPLAY_NAME];
+    return DSLocalizedFormat(@"PIN for %@", nil, DISPLAY_NAME);
 }
 
 - (void)viewDidLoad {

DashSync/shared/Categories/BigIntTypes.h

@@ -205,6 +205,7 @@ typedef uint32_t (^_Nullable BlockHeightFinder)(UInt256 blockHash);
 #define uint768_hex(u) [NSData dataWithUInt768:u].hexString
 #define uint768_reverse_hex(u) [NSData dataWithUInt768:u].reverse.hexString
 #define ecpoint_hex(u) [NSData dataWithBytes:u.p length:sizeof(DSECPoint)].hexString
+#define dsutxo_hex(u) [NSData dataWithBytes:u.p length:sizeof(DSUTXO)].hexString
 #define uint256_reverse(u) [NSData dataWithUInt256:u].reverse.UInt256
 
 #define uint256_from_int(u) ((UInt256){.u32 = {u, 0, 0, 0, 0, 0, 0, 0}})

DashSync/shared/Categories/NSArray+Dash.h

@@ -6,6 +6,8 @@
 //
 
 #import "BigIntTypes.h"
+#import "dash_spv_apple_bindings.h"
+#import "DSKeyManager.h"
 #import "NSData+Dash.h"
 #import <Foundation/Foundation.h>
 
@@ -23,4 +25,35 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+@interface NSArray (_)
++ (NSArray<NSString *> *)ffi_from_vec:(Vec_ *)ffi_ref;
++ (Vec_ *)ffi_to_vec:(NSArray<NSString *> *)obj;
++ (void)ffi_destroy_vec:(Vec_ *)ffi_ref;
+@end
+
+@interface NSArray (Vec_String)
++ (NSArray<NSString *> *)ffi_from_vec_of_string:(Vec_String *)ffi_ref;
++ (Vec_String *)ffi_to_vec_of_string:(NSArray<NSString *> *)obj;
++ (void)ffi_destroy_vec_of_string:(Vec_String *)ffi_ref;
+@end
+
+@interface NSArray (Vec_u8_32)
++ (NSArray<NSData *> *)ffi_from_vec_u256:(Vec_u8_32 *)ffi_ref;
++ (Vec_u8_32 *)ffi_to_vec_u256:(NSArray<NSData *> *)obj;
++ (void)ffi_destroy_vec_u256:(Vec_u8_32 *)ffi_ref;
+@end
+
+@interface NSArray (Vec_Vec_u8)
++ (NSArray<NSData *> *)ffi_from_vec_vec_u8:(Vec_Vec_u8 *)ffi_ref;
++ (Vec_Vec_u8 *)ffi_to_vec_vec_u8:(NSArray<NSData *> *)obj;
++ (void)ffi_destroy_vec_vec_u8:(Vec_Vec_u8 *)ffi_ref;
+@end
+
+@interface NSArray (std_collections_BTreeSet_dashcore_hash_types_BlockHash)
++ (NSArray<NSData *> *)ffi_from_block_hash_btree_set:(std_collections_BTreeSet_dashcore_hash_types_BlockHash *)ffi_ref;
++ (std_collections_BTreeSet_dashcore_hash_types_BlockHash *)ffi_to_block_hash_btree_set:(NSArray<NSData *> *)obj;
++ (void)ffi_destroy_block_hash_btree_set:(std_collections_BTreeSet_dashcore_hash_types_BlockHash *)ffi_ref;
+@end
+
+
 NS_ASSUME_NONNULL_END

DashSync/shared/Categories/NSArray+Dash.m

@@ -68,3 +68,117 @@ - (NSArray *)map:(id (^)(id obj))block {
 }
 
 @end
+
+@implementation NSArray (_)
+
++ (NSArray<NSString *> *)ffi_from_vec:(Vec_ *)ffi_ref {
+    NSMutableArray<NSString *> *arr = [NSMutableArray arrayWithCapacity:ffi_ref->count];
+    for (int i = 0; i < ffi_ref->count; i++) {
+        [arr addObject:[NSString stringWithUTF8String:ffi_ref->values[i]]];
+    }
+    return arr;
+}
++ (Vec_ *)ffi_to_vec:(NSArray<NSString *> *)obj {
+    NSUInteger count = obj.count;
+    char **values = malloc(count * sizeof(char *));
+    for (NSUInteger i = 0; i < count; i++) {
+        values[i] = strdup([obj[i] UTF8String]);
+    }
+    return Vec__ctor(count, values);
+}
++ (void)ffi_destroy_vec:(Vec_ *)ffi_ref {
+    Vec__destroy(ffi_ref);
+}
+@end
+
+@implementation NSArray (Vec_String)
+
++ (NSArray<NSString *> *)ffi_from_vec_of_string:(Vec_String *)ffi_ref {
+    NSMutableArray<NSString *> *arr = [NSMutableArray arrayWithCapacity:ffi_ref->count];
+    for (int i = 0; i < ffi_ref->count; i++) {
+        [arr addObject:[NSString stringWithUTF8String:ffi_ref->values[i]]];
+    }
+    return arr;
+}
++ (Vec_String *)ffi_to_vec_of_string:(NSArray<NSString *> *)obj {
+    NSUInteger count = obj.count;
+    char **values = malloc(count * sizeof(char *));
+    for (NSUInteger i = 0; i < count; i++) {
+        values[i] = strdup([obj[i] UTF8String]);
+    }
+    return Vec_String_ctor(count, values);
+}
++ (void)ffi_destroy_vec_of_string:(Vec_String *)ffi_ref {
+    Vec_String_destroy(ffi_ref);
+}
+@end
+
+@implementation NSArray (Vec_u8_32)
+
++ (NSArray<NSData *> *)ffi_from_vec_u256:(Vec_u8_32 *)ffi_ref {
+    NSMutableArray<NSData *> *arr = [NSMutableArray arrayWithCapacity:ffi_ref->count];
+    for (int i = 0; i < ffi_ref->count; i++) {
+        [arr addObject:NSDataFromPtr(ffi_ref->values[i])];
+    }
+    return arr;
+}
++ (Vec_u8_32 *)ffi_to_vec_u256:(NSArray<NSData *> *)obj {
+    NSUInteger count = obj.count;
+    u256 **values = malloc(count * sizeof(u256 *));
+    for (NSUInteger i = 0; i < count; i++) {
+        values[i] = u256_ctor(obj[i]);
+    }
+    return Vec_u8_32_ctor(count, values);
+}
++ (void)ffi_destroy_vec_u256:(Vec_u8_32 *)ffi_ref {
+    Vec_u8_32_destroy(ffi_ref);
+}
+@end
+
+@implementation NSArray (Vec_Vec_u8)
+
++ (NSArray<NSData *> *)ffi_from_vec_vec_u8:(Vec_Vec_u8 *)ffi_ref {
+    NSMutableArray<NSData *> *arr = [NSMutableArray arrayWithCapacity:ffi_ref->count];
+    for (int i = 0; i < ffi_ref->count; i++) {
+        [arr addObject:NSDataFromPtr(ffi_ref->values[i])];
+    }
+    return arr;
+}
++ (Vec_Vec_u8 *)ffi_to_vec_vec_u8:(NSArray<NSData *> *)obj {
+    NSUInteger count = obj.count;
+    Vec_u8 **values = malloc(sizeof(Vec_u8 *) * count);
+    for (int i = 0; i < count; i++) {
+        values[i] = bytes_ctor(obj[i]);
+    }
+    return Vec_Vec_u8_ctor(count, values);
+}
++ (void)ffi_destroy_vec_vec_u8:(Vec_Vec_u8 *)ffi_ref {
+    Vec_Vec_u8_destroy(ffi_ref);
+}
+@end
+
+@implementation NSArray (std_collections_BTreeSet_dashcore_hash_types_BlockHash)
+
++ (NSArray<NSData *> *)ffi_from_block_hash_btree_set:(std_collections_BTreeSet_dashcore_hash_types_BlockHash *)ffi_ref {
+    NSMutableArray<NSData *> *arr = [NSMutableArray arrayWithCapacity:ffi_ref->count];
+    for (int i = 0; i < ffi_ref->count; i++) {
+        u256 *block_hash = dashcore_hash_types_BlockHash_inner(ffi_ref->values[i]);
+        NSData *blockHashData = NSDataFromPtr(block_hash);
+        u256_dtor(block_hash);
+        [arr addObject:blockHashData];
+    }
+    return arr;
+}
++ (std_collections_BTreeSet_dashcore_hash_types_BlockHash *)ffi_to_block_hash_btree_set:(NSArray<NSData *> *)obj {
+    NSUInteger count = obj.count;
+    DBlockHash **values = malloc(sizeof(DBlockHash *) * count);
+    for (int i = 0; i < count; i++) {
+        values[i] = dashcore_hash_types_BlockHash_ctor(u256_ctor(obj[i]));
+    }
+    return std_collections_BTreeSet_dashcore_hash_types_BlockHash_ctor(count, values);
+}
++ (void)ffi_destroy_block_hash_btree_set:(std_collections_BTreeSet_dashcore_hash_types_BlockHash *)ffi_ref {
+    std_collections_BTreeSet_dashcore_hash_types_BlockHash_destroy(ffi_ref);
+}
+@end
+

DashSync/shared/Categories/NSData/NSData+DSHash.m

@@ -23,14 +23,18 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 //  THE SOFTWARE.
 
-#import "dash_shared_core.h"
+#import "dash_spv_apple_bindings.h"
 #import "DSKeyManager.h"
 #import "NSData+DSHash.h"
 
 @implementation NSData (DSHash)
 
 - (NSData *)blake3Data {
-    return [DSKeyManager NSDataFrom:processor_blake3(self.bytes, self.length)];
+    Slice_u8 *slice = slice_ctor(self);
+    u256 *result = dash_spv_crypto_blake3(slice);
+    NSData *data = NSDataFromPtr(result);
+    u256_dtor(result);
+    return data;
 }
 
 

DashSync/shared/Categories/NSData/NSData+DSMerkAVLTree.h

@@ -15,19 +15,19 @@
 //  limitations under the License.
 //
 
-#import "DSDAPIPlatformNetworkServiceProtocol.h"
+//#import "DSDAPIPlatformNetworkServiceProtocol.h"
 #import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
-@class DSPlatformTreeQuery;
+//@class DSPlatformTreeQuery;
 
 @interface NSData (DSMerkAVLTree)
 
 /* executeProofReturnElementDictionary returns items from the proof that match the specific query, if no query is set all
  items are returned.
  */
-- (NSData *_Nullable)executeProofReturnElementDictionary:(NSDictionary *_Nonnull *_Nullable)rElementDictionary query:(DSPlatformTreeQuery *_Nullable)query decode:(BOOL)decode usesVersion:(BOOL)usesVersion error:(NSError **)error;
+//- (NSData *_Nullable)executeProofReturnElementDictionary:(NSDictionary *_Nonnull *_Nullable)rElementDictionary query:(DSPlatformTreeQuery *_Nullable)query decode:(BOOL)decode usesVersion:(BOOL)usesVersion error:(NSError **)error;
 
 @end