diff --git a/.gitmodules b/.gitmodules index 93101a2..863c3a4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,4 +19,4 @@ [submodule "salvium"] path = salvium url = https://github.com/salvium/salvium - branch = rebase-v0.18 + branch = develop diff --git a/salvium_libwallet2_api_c/src/main/cpp/wallet2_api_c.cpp b/salvium_libwallet2_api_c/src/main/cpp/wallet2_api_c.cpp index cc265ce..a6b076d 100644 --- a/salvium_libwallet2_api_c/src/main/cpp/wallet2_api_c.cpp +++ b/salvium_libwallet2_api_c/src/main/cpp/wallet2_api_c.cpp @@ -1738,12 +1738,26 @@ void* SALVIUM_Wallet_createTransactionMultDest(void* wallet_ptr, const char* dst "SAL1", false /* is_return */, PendingTransaction_Priority_fromInt(pendingTransactionPriority), subaddr_account, - subaddr_indices, - preferred_inputs + subaddr_indices ); DEBUG_END() } +void* SALVIUM_Wallet_createStakeTransaction(void* wallet_ptr, const char* dst_addr, const char* payment_id, + uint64_t amount, uint32_t mixin_count, + int pendingTransactionPriority, + uint32_t subaddr_account, + const char* preferredInputs, const char* separator) { + DEBUG_START() + Monero::Wallet *wallet = reinterpret_cast(wallet_ptr); + std::set subaddr_indices = {}; + std::set preferred_inputs = splitString(std::string(preferredInputs), std::string(separator)); + return wallet->createStakeTransaction(amount, mixin_count, + PendingTransaction_Priority_fromInt(pendingTransactionPriority), + subaddr_account, subaddr_indices); + DEBUG_END() +} + void* SALVIUM_Wallet_createTransaction(void* wallet_ptr, const char* dst_addr, const char* payment_id, uint64_t amount, uint32_t mixin_count, int pendingTransactionPriority, @@ -1761,7 +1775,7 @@ void* SALVIUM_Wallet_createTransaction(void* wallet_ptr, const char* dst_addr, c optAmount, mixin_count, "SAL1", false /* is_return */, PendingTransaction_Priority_fromInt(pendingTransactionPriority), - subaddr_account, subaddr_indices, preferred_inputs); + subaddr_account, subaddr_indices); DEBUG_END() } diff --git a/salvium_libwallet2_api_c/src/main/cpp/wallet2_api_c.h b/salvium_libwallet2_api_c/src/main/cpp/wallet2_api_c.h index 9a1c3a5..e665e2f 100644 --- a/salvium_libwallet2_api_c/src/main/cpp/wallet2_api_c.h +++ b/salvium_libwallet2_api_c/src/main/cpp/wallet2_api_c.h @@ -719,6 +719,11 @@ extern ADDAPI void* SALVIUM_Wallet_createTransaction(void* wallet_ptr, const cha int pendingTransactionPriority, uint32_t subaddr_account, const char* preferredInputs, const char* separator); +extern ADDAPI void* SALVIUM_Wallet_createStakeTransaction(void* wallet_ptr, const char* dst_addr, const char* payment_id, + uint64_t amount, uint32_t mixin_count, + int pendingTransactionPriority, + uint32_t subaddr_account, + const char* preferredInputs, const char* separator); // virtual PendingTransaction * createSweepUnmixableTransaction() = 0; // virtual UnsignedTransaction * loadUnsignedTx(const std::string &unsigned_filename) = 0; extern ADDAPI void* SALVIUM_Wallet_loadUnsignedTx(void* wallet_ptr, const char* unsigned_filename);