updated build to include correct source files upstream; renamed codebase to use SALVIUM_

This commit is contained in:
Some Random Crypto Guy
2025-03-18 10:31:55 +00:00
parent e79f77f0a6
commit 235107fe5d
6 changed files with 973 additions and 652 deletions

View File

@@ -550,7 +550,7 @@ index 4b0a26a6b..644cf503b 100644
// - confirmed_transfer_details)
-PendingTransaction *WalletImpl::createTransactionMultDest(const Monero::transaction_type &tx_type, const std::vector<string> &dst_addr, const string &payment_id, optional<std::vector<uint64_t>> amount, uint32_t mixin_count, const std::string &asset_type, const bool is_return, PendingTransaction::Priority priority, uint32_t subaddr_account, std::set<uint32_t> subaddr_indices)
+PendingTransaction *WalletImpl::createTransactionMultDest(const Monero::transaction_type &tx_type, const std::vector<string> &dst_addr, const string &payment_id, optional<std::vector<uint64_t>> amount, uint32_t mixin_count, const std::string &asset_type, const bool is_return, PendingTransaction::Priority priority, uint32_t subaddr_account, std::set<uint32_t> subaddr_indices), const std::set<std::string> &preferred_inputs)
+PendingTransaction *WalletImpl::createTransactionMultDest(const Monero::transaction_type &tx_type, const std::vector<string> &dst_addr, const string &payment_id, optional<std::vector<uint64_t>> amount, uint32_t mixin_count, const std::string &asset_type, const bool is_return, PendingTransaction::Priority priority, uint32_t subaddr_account, std::set<uint32_t> subaddr_indices, const std::set<std::string> &preferred_inputs)
{
clearStatus();
@@ -749,20 +749,7 @@ index 4b0a26a6b..644cf503b 100644
setStatusError(writer.str());
} catch (const tools::error::tx_not_possible& e) {
std::ostringstream writer;
@@ -2222,10 +2304,10 @@ PendingTransaction *WalletImpl::createTransactionMultDest(const Monero::transact
}
PendingTransaction *WalletImpl::createTransaction(const string &dst_addr, const string &payment_id, optional<uint64_t> amount, uint32_t mixin_count,
- const std::string &asset_type, const bool is_return, PendingTransaction::Priority priority, uint32_t subaddr_account, std::set<uint32_t> subaddr_indices)
+ const std::string &asset_type, const bool is_return, PendingTransaction::Priority priority, uint32_t subaddr_account, std::set<uint32_t> subaddr_indices, const std::set<std::string> &preferred_inputs)
{
- return createTransactionMultDest(Monero::transaction_type::TRANSFER, std::vector<string> {dst_addr}, payment_id, amount ? (std::vector<uint64_t> {*amount}) : (optional<std::vector<uint64_t>>()), mixin_count, asset_type, is_return, priority, subaddr_account, subaddr_indices);
+ return createTransactionMultDest(Monero::transaction_type::TRANSFER, std::vector<string> {dst_addr}, payment_id, amount ? (std::vector<uint64_t> {*amount}) : (optional<std::vector<uint64_t>>()), mixin_count, asset_type, is_return, priority, subaddr_account, subaddr_indices, preferred_inputs);
}
PendingTransaction *WalletImpl::createSweepUnmixableTransaction()
@@ -2278,6 +2360,16 @@ PendingTransaction *WalletImpl::createSweepUnmixableTransaction()
@@ -2179,6 +2261,16 @@ PendingTransaction *WalletImpl::createTransactionMultDest(const Monero::transact
print_money(e.tx_amount() + e.fee()) %
print_money(e.tx_amount()) %
print_money(e.fee());
@@ -779,6 +766,19 @@ index 4b0a26a6b..644cf503b 100644
setStatusError(writer.str());
} catch (const tools::error::not_enough_outs_to_mix& e) {
std::ostringstream writer;
@@ -2222,10 +2304,10 @@ PendingTransaction *WalletImpl::createTransactionMultDest(const Monero::transact
}
PendingTransaction *WalletImpl::createTransaction(const string &dst_addr, const string &payment_id, optional<uint64_t> amount, uint32_t mixin_count,
- const std::string &asset_type, const bool is_return, PendingTransaction::Priority priority, uint32_t subaddr_account, std::set<uint32_t> subaddr_indices)
+ const std::string &asset_type, const bool is_return, PendingTransaction::Priority priority, uint32_t subaddr_account, std::set<uint32_t> subaddr_indices, const std::set<std::string> &preferred_inputs)
{
- return createTransactionMultDest(Monero::transaction_type::TRANSFER, std::vector<string> {dst_addr}, payment_id, amount ? (std::vector<uint64_t> {*amount}) : (optional<std::vector<uint64_t>>()), mixin_count, asset_type, is_return, priority, subaddr_account, subaddr_indices);
+ return createTransactionMultDest(Monero::transaction_type::TRANSFER, std::vector<string> {dst_addr}, payment_id, amount ? (std::vector<uint64_t> {*amount}) : (optional<std::vector<uint64_t>>()), mixin_count, asset_type, is_return, priority, subaddr_account, subaddr_indices, preferred_inputs);
}
PendingTransaction *WalletImpl::createSweepUnmixableTransaction()
@@ -2350,6 +2442,11 @@ AddressBook *WalletImpl::addressBook()
return m_addressBook.get();
}

View File

@@ -103,6 +103,9 @@ elseif(${MONERO_FLAVOR} STREQUAL "wownero")
target_compile_definitions(wallet2_api_c PRIVATE FLAVOR_WOWNERO)
elseif(${MONERO_FLAVOR} STREQUAL "zano")
target_compile_definitions(wallet2_api_c PRIVATE FLAVOR_ZANO)
elseif(${MONERO_FLAVOR} STREQUAL "salvium")
target_compile_definitions(wallet2_api_c PRIVATE FLAVOR_SALVIUM)
set(BCUR_ENABLED bc-ur)
endif()
if(NOT ${HOST_ABI} STREQUAL "x86_64-apple-darwin11" AND NOT ${HOST_ABI} STREQUAL "aarch64-apple-darwin11" AND NOT ${HOST_ABI} STREQUAL "aarch64-apple-darwin" AND NOT ${HOST_ABI} STREQUAL "x86_64-apple-darwin" AND NOT ${HOST_ABI} STREQUAL "host-apple-darwin" AND NOT ${HOST_ABI} STREQUAL "x86_64-host-apple-darwin" AND NOT ${HOST_ABI} STREQUAL "aarch64-host-apple-darwin" AND NOT ${HOST_ABI} STREQUAL "host-apple-ios" AND NOT ${HOST_ABI} STREQUAL "aarch64-apple-ios" AND NOT ${HOST_ABI} STREQUAL "aarch64-apple-iossimulator" AND NOT ${HOST_ABI} STREQUAL "x86_64-apple-iossimulator")
@@ -123,6 +126,8 @@ if(${HOST_ABI} STREQUAL "x86_64-apple-darwin11" OR ${HOST_ABI} STREQUAL "aarch64
set(EXPORTED_SYMBOLS_FILE ${CMAKE_CURRENT_SOURCE_DIR}/wownero_libwallet2_api_c.exp)
elseif(${MONERO_FLAVOR} STREQUAL "zano")
set(EXPORTED_SYMBOLS_FILE ${CMAKE_CURRENT_SOURCE_DIR}/zano_libwallet2_api_c.exp)
elseif(${MONERO_FLAVOR} STREQUAL "salvium")
set(EXPORTED_SYMBOLS_FILE ${CMAKE_CURRENT_SOURCE_DIR}/salvium_libwallet2_api_c.exp)
endif()
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -exported_symbols_list ${EXPORTED_SYMBOLS_FILE}")
@@ -147,6 +152,8 @@ elseif(${MONERO_FLAVOR} STREQUAL "zano")
${Boost_LIBRARIES}
${OpenSSL_LIBRARIES})
elseif(${MONERO_FLAVOR} STREQUAL "salvium")
set(WALLET_TARGETS wallet_api ${wallet_api_LIB_DEPENDS}) # wallet_api_LIB_DEPENDS
endif()
if(${MONERO_FLAVOR} STREQUAL "wownero")

View File

@@ -0,0 +1,308 @@
_SALVIUM_PendingTransaction_status
_SALVIUM_PendingTransaction_errorString
_SALVIUM_PendingTransaction_commit
_SALVIUM_PendingTransaction_commitUR
_SALVIUM_PendingTransaction_amount
_SALVIUM_PendingTransaction_dust
_SALVIUM_PendingTransaction_fee
_SALVIUM_PendingTransaction_txid
_SALVIUM_PendingTransaction_txCount
_SALVIUM_PendingTransaction_subaddrAccount
_SALVIUM_PendingTransaction_subaddrIndices
_SALVIUM_PendingTransaction_multisigSignData
_SALVIUM_PendingTransaction_signMultisigTx
_SALVIUM_PendingTransaction_signersKeys
_SALVIUM_PendingTransaction_hex
_SALVIUM_UnsignedTransaction_status
_SALVIUM_UnsignedTransaction_errorString
_SALVIUM_UnsignedTransaction_amount
_SALVIUM_UnsignedTransaction_fee
_SALVIUM_UnsignedTransaction_mixin
_SALVIUM_UnsignedTransaction_confirmationMessage
_SALVIUM_UnsignedTransaction_paymentId
_SALVIUM_UnsignedTransaction_recipientAddress
_SALVIUM_UnsignedTransaction_minMixinCount
_SALVIUM_UnsignedTransaction_txCount
_SALVIUM_UnsignedTransaction_sign
_SALVIUM_UnsignedTransaction_signUR
_SALVIUM_TransactionInfo_direction
_SALVIUM_TransactionInfo_isPending
_SALVIUM_TransactionInfo_isFailed
_SALVIUM_TransactionInfo_isCoinbase
_SALVIUM_TransactionInfo_amount
_SALVIUM_TransactionInfo_fee
_SALVIUM_TransactionInfo_blockHeight
_SALVIUM_TransactionInfo_description
_SALVIUM_TransactionInfo_subaddrIndex
_SALVIUM_TransactionInfo_subaddrAccount
_SALVIUM_TransactionInfo_label
_SALVIUM_TransactionInfo_confirmations
_SALVIUM_TransactionInfo_unlockTime
_SALVIUM_TransactionInfo_hash
_SALVIUM_TransactionInfo_timestamp
_SALVIUM_TransactionInfo_paymentId
_SALVIUM_TransactionInfo_transfers_count
_SALVIUM_TransactionInfo_transfers_amount
_SALVIUM_TransactionInfo_transfers_address
_SALVIUM_TransactionHistory_count
_SALVIUM_TransactionHistory_transaction
_SALVIUM_TransactionHistory_transactionById
_SALVIUM_TransactionHistory_refresh
_SALVIUM_TransactionHistory_setTxNote
_SALVIUM_AddressBookRow_extra
_SALVIUM_AddressBookRow_getAddress
_SALVIUM_AddressBookRow_getDescription
_SALVIUM_AddressBookRow_getPaymentId
_SALVIUM_AddressBookRow_getRowId
_SALVIUM_AddressBook_getAll_size
_SALVIUM_AddressBook_getAll_byIndex
_SALVIUM_AddressBook_addRow
_SALVIUM_AddressBook_deleteRow
_SALVIUM_AddressBook_setDescription
_SALVIUM_AddressBook_refresh
_SALVIUM_AddressBook_errorString
_SALVIUM_AddressBook_errorCode
_SALVIUM_AddressBook_lookupPaymentID
_SALVIUM_CoinsInfo_blockHeight
_SALVIUM_CoinsInfo_hash
_SALVIUM_CoinsInfo_internalOutputIndex
_SALVIUM_CoinsInfo_globalOutputIndex
_SALVIUM_CoinsInfo_spent
_SALVIUM_CoinsInfo_frozen
_SALVIUM_CoinsInfo_spentHeight
_SALVIUM_CoinsInfo_amount
_SALVIUM_CoinsInfo_rct
_SALVIUM_CoinsInfo_keyImageKnown
_SALVIUM_CoinsInfo_pkIndex
_SALVIUM_CoinsInfo_subaddrIndex
_SALVIUM_CoinsInfo_subaddrAccount
_SALVIUM_CoinsInfo_address
_SALVIUM_CoinsInfo_addressLabel
_SALVIUM_CoinsInfo_keyImage
_SALVIUM_CoinsInfo_unlockTime
_SALVIUM_CoinsInfo_unlocked
_SALVIUM_CoinsInfo_pubKey
_SALVIUM_CoinsInfo_coinbase
_SALVIUM_CoinsInfo_description
_SALVIUM_Coins_count
_SALVIUM_Coins_coin
_SALVIUM_Coins_getAll_size
_SALVIUM_Coins_getAll_byIndex
_SALVIUM_Coins_refresh
_SALVIUM_Coins_setFrozenByPublicKey
_SALVIUM_Coins_setFrozen
_SALVIUM_Coins_thaw
_SALVIUM_Coins_thawByPublicKey
_SALVIUM_Coins_isTransferUnlocked
_SALVIUM_Coins_setDescription
_SALVIUM_SubaddressRow_extra
_SALVIUM_SubaddressRow_getAddress
_SALVIUM_SubaddressRow_getLabel
_SALVIUM_SubaddressRow_getRowId
_SALVIUM_Subaddress_getAll_size
_SALVIUM_Subaddress_getAll_byIndex
_SALVIUM_Subaddress_addRow
_SALVIUM_Subaddress_setLabel
_SALVIUM_Subaddress_refresh
_SALVIUM_SubaddressAccountRow_extra
_SALVIUM_SubaddressAccountRow_getAddress
_SALVIUM_SubaddressAccountRow_getLabel
_SALVIUM_SubaddressAccountRow_getBalance
_SALVIUM_SubaddressAccountRow_getUnlockedBalance
_SALVIUM_SubaddressAccountRow_getRowId
_SALVIUM_SubaddressAccount_getAll_size
_SALVIUM_SubaddressAccount_getAll_byIndex
_SALVIUM_SubaddressAccount_addRow
_SALVIUM_SubaddressAccount_setLabel
_SALVIUM_SubaddressAccount_refresh
_SALVIUM_MultisigState_isMultisig
_SALVIUM_MultisigState_isReady
_SALVIUM_MultisigState_threshold
_SALVIUM_MultisigState_total
_SALVIUM_DeviceProgress_progress
_SALVIUM_DeviceProgress_indeterminate
_SALVIUM_Wallet_seed
_SALVIUM_Wallet_getSeedLanguage
_SALVIUM_Wallet_setSeedLanguage
_SALVIUM_Wallet_status
_SALVIUM_Wallet_errorString
_SALVIUM_Wallet_setPassword
_SALVIUM_Wallet_getPassword
_SALVIUM_Wallet_setDevicePin
_SALVIUM_Wallet_setDevicePassphrase
_SALVIUM_Wallet_address
_SALVIUM_Wallet_path
_SALVIUM_Wallet_nettype
_SALVIUM_Wallet_useForkRules
_SALVIUM_Wallet_integratedAddress
_SALVIUM_Wallet_secretViewKey
_SALVIUM_Wallet_publicViewKey
_SALVIUM_Wallet_secretSpendKey
_SALVIUM_Wallet_publicSpendKey
_SALVIUM_Wallet_publicMultisigSignerKey
_SALVIUM_Wallet_stop
_SALVIUM_Wallet_store
_SALVIUM_Wallet_filename
_SALVIUM_Wallet_keysFilename
_SALVIUM_Wallet_init
_SALVIUM_Wallet_createWatchOnly
_SALVIUM_Wallet_setRefreshFromBlockHeight
_SALVIUM_Wallet_getRefreshFromBlockHeight
_SALVIUM_Wallet_setRecoveringFromSeed
_SALVIUM_Wallet_setRecoveringFromDevice
_SALVIUM_Wallet_setSubaddressLookahead
_SALVIUM_Wallet_connectToDaemon
_SALVIUM_Wallet_connected
_SALVIUM_Wallet_setTrustedDaemon
_SALVIUM_Wallet_trustedDaemon
_SALVIUM_Wallet_setProxy
_SALVIUM_Wallet_balance
_SALVIUM_Wallet_unlockedBalance
_SALVIUM_Wallet_viewOnlyBalance
_SALVIUM_Wallet_watchOnly
_SALVIUM_Wallet_isDeterministic
_SALVIUM_Wallet_blockChainHeight
_SALVIUM_Wallet_approximateBlockChainHeight
_SALVIUM_Wallet_estimateBlockChainHeight
_SALVIUM_Wallet_daemonBlockChainHeight
_SALVIUM_Wallet_daemonBlockChainTargetHeight
_SALVIUM_Wallet_synchronized
_SALVIUM_Wallet_displayAmount
_SALVIUM_Wallet_amountFromString
_SALVIUM_Wallet_amountFromDouble
_SALVIUM_Wallet_genPaymentId
_SALVIUM_Wallet_paymentIdValid
_SALVIUM_Wallet_addressValid
_SALVIUM_Wallet_keyValid
_SALVIUM_Wallet_keyValid_error
_SALVIUM_Wallet_paymentIdFromAddress
_SALVIUM_Wallet_maximumAllowedAmount
_SALVIUM_Wallet_init3
_SALVIUM_Wallet_getPolyseed
_SALVIUM_Wallet_createPolyseed
_SALVIUM_Wallet_startRefresh
_SALVIUM_Wallet_pauseRefresh
_SALVIUM_Wallet_refresh
_SALVIUM_Wallet_refreshAsync
_SALVIUM_Wallet_rescanBlockchain
_SALVIUM_Wallet_rescanBlockchainAsync
_SALVIUM_Wallet_setAutoRefreshInterval
_SALVIUM_Wallet_autoRefreshInterval
_SALVIUM_Wallet_addSubaddressAccount
_SALVIUM_Wallet_numSubaddressAccounts
_SALVIUM_Wallet_numSubaddresses
_SALVIUM_Wallet_addSubaddress
_SALVIUM_Wallet_getSubaddressLabel
_SALVIUM_Wallet_setSubaddressLabel
_SALVIUM_Wallet_multisig
_SALVIUM_Wallet_getMultisigInfo
_SALVIUM_Wallet_makeMultisig
_SALVIUM_Wallet_exchangeMultisigKeys
_SALVIUM_Wallet_exportMultisigImages
_SALVIUM_Wallet_importMultisigImages
_SALVIUM_Wallet_hasMultisigPartialKeyImages
_SALVIUM_Wallet_restoreMultisigTransaction
_SALVIUM_Wallet_createTransactionMultDest
_SALVIUM_Wallet_createTransaction
_SALVIUM_Wallet_loadUnsignedTx
_SALVIUM_Wallet_loadUnsignedTxUR
_SALVIUM_Wallet_submitTransaction
_SALVIUM_Wallet_submitTransactionUR
_SALVIUM_Wallet_hasUnknownKeyImages
_SALVIUM_Wallet_exportKeyImages
_SALVIUM_Wallet_exportKeyImagesUR
_SALVIUM_Wallet_importKeyImages
_SALVIUM_Wallet_importKeyImagesUR
_SALVIUM_Wallet_exportOutputs
_SALVIUM_Wallet_exportOutputsUR
_SALVIUM_Wallet_importOutputs
_SALVIUM_Wallet_importOutputsUR
_SALVIUM_Wallet_setupBackgroundSync
_SALVIUM_Wallet_getBackgroundSyncType
_SALVIUM_Wallet_startBackgroundSync
_SALVIUM_Wallet_stopBackgroundSync
_SALVIUM_Wallet_isBackgroundSyncing
_SALVIUM_Wallet_isBackgroundWallet
_SALVIUM_Wallet_history
_SALVIUM_Wallet_addressBook
_SALVIUM_Wallet_coins
_SALVIUM_Wallet_subaddress
_SALVIUM_Wallet_subaddressAccount
_SALVIUM_Wallet_defaultMixin
_SALVIUM_Wallet_setDefaultMixin
_SALVIUM_Wallet_setCacheAttribute
_SALVIUM_Wallet_getCacheAttribute
_SALVIUM_Wallet_setUserNote
_SALVIUM_Wallet_getUserNote
_SALVIUM_Wallet_getTxKey
_SALVIUM_Wallet_signMessage
_SALVIUM_Wallet_verifySignedMessage
_SALVIUM_Wallet_rescanSpent
_SALVIUM_Wallet_setOffline
_SALVIUM_Wallet_isOffline
_SALVIUM_Wallet_segregatePreForkOutputs
_SALVIUM_Wallet_segregationHeight
_SALVIUM_Wallet_keyReuseMitigation2
_SALVIUM_Wallet_lockKeysFile
_SALVIUM_Wallet_unlockKeysFile
_SALVIUM_Wallet_isKeysFileLocked
_SALVIUM_Wallet_getDeviceType
_SALVIUM_Wallet_coldKeyImageSync
_SALVIUM_Wallet_deviceShowAddress
_SALVIUM_Wallet_reconnectDevice
_SALVIUM_Wallet_getBytesReceived
_SALVIUM_Wallet_getBytesSent
_SALVIUM_Wallet_getStateIsConnected
_SALVIUM_Wallet_getSendToDevice
_SALVIUM_Wallet_getSendToDeviceLength
_SALVIUM_Wallet_getReceivedFromDevice
_SALVIUM_Wallet_getReceivedFromDeviceLength
_SALVIUM_Wallet_getWaitsForDeviceSend
_SALVIUM_Wallet_getWaitsForDeviceReceive
_SALVIUM_Wallet_setDeviceReceivedData
_SALVIUM_Wallet_setDeviceSendData
_SALVIUM_WalletManager_createWallet
_SALVIUM_WalletManager_openWallet
_SALVIUM_WalletManager_recoveryWallet
_SALVIUM_WalletManager_createWalletFromKeys
_SALVIUM_WalletManager_createDeterministicWalletFromSpendKey
_SALVIUM_WalletManager_createWalletFromDevice
_SALVIUM_WalletManager_createWalletFromPolyseed
_SALVIUM_WalletManager_closeWallet
_SALVIUM_WalletManager_walletExists
_SALVIUM_WalletManager_verifyWalletPassword
_SALVIUM_WalletManager_queryWalletDevice
_SALVIUM_WalletManager_findWallets
_SALVIUM_WalletManager_errorString
_SALVIUM_WalletManager_setDaemonAddress
_SALVIUM_WalletManager_blockchainHeight
_SALVIUM_WalletManager_blockchainTargetHeight
_SALVIUM_WalletManager_networkDifficulty
_SALVIUM_WalletManager_miningHashRate
_SALVIUM_WalletManager_blockTarget
_SALVIUM_WalletManager_isMining
_SALVIUM_WalletManager_startMining
_SALVIUM_WalletManager_stopMining
_SALVIUM_WalletManager_resolveOpenAlias
_SALVIUM_WalletManager_setProxy
_SALVIUM_WalletManagerFactory_getWalletManager
_SALVIUM_WalletManagerFactory_setLogLevel
_SALVIUM_WalletManagerFactory_setLogCategories
_SALVIUM_DEBUG_test0
_SALVIUM_DEBUG_test1
_SALVIUM_DEBUG_test2
_SALVIUM_DEBUG_test3
_SALVIUM_DEBUG_test4
_SALVIUM_DEBUG_test5
_SALVIUM_DEBUG_test5_std
_SALVIUM_DEBUG_isPointerNull
_SALVIUM_cw_getWalletListener
_SALVIUM_cw_WalletListener_resetNeedToRefresh
_SALVIUM_cw_WalletListener_isNeedToRefresh
_SALVIUM_cw_WalletListener_isNewTransactionExist
_SALVIUM_cw_WalletListener_resetIsNewTransactionExist
_SALVIUM_cw_WalletListener_height
_SALVIUM_free
_SALVIUM_checksum_wallet2_api_c_h
_SALVIUM_checksum_wallet2_api_c_cpp
_SALVIUM_checksum_wallet2_api_c_exp

View File

@@ -0,0 +1,6 @@
#ifndef SALVIUMC_CHECKSUMS
#define SALVIUMC_CHECKSUMS
const char * SALVIUM_wallet2_api_c_h_sha256 = "9e80c4b59a0509aa02fbf01e8df2881b89f82225d1765bfa7856cbdbaf7af116";
const char * SALVIUM_wallet2_api_c_cpp_sha256 = "d229507db508e574bd2badf4819a38dbead8c16a84311ad32c22c887a6003439-0232839913b13cf0ab0bb7ad25fff0c05f37d2fe";
const char * SALVIUM_wallet2_api_c_exp_sha256 = "d0f95f1f3bc49f1f59fe4eb0b61826128d7d3bb75405d5a01a252d02db03097d";
#endif

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff