diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2019-03-13 11:32:44 +0000 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2019-03-21 14:46:29 +0000 |
| commit | adf6d7730f3389649ea0e79d2968e04fd3700dff (patch) | |
| tree | 6e1af06a30d0e6e9eda6869da3a81b2e16ca9de3 /src/device_trezor/trezor/protocol.cpp | |
| parent | Merge pull request #5283 (diff) | |
| download | monero-adf6d7730f3389649ea0e79d2968e04fd3700dff.tar.xz | |
wallet: fix offline signing calling a daemon RPC
Diffstat (limited to 'src/device_trezor/trezor/protocol.cpp')
| -rw-r--r-- | src/device_trezor/trezor/protocol.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/device_trezor/trezor/protocol.cpp b/src/device_trezor/trezor/protocol.cpp index db2444df6..5fe08abbe 100644 --- a/src/device_trezor/trezor/protocol.cpp +++ b/src/device_trezor/trezor/protocol.cpp @@ -410,8 +410,8 @@ namespace tx { } } - static unsigned get_rsig_type(bool use_bulletproof, size_t num_outputs){ - if (!use_bulletproof){ + static unsigned get_rsig_type(const rct::RCTConfig &rct_config, size_t num_outputs){ + if (rct_config.range_proof_type == rct::RangeProofBorromean){ return rct::RangeProofBorromean; } else if (num_outputs > BULLETPROOF_MAX_OUTPUTS){ return rct::RangeProofMultiOutputBulletproof; @@ -506,9 +506,9 @@ namespace tx { // Rsig decision auto rsig_data = tsx_data.mutable_rsig_data(); - m_ct.rsig_type = get_rsig_type(tx.use_bulletproofs, tx.splitted_dsts.size()); + m_ct.rsig_type = get_rsig_type(tx.rct_config, tx.splitted_dsts.size()); rsig_data->set_rsig_type(m_ct.rsig_type); - if (tx.use_bulletproofs){ + if (tx.rct_config.range_proof_type != rct::RangeProofBorromean){ m_ct.bp_version = (m_aux_data->bp_version ? m_aux_data->bp_version.get() : 1); rsig_data->set_bp_version((uint32_t) m_ct.bp_version); } |