mirror of
https://github.com/mollyim/monero-wallet-sdk.git
synced 2024-10-01 03:45:36 -04:00
monero: rebase molly/release-v0.18 onto v0.18.3.3
This commit is contained in:
parent
30ef8b481b
commit
b3fb65b858
@ -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) {
|
||||
|
@ -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);
|
||||
}
|
||||
|
||||
|
@ -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
|
||||
|
@ -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,
|
||||
|
@ -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
2
vendor/monero
vendored
@ -1 +1 @@
|
||||
Subproject commit 36d6a9c4c68a9c787a14d419edc05384fe1c506d
|
||||
Subproject commit 64eebdb3ace488435a95acd6eb4e48f908a47c2c
|
Loading…
Reference in New Issue
Block a user