Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

in get_tx_version() params named more obviously to avoid mistakes

Browse source
This commit is contained in:
sowle 2022-11-09 23:49:45 +01:00
parent 89fa48880e
commit 4f02abac02
No known key found for this signature in database
GPG key ID: C07A24B2D89D49FC
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/currency_core/currency_format_utils.cpp
View file

@ -2110,9 +2110,9 @@ namespace currency
//---------------------------------------------------------------
uint64_t get_tx_version(uint64_t h, const hard_forks_descriptor& hfd)
uint64_t get_tx_version(uint64_t tx_expected_block_height, const hard_forks_descriptor& hfd)
{
if (!hfd.is_hardfork_active_for_height(4, h))
if (!hfd.is_hardfork_active_for_height(ZANO_HARDFORK_04_ZARCANUM, tx_expected_block_height))
{
return TRANSACTION_VERSION_PRE_HF4;
}

2
src/currency_core/currency_format_utils.h
View file

@ -291,7 +291,7 @@ namespace currency
bool shuffle = true,
uint64_t flags = 0);
uint64_t get_tx_version(uint64_t h, const hard_forks_descriptor& hfd);
uint64_t get_tx_version(uint64_t tx_expected_block_height, const hard_forks_descriptor& hfd); // returns tx version based on the height of the block where the transaction is expected to be
bool construct_tx(const account_keys& sender_account_keys, const finalize_tx_param& param, finalized_tx& result);
crypto::hash get_asset_id_from_descriptor(const asset_descriptor_base& adb);