aboutsummaryrefslogtreecommitdiff
path: root/src/multisig
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/multisig/multisig_account.h13
-rw-r--r--src/multisig/multisig_tx_builder_ringct.cpp3
-rw-r--r--src/multisig/multisig_tx_builder_ringct.h1
3 files changed, 14 insertions, 3 deletions
diff --git a/src/multisig/multisig_account.h b/src/multisig/multisig_account.h
index 0d832f243..2ea8d0133 100644
--- a/src/multisig/multisig_account.h
+++ b/src/multisig/multisig_account.h
@@ -40,6 +40,19 @@
namespace multisig
{
+ struct multisig_account_status
+ {
+ // is the multisig account active/initialized?
+ bool multisig_is_active{false};
+ // has the multisig account completed the main key exchange rounds?
+ bool kex_is_done{false};
+ // is the multisig account ready to use?
+ bool is_ready{false};
+ // multisig is: M-of-N
+ std::uint32_t threshold{0}; // M
+ std::uint32_t total{0}; // N
+ };
+
/**
* multisig account:
*
diff --git a/src/multisig/multisig_tx_builder_ringct.cpp b/src/multisig/multisig_tx_builder_ringct.cpp
index 8643a8af4..2653a70dd 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 f1bd24e73..a1b72b177 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,