mirror of https://github.com/BTCPrivate/copay.git
commit
986a9a6ff0
|
@ -22,7 +22,7 @@
|
||||||
"windowsAppId": "804636ee-b017-4cad-8719-e58ac97ffa5c",
|
"windowsAppId": "804636ee-b017-4cad-8719-e58ac97ffa5c",
|
||||||
"pushSenderId": "1036948132229",
|
"pushSenderId": "1036948132229",
|
||||||
"description": "A Secure Bitcoin Wallet",
|
"description": "A Secure Bitcoin Wallet",
|
||||||
"version": "3.4.0",
|
"version": "3.4.1",
|
||||||
"androidVersion": "340001",
|
"androidVersion": "340001",
|
||||||
"_extraCSS": null,
|
"_extraCSS": null,
|
||||||
"_enabledExtensions": {
|
"_enabledExtensions": {
|
||||||
|
|
|
@ -107,7 +107,7 @@
|
||||||
"run:android": "cordova run android --device",
|
"run:android": "cordova run android --device",
|
||||||
"run:android-release": "cordova run android --device --release",
|
"run:android-release": "cordova run android --device --release",
|
||||||
"log:android": "adb logcat | grep chromium",
|
"log:android": "adb logcat | grep chromium",
|
||||||
"sign:android": "rm -f platforms/android/build/outputs/apk/android-release-signed-aligned.apk; jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../copay.keystore -signedjar platforms/android/build/outputs/apk/android-release-signed.apk platforms/android/build/outputs/apk/android-release-unsigned.apk copay_play && ../android-sdk-macosx/build-tools/21.1.1/zipalign -v 4 platforms/android/build/outputs/apk/android-release-signed.apk platforms/android/build/outputs/apk/android-release-signed-aligned.apk",
|
"sign:android": "rm -f platforms/android/build/outputs/apk/android-release-signed-aligned.apk; jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../copay.keystore -signedjar platforms/android/build/outputs/apk/android-release-signed.apk platforms/android/build/outputs/apk/android-release-unsigned.apk copay_play && ../android-sdk-macosx/build-tools/25.0.3/zipalign -v 4 platforms/android/build/outputs/apk/android-release-signed.apk platforms/android/build/outputs/apk/android-release-signed-aligned.apk",
|
||||||
"apply:copay": "npm i fs-extra && cd app-template && node apply.js copay && npm i && cordova prepare",
|
"apply:copay": "npm i fs-extra && cd app-template && node apply.js copay && npm i && cordova prepare",
|
||||||
"apply:bitpay": "npm i fs-extra && cd app-template && node apply.js bitpay && npm i && cordova prepare",
|
"apply:bitpay": "npm i fs-extra && cd app-template && node apply.js bitpay && npm i && cordova prepare",
|
||||||
"test": "echo \"no package tests configured\"",
|
"test": "echo \"no package tests configured\"",
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular.module('copayApp.controllers').controller('importController',
|
angular.module('copayApp.controllers').controller('importController',
|
||||||
function($scope, $timeout, $log, $state, $stateParams, $ionicHistory, $ionicScrollDelegate, profileService, configService, sjcl, ledger, trezor, derivationPathHelper, platformInfo, bwcService, ongoingProcess, walletService, popupService, gettextCatalog, appConfigService) {
|
function($scope, $timeout, $log, $state, $stateParams, $ionicHistory, $ionicScrollDelegate, profileService, configService, sjcl, ledger, trezor, derivationPathHelper, platformInfo, bwcService, ongoingProcess, walletService, popupService, gettextCatalog, appConfigService, hwWallet) {
|
||||||
|
|
||||||
var reader = new FileReader();
|
var reader = new FileReader();
|
||||||
var defaults = configService.getDefaults();
|
var defaults = configService.getDefaults();
|
||||||
|
@ -17,6 +17,7 @@ angular.module('copayApp.controllers').controller('importController',
|
||||||
$scope.formData.account = 1;
|
$scope.formData.account = 1;
|
||||||
$scope.importErr = false;
|
$scope.importErr = false;
|
||||||
$scope.isCopay = appConfigService.name == 'copay';
|
$scope.isCopay = appConfigService.name == 'copay';
|
||||||
|
$scope.fromHardwareWallet = { value: false };
|
||||||
|
|
||||||
if ($stateParams.code)
|
if ($stateParams.code)
|
||||||
$scope.processWalletInfo($stateParams.code);
|
$scope.processWalletInfo($stateParams.code);
|
||||||
|
@ -38,6 +39,21 @@ angular.module('copayApp.controllers').controller('importController',
|
||||||
$scope.formData.seedSource = $scope.seedOptions[0];
|
$scope.formData.seedSource = $scope.seedOptions[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
$scope.seedOptionsAll = [];
|
||||||
|
|
||||||
|
$scope.seedOptionsAll.push({
|
||||||
|
id: walletService.externalSource.ledger.id,
|
||||||
|
label: walletService.externalSource.ledger.longName,
|
||||||
|
});
|
||||||
|
|
||||||
|
$scope.seedOptionsAll.push({
|
||||||
|
id: walletService.externalSource.trezor.id,
|
||||||
|
label: walletService.externalSource.trezor.longName,
|
||||||
|
});
|
||||||
|
$scope.formData.seedSourceAll = $scope.seedOptionsAll[0];
|
||||||
|
|
||||||
|
|
||||||
$timeout(function() {
|
$timeout(function() {
|
||||||
$scope.$apply();
|
$scope.$apply();
|
||||||
});
|
});
|
||||||
|
@ -159,6 +175,7 @@ angular.module('copayApp.controllers').controller('importController',
|
||||||
|
|
||||||
$timeout(function() {
|
$timeout(function() {
|
||||||
profileService.importMnemonic(words, opts, function(err, client) {
|
profileService.importMnemonic(words, opts, function(err, client) {
|
||||||
|
|
||||||
ongoingProcess.set('importingWallet', false);
|
ongoingProcess.set('importingWallet', false);
|
||||||
|
|
||||||
if (err) {
|
if (err) {
|
||||||
|
@ -177,7 +194,7 @@ angular.module('copayApp.controllers').controller('importController',
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.setDerivationPath = function() {
|
$scope.setDerivationPath = function() {
|
||||||
$scope.formData.derivationPath = $scope.formData.testnetEnabled ? derivationPathHelper.defaultTestnet : derivationPathHelper.default;
|
$scope.formData.testnetEnabled ? derivationPathHelper.defaultTestnet : derivationPathHelper.default;
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.getFile = function() {
|
$scope.getFile = function() {
|
||||||
|
@ -256,6 +273,18 @@ angular.module('copayApp.controllers').controller('importController',
|
||||||
}
|
}
|
||||||
|
|
||||||
opts.passphrase = $scope.formData.passphrase || null;
|
opts.passphrase = $scope.formData.passphrase || null;
|
||||||
|
|
||||||
|
if ($scope.fromHardwareWallet.value) {
|
||||||
|
$log.debug('Importing seed from hardware wallet');
|
||||||
|
$log.warn('This wont work for Intel TEE wallets');
|
||||||
|
|
||||||
|
var id = $scope.formData.seedSourceAll.id;
|
||||||
|
var isMultisig = opts.derivationStrategy =='BIP48';
|
||||||
|
var account = opts.account;
|
||||||
|
opts.entropySourcePath = 'm/' + hwWallet.getEntropyPath(id, isMultisig, account);
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log('[import.js.283:opts:]',opts); //TODO
|
||||||
_importMnemonic(words, opts);
|
_importMnemonic(words, opts);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -269,6 +298,7 @@ angular.module('copayApp.controllers').controller('importController',
|
||||||
|
|
||||||
lopts.externalSource = walletService.externalSource.trezor.id;
|
lopts.externalSource = walletService.externalSource.trezor.id;
|
||||||
lopts.bwsurl = $scope.formData.bwsurl;
|
lopts.bwsurl = $scope.formData.bwsurl;
|
||||||
|
console.log('[import.js.299:lopts:]',lopts); //TODO
|
||||||
ongoingProcess.set('importingWallet', true);
|
ongoingProcess.set('importingWallet', true);
|
||||||
$log.debug('Import opts', lopts);
|
$log.debug('Import opts', lopts);
|
||||||
|
|
||||||
|
|
|
@ -618,6 +618,8 @@ angular.module('copayApp.services')
|
||||||
walletClient.importFromMnemonic(words, {
|
walletClient.importFromMnemonic(words, {
|
||||||
network: opts.networkName,
|
network: opts.networkName,
|
||||||
passphrase: opts.passphrase,
|
passphrase: opts.passphrase,
|
||||||
|
entropySourcePath: opts.entropySourcePath,
|
||||||
|
derivationStrategy: opts.derivationStrategy || 'BIP44',
|
||||||
account: opts.account || 0,
|
account: opts.account || 0,
|
||||||
}, function(err) {
|
}, function(err) {
|
||||||
if (err) {
|
if (err) {
|
||||||
|
|
|
@ -18,7 +18,9 @@ angular.module('copayApp.services')
|
||||||
};
|
};
|
||||||
|
|
||||||
root.getEntropySource = function(isMultisig, account, callback) {
|
root.getEntropySource = function(isMultisig, account, callback) {
|
||||||
|
console.log('[trezor.js.20:isMultisig:]',root.description.id, isMultisig, account); //TODO
|
||||||
root.getXPubKey(hwWallet.getEntropyPath(root.description.id, isMultisig, account), function(data) {
|
root.getXPubKey(hwWallet.getEntropyPath(root.description.id, isMultisig, account), function(data) {
|
||||||
|
console.log('[trezor.js.21:data:]',data); //TODO
|
||||||
if (!data.success)
|
if (!data.success)
|
||||||
return callback(hwWallet._err(data));
|
return callback(hwWallet._err(data));
|
||||||
|
|
||||||
|
@ -30,6 +32,7 @@ angular.module('copayApp.services')
|
||||||
root.getXPubKey = function(path, callback) {
|
root.getXPubKey = function(path, callback) {
|
||||||
$log.debug('TREZOR deriving xPub path:', path);
|
$log.debug('TREZOR deriving xPub path:', path);
|
||||||
try {
|
try {
|
||||||
|
console.log('[trezor.js.35:path:]',path); //TODO
|
||||||
TrezorConnect.getXPubKey(path, callback);
|
TrezorConnect.getXPubKey(path, callback);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
callback('Error connecting Trezor');
|
callback('Error connecting Trezor');
|
||||||
|
|
|
@ -49,14 +49,28 @@
|
||||||
ng-model="formData.derivationPath">
|
ng-model="formData.derivationPath">
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
<label class="item item-input item-stacked-label">
|
|
||||||
<span class="input-label" translate>Wallet Service URL</span>
|
<ion-toggle ng-model="fromHardwareWallet.value" toggle-class="toggle-positive">
|
||||||
<input type="text" ng-model="formData.bwsurl">
|
<span class="toggle-label" translate>From Hardware Wallet</span>
|
||||||
|
</ion-toggle>
|
||||||
|
|
||||||
|
<label class="item item-input item-select" ng-if="fromHardwareWallet.value">
|
||||||
|
<div class="input-label" translate>
|
||||||
|
Wallet Type
|
||||||
|
</div>
|
||||||
|
<select class="m10t" ng-model="formData.seedSourceAll" ng-options="seed as seed.label for seed in seedOptionsAll"></select>
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
<ion-toggle ng-model="formData.testnetEnabled" ng-change="setDerivationPath()" toggle-class="toggle-positive">
|
<ion-toggle ng-model="formData.testnetEnabled" ng-change="setDerivationPath()" toggle-class="toggle-positive">
|
||||||
<span translate>Testnet</span>
|
<span translate>Testnet</span>
|
||||||
</ion-toggle>
|
</ion-toggle>
|
||||||
|
|
||||||
|
|
||||||
|
<label class="item item-input item-stacked-label">
|
||||||
|
<span class="input-label" translate>Wallet Service URL</span>
|
||||||
|
<input type="text" ng-model="formData.bwsurl">
|
||||||
|
</label>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue