diff --git a/salvium_libwallet2_api_c/salvium_libwallet2_api_c.exp b/salvium_libwallet2_api_c/salvium_libwallet2_api_c.exp index d566d68..f2d57e0 100644 --- a/salvium_libwallet2_api_c/salvium_libwallet2_api_c.exp +++ b/salvium_libwallet2_api_c/salvium_libwallet2_api_c.exp @@ -210,6 +210,7 @@ _SALVIUM_Wallet_hasMultisigPartialKeyImages _SALVIUM_Wallet_restoreMultisigTransaction _SALVIUM_Wallet_createTransactionMultDest _SALVIUM_Wallet_createTransaction +_SALVIUM_Wallet_createStakeTransaction _SALVIUM_Wallet_loadUnsignedTx _SALVIUM_Wallet_loadUnsignedTxUR _SALVIUM_Wallet_submitTransaction 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 d87e500..3d9c644 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 @@ -967,7 +967,7 @@ const char* SALVIUM_SubaddressAccountRow_getLabel(void* subaddressAccountRow_ptr DEBUG_END() } // std::string getBalance() const {return m_balance;} -const char* SALVIUM_SubaddressAccountRow_getBalance(void* subaddressAccountRow_ptr) { +const char* SALVIUM_SubaddressAccountRow_getBalance(void* subaddressAccountRow_ptr, const char* asset) { DEBUG_START() Monero::SubaddressAccountRow *subaddressAccountRow = reinterpret_cast(subaddressAccountRow_ptr); std::string str = subaddressAccountRow->getBalance("SAL1"); @@ -978,7 +978,7 @@ const char* SALVIUM_SubaddressAccountRow_getBalance(void* subaddressAccountRow_p DEBUG_END() } // std::string getUnlockedBalance() const {return m_unlockedBalance;} -const char* SALVIUM_SubaddressAccountRow_getUnlockedBalance(void* subaddressAccountRow_ptr) { +const char* SALVIUM_SubaddressAccountRow_getUnlockedBalance(void* subaddressAccountRow_ptr, const char* asset) { DEBUG_START() Monero::SubaddressAccountRow *subaddressAccountRow = reinterpret_cast(subaddressAccountRow_ptr); std::string str = subaddressAccountRow->getUnlockedBalance("SAL1"); 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 0f9884e..127dd3f 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 @@ -194,6 +194,7 @@ extern ADDAPI const char* SALVIUM_TransactionInfo_paymentId(void* txInfo_ptr); extern ADDAPI int SALVIUM_TransactionInfo_transfers_count(void* txInfo_ptr); extern ADDAPI uint64_t SALVIUM_TransactionInfo_transfers_amount(void* txInfo_ptr, int index); extern ADDAPI const char* SALVIUM_TransactionInfo_transfers_address(void* txInfo_ptr, int address); +extern ADDAPI const char* SALVIUM_TransactionInfo_transfers_asset(void* txInfo_ptr, int asset); // }; // struct TransactionHistory // { @@ -384,14 +385,18 @@ extern ADDAPI void SALVIUM_Subaddress_refresh(void* subaddress_ptr, uint32_t acc // m_address(_address), // m_label(_label), // m_balance(_balance), -// m_unlockedBalance(_unlockedBalance) {} +// m_unlockedBalance(_unlockedBalance), +// m_balance_sal1(_balance_sal1), +// m_unlockedBalance_sal1(_unlockedBalance_sal1) {} // private: // std::size_t m_rowId; // std::string m_address; // std::string m_label; // std::string m_balance; +// std::string m_balance_sal1; // std::string m_unlockedBalance; +// std::string m_unlockedBalance_sal1; // public: // std::string extra; extern ADDAPI const char* SALVIUM_SubaddressAccountRow_extra(void* subaddressAccountRow_ptr); @@ -400,9 +405,9 @@ extern ADDAPI const char* SALVIUM_SubaddressAccountRow_getAddress(void* subaddre // std::string getLabel() const {return m_label;} extern ADDAPI const char* SALVIUM_SubaddressAccountRow_getLabel(void* subaddressAccountRow_ptr); // std::string getBalance() const {return m_balance;} -extern ADDAPI const char* SALVIUM_SubaddressAccountRow_getBalance(void* subaddressAccountRow_ptr); + extern ADDAPI const char* SALVIUM_SubaddressAccountRow_getBalance(void* subaddressAccountRow_ptr, const char* asset); // std::string getUnlockedBalance() const {return m_unlockedBalance;} -extern ADDAPI const char* SALVIUM_SubaddressAccountRow_getUnlockedBalance(void* subaddressAccountRow_ptr); +extern ADDAPI const char* SALVIUM_SubaddressAccountRow_getUnlockedBalance(void* subaddressAccountRow_ptr, const char* asset); // std::size_t getRowId() const {return m_rowId;} extern ADDAPI size_t SALVIUM_SubaddressAccountRow_getRowId(void* subaddressAccountRow_ptr); // };