[RELEASE] multisig entries for wallet api #3489

naughtyfox · 2018-03-23T15:29:17Z

Hey guys! We are making multisig gui wallet and we'd like these changes to be in upcoming release.

Added abilities in gui wallet api to:

create multisig wallets
multisig key images exchange
create, sign, commit multisig transactions
Refactored the facility to set Wallet status to work in atomic way.

Tested transaction sending on ubuntu 17.10
API usage example: https://github.com/naughtyfox/monero-multisig-api-example/blob/master/main.cpp

stoffu

There are some changes done and undone in different commits; if possible, please try to squash them before the final merge.

stoffu · 2018-03-23T15:47:46Z

src/wallet/api/wallet.cpp

            break;
        }

-


stoffu · 2018-03-23T15:49:37Z

src/wallet/api/wallet.cpp

        } catch (const tools::error::not_enough_unlocked_money& e) {
-            m_status = Status_Error;
+            setStatusError("");


setStatusError() is called a few lines below. Mistake?

actually no. in previous version of code there was something like this:

m_status = Status_Error; .... m_status = Status_Error; m_errorString = "...";

because api lib wanted a caller to know error happened before setting actual error string. I followed the same way since m_status was atomic

stoffu · 2018-03-23T15:49:53Z

src/wallet/api/wallet.cpp

        } catch (const tools::error::not_enough_money& e) {
-            m_status = Status_Error;
+            setStatusError("");


answered above

stoffu · 2018-03-23T15:50:12Z

src/wallet/api/wallet.cpp

        } catch (const tools::error::tx_not_possible& e) {
-            m_status = Status_Error;
+            setStatusError("");


stoffu · 2018-03-23T16:22:15Z

src/wallet/api/wallet.cpp

+        }
+
+        if (!ready) {
+            throw runtime_error("Multisig wallet is not finalized yet");


Seems spurious, since checkMultisigWalletReady() is called just above

you absolutely right, thank you! i wrote this code first then refactored a bit and forgot about this lines. will fix it

i deleted redundant checks but github shows it still for some reason

stoffu · 2018-03-23T16:28:21Z

src/wallet/wallet2.cpp

-  multisig_tx_set txs;
-  txs.m_ptx = ptx_vector;
+wallet2::multisig_tx_set wallet2::make_multisig_tx_set(const std::vector<pending_tx>& ptx_vector) const {
+    multisig_tx_set txs;


Please conform to the same indentation convention already used in each file, which in this case is two whitespaces.

stoffu · 2018-03-23T16:29:26Z

src/wallet/wallet2.cpp

+    {
+      crypto::public_key pkey = get_multisig_signing_public_key(msk);
+      for (auto &ptx: txs.m_ptx) for (auto &sig: ptx.multisig_sigs) sig.signing_keys.insert(pkey);
+    }


No whitespace changes

stoffu · 2018-03-23T16:32:46Z

src/wallet/wallet2.h

@@ -821,6 +821,8 @@ namespace tools
      a & m_ring_history_saved;
    }

+    multisig_tx_set make_multisig_tx_set(const std::vector<pending_tx>& ptx_vector) const;


Maybe move this line next to save_multisig_tx() as they're closely related?

stoffu · 2018-03-23T16:37:31Z

src/wallet/api/wallet.cpp

+        }
+
+        tools::wallet2::multisig_tx_set txSet;
+        if (!m_wallet->load_multisig_tx(binary, txSet, std::function<bool(const tools::wallet2::multisig_tx_set&)>())) {


The last argument can simply be {}

that's it! thx :)

stoffu · 2018-03-23T16:43:59Z

src/wallet/api/wallet2_api.h

+    /**
+     * @brief makeMultisig - switches wallet in multisig state. The one and only creation phase for N / N wallets
+     * @param info - vector of multisig infos from other participants obtained with getMulitisInfo call
+     * @param threshold - number of required signatures to make valid transaction. Must be equal to number of participants (N) or N - 1


I'd rephrase "number of required signatures" to "number of required signers".

good point, i'll do it

stoffu · 2018-03-26T11:22:44Z

Please do not make changes to indentations if there's no functional change.

… operations atomic along with error strings WalletApi: added method statusWithErrorString to atomically retrieve error with error string

naughtyfox · 2018-03-28T14:11:41Z

squashed into 3 commits
@stoffu please check this out

stoffu · 2018-03-28T14:30:10Z

@naughtyfox
Are you intentionally refusing to remove those indentation changes and spurious line addition/deletion, which I'm strongly against?

naughtyfox · 2018-03-28T14:51:04Z

@stoffu Sorry, just got your message about minimizing changes wrong. Brought it back

stoffu · 2018-03-28T14:59:10Z

src/wallet/wallet2.cpp

@@ -4955,18 +4955,19 @@ bool wallet2::save_multisig_tx(const multisig_tx_set &txs, const std::string &fi
  return epee::file_io_utils::save_string_to_file(filename, ciphertext);
 }
 //----------------------------------------------------------------------------------------------------
-wallet2::multisig_tx_set wallet2::make_multisig_tx_set(const std::vector<pending_tx>& ptx_vector) const {


Please revert this indentation change.

why do you want to revert it? this function is used in WalletImpl::createTransaction

stoffu · 2018-03-28T14:59:48Z

src/wallet/wallet2.h

@@ -821,8 +822,6 @@ namespace tools
      a & m_ring_history_saved;
    }

-    multisig_tx_set make_multisig_tx_set(const std::vector<pending_tx>& ptx_vector) const;
-


Please squash this change to the previous commit where this function was introduced.

stoffu · 2018-03-28T15:03:14Z

There should be just two commits, one for the status-related refactoring and the other for the multisig feature. The last two commits should be squashed into the second commit, and the indentation change should be undone.

naughtyfox · 2018-03-28T15:04:26Z

i thought i removed all of identations... did i miss something?

stoffu · 2018-03-28T15:05:34Z

~~Don't you see the problem in the color-coded diff that GitHub offers?~~

Ah, you just need to squash the last three commits into one. That'll clear the issue.

WalletApi: makeMultisig call introduced WalletApi: finalizeMultisig call introduced WalletApi: new calls exportMultisigImages and importMultisigImages WalletApi: method to return multisig wallet creation state WalletApi: create multisig transaction, sign multisig transaction, commit transaction and get multisig data are added WalletApi: identation and style fixes

naughtyfox · 2018-03-28T15:25:19Z

Squashed into 2 commits:

refactoring
feature commit

stoffu

Looks good!
Sorry for being a little snarky about style changes, there's been quite a few similar cases lately, and I seem to be getting a little nervous about them :)

naughtyfox · 2018-03-29T09:33:02Z

No worries! It's my fault i didn't read the contribution doc, that's my first open source contribution and i've been a bit distracted. Thank you for your patience!

moneromooo-monero · 2018-05-30T11:00:02Z

src/wallet/api/pending_transaction.cpp

+        auto cipher = m_wallet.m_wallet->save_multisig_tx(m_pending_tx);
+        return epee::string_tools::buff_to_hex_nodelimer(cipher);
+    } catch (const std::exception& e) {
+        m_status = Status_Error;


Should this not lock the new mutex (and others below) ?

It seems PendingTransactionImpl class is not thread safe and there's no mutex at all. I just followed the same logic. If you want i can fix it

moneromooo-monero · 2018-05-30T12:51:14Z

No it's fine, I did not know it was a different m_status field.

47fdb74 WalletApi: getMultisigInfo entry for gui wallets... (naughtyfox) 47fdb74 Refactored: work with wallet api statuses to make setting and getting operations atomic along with error strings (naughtyfox)

stoffu reviewed Mar 23, 2018

View reviewed changes

Refactored: work with wallet api statuses to make setting and getting…

47fdb74

… operations atomic along with error strings WalletApi: added method statusWithErrorString to atomically retrieve error with error string

naughtyfox changed the title ~~[WIP] multisig entries for wallet api~~ [RELEASE] multisig entries for wallet api Mar 28, 2018

naughtyfox force-pushed the multisig-wallet-api branch from 93b056e to c9bc037 Compare March 28, 2018 14:07

stoffu reviewed Mar 28, 2018

View reviewed changes

naughtyfox force-pushed the multisig-wallet-api branch from 86b0f7f to 235adb5 Compare March 28, 2018 15:13

naughtyfox force-pushed the multisig-wallet-api branch from 235adb5 to 5a96056 Compare March 28, 2018 15:24

stoffu approved these changes Mar 28, 2018

View reviewed changes

moneromooo-monero reviewed May 30, 2018

View reviewed changes

luigi1111 merged commit 5a96056 into monero-project:master May 31, 2018

stoffu mentioned this pull request Jul 4, 2018

For 0.12.3.0 #4092

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[RELEASE] multisig entries for wallet api #3489

[RELEASE] multisig entries for wallet api #3489

naughtyfox commented Mar 23, 2018 •

edited

Loading

stoffu left a comment

stoffu Mar 23, 2018

stoffu Mar 23, 2018

naughtyfox Mar 23, 2018

stoffu Mar 23, 2018

naughtyfox Mar 23, 2018

stoffu Mar 23, 2018

stoffu Mar 23, 2018

naughtyfox Mar 23, 2018

naughtyfox Mar 26, 2018

stoffu Mar 23, 2018

stoffu Mar 23, 2018

stoffu Mar 23, 2018

stoffu Mar 23, 2018

naughtyfox Mar 23, 2018

stoffu Mar 23, 2018

naughtyfox Mar 23, 2018

stoffu commented Mar 26, 2018

naughtyfox commented Mar 28, 2018 •

edited

Loading

stoffu commented Mar 28, 2018 •

edited

Loading

naughtyfox commented Mar 28, 2018

stoffu Mar 28, 2018 •

edited

Loading

naughtyfox Mar 28, 2018

stoffu Mar 28, 2018

stoffu commented Mar 28, 2018 •

edited

Loading

naughtyfox commented Mar 28, 2018

stoffu commented Mar 28, 2018 •

edited

Loading

naughtyfox commented Mar 28, 2018

stoffu left a comment

naughtyfox commented Mar 29, 2018

moneromooo-monero May 30, 2018

naughtyfox May 30, 2018

moneromooo-monero commented May 30, 2018

[RELEASE] multisig entries for wallet api #3489

[RELEASE] multisig entries for wallet api #3489

Conversation

naughtyfox commented Mar 23, 2018 • edited Loading

stoffu left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

stoffu commented Mar 26, 2018

naughtyfox commented Mar 28, 2018 • edited Loading

stoffu commented Mar 28, 2018 • edited Loading

naughtyfox commented Mar 28, 2018

stoffu Mar 28, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

stoffu commented Mar 28, 2018 • edited Loading

naughtyfox commented Mar 28, 2018

stoffu commented Mar 28, 2018 • edited Loading

naughtyfox commented Mar 28, 2018

stoffu left a comment

Choose a reason for hiding this comment

naughtyfox commented Mar 29, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

moneromooo-monero commented May 30, 2018

naughtyfox commented Mar 23, 2018 •

edited

Loading

naughtyfox commented Mar 28, 2018 •

edited

Loading

stoffu commented Mar 28, 2018 •

edited

Loading

stoffu Mar 28, 2018 •

edited

Loading

stoffu commented Mar 28, 2018 •

edited

Loading

stoffu commented Mar 28, 2018 •

edited

Loading