view-only support

3 files changed, 28 insertions, 5 deletions

diff --git a/README.md b/README.md
index 8c3a1a1..29254da 100644
--- a/README.md
+++ b/README.md
@@ -33,10 +33,10 @@ $ docker run --rm -it \
     -v $PWD/libbridge:/opt/wspace/libbridge_up \
     --entrypoint /bin/bash \
     monero_c:dev
-[docker] $ export 'PATH=/usr/cmake-3.14.6-Linux-x86_64/bin:/opt/android/toolchain/aarch64-linux-android/bin:/opt/android/toolchain/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
-[docker] $ cd /opt/wspace/libbridge_up
-[docker] $ rm -rf build && mkdir build && cd build
-[docker] $ env CC=clang CXX=clang++ cmake -DANDROID_ABI=-arm64-v8a ..
-[docker] $ make
+[docker] $ export 'PATH=/usr/cmake-3.14.6-Linux-x86_64/bin:/opt/android/toolchain/aarch64-linux-android/bin:/opt/android/toolchain/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' \
+    && cd /opt/wspace/libbridge_up \
+    && rm -rf build && mkdir build && cd build \
+    && env CC=clang CXX=clang++ cmake -DANDROID_ABI=-arm64-v8a .. \
+    && make
 # Resulting file will be available in the current directory.
 ```
diff --git a/libbridge/src/main/cpp/wallet2_api_c.cpp b/libbridge/src/main/cpp/wallet2_api_c.cpp
index 31f3bd4..95931fc 100644
--- a/libbridge/src/main/cpp/wallet2_api_c.cpp
+++ b/libbridge/src/main/cpp/wallet2_api_c.cpp
@@ -1428,6 +1428,28 @@ void* MONERO_WalletManager_recoveryWallet(const char* path, const char* password
                     std::string(seedOffset));
     return reinterpret_cast<void*>(wallet);
 }
+//     virtual Wallet * createWalletFromKeys(const std::string &path,
+//                                                     const std::string &password,
+//                                                     const std::string &language,
+//                                                     NetworkType nettype,
+//                                                     uint64_t restoreHeight,
+//                                                     const std::string &addressString,
+//                                                     const std::string &viewKeyString,
+//                                                     const std::string &spendKeyString = "",
+//                                                     uint64_t kdf_rounds = 1) = 0;
+void* MONERO_WalletManager_createWalletFromKeys(const char* path, const char* password, const char* language, int nettype, uint64_t restoreHeight, const char* addressString, const char* viewKeyString, const char* spendKeyString, uint64_t kdf_rounds) {
+    Monero::Wallet *wallet =
+            Monero::WalletManagerFactory::getWalletManager()->createWalletFromKeys(
+                    std::string(path),
+                    std::string(password),
+                    std::string(language),
+                    static_cast<Monero::NetworkType>(nettype),
+                    restoreHeight,
+                    std::string(addressString),
+                    std::string(viewKeyString),
+                    std::string(spendKeyString));
+    return reinterpret_cast<void*>(wallet);
+}
 
 void* MONERO_WalletManager_createWalletFromPolyseed(const char* path, const char* password,
                                                 int nettype, const char* mnemonic, const char* passphrase,
diff --git a/libbridge/src/main/cpp/wallet2_api_c.h b/libbridge/src/main/cpp/wallet2_api_c.h
index 27aa2e3..0f993c3 100644
--- a/libbridge/src/main/cpp/wallet2_api_c.h
+++ b/libbridge/src/main/cpp/wallet2_api_c.h
@@ -840,6 +840,7 @@ void* MONERO_WalletManager_recoveryWallet(const char* path, const char* password
 //                                                     const std::string &viewKeyString,
 //                                                     const std::string &spendKeyString = "",
 //                                                     uint64_t kdf_rounds = 1) = 0;
+void* MONERO_WalletManager_createWalletFromKeys(const char* path, const char* password, const char* language, int nettype, uint64_t restoreHeight, const char* addressString, const char* viewKeyString, const char* spendKeyString, uint64_t kdf_rounds);
 //     Wallet * createWalletFromKeys(const std::string &path,
 //                                   const std::string &password,
 //                                   const std::string &language,