From e164a7a375221414c84a911849baea4de019b9ca Mon Sep 17 00:00:00 2001 From: Roman Volosovskyi Date: Mon, 5 Jun 2017 18:35:02 +0300 Subject: [PATCH] upgrade status-go --- modules/react-native-status/android/build.gradle | 2 +- .../main/java/im/status/ethereum/module/StatusModule.java | 3 ++- modules/react-native-status/ios/RCTStatus/RCTStatus.m | 7 ++++++- modules/react-native-status/ios/RCTStatus/pom.xml | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/modules/react-native-status/android/build.gradle b/modules/react-native-status/android/build.gradle index a586e99405..27c5dec2e0 100644 --- a/modules/react-native-status/android/build.gradle +++ b/modules/react-native-status/android/build.gradle @@ -15,5 +15,5 @@ android { dependencies { compile 'com.facebook.react:react-native:+' compile 'com.instabug.library:instabug:3+' - compile(group: 'status-im', name: 'status-go', version: 'jail-signals-gfe007d5', ext: 'aar') + compile(group: 'status-im', name: 'status-go', version: 'whisper-on-geth1.6.1', ext: 'aar') } diff --git a/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java b/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java index d4476718bb..d9272d22dc 100644 --- a/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java +++ b/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java @@ -141,7 +141,8 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL } String config; - String defaultConfig = Statusgo.GenerateConfig(dataFolder, 3); + int devCluster = this.debug ? 1 : 0; + String defaultConfig = Statusgo.GenerateConfig(dataFolder, 3, devCluster); try { JSONObject jsonConfig = new JSONObject(defaultConfig); String gethLogFileName = "geth.log"; diff --git a/modules/react-native-status/ios/RCTStatus/RCTStatus.m b/modules/react-native-status/ios/RCTStatus/RCTStatus.m index 3c7484c144..1d96ca5f39 100644 --- a/modules/react-native-status/ios/RCTStatus/RCTStatus.m +++ b/modules/react-native-status/ios/RCTStatus/RCTStatus.m @@ -202,7 +202,12 @@ RCT_EXPORT_METHOD(startNode:(RCTResponseSenderBlock)onResultCallback) { NSLog(@"error %@", error); }else NSLog(@"folderName: %@", folderName); - char *configChars = GenerateConfig([folderName.path UTF8String], 3); +#if DEBUG + int devCluster = 1; +#else + int devCluster = 0; +#endif + char *configChars = GenerateConfig([folderName.path UTF8String], 3, devCluster); NSString *config = [NSString stringWithUTF8String: configChars]; NSData *configData = [config dataUsingEncoding:NSUTF8StringEncoding]; NSDictionary *resultingConfigJson = [NSJSONSerialization JSONObjectWithData:configData options:NSJSONReadingMutableContainers error:nil]; diff --git a/modules/react-native-status/ios/RCTStatus/pom.xml b/modules/react-native-status/ios/RCTStatus/pom.xml index 2ce963f1d0..abca4b6a8f 100644 --- a/modules/react-native-status/ios/RCTStatus/pom.xml +++ b/modules/react-native-status/ios/RCTStatus/pom.xml @@ -25,7 +25,7 @@ status-im status-go-ios-simulator - jail-signals-gfe007d5 + whisper-on-geth1.6.1 zip true ./