Added multisig wallets to the Android application #2279

Aldin-SXR · 2021-05-21T10:15:32Z

This pull request implements the multisig wallet feature into the Android application, in addition to some other changes. The main changes are as follows:

Adds the option to create multisig wallets when creating a new wallet.
- This re-arranges the original "New wallet" layout a bit, to first ask the user about the wallet kind they want (standard or multisig), and then display the appropriate follow-up dialogs.
Adds the wallet type next to the name of an open wallet in the navbar (to easily differentiate between standard and m-of-n wallets).
Adds the "Information" option in the wallet dropdown to display a dialog with wallet name, type and script type, and the master public key (to allow for easier creation of multisig wallets by simply copying that key).
Makes the QR code scanner in "Load Transaction" also work with Base43-encoded data.
- Implements the Base43 companion object for encoding/decoding.
- Since the QR code module on the desktop version creates Base43-encoded strings, this makes it possible to begin a transaction on desktop, scan it via the application and complete it inside the app.
Adds some additional information about raw transactions in the "Save/Load Transaction" - transaction signing state (unsigned, partially signed, fully signed, etc).
- Can be helpful with multisig sending, to know how many signatures are still required.
Makes it possible to send transactions in multisig wallets via "Save transaction" and "Load transaction".
- Create a partially signed transaction inside the application or in the desktop version.
- Send the hex (or scan the QR code on desktop) to another cosigner to either add a new signature or to broadcast, if there is enough signatures.

…ulti-sig wallet.

…t multisig wallet creation.

…aining the master public key).

…od; some updates to Daemon model.

…ialog to match the approach used in the Send dialog.

…tsig wallets.

…e 'Sign' dialog.

…tion QRs.

… transactions for multisig wallets.

… again from the same wallet.

mhsmith · 2021-05-23T00:20:05Z

Thanks, this looks very good. I'll post a more detailed review tomorrow.

mhsmith

I haven't tested everything yet, but here are my comments so far. These are mostly layout and style issues which should be easy to fix.

android/app/src/main/java/org/electroncash/electroncash3/ColdLoad.kt

android/app/src/main/java/org/electroncash/electroncash3/Send.kt

android/app/src/main/java/org/electroncash/electroncash3/ColdLoad.kt

android/app/src/main/java/org/electroncash/electroncash3/Main.kt

android/app/src/main/res/layout/wallet_information.xml

android/app/src/main/res/layout/load.xml

android/app/src/main/res/layout/choose_keystore.xml

mhsmith · 2021-05-26T01:03:21Z

Sorry for being so slow, I'll have more comments soon. Meanwhile, it would be a good idea to merge from the Electron-Cash master branch and test the result to make sure your changes still work with the current version.

Aldin-SXR · 2021-05-26T06:39:43Z

Sorry for being so slow, I'll have more comments soon. Meanwhile, it would be a good idea to merge from the Electron-Cash master branch and test the result to make sure your changes still work with the current version.

No problem. I'm also a bit busier these days, but I'm working on the requested changes.

Will do that.

mhsmith

Final comments:

android/app/src/main/java/org/electroncash/electroncash3/Transactions.kt

android/app/src/main/java/org/electroncash/electroncash3/ColdLoad.kt

android/app/src/main/java/org/electroncash/electroncash3/Send.kt

android/app/src/main/java/org/electroncash/electroncash3/ColdLoad.kt

mhsmith · 2021-05-30T00:28:33Z

OK, that's the last batch. Overall I think you've done a great job, especially since this is your first contribution to the project. I'm sure the users are going to like it.

mhsmith

All of your changes yesterday look good, except for this one:

android/app/src/main/java/org/electroncash/electroncash3/Main.kt

…y KeystoreDialog is handled for multiple cosigners.

… dilaog argument; updated the way closeDialogs() works.

…er')

…alog2.

…een rotations.

…ialog.

…d ColdLoad; added a comment about 'keystores' in NewWallet.

…ransaction dialogs in Send.kt

…ny wallet.

…tExecute.

mhsmith

The ColdLoad updates look mostly fine, just a few more comments:

android/app/src/main/java/org/electroncash/electroncash3/ColdLoad.kt

android/app/src/main/res/layout/load.xml

…stead of string comparison; fixed an issue with status text wrapping.

…ded transaction.

…log title for signing of loaded transactions.

Aldin-SXR · 2021-06-10T21:16:59Z

With my latest commits, I think I have addressed all of the comments so far. I'm now waiting on final reviews and potential changes/fixes. Thank you for your help and additional clarification on some of the issues.

I have also learned a lot by working on this project and from the reviews, and I'm glad to be able to contribute to this codebase.

mhsmith

No problem, I'm happy to help. This was an ambitious piece of work for someone new to the project, and I think you've done about as well as anyone could have.

Here are a few remaining issues with NewWallet. I'll review the transaction details updates separately.

android/app/src/main/java/org/electroncash/electroncash3/NewWallet.kt

…thod; updated the way default progress and max values are set for multisig sliders.

… moved risky argument modification from doInBackground() to onPostExecute()

…allets.

Aldin-SXR added 21 commits March 22, 2021 23:02

Android: add new layout screens for the choice between standard and m…

7e25aaa

…ulti-sig wallet.

Android: reorganize code for creating a standard wallet.

67f9255

Android: Added initial UI for multisg wallet creation.

5e1cd78

Android: Added the layout for displaying the master key.

e286a8a

Android: Updated the keystore dialog text.

73ec4a6

Android: Added the menu for cosigner keystores.

b784693

Android: Added multisig wallet creation logic to console.py.

d68c1fd

Android: Implemented several new dialogs and reworked logic to suppor…

a626e64

…t multisig wallet creation.

Android: Added wallet type near the wallet name in the appbar.

29da35d

Android: Added layouts and menu dropdown for wallet information (cont…

1e73a50

…aining the master public key).

Android: Added logic to view wallet information.

fd4d346

Android: improved the layout of the wallet information popup.

9f82245

Android: refactored to use the already existing copyToClipoard() meth…

3c0da3e

…od; some updates to Daemon model.

Android: Updated the cosigner and signature sliders in the cosigner d…

c7186df

…ialog to match the approach used in the Send dialog.

Android: Using Schnorr signatures for standard wallets; ECDSA for mul…

6b1875b

…tsig wallets.

Android: on multisig wallets, the 'Send' dialog will correspond to th…

9ddb6ad

…e 'Sign' dialog.

Android: Added Base43 encode/decode for working with Electron transac…

130877f

…tion QRs.

Android: added the ability to load, sign and eventually broadcast hex…

d0c4e26

… transactions for multisig wallets.

Android: Update 'Load Transaction' to prevent signing the transaction…

308e1a0

… again from the same wallet.

Android: Using 'get_tx_info' to get the status of the transaction.

3306947

Android: Minor text updates.

f4d5118

mhsmith self-requested a review May 21, 2021 11:01

mhsmith requested changes May 24, 2021

View reviewed changes

Removed unused lines and layout elements.

ce56d60

Aldin-SXR added 3 commits May 27, 2021 21:28

Made 'sign_schnorr' into a Kwarg parameter

fec98cd

Merge branch 'Electron-Cash:master' into master

bf9bd17

Merge branch 'master' of github.com:Aldin-SXR/Electron-Cash

947b9dc

Aldin-SXR added 2 commits May 30, 2021 00:48

Android: Fixed the 'no master public key' crash on imported wallets.

42f2c86

Android: Removed wallet type from app title.

f2219fa

mhsmith requested changes May 30, 2021

View reviewed changes

android/app/src/main/java/org/electroncash/electroncash3/Main.kt Outdated Show resolved Hide resolved

Aldin-SXR added 13 commits June 2, 2021 23:08

Android: Moved closeDialog() calls to onPostExecute(); updated the wa…

0ecc3bf

…y KeystoreDialog is handled for multiple cosigners.

Android: Removed the global keystores variable and replaced it with a…

653f9cf

… dilaog argument; updated the way closeDialogs() works.

Android: Removed superfluous dialog arguments ('multisig' and 'i_sign…

57b7644

…er')

Android: Moved common code up to NewWalletDialog2.

e477103

Android: Moved up 'new seed/key' dialog title decision to NewWalletDi…

0c16494

…alog2.

Android: Updated the cosigner/signature sliders to persist across scr…

f08f34d

…een rotations.

Android: Moved QR decoding in ColdLoad inside the conditional block.

e052880

Android: Checking if master public key is null in WalletInformation d…

26aa8e0

…ialog.

Android: Updated the logic for choosing Schnorr signatures in Send an…

5d2d6e3

…d ColdLoad; added a comment about 'keystores' in NewWallet.

Android: Added a better check for deciding between 'Save' or 'Send' t…

21fb70d

…ransaction dialogs in Send.kt

Android: Updated status displaying for raw hex transactions.

d763755

Android: Enabled broadcasting of fully signed hex transactions from a…

bf71bbc

…ny wallet.

Android: Moved UI updates when signing load hex transactions to onPos…

d93715a

…tExecute.

mhsmith requested changes Jun 7, 2021

View reviewed changes

android/app/src/main/java/org/electroncash/electroncash3/ColdLoad.kt Outdated Show resolved Hide resolved

android/app/src/main/java/org/electroncash/electroncash3/ColdLoad.kt Outdated Show resolved Hide resolved

android/app/src/main/res/layout/load.xml Show resolved Hide resolved

Aldin-SXR added 4 commits June 9, 2021 19:51

Merge branch 'Electron-Cash:master' into master

8a2c0d6

Android: Moved signSchnorr() into a function; using canBroadcast() in…

5610e65

…stead of string comparison; fixed an issue with status text wrapping.

Android: Showing transaction details in a dialog before signing a loa…

0663281

…ded transaction.

Android: Disabled QR code scanner on loaded transactions; updated dia…

62feea1

…log title for signing of loaded transactions.

mhsmith requested changes Jun 11, 2021

View reviewed changes

Aldin-SXR added 3 commits June 11, 2021 20:00

Android: Refactored the selection of a newly-created wallet into a me…

ef287d7

…thod; updated the way default progress and max values are set for multisig sliders.

Android: Updated NewWallet.kt to not share arguments between dialogs;…

6a6c146

… moved risky argument modification from doInBackground() to onPostExecute()

Android: Added the displaying of all master public keys in multisig w…

895c2d8

…allets.

mhsmith approved these changes Jun 16, 2021

View reviewed changes

mhsmith merged commit c7b5725 into Electron-Cash:master Jun 16, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added multisig wallets to the Android application #2279

Added multisig wallets to the Android application #2279

Aldin-SXR commented May 21, 2021 •

edited

mhsmith commented May 23, 2021

mhsmith left a comment

mhsmith commented May 26, 2021

Aldin-SXR commented May 26, 2021

mhsmith left a comment

mhsmith commented May 30, 2021

mhsmith left a comment

mhsmith left a comment

Aldin-SXR commented Jun 10, 2021 •

edited

mhsmith left a comment

Added multisig wallets to the Android application #2279

Added multisig wallets to the Android application #2279

Conversation

Aldin-SXR commented May 21, 2021 • edited

mhsmith commented May 23, 2021

mhsmith left a comment

Choose a reason for hiding this comment

mhsmith commented May 26, 2021

Aldin-SXR commented May 26, 2021

mhsmith left a comment

Choose a reason for hiding this comment

mhsmith commented May 30, 2021

mhsmith left a comment

Choose a reason for hiding this comment

mhsmith left a comment

Choose a reason for hiding this comment

Aldin-SXR commented Jun 10, 2021 • edited

mhsmith left a comment

Choose a reason for hiding this comment

Aldin-SXR commented May 21, 2021 •

edited

Aldin-SXR commented Jun 10, 2021 •

edited