From 0fd278377470954a7529c07e3bea2a866669bd6e Mon Sep 17 00:00:00 2001 From: Andrea Maria Piana Date: Mon, 30 Jan 2023 16:45:23 +0000 Subject: [PATCH] Update status-go and temporary fix for keycard --- .../main/java/im/status/ethereum/module/StatusModule.java | 3 ++- modules/react-native-status/ios/RCTStatus/RCTStatus.m | 2 +- status-go-version.json | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) 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 8b3b24bfb0..c76deaa400 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 @@ -1307,7 +1307,8 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL @ReactMethod 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); - executeRunnableStatusGoMethod(() -> Statusgo.convertToKeycardAccount(keyStoreDir, accountData, options, password, newPassword), callback); + // Temporary fix for broken status-go compatibilty + executeRunnableStatusGoMethod(() -> Statusgo.convertToKeycardAccount(accountData, options, password, newPassword), callback); } } diff --git a/modules/react-native-status/ios/RCTStatus/RCTStatus.m b/modules/react-native-status/ios/RCTStatus/RCTStatus.m index 0558e10535..3de2c8fbb3 100644 --- a/modules/react-native-status/ios/RCTStatus/RCTStatus.m +++ b/modules/react-native-status/ios/RCTStatus/RCTStatus.m @@ -694,7 +694,7 @@ RCT_EXPORT_METHOD(convertToKeycardAccount:(NSString *)keyUID NSLog(@"convertToKeycardAccount() method called"); #endif NSURL *multiaccountKeystoreDir = [self getKeyStoreDir:keyUID]; - NSString *result = StatusgoConvertToKeycardAccount(multiaccountKeystoreDir.path, accountData, settings, currentPassword, newPassword); + NSString *result = StatusgoConvertToKeycardAccount(accountData, settings, currentPassword, newPassword); callback(@[result]); } diff --git a/status-go-version.json b/status-go-version.json index ff83f8f705..413a2661df 100644 --- a/status-go-version.json +++ b/status-go-version.json @@ -3,7 +3,7 @@ "_comment": "Instead use: scripts/update-status-go.sh ", "owner": "status-im", "repo": "status-go", - "version": "feature/add-compressed-keys", - "commit-sha1": "caf3cc04768959db95f1cc9fcd9b97fdd1db42ca", - "src-sha256": "04d8mp2zngcr8sh62is6mhp22xfngw97bkzgykzbx98cy588lrh7" + "version": "v0.125.4", + "commit-sha1": "7e1a894ab824904f0c90acbc307955940ef17800", + "src-sha256": "0sf33afgvmn4rj6ka7rxx3jnvpyjxcayv25jyiv1s9dkh581zy1i" }