diff options
| author | jeffro256 <jeffro256@tutanota.com> | 2024-02-03 21:59:58 -0600 |
|---|---|---|
| committer | jeffro256 <jeffro256@tutanota.com> | 2024-04-29 00:08:53 -0500 |
| commit | dd47d03cf2b5b3dc59cd99aca247d1025679f83a (patch) | |
| tree | af4d5d6cc0accac47131a232aea40db20d167fcb /src/wallet/wallet_errors.h | |
| parent | 81d4db08eb75ce5392c65ca6571e7b08e41b7c95 (diff) | |
| download | monzero-core-dd47d03cf2b5b3dc59cd99aca247d1025679f83a.tar.gz monzero-core-dd47d03cf2b5b3dc59cd99aca247d1025679f83a.tar.xz monzero-core-dd47d03cf2b5b3dc59cd99aca247d1025679f83a.zip | |
Enforce Tx unlock_time is Zero by Relay Rule [RELEASE]
Related to https://github.com/monero-project/research-lab/issues/78
Added a relay rule that enforces the `unlock_time` field is equal to 0 for non-coinbase transactions.
UIs changed:
* Removed `locked_transfer` and `locked_sweep_all` commands from `monero-wallet-cli`
APIs changed:
* Removed `unlock_time` parameters from `wallet2` transfer methods
* Wallet RPC transfer endpoints send error codes when requested unlock time is not 0
* Removed `unlock_time` parameters from `construct_tx*` cryptonote core functions
@tobtoht: undo rebase changes tx.dsts -> tx_dsts
Diffstat (limited to 'src/wallet/wallet_errors.h')
| -rw-r--r-- | src/wallet/wallet_errors.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/wallet/wallet_errors.h b/src/wallet/wallet_errors.h index 1f7e1c75d..c077313d4 100644 --- a/src/wallet/wallet_errors.h +++ b/src/wallet/wallet_errors.h @@ -86,6 +86,7 @@ namespace tools // zero_amount // zero_destination // subtract_fee_from_bad_index + // nonzero_unlock_time // wallet_rpc_error * // daemon_busy // no_connection_to_daemon @@ -592,20 +593,17 @@ namespace tools std::string && loc , sources_t const & sources , destinations_t const & destinations - , uint64_t unlock_time , cryptonote::network_type nettype ) : transfer_error(std::move(loc), "transaction was not constructed") , m_sources(sources) , m_destinations(destinations) - , m_unlock_time(unlock_time) , m_nettype(nettype) { } const sources_t& sources() const { return m_sources; } const destinations_t& destinations() const { return m_destinations; } - uint64_t unlock_time() const { return m_unlock_time; } std::string to_string() const { @@ -637,15 +635,12 @@ namespace tools cryptonote::print_money(dst.amount); } - ss << "\nunlock_time: " << m_unlock_time; - return ss.str(); } private: sources_t m_sources; destinations_t m_destinations; - uint64_t m_unlock_time; cryptonote::network_type m_nettype; }; //---------------------------------------------------------------------------------------------------- @@ -789,6 +784,14 @@ namespace tools } }; //---------------------------------------------------------------------------------------------------- + struct nonzero_unlock_time : public transfer_error + { + explicit nonzero_unlock_time(std::string&& loc) + : transfer_error(std::move(loc), "transaction cannot have non-zero unlock time") + { + } + }; + //---------------------------------------------------------------------------------------------------- struct wallet_rpc_error : public wallet_logic_error { const std::string& request() const { return m_request; } |
