From 5175e7e2c49f3d7d45f19d2a54e7434be7db4e01 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 28 Aug 2017 12:57:32 -0300 Subject: [PATCH] Create, import join wallet BCH --- src/js/controllers/import.js | 2 ++ src/js/controllers/join.js | 4 +++- src/js/services/profileService.js | 8 +++++++- www/views/join.html | 11 +++++++++++ www/views/tab-create-shared.html | 10 ++++++++++ www/views/tab-import-phrase.html | 11 +++++++++++ 6 files changed, 44 insertions(+), 2 deletions(-) diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js index 3b34839ad..d026c6c07 100644 --- a/src/js/controllers/import.js +++ b/src/js/controllers/import.js @@ -15,6 +15,7 @@ angular.module('copayApp.controllers').controller('importController', $scope.formData.bwsurl = defaults.bws.url; $scope.formData.derivationPath = derivationPathHelper.default; $scope.formData.account = 1; + $scope.formData.coin = 'btc'; $scope.importErr = false; $scope.isCopay = appConfigService.name == 'copay'; $scope.fromHardwareWallet = { value: false }; @@ -273,6 +274,7 @@ angular.module('copayApp.controllers').controller('importController', } opts.passphrase = $scope.formData.passphrase || null; + opts.coin = $scope.formData.coin; if ($scope.fromHardwareWallet.value) { $log.debug('Importing seed from hardware wallet'); diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js index 2728b6eb0..bf1e5ec00 100644 --- a/src/js/controllers/join.js +++ b/src/js/controllers/join.js @@ -10,6 +10,7 @@ angular.module('copayApp.controllers').controller('joinController', $scope.formData.derivationPath = derivationPathHelper.default; $scope.formData.account = 1; $scope.formData.secret = null; + $scope.formData.coin = 'btc'; resetPasswordFields(); updateSeedSourceSelect(); }); @@ -103,7 +104,8 @@ angular.module('copayApp.controllers').controller('joinController', var opts = { secret: $scope.formData.secret, myName: $scope.formData.myName, - bwsurl: $scope.formData.bwsurl + bwsurl: $scope.formData.bwsurl, + coin: $scope.formData.coin } var setSeed = $scope.formData.seedSource.id == 'set'; diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index bbba03cf6..bef87b67d 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -334,6 +334,7 @@ console.log('[profileService.js:92]',wallet); //TODO/ passphrase: opts.passphrase, account: opts.account || 0, derivationStrategy: opts.derivationStrategy || 'BIP44', + coin: opts.coin }); } catch (ex) { @@ -352,6 +353,7 @@ console.log('[profileService.js:92]',wallet); //TODO/ walletClient.seedFromExtendedPublicKey(opts.extendedPublicKey, opts.externalSource, opts.entropySource, { account: opts.account || 0, derivationStrategy: opts.derivationStrategy || 'BIP44', + coin: opts.coin }); walletClient.credentials.hwInfo = opts.hwInfo; } catch (ex) { @@ -366,6 +368,7 @@ console.log('[profileService.js:92]',wallet); //TODO/ passphrase: opts.passphrase, language: lang, account: 0, + coin: opts.coin }); } catch (e) { $log.info('Error creating recovery phrase: ' + e.message); @@ -375,6 +378,7 @@ console.log('[profileService.js:92]',wallet); //TODO/ network: network, passphrase: opts.passphrase, account: 0, + coin: opts.coin }); } else { return cb(e); @@ -442,7 +446,7 @@ console.log('[profileService.js:92]',wallet); //TODO/ seedWallet(opts, function(err, walletClient) { if (err) return cb(err); - walletClient.joinWallet(opts.secret, opts.myName || 'me', {}, function(err) { + walletClient.joinWallet(opts.secret, opts.myName || 'me', { coin: opts.coin }, function(err) { if (err) return bwcError.cb(err, gettextCatalog.getString('Could not join wallet'), cb); addAndBindWalletClient(walletClient, { bwsurl: opts.bwsurl @@ -630,6 +634,7 @@ console.log('[profileService.js:92]',wallet); //TODO/ entropySourcePath: opts.entropySourcePath, derivationStrategy: opts.derivationStrategy || 'BIP44', account: opts.account || 0, + coin: opts.coin }, function(err) { if (err) { if (err instanceof errors.NOT_AUTHORIZED) @@ -651,6 +656,7 @@ console.log('[profileService.js:92]',wallet); //TODO/ walletClient.importFromExtendedPublicKey(opts.extendedPublicKey, opts.externalSource, opts.entropySource, { account: opts.account || 0, derivationStrategy: opts.derivationStrategy || 'BIP44', + coin: opts.coin }, function(err) { if (err) { diff --git a/www/views/join.html b/www/views/join.html index 411b8b190..ce282b67e 100644 --- a/www/views/join.html +++ b/www/views/join.html @@ -39,6 +39,17 @@ + + +
diff --git a/www/views/tab-create-shared.html b/www/views/tab-create-shared.html index 700ac9c2b..593dad599 100644 --- a/www/views/tab-create-shared.html +++ b/www/views/tab-create-shared.html @@ -29,6 +29,16 @@ ng-blur="formFocus(false)"> + +