status-im/status-react
2
0
Fork 0
mirror of https://github.com/status-im/status-react.git synced 2025-01-09 18:46:19 +00:00
Code Issues Projects Releases Wiki Activity

Update status-go and temporary fix for keycard

Browse Source
This commit is contained in:
Andrea Maria Piana 2023-01-30 16:45:23 +00:00
parent 6830f98f95
commit 0fd2783774
No known key found for this signature in database
GPG Key ID: AA6CCA6DE0E06424
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1307,7 +1307,8 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
@ReactMethod @ReactMethod
public void convertToKeycardAccount(final String keyUID, final String accountData, final String options, final String password, final String newPassword, final Callback callback) throws JSONException { public void convertToKeycardAccount(final String keyUID, final String accountData, final String options, final String password, final String newPassword, final Callback callback) throws JSONException {
final String keyStoreDir = this.getKeyStorePath(keyUID); final String keyStoreDir = this.getKeyStorePath(keyUID);
executeRunnableStatusGoMethod(() -> Statusgo.convertToKeycardAccount(keyStoreDir, accountData, options, password, newPassword), callback); // Temporary fix for broken status-go compatibilty
executeRunnableStatusGoMethod(() -> Statusgo.convertToKeycardAccount(accountData, options, password, newPassword), callback);
} }
} }

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

@ -694,7 +694,7 @@ RCT_EXPORT_METHOD(convertToKeycardAccount:(NSString *)keyUID
NSLog(@"convertToKeycardAccount() method called"); NSLog(@"convertToKeycardAccount() method called");
#endif #endif
NSURL *multiaccountKeystoreDir = [self getKeyStoreDir:keyUID]; NSURL *multiaccountKeystoreDir = [self getKeyStoreDir:keyUID];
NSString *result = StatusgoConvertToKeycardAccount(multiaccountKeystoreDir.path, accountData, settings, currentPassword, newPassword); NSString *result = StatusgoConvertToKeycardAccount(accountData, settings, currentPassword, newPassword);
callback(@[result]); callback(@[result]);
} }

6
status-go-version.json
View File

@ -3,7 +3,7 @@
"_comment": "Instead use: scripts/update-status-go.sh <rev>", "_comment": "Instead use: scripts/update-status-go.sh <rev>",
"owner": "status-im", "owner": "status-im",
"repo": "status-go", "repo": "status-go",
"version": "feature/add-compressed-keys", "version": "v0.125.4",
"commit-sha1": "caf3cc04768959db95f1cc9fcd9b97fdd1db42ca", "commit-sha1": "7e1a894ab824904f0c90acbc307955940ef17800",
"src-sha256": "04d8mp2zngcr8sh62is6mhp22xfngw97bkzgykzbx98cy588lrh7" "src-sha256": "0sf33afgvmn4rj6ka7rxx3jnvpyjxcayv25jyiv1s9dkh581zy1i"
} }