mirror of
https://github.com/oxen-io/oxen-core.git
synced 2023-12-14 02:22:56 +01:00
Merge branch 'MergeUpstream' into MergeUpstream2
This commit is contained in:
commit
e5e48b2ba2
2 changed files with 2 additions and 2 deletions
2
external/trezor-common
vendored
2
external/trezor-common
vendored
|
@ -1 +1 @@
|
||||||
Subproject commit cb238cb1f134accc4200217d9511115a8f61c6cb
|
Subproject commit 31a0073c62738827b48d725facd3766879429124
|
|
@ -504,7 +504,7 @@ namespace tx {
|
||||||
tsx_data.set_num_inputs(static_cast<google::protobuf::uint32>(tx.sources.size()));
|
tsx_data.set_num_inputs(static_cast<google::protobuf::uint32>(tx.sources.size()));
|
||||||
tsx_data.set_mixin(static_cast<google::protobuf::uint32>(tx.sources[0].outputs.size() - 1));
|
tsx_data.set_mixin(static_cast<google::protobuf::uint32>(tx.sources[0].outputs.size() - 1));
|
||||||
tsx_data.set_account(tx.subaddr_account);
|
tsx_data.set_account(tx.subaddr_account);
|
||||||
tsx_data.set_monero_version(std::string(LOKI_VERSION) + "|" + LOKI_VERSION_TAG);
|
tsx_data.set_monero_version(std::string(LOKI_VERSION_STR) + "|" + LOKI_VERSION_TAG);
|
||||||
tsx_data.set_hard_fork(m_aux_data->hard_fork ? m_aux_data->hard_fork.get() : 0);
|
tsx_data.set_hard_fork(m_aux_data->hard_fork ? m_aux_data->hard_fork.get() : 0);
|
||||||
assign_to_repeatable(tsx_data.mutable_minor_indices(), tx.subaddr_indices.begin(), tx.subaddr_indices.end());
|
assign_to_repeatable(tsx_data.mutable_minor_indices(), tx.subaddr_indices.begin(), tx.subaddr_indices.end());
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue