diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2024-05-20 23:42:54 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2024-05-20 23:42:54 -0500 |
| commit | 1ec7eae0364a9d13db6aebc5819468f07667e7ab (patch) | |
| tree | 838c211368e6b486fef301b696cfc0bddbf6647b /src/multisig | |
| parent | 2f0503d7f3462410a8c21a7baca35fa18763b4b7 (diff) | |
| parent | dd47d03cf2b5b3dc59cd99aca247d1025679f83a (diff) | |
| download | monzero-core-1ec7eae0364a9d13db6aebc5819468f07667e7ab.tar.gz monzero-core-1ec7eae0364a9d13db6aebc5819468f07667e7ab.tar.xz monzero-core-1ec7eae0364a9d13db6aebc5819468f07667e7ab.zip | |
Merge pull request #9311
dd47d03 Enforce Tx unlock_time is Zero by Relay Rule [RELEASE] (jeffro256)
Diffstat (limited to 'src/multisig')
| -rw-r--r-- | src/multisig/multisig_tx_builder_ringct.cpp | 3 | ||||
| -rw-r--r-- | src/multisig/multisig_tx_builder_ringct.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/multisig/multisig_tx_builder_ringct.cpp b/src/multisig/multisig_tx_builder_ringct.cpp index e5c9ac483..33c0396dc 100644 --- a/src/multisig/multisig_tx_builder_ringct.cpp +++ b/src/multisig/multisig_tx_builder_ringct.cpp @@ -820,7 +820,6 @@ tx_builder_ringct_t::~tx_builder_ringct_t() bool tx_builder_ringct_t::init( const cryptonote::account_keys& account_keys, const std::vector<std::uint8_t>& extra, - const std::uint64_t unlock_time, const std::uint32_t subaddr_account, const std::set<std::uint32_t>& subaddr_minor_indices, std::vector<cryptonote::tx_source_entry>& sources, @@ -854,7 +853,7 @@ bool tx_builder_ringct_t::init( // misc. fields unsigned_tx.version = 2; //rct = 2 - unsigned_tx.unlock_time = unlock_time; + unsigned_tx.unlock_time = 0; // sort inputs sort_sources(sources); diff --git a/src/multisig/multisig_tx_builder_ringct.h b/src/multisig/multisig_tx_builder_ringct.h index 853934659..92be95be0 100644 --- a/src/multisig/multisig_tx_builder_ringct.h +++ b/src/multisig/multisig_tx_builder_ringct.h @@ -71,7 +71,6 @@ public: bool init( const cryptonote::account_keys& account_keys, const std::vector<std::uint8_t>& extra, - const std::uint64_t unlock_time, const std::uint32_t subaddr_account, const std::set<std::uint32_t>& subaddr_minor_indices, std::vector<cryptonote::tx_source_entry>& sources, |