status-im/status-mobile
2
0
Fork 0
mirror of https://github.com/status-im/status-mobile.git synced 2025-02-03 04:14:02 +00:00
Code Issues Projects Releases Wiki Activity

updated status-go to latest

Browse Source 
Signed-off-by: Eric Dvorsak <eric@dvorsak.fr>
This commit is contained in:
Andrey Shovkoplyas 2018-05-10 17:46:21 +03:00 committed by Eric Dvorsak
parent d876895492
commit 94becb5094
No known key found for this signature in database
GPG Key ID: 932AC1CE5F05DE0C
8 changed files with 327 additions and 1388 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/react-native-status/android/build.gradle
View File

@ -17,7 +17,7 @@ dependencies {
implementation 'com.github.ericwlange:AndroidJSCore:3.0.1' implementation 'com.github.ericwlange:AndroidJSCore:3.0.1'
implementation 'status-im:function:0.0.1' implementation 'status-im:function:0.0.1'
String statusGoVersion = 'develop-g5f075eea' String statusGoVersion = 'develop-g6c469299'
final String statusGoGroup = 'status-im', statusGoName = 'status-go' final String statusGoGroup = 'status-im', statusGoName = 'status-go'
// Check if the local status-go jar exists, and compile against that if it does // Check if the local status-go jar exists, and compile against that if it does

7
modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java
View File

@ -204,12 +204,7 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
} }
} }
int dev = 0; String config = Statusgo.GenerateConfig(testnetDataDir, 3);
if (this.devCluster) {
dev = 1;
}
String config = Statusgo.GenerateConfig(testnetDataDir, 3, dev);
try { try {
JSONObject customConfig = new JSONObject(defaultConfig); JSONObject customConfig = new JSONObject(defaultConfig);
JSONObject jsonConfig = new JSONObject(config); JSONObject jsonConfig = new JSONObject(config);

6
modules/react-native-status/ios/RCTStatus/RCTStatus.m
View File

@ -170,11 +170,7 @@ RCT_EXPORT_METHOD(startNode:(NSString *)configString) {
NSString *networkDir = [rootUrl.path stringByAppendingString:dataDir]; NSString *networkDir = [rootUrl.path stringByAppendingString:dataDir];
NSString *devCluster = [ReactNativeConfig envFor:@"ETHEREUM_DEV_CLUSTER"]; NSString *devCluster = [ReactNativeConfig envFor:@"ETHEREUM_DEV_CLUSTER"];
NSString *logLevel = [[ReactNativeConfig envFor:@"LOG_LEVEL_STATUS_GO"] uppercaseString]; NSString *logLevel = [[ReactNativeConfig envFor:@"LOG_LEVEL_STATUS_GO"] uppercaseString];
int dev = 0; char *configChars = GenerateConfig((char *)[networkDir UTF8String], networkId);
if([devCluster isEqualToString:@"1"]){
dev = 1;
}
char *configChars = GenerateConfig((char *)[networkDir UTF8String], networkId, dev);
NSString *config = [NSString stringWithUTF8String: configChars]; NSString *config = [NSString stringWithUTF8String: configChars];
configData = [config dataUsingEncoding:NSUTF8StringEncoding]; configData = [config dataUsingEncoding:NSUTF8StringEncoding];
NSDictionary *resultingConfigJson = [NSJSONSerialization JSONObjectWithData:configData options:NSJSONReadingMutableContainers error:nil]; NSDictionary *resultingConfigJson = [NSJSONSerialization JSONObjectWithData:configData options:NSJSONReadingMutableContainers error:nil];

2
modules/react-native-status/ios/RCTStatus/pom.xml
View File

@ -25,7 +25,7 @@
<artifactItem> <artifactItem>
<groupId>status-im</groupId> <groupId>status-im</groupId>
<artifactId>status-go-ios-simulator</artifactId> <artifactId>status-go-ios-simulator</artifactId>
<version>develop-g5f075eea</version> <version>develop-g6c469299</version>
<type>zip</type> <type>zip</type>
<overWrite>true</overWrite> <overWrite>true</overWrite>
<outputDirectory>./</outputDirectory> <outputDirectory>./</outputDirectory>

1677
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@ -63,6 +63,6 @@
"rn-snoopy": "github:status-im/rn-snoopy", "rn-snoopy": "github:status-im/rn-snoopy",
"string_decoder": "0.10.31", "string_decoder": "0.10.31",
"url": "0.10.3", "url": "0.10.3",
"web3": "github:status-im/web3.js#status-develop" "web3": "github:status-im/web3.js#extshh_post"
} }
} }

7
src/status_im/constants.cljs
View File

@ -90,13 +90,10 @@
(def default-wnodes (def default-wnodes
{:testnet {"main" {:id "main" {:testnet {"main" {:id "main"
:name "Status testnet mailserver A" :name "Status testnet mailserver A"
:address "enode://fa63a6cc730468c5456eab365b2a7a68a166845423c8c9acc363e5f8c4699ff6d954e7ec58f13ae49568600cff9899561b54f6fc2b9923136cd7104911f31cce@163.172.168.202:30303"} :address "enode://88329092a4328bec2bf5422063a87e50637992d3d7e2e2937371ad6db36e268c4fe7ce4e1f45c71e462339d051505a65b9ac13b86c5788d5bee7f481c01ba58b@159.65.125.20:30504"}}
"backup" {:id "backup"
:name "Status testnet mailserver B"
:address "enode://90cbf961c87eb837adc1300a0a6722a57134d843f0028a976d35dff387f101a2754842b6b694e50a01093808f304440d4d968bcbc599259e895ff26e5a1a17cf@51.15.194.39:30303"}}
:mainnet {"main" {:id "main" :mainnet {"main" {:id "main"
:name "Status mainnet mailserver" :name "Status mainnet mailserver"
:address "enode://b963569aac14785f756ecf97e7549a513dea993a1bc744c4f8efe2b4e9479500dd3f5d18f3da19f6550b8bd0d8770350950c9a7da8168b44865402dcc9a51657@51.15.35.110:30403"}}}) :address "enode://b17980946f8ae5415bd43930582a1ba792ac03a3654a9a5348263d80b5b5bc9206ec057dd603e9be87c2599e5ca23532d070969bcb1a3f985b318cc2e8290449@46.101.250.197:30504"}}})
(def currencies (def currencies
{:aed {:id :aed :code "AED" :display-name (i18n/label :t/currency-display-name-aed) :symbol "د.إ"} {:aed {:id :aed :code "AED" :display-name (i18n/label :t/currency-display-name-aed) :symbol "د.إ"}