diff options
Diffstat (limited to 'libbridge/src/main/cpp/wallet2_api_c.h')
| -rw-r--r-- | libbridge/src/main/cpp/wallet2_api_c.h | 98 |
1 files changed, 76 insertions, 22 deletions
diff --git a/libbridge/src/main/cpp/wallet2_api_c.h b/libbridge/src/main/cpp/wallet2_api_c.h index e38c51b..300d3ca 100644 --- a/libbridge/src/main/cpp/wallet2_api_c.h +++ b/libbridge/src/main/cpp/wallet2_api_c.h @@ -293,6 +293,8 @@ bool MONERO_CoinsInfo_unlocked(void* coinsInfo_ptr); const char* MONERO_CoinsInfo_pubKey(void* coinsInfo_ptr); // virtual bool coinbase() const = 0; bool MONERO_CoinsInfo_coinbase(void* coinsInfo_ptr); +// virtual std::string description() const = 0; +const char* MONERO_CoinsInfo_description(void* coinsInfo_ptr); // }; // struct Coins // { @@ -302,14 +304,22 @@ int MONERO_Coins_count(void* coins_ptr); // virtual CoinsInfo * coin(int index) const = 0; void* MONERO_Coins_coin(void* coins_ptr, int index); // virtual std::vector<CoinsInfo*> getAll() const = 0; +int MONERO_Coins_getAll_size(void* coins_ptr); +void* MONERO_Coins_getAll_byIndex(void* coins_ptr, int index); // virtual void refresh() = 0; void MONERO_Coins_refresh(void* coins_ptr); +// virtual void setFrozen(std::string public_key) = 0; +void MONERO_Coins_setFrozenByPublicKey(void* coins_ptr, const char* public_key); // virtual void setFrozen(int index) = 0; void MONERO_Coins_setFrozen(void* coins_ptr, int index); // virtual void thaw(int index) = 0; void MONERO_Coins_thaw(void* coins_ptr, int index); +// virtual void thaw(std::string public_key) = 0; +void MONERO_Coins_thawByPublicKey(void* coins_ptr, const char* public_key); // virtual bool isTransferUnlocked(uint64_t unlockTime, uint64_t blockHeight) = 0; bool MONERO_Coins_isTransferUnlocked(void* coins_ptr, uint64_t unlockTime, uint64_t blockHeight); +// virtual void setDescription(const std::string &public_key, const std::string &description) = 0; +void MONERO_Coins_setDescription(void* coins_ptr, const char* public_key, const char* description); // }; // struct SubaddressRow { // public: @@ -467,6 +477,14 @@ const int WalletConnectionStatus_Connected = 1; // ConnectionStatus_WrongVersion const int WalletConnectionStatus_WrongVersion = 2; // }; +// enum BackgroundSyncType { +// BackgroundSync_Off = 0, +const int WalletBackgroundSync_Off = 0; +// BackgroundSync_ReusePassword = 1, +const int WalletBackgroundSync_ReusePassword = 1; +// BackgroundSync_CustomPassword = 2 +const int BackgroundSync_CustomPassword = 2; +// }; // virtual ~Wallet() = 0; // virtual std::string seed(const std::string& seed_offset = "") const = 0; const char* MONERO_Wallet_seed(void* wallet_ptr, const char* seed_offset); @@ -561,6 +579,8 @@ uint64_t MONERO_Wallet_unlockedBalance(void* wallet_ptr, uint32_t accountIndex); // return result; // } // virtual bool watchOnly() const = 0; +// virtual uint64_t viewOnlyBalance(uint32_t accountIndex, const std::vector<std::string> &key_images = {}) const = 0; +uint64_t MONERO_Wallet_viewOnlyBalance(void* wallet_ptr, uint32_t accountIndex); bool MONERO_Wallet_watchOnly(void* wallet_ptr); // virtual bool isDeterministic() const = 0; bool MONERO_Wallet_isDeterministic(void* wallet_ptr); @@ -573,7 +593,7 @@ uint64_t MONERO_Wallet_estimateBlockChainHeight(void* wallet_ptr); // virtual uint64_t daemonBlockChainHeight() const = 0; uint64_t MONERO_Wallet_daemonBlockChainHeight(void* wallet_ptr); uint64_t MONERO_Wallet_daemonBlockChainHeight_cached(void* wallet_ptr); -bool MONERO_Wallet_daemonBlockChainHeight_enableRefresh(void* wallet_ptr, int seconds); +void MONERO_Wallet_daemonBlockChainHeight_runThread(void* wallet_ptr, int seconds); // virtual uint64_t daemonBlockChainTargetHeight() const = 0; uint64_t MONERO_Wallet_daemonBlockChainTargetHeight(void* wallet_ptr); // virtual bool synchronized() const = 0; @@ -617,6 +637,10 @@ void MONERO_Wallet_init3(void* wallet_ptr, const char* argv0, const char* defaul // static void warning(const std::string &category, const std::string &str); // static void error(const std::string &category, const std::string &str); // virtual void startRefresh() = 0; +// virtual bool getPolyseed(std::string &seed, std::string &passphrase) const = 0; +const char* MONERO_Wallet_getPolyseed(void* wallet_ptr, const char* passphrase); +// static bool createPolyseed(std::string &seed_words, std::string &err, const std::string &language = "English"); +const char* MONERO_Wallet_createPolyseed(); void MONERO_Wallet_startRefresh(void* wallet_ptr); // virtual void pauseRefresh() = 0; void MONERO_Wallet_pauseRefresh(void* wallet_ptr); @@ -662,11 +686,13 @@ const char* MONERO_Wallet_getMultisigInfo(void* wallet_ptr); // optional<uint64_t> amount, uint32_t mixin_count, // PendingTransaction::Priority = PendingTransaction::Priority_Low, // uint32_t subaddr_account = 0, -// std::set<uint32_t> subaddr_indices = {}) = 0; +// std::set<uint32_t> subaddr_indices = {}, +// const std::set<std::string> &preferred_inputs = {) = 0; void* MONERO_Wallet_createTransaction(void* wallet_ptr, const char* dst_addr, const char* payment_id, uint64_t amount, uint32_t mixin_count, int pendingTransactionPriority, - uint32_t subaddr_account); // std::nullopt + uint32_t subaddr_account, + const char* preferredInputs, const char* separator); // virtual PendingTransaction * createSweepUnmixableTransaction() = 0; // virtual UnsignedTransaction * loadUnsignedTx(const std::string &unsigned_filename) = 0; void* MONERO_Wallet_loadUnsignedTx(void* wallet_ptr, const char* unsigned_filename); @@ -675,6 +701,8 @@ bool MONERO_Wallet_submitTransaction(void* wallet_ptr, const char* fileName); // virtual void disposeTransaction(PendingTransaction * t) = 0; // virtual uint64_t estimateTransactionFee(const std::vector<std::pair<std::string, uint64_t>> &destinations, // PendingTransaction::Priority priority) const = 0; +// virtual bool hasUnknownKeyImages() const = 0; +bool MONERO_Wallet_hasUnknownKeyImages(void* wallet_ptr); // virtual bool exportKeyImages(const std::string &filename, bool all = false) = 0; bool MONERO_Wallet_exportKeyImages(void* wallet_ptr, const char* filename, bool all); // virtual bool importKeyImages(const std::string &filename) = 0; @@ -684,6 +712,18 @@ bool MONERO_Wallet_exportOutputs(void* wallet_ptr, const char* filename, bool al // virtual bool importOutputs(const std::string &filename) = 0; bool MONERO_Wallet_importOutputs(void* wallet_ptr, const char* filename); // virtual bool scanTransactions(const std::vector<std::string> &txids) = 0; +// virtual bool setupBackgroundSync(const BackgroundSyncType background_sync_type, const std::string &wallet_password, const optional<std::string> &background_cache_password) = 0; +bool MONERO_Wallet_setupBackgroundSync(void* wallet_ptr, int background_sync_type, const char* wallet_password, const char* background_cache_password); +// virtual BackgroundSyncType getBackgroundSyncType() const = 0; +int MONERO_Wallet_getBackgroundSyncType(void* wallet_ptr); +// virtual bool startBackgroundSync() = 0; +bool MONERO_Wallet_startBackgroundSync(void* wallet_ptr); +// virtual bool stopBackgroundSync(const std::string &wallet_password) = 0; +bool MONERO_Wallet_stopBackgroundSync(void* wallet_ptr, const char* wallet_password); +// virtual bool isBackgroundSyncing() const = 0; +bool MONERO_Wallet_isBackgroundSyncing(void* wallet_ptr); +// virtual bool isBackgroundWallet() const = 0; +bool MONERO_Wallet_isBackgroundWallet(void* wallet_ptr); // virtual TransactionHistory * history() = 0; void* MONERO_Wallet_history(void* wallet_ptr); // virtual AddressBook * addressBook() = 0; @@ -766,13 +806,13 @@ uint64_t MONERO_Wallet_getBytesSent(void* wallet_ptr); // struct WalletManager // { // virtual Wallet * createWallet(const std::string &path, const std::string &password, const std::string &language, NetworkType nettype, uint64_t kdf_rounds = 1) = 0; -void* MONERO_WalletManager_createWallet(const char* path, const char* password, const char* language, int networkType); +void* MONERO_WalletManager_createWallet(void* wm_ptr, const char* path, const char* password, const char* language, int networkType); // Wallet * createWallet(const std::string &path, const std::string &password, const std::string &language, bool testnet = false) // deprecated // { // return createWallet(path, password, language, testnet ? TESTNET : MAINNET); // } // virtual Wallet * openWallet(const std::string &path, const std::string &password, NetworkType nettype, uint64_t kdf_rounds = 1, WalletListener * listener = nullptr) = 0; -void* MONERO_WalletManager_openWallet(const char* path, const char* password, int networkType); +void* MONERO_WalletManager_openWallet(void* wm_ptr, const char* path, const char* password, int networkType); // Wallet * openWallet(const std::string &path, const std::string &password, bool testnet = false) // deprecated // { // return openWallet(path, password, testnet ? TESTNET : MAINNET); @@ -780,7 +820,7 @@ void* MONERO_WalletManager_openWallet(const char* path, const char* password, in // virtual Wallet * recoveryWallet(const std::string &path, const std::string &password, const std::string &mnemonic, // NetworkType nettype = MAINNET, uint64_t restoreHeight = 0, uint64_t kdf_rounds = 1, // const std::string &seed_offset = {}) = 0; -void* MONERO_WalletManager_recoveryWallet(const char* path, const char* password, const char* mnemonic, int networkType, uint64_t restoreHeight, uint64_t kdfRounds, const char* seedOffset); +void* MONERO_WalletManager_recoveryWallet(void* wm_ptr, const char* path, const char* password, const char* mnemonic, int networkType, uint64_t restoreHeight, uint64_t kdfRounds, const char* seedOffset); // Wallet * recoveryWallet(const std::string &path, const std::string &password, const std::string &mnemonic, // bool testnet = false, uint64_t restoreHeight = 0) // deprecated // { @@ -800,6 +840,7 @@ void* MONERO_WalletManager_recoveryWallet(const char* path, const char* password // const std::string &viewKeyString, // const std::string &spendKeyString = "", // uint64_t kdf_rounds = 1) = 0; +void* MONERO_WalletManager_createWalletFromKeys(void* wm_ptr, const char* path, const char* password, const char* language, int nettype, uint64_t restoreHeight, const char* addressString, const char* viewKeyString, const char* spendKeyString, uint64_t kdf_rounds); // Wallet * createWalletFromKeys(const std::string &path, // const std::string &password, // const std::string &language, @@ -836,46 +877,57 @@ void* MONERO_WalletManager_recoveryWallet(const char* path, const char* password // const std::string &subaddressLookahead = "", // uint64_t kdf_rounds = 1, // WalletListener * listener = nullptr) = 0; +// virtual Wallet * createWalletFromPolyseed(const std::string &path, +// const std::string &password, +// NetworkType nettype, +// const std::string &mnemonic, +// const std::string &passphrase = "", +// bool newWallet = true, +// uint64_t restore_height = 0, +// uint64_t kdf_rounds = 1) = 0; +void* MONERO_WalletManager_createWalletFromPolyseed(void* wm_ptr, const char* path, const char* password, + int nettype, const char* mnemonic, const char* passphrase, + bool newWallet, uint64_t restore_height, uint64_t kdf_rounds); // virtual bool closeWallet(Wallet *wallet, bool store = true) = 0; -bool MONERO_WalletManager_closeWallet(void* wallet_ptr, bool store); +bool MONERO_WalletManager_closeWallet(void* wm_ptr, void* wallet_ptr, bool store); // virtual bool walletExists(const std::string &path) = 0; -bool MONERO_WalletManager_walletExists(const char* path); +bool MONERO_WalletManager_walletExists(void* wm_ptr, const char* path); // virtual bool verifyWalletPassword(const std::string &keys_file_name, const std::string &password, bool no_spend_key, uint64_t kdf_rounds = 1) const = 0; -bool MONERO_WalletManager_verifyWalletPassword(const char* keys_file_name, const char* password, bool no_spend_key, uint64_t kdf_rounds); +bool MONERO_WalletManager_verifyWalletPassword(void* wm_ptr, const char* keys_file_name, const char* password, bool no_spend_key, uint64_t kdf_rounds); // virtual bool queryWalletDevice(Wallet::Device& device_type, const std::string &keys_file_name, const std::string &password, uint64_t kdf_rounds = 1) const = 0; // bool MONERO_WalletManager_queryWalletDevice(int device_type, const char* keys_file_name, const char* password, uint64_t kdf_rounds); // virtual std::vector<std::string> findWallets(const std::string &path) = 0; -const char* MONERO_WalletManager_findWallets(const char* path, const char* separator); +const char* MONERO_WalletManager_findWallets(void* wm_ptr, const char* path, const char* separator); // virtual std::string errorString() const = 0; -const char* MONERO_WalletManager_errorString(); +const char* MONERO_WalletManager_errorString(void* wm_ptr); // virtual void setDaemonAddress(const std::string &address) = 0; -void MONERO_WalletManager_setDaemonAddress(const char* address); +void MONERO_WalletManager_setDaemonAddress(void* wm_ptr, const char* address); // virtual bool connected(uint32_t *version = NULL) = 0; // virtual uint64_t blockchainHeight() = 0; -uint64_t MONERO_WalletManager_blockchainHeight(); +uint64_t MONERO_WalletManager_blockchainHeight(void* wm_ptr); // virtual uint64_t blockchainTargetHeight() = 0; -uint64_t MONERO_WalletManager_blockchainTargetHeight(); +uint64_t MONERO_WalletManager_blockchainTargetHeight(void* wm_ptr); // virtual uint64_t networkDifficulty() = 0; -uint64_t MONERO_WalletManager_networkDifficulty(); +uint64_t MONERO_WalletManager_networkDifficulty(void* wm_ptr); // virtual double miningHashRate() = 0; -double MONERO_WalletManager_miningHashRate(); +double MONERO_WalletManager_miningHashRate(void* wm_ptr); // virtual uint64_t blockTarget() = 0; -uint64_t MONERO_WalletManager_blockTarget(); +uint64_t MONERO_WalletManager_blockTarget(void* wm_ptr); // virtual bool isMining() = 0; -bool MONERO_WalletManager_isMining(); +bool MONERO_WalletManager_isMining(void* wm_ptr); // virtual bool startMining(const std::string &address, uint32_t threads = 1, bool background_mining = false, bool ignore_battery = true) = 0; -bool MONERO_WalletManager_startMining(const char* address, uint32_t threads, bool backgroundMining, bool ignoreBattery); +bool MONERO_WalletManager_startMining(void* wm_ptr, const char* address, uint32_t threads, bool backgroundMining, bool ignoreBattery); // virtual bool stopMining() = 0; -bool MONERO_WalletManager_stopMining(const char* address); +bool MONERO_WalletManager_stopMining(void* wm_ptr, const char* address); // virtual std::string resolveOpenAlias(const std::string &address, bool &dnssec_valid) const = 0; -const char* MONERO_WalletManager_resolveOpenAlias(const char* address, bool dnssec_valid); +const char* MONERO_WalletManager_resolveOpenAlias(void* wm_ptr, const char* address, bool dnssec_valid); // static std::tuple<bool, std::string, std::string, std::string, std::string> checkUpdates( // const std::string &software, // std::string subdir, // const char *buildtag = nullptr, // const char *current_version = nullptr); // virtual bool setProxy(const std::string &address) = 0; -bool MONERO_WalletManager_setProxy(const char* address); +bool MONERO_WalletManager_setProxy(void* wm_ptr, const char* address); // }; int LogLevel_Silent = -1; @@ -900,6 +952,7 @@ int LogLevel_Max = 4; // LogLevel_Max = LogLevel_4 // }; // static WalletManager * getWalletManager(); +void* MONERO_WalletManagerFactory_getWalletManager(); // static void setLogLevel(int level); void MONERO_WalletManagerFactory_setLogLevel(int level); // static void setLogCategories(const std::string &categories); @@ -914,6 +967,7 @@ uint64_t MONERO_DEBUG_test3(uint64_t x); void* MONERO_DEBUG_test4(uint64_t x); const char* MONERO_DEBUG_test5(); const char* MONERO_DEBUG_test5_std(); +bool MONERO_DEBUG_isPointerNull(void* wallet_ptr); #ifdef __cplusplus } |