rottenwheel/mysu
1
0
Fork 0
mirror of https://codeberg.org/r4v3r23/mysu.git synced 2024-11-26 15:52:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to 0.18.1.1-mynero

Browse source
This commit is contained in:
pokkst 2022-09-25 18:31:00 -05:00
parent f02d56ef1c
commit 2884024e8f
No known key found for this signature in database
GPG key ID: 90C2ED85E67A50FF
5 changed files with 2 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
app/src/main/cpp/monerujo.cpp
View file

@ -1039,35 +1039,6 @@ Java_net_mynero_wallet_model_Wallet_estimateTransactionFee(JNIEnv *env, jobject
return fee; 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<Monero::PendingTransaction::Priority>(priority);
Monero::Wallet *wallet = getHandle<Monero::Wallet>(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<jlong>(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<std::string> _key_images = java2cpp(env, key_images);
const char *_dst_addr = env->GetStringUTFChars(dst_addr, nullptr);
Monero::PendingTransaction::Priority _priority =
static_cast<Monero::PendingTransaction::Priority>(priority);
Monero::Wallet *wallet = getHandle<Monero::Wallet>(env, instance);
Monero::PendingTransaction *tx = wallet->createTransactionSelected(_key_images, _dst_addr, _priority);
env->ReleaseStringUTFChars(dst_addr, _dst_addr);
return reinterpret_cast<jlong>(tx);
}
JNIEXPORT jlong JNICALL JNIEXPORT jlong JNICALL
Java_net_mynero_wallet_model_Wallet_createSweepTransaction(JNIEnv *env, jobject instance, Java_net_mynero_wallet_model_Wallet_createSweepTransaction(JNIEnv *env, jobject instance,
jstring dst_addr, jstring payment_id, jstring dst_addr, jstring payment_id,

4
app/src/main/java/net/mynero/wallet/model/Wallet.java
View file

@ -312,10 +312,6 @@ public class Wallet {
int mixin_count, int mixin_count,
int priority, int accountIndex, ArrayList<String> key_images); int priority, int accountIndex, ArrayList<String> key_images);
private native long createTransactionSingleJ(String key_image, String dst_addr, int priority);
private native long createTransactionSelectedJ(List<String> key_images, String dst_addr, int priority);
public PendingTransaction createSweepUnmixableTransaction() { public PendingTransaction createSweepUnmixableTransaction() {
disposePendingTransaction(); disposePendingTransaction();
long txHandle = createSweepUnmixableTransactionJ(); long txHandle = createSweepUnmixableTransactionJ();

2
doc/BUILDING-external-libs.md
View file

@ -12,7 +12,7 @@
1. Clone https://github.com/pokkst/monero repo. 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`. 3. Update submodules: `git submodule update --init --force`.

2
external-libs/VERSION
View file

@ -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

26
external-libs/include/wallet2_api.h
View file

@ -909,32 +909,6 @@ struct Wallet
std::set<uint32_t> subaddr_indices = {}, std::set<uint32_t> subaddr_indices = {},
const std::set<std::string> &preferred_inputs = {}) = 0; const std::set<std::string> &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<std::string> &key_images, const std::string &dst_addr,
size_t outputs = 1, PendingTransaction::Priority = PendingTransaction::Priority_Low) = 0;
/*! /*!
* \brief createSweepUnmixableTransaction creates transaction with unmixable outputs. * \brief createSweepUnmixableTransaction creates transaction with unmixable outputs.
* \return PendingTransaction object. caller is responsible to check PendingTransaction::status() * \return PendingTransaction object. caller is responsible to check PendingTransaction::status()