From 2884024e8f9446c1645865b3f5f63def4f5a6e4f Mon Sep 17 00:00:00 2001 From: pokkst Date: Sun, 25 Sep 2022 18:31:00 -0500 Subject: [PATCH] Update to 0.18.1.1-mynero --- app/src/main/cpp/monerujo.cpp | 29 ------------------- .../java/net/mynero/wallet/model/Wallet.java | 4 --- doc/BUILDING-external-libs.md | 2 +- external-libs/VERSION | 2 +- external-libs/include/wallet2_api.h | 26 ----------------- 5 files changed, 2 insertions(+), 61 deletions(-) diff --git a/app/src/main/cpp/monerujo.cpp b/app/src/main/cpp/monerujo.cpp index eb3bb68..c6a109a 100644 --- a/app/src/main/cpp/monerujo.cpp +++ b/app/src/main/cpp/monerujo.cpp @@ -1039,35 +1039,6 @@ Java_net_mynero_wallet_model_Wallet_estimateTransactionFee(JNIEnv *env, jobject return fee; } -JNIEXPORT jlong JNICALL -Java_net_mynero_wallet_model_Wallet_createTransactionSingleJ(JNIEnv *env, jobject instance, - jstring key_image, jstring dst_addr, - jint priority) { - const char *_key_image = env->GetStringUTFChars(key_image, nullptr); - const char *_dst_addr = env->GetStringUTFChars(dst_addr, nullptr); - Monero::PendingTransaction::Priority _priority = - static_cast(priority); - Monero::Wallet *wallet = getHandle(env, instance); - Monero::PendingTransaction *tx = wallet->createTransactionSingle(_key_image, _dst_addr, _priority); - env->ReleaseStringUTFChars(key_image, _key_image); - env->ReleaseStringUTFChars(dst_addr, _dst_addr); - return reinterpret_cast(tx); -} - -JNIEXPORT jlong JNICALL -Java_net_mynero_wallet_model_Wallet_createTransactionSelectedJ(JNIEnv *env, jobject instance, - jobject key_images, jstring dst_addr, - jint priority) { - const std::vector _key_images = java2cpp(env, key_images); - const char *_dst_addr = env->GetStringUTFChars(dst_addr, nullptr); - Monero::PendingTransaction::Priority _priority = - static_cast(priority); - Monero::Wallet *wallet = getHandle(env, instance); - Monero::PendingTransaction *tx = wallet->createTransactionSelected(_key_images, _dst_addr, _priority); - env->ReleaseStringUTFChars(dst_addr, _dst_addr); - return reinterpret_cast(tx); -} - JNIEXPORT jlong JNICALL Java_net_mynero_wallet_model_Wallet_createSweepTransaction(JNIEnv *env, jobject instance, jstring dst_addr, jstring payment_id, diff --git a/app/src/main/java/net/mynero/wallet/model/Wallet.java b/app/src/main/java/net/mynero/wallet/model/Wallet.java index 18a14ea..11d5462 100644 --- a/app/src/main/java/net/mynero/wallet/model/Wallet.java +++ b/app/src/main/java/net/mynero/wallet/model/Wallet.java @@ -312,10 +312,6 @@ public class Wallet { int mixin_count, int priority, int accountIndex, ArrayList key_images); - private native long createTransactionSingleJ(String key_image, String dst_addr, int priority); - - private native long createTransactionSelectedJ(List key_images, String dst_addr, int priority); - public PendingTransaction createSweepUnmixableTransaction() { disposePendingTransaction(); long txHandle = createSweepUnmixableTransactionJ(); diff --git a/doc/BUILDING-external-libs.md b/doc/BUILDING-external-libs.md index 2e44db7..2c0a41d 100644 --- a/doc/BUILDING-external-libs.md +++ b/doc/BUILDING-external-libs.md @@ -12,7 +12,7 @@ 1. Clone https://github.com/pokkst/monero repo. -2. Change repo to correct branch (example: `git checkout release-v0.18.1.0-mynero`). +2. Change repo to correct branch (example: `git checkout release-v0.18.1.1-mynero`). 3. Update submodules: `git submodule update --init --force`. diff --git a/external-libs/VERSION b/external-libs/VERSION index 737a491..a6c53b7 100644 --- a/external-libs/VERSION +++ b/external-libs/VERSION @@ -1 +1 @@ -MONERUJO_monero feature/select-utxos with monero release-v0.18.1.0-mynero +MONERUJO_monero feature/select-utxos with monero release-v0.18.1.1-mynero diff --git a/external-libs/include/wallet2_api.h b/external-libs/include/wallet2_api.h index 291f214..3bff2a4 100644 --- a/external-libs/include/wallet2_api.h +++ b/external-libs/include/wallet2_api.h @@ -909,32 +909,6 @@ struct Wallet std::set subaddr_indices = {}, const std::set &preferred_inputs = {}) = 0; - /*! - * \brief createTransactionSingle creates transaction with single input - * \param key_image key image as string - * \param dst_addr destination address as string - * \param priority - * \return PendingTransaction object. caller is responsible to check PendingTransaction::status() - * after object returned - */ - - virtual PendingTransaction * createTransactionSingle(const std::string &key_image, const std::string &dst_addr, - size_t outputs = 1, PendingTransaction::Priority = PendingTransaction::Priority_Low) = 0; - - - /*! - * \brief createTransactionSelected creates transaction with selected inputs - * \param key_images vector of key images as string - * \param dst_addr destination address as string - * \param outputs split amount into this many outputs of equal amount - * \param priority transaction priority - * \return PendingTransaction object. caller is responsible to check PendingTransaction::status() - * after object returned - */ - - virtual PendingTransaction * createTransactionSelected(const std::vector &key_images, const std::string &dst_addr, - size_t outputs = 1, PendingTransaction::Priority = PendingTransaction::Priority_Low) = 0; - /*! * \brief createSweepUnmixableTransaction creates transaction with unmixable outputs. * \return PendingTransaction object. caller is responsible to check PendingTransaction::status()