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

Merge branch 'develop' into develop_mobile

Browse source
This commit is contained in:
cryptozoidberg 2021-09-11 12:06:09 +03:00
commit b0d2838c90
No known key found for this signature in database
GPG key ID: 22DEB97A54C6FDEC
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/version.h.in
View file

@ -4,10 +4,10 @@
#define BUILD_COMMIT_ID "@VERSION@"
#define PROJECT_MAJOR_VERSION "1"
#define PROJECT_MINOR_VERSION "2"
#define PROJECT_REVISION "1"
#define PROJECT_MINOR_VERSION "3"
#define PROJECT_REVISION "0"
#define PROJECT_VERSION PROJECT_MAJOR_VERSION "." PROJECT_MINOR_VERSION "." PROJECT_REVISION
#define PROJECT_VERSION_BUILD_NO 128
#define PROJECT_VERSION_BUILD_NO 132
#define PROJECT_VERSION_BUILD_NO_STR STRINGIFY_EXPAND(PROJECT_VERSION_BUILD_NO)
#define PROJECT_VERSION_LONG PROJECT_VERSION "." PROJECT_VERSION_BUILD_NO_STR "[" BUILD_COMMIT_ID "]"

2
src/wallet/wallet_rpc_server.cpp
View file

@ -367,7 +367,7 @@ namespace tools
attachments.push_back(comment);
}
if (req.push_payer )
if (req.push_payer && !wrap)
{
currency::create_and_add_tx_payer_to_container_from_address(extra, m_wallet.get_account().get_keys().account_address, m_wallet.get_top_block_height(), m_wallet.get_core_runtime_config());
}

3
src/wallet/wallets_manager.cpp
View file

@ -1350,6 +1350,7 @@ std::string wallets_manager::transfer(size_t wallet_id, const view::transfer_par
sa.body = d.address;
extra.push_back(sa);
currency::account_public_address acc = AUTO_VAL_INIT(acc);
currency::get_account_address_from_str(acc, BC_WRAP_SERVICE_CUSTODY_WALLET);
de.addr.front() = acc;
@ -1404,7 +1405,7 @@ std::string wallets_manager::transfer(size_t wallet_id, const view::transfer_par
tc.comment = tp.comment;
extra.push_back(tc);
}
if (tp.push_payer)
if (tp.push_payer && !wrap)
{
currency::create_and_add_tx_payer_to_container_from_address(extra, w->get()->get_account().get_keys().account_address, w->get()->get_top_block_height(), w->get()->get_core_runtime_config());
}