release

BeamMW · Sep 3, 2021 · 7f77c81 · 7f77c81
1 parent 36263fd
commit 7f77c81
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 38 deletions.
diff --git a/BeamWallet.xcodeproj/project.pbxproj b/BeamWallet.xcodeproj/project.pbxproj
@@ -4694,7 +4694,7 @@
 				CLANG_WARN_ENUM_CONVERSION = NO;
 				CODE_SIGN_ENTITLEMENTS = Resources/BeamWallet.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 4;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = KNU2R94BJK;
 				ENABLE_BITCODE = NO;
@@ -4769,7 +4769,7 @@
 				CLANG_WARN_ENUM_CONVERSION = NO;
 				CODE_SIGN_ENTITLEMENTS = Resources/BeamWallet.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = KNU2R94BJK;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (

diff --git a/BeamWallet/BeamSDK/AppModel.mm b/BeamWallet/BeamSDK/AppModel.mm
@@ -439,28 +439,41 @@ -(void)setIsNodeChanging:(BOOL)isNodeChanging {
 }
 
 -(BOOL)reconnect {
-    if(Settings.sharedManager.connectToRandomNode && reconnectAttempts < 3) {        
-        [reconnectNodes addObject:Settings.sharedManager.nodeAddress];
-
-       // reconnectAttempts = reconnectAttempts + 1;
-
-        NSString *node = [AppModel chooseRandomNodeWithoutNodes:reconnectNodes];
-        if(node.length > 0) {
-            Settings.sharedManager.nodeAddress = node;
-            [self changeNodeAddress];
-
-            NSArray *delegates = [AppModel sharedManager].delegates.allObjects;
-            for(id<WalletModelDelegate> delegate in delegates)
-            {
-                if ([delegate respondsToSelector:@selector(onNetwotkStartReconnecting)]) {
-                    [delegate onNetwotkStartReconnecting];
-                }
-            }
-
-            return YES;
+    Settings.sharedManager.nodeAddress = [AppModel chooseRandomNode];
+    [self changeNodeAddress];
+
+    NSArray *delegates = [AppModel sharedManager].delegates.allObjects;
+    for(id<WalletModelDelegate> delegate in delegates)
+    {
+        if ([delegate respondsToSelector:@selector(onNetwotkStartReconnecting)]) {
+            [delegate onNetwotkStartReconnecting];
         }
     }
-    return NO;
+
+    return YES;
+
+//    if(Settings.sharedManager.connectToRandomNode && reconnectAttempts < 3) {
+//        [reconnectNodes addObject:Settings.sharedManager.nodeAddress];
+//
+//       // reconnectAttempts = reconnectAttempts + 1;
+//
+//        NSString *node = [AppModel chooseRandomNodeWithoutNodes:reconnectNodes];
+//        if(node.length > 0) {
+//            Settings.sharedManager.nodeAddress = node;
+//            [self changeNodeAddress];
+//
+//            NSArray *delegates = [AppModel sharedManager].delegates.allObjects;
+//            for(id<WalletModelDelegate> delegate in delegates)
+//            {
+//                if ([delegate respondsToSelector:@selector(onNetwotkStartReconnecting)]) {
+//                    [delegate onNetwotkStartReconnecting];
+//                }
+//            }
+//
+//            return YES;
+//        }
+//    }
+//    return NO;
 }
 
 

diff --git a/Frameworks/openssl.framework/Headers/ec.h b/Frameworks/openssl.framework/Headers/ec.h
@@ -7,7 +7,7 @@
  * \author Originally written by Bodo Moeller for the OpenSSL project
  */
 /* ====================================================================
- * Copyright (c) 1998-2019 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1998-2005 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -1073,7 +1073,6 @@ int EC_KEY_print_fp(FILE *fp, const EC_KEY *key, int off);
  * The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
  */
-
 void ERR_load_EC_strings(void);
 
 /* Error codes for the EC functions. */
@@ -1271,14 +1270,13 @@ void ERR_load_EC_strings(void);
 # define EC_R_SLOT_FULL                                   108
 # define EC_R_UNDEFINED_GENERATOR                         113
 # define EC_R_UNDEFINED_ORDER                             128
-# define EC_R_UNKNOWN_COFACTOR                            152
 # define EC_R_UNKNOWN_GROUP                               129
 # define EC_R_UNKNOWN_ORDER                               114
 # define EC_R_UNSUPPORTED_FIELD                           131
 # define EC_R_WRONG_CURVE_PARAMETERS                      145
 # define EC_R_WRONG_ORDER                                 130
 
-# ifdef  __cplusplus
+#ifdef  __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/Frameworks/openssl.framework/Headers/err.h b/Frameworks/openssl.framework/Headers/err.h
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 /* ====================================================================
- * Copyright (c) 1998-2019 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -143,7 +143,6 @@ extern "C" {
 # define ERR_TXT_STRING          0x02
 
 # define ERR_FLAG_MARK           0x01
-# define ERR_FLAG_CLEAR          0x02
 
 # define ERR_NUM_ERRORS  16
 typedef struct err_state_st {

diff --git a/Frameworks/openssl.framework/Headers/evp.h b/Frameworks/openssl.framework/Headers/evp.h
@@ -1489,10 +1489,8 @@ void ERR_load_EVP_strings(void);
 # define EVP_F_EVP_CIPHER_CTX_CTRL                        124
 # define EVP_F_EVP_CIPHER_CTX_SET_KEY_LENGTH              122
 # define EVP_F_EVP_DECRYPTFINAL_EX                        101
-# define EVP_F_EVP_DECRYPTUPDATE                          181
 # define EVP_F_EVP_DIGESTINIT_EX                          128
 # define EVP_F_EVP_ENCRYPTFINAL_EX                        127
-# define EVP_F_EVP_ENCRYPTUPDATE                          180
 # define EVP_F_EVP_MD_CTX_COPY_EX                         110
 # define EVP_F_EVP_MD_SIZE                                162
 # define EVP_F_EVP_OPENINIT                               102

diff --git a/Frameworks/openssl.framework/Headers/openssl.h b/Frameworks/openssl.framework/Headers/openssl.h
@@ -2,8 +2,8 @@
 //  openssl.h
 //  OpenSSL-iOS
 //
-//  Created by @levigroker Fri Apr 24 15:21:34 MDT 2020.
-//  Copyright © 2020 @levigroker. All rights reserved.
+//  Created by @levigroker Thu Feb 28 00:31:06 EET 2019.
+//  Copyright © 2019 @levigroker. All rights reserved.
 //
 
 #ifndef openssl_h

diff --git a/Frameworks/openssl.framework/Headers/opensslconf.h b/Frameworks/openssl.framework/Headers/opensslconf.h
@@ -122,8 +122,8 @@ extern "C" {
 
 #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
 #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#define ENGINESDIR "/tmp/openssl-1.0.2u-arm64/lib/engines"
-#define OPENSSLDIR "/tmp/openssl-1.0.2u-arm64"
+#define ENGINESDIR "/tmp/openssl-1.0.2q-arm64/lib/engines"
+#define OPENSSLDIR "/tmp/openssl-1.0.2q-arm64"
 #endif
 #endif
 

diff --git a/Frameworks/openssl.framework/Headers/opensslv.h b/Frameworks/openssl.framework/Headers/opensslv.h
@@ -30,11 +30,11 @@ extern "C" {
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-# define OPENSSL_VERSION_NUMBER  0x1000215fL
+# define OPENSSL_VERSION_NUMBER  0x1000211fL
 # ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2u-fips  20 Dec 2019"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2q-fips  20 Nov 2018"
 # else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2u  20 Dec 2019"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2q  20 Nov 2018"
 # endif
 # define OPENSSL_VERSION_PTEXT   " part of " OPENSSL_VERSION_TEXT
 

diff --git a/Frameworks/openssl.framework/Info.plist b/Frameworks/openssl.framework/Info.plist
diff --git a/Frameworks/openssl.framework/openssl b/Frameworks/openssl.framework/openssl