Git-Mirrors/mollyim-monero-wallet-sdk
1
0
Fork 0
mirror of https://github.com/mollyim/monero-wallet-sdk.git synced 2024-09-07 20:31:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

monero: rebase molly/release-v0.18 onto v0.18.3.3

Browse Source
This commit is contained in:
Oscar Mira 2024-05-27 19:08:14 +02:00
parent 30ef8b481b
commit b3fb65b858
No known key found for this signature in database
GPG Key ID: B371B98C5DC32237
6 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/android/src/main/cpp/wallet/wallet.cc
View File

@ -168,7 +168,6 @@ std::string Wallet::addSubaddressInternal(const cryptonote::subaddress_index& in
std::unique_ptr<PendingTransfer> Wallet::createPayment(
const std::vector<std::string>& addresses,
const std::vector<uint64_t>& amounts,
uint64_t time_lock,
int priority,
uint32_t account_index,
const std::set<uint32_t>& subaddr_indexes) {
@ -196,7 +195,6 @@ std::unique_ptr<PendingTransfer> Wallet::createPayment(
auto ptxs = m_wallet.create_transactions_2(
dsts,
m_wallet.get_min_ring_size() - 1,
time_lock,
priority,
{}, /* extra */
account_index,
@ -847,7 +845,6 @@ Java_im_molly_monero_WalletNative_nativeCreatePayment(
jlong handle,
jobjectArray j_addresses,
jlongArray j_amounts,
jlong time_lock,
jint priority,
jint account_index,
jintArray j_subaddr_indexes,
@ -865,7 +862,7 @@ Java_im_molly_monero_WalletNative_nativeCreatePayment(
pending_transfer = wallet->createPayment(
addresses,
{amounts.begin(), amounts.end()},
time_lock, priority,
priority,
account_index,
{subaddr_indexes.begin(), subaddr_indexes.end()});
// } catch (error::daemon_busy& e) {

3
lib/android/src/main/cpp/wallet/wallet.h
View File

@ -101,7 +101,6 @@ class Wallet : i_wallet2_callback {
std::unique_ptr<PendingTransfer> createPayment(
const std::vector<std::string>& addresses,
const std::vector<uint64_t>& amounts,
uint64_t time_lock,
int priority,
uint32_t account_index,
const std::set<uint32_t>& subaddr_indexes);
@ -175,7 +174,7 @@ class Wallet : i_wallet2_callback {
handleNewBlock(height, block.timestamp);
}
void on_reorg(uint64_t height) override {
void on_reorg(uint64_t height, uint64_t blocks_detached, size_t transfers_detached) override {
handleReorgEvent(height);
}

2
lib/android/src/main/kotlin/im/molly/monero/TransferRequest.kt
View File

@ -10,7 +10,6 @@ data class PaymentRequest(
val paymentDetails: List<PaymentDetail>,
val spendingAccountIndex: Int,
val feePriority: FeePriority? = null,
val timeLock: UnlockTime? = null,
) : TransferRequest
@Parcelize
@ -19,5 +18,4 @@ data class SweepRequest(
val splitCount: Int = 1,
val keyImageHashes: List<HashDigest>,
val feePriority: FeePriority? = null,
val timeLock: UnlockTime? = null,
) : TransferRequest

2
lib/android/src/main/kotlin/im/molly/monero/WalletNative.kt
View File

@ -193,7 +193,6 @@ internal class WalletNative private constructor(
handle = handle,
addresses = addresses.toTypedArray(),
amounts = amounts.toLongArray(),
timeLock = request.timeLock?.blockchainTime?.toLong() ?: 0,
priority = request.feePriority?.priority ?: 0,
accountIndex = request.spendingAccountIndex,
subAddressIndexes = IntArray(0),
@ -469,7 +468,6 @@ internal class WalletNative private constructor(
handle: Long,
addresses: Array<String>,
amounts: LongArray,
timeLock: Long,
priority: Int,
accountIndex: Int,
subAddressIndexes: IntArray,

2
lib/android/src/main/kotlin/im/molly/monero/internal/HttpRequest.kt
View File

@ -12,7 +12,7 @@ data class HttpRequest(
) : Parcelable {
override fun toString(): String =
"HttpRequest(method=$method, path$path, headers=${header?.length}, body=${bodyBytes?.size})"
"HttpRequest(method=$method, path=$path, headers=${header?.length}, body=${bodyBytes?.size})"
override fun equals(other: Any?): Boolean {
if (this === other) return true

2
vendor/monero vendored

@ -1 +1 @@
Subproject commit 36d6a9c4c68a9c787a14d419edc05384fe1c506d
Subproject commit 64eebdb3ace488435a95acd6eb4e48f908a47c2c