From dd47d03cf2b5b3dc59cd99aca247d1025679f83a Mon Sep 17 00:00:00 2001 From: jeffro256 Date: Sat, 3 Feb 2024 21:59:58 -0600 Subject: 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 --- src/simplewallet/simplewallet.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/simplewallet/simplewallet.h') diff --git a/src/simplewallet/simplewallet.h b/src/simplewallet/simplewallet.h index 7c45d45e8..652708f5a 100644 --- a/src/simplewallet/simplewallet.h +++ b/src/simplewallet/simplewallet.h @@ -170,11 +170,9 @@ namespace cryptonote bool show_incoming_transfers(const std::vector &args); bool show_payments(const std::vector &args); bool show_blockchain_height(const std::vector &args); - bool transfer_main(int transfer_type, const std::vector &args, bool called_by_mms); + bool transfer_main(const std::vector &args, bool called_by_mms); bool transfer(const std::vector &args); - bool locked_transfer(const std::vector &args); - bool locked_sweep_all(const std::vector &args); - bool sweep_main(uint32_t account, uint64_t below, bool locked, const std::vector &args); + bool sweep_main(uint32_t account, uint64_t below, const std::vector &args); bool sweep_all(const std::vector &args); bool sweep_account(const std::vector &args); bool sweep_below(const std::vector &args); -- cgit v1.2.3