Skip to content

Commit

Permalink
fix watch only
Browse files Browse the repository at this point in the history
  • Loading branch information
glslang committed Sep 24, 2017
1 parent 3eaafc7 commit a86a7e3
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions static/js/greenwallet/services/wallets.js
Original file line number Diff line number Diff line change
Expand Up @@ -268,10 +268,12 @@ function factory ($q, $rootScope, tx_sender, $location, notices, $uibModal,
$scope.wallet.nlocktime_blocks = data.nlocktime_blocks;
$scope.wallet.gait_path = data.gait_path;
// create a per-wallet keyname to store segwit lockin status
$scope.wallet.segwit_locked_key =
Bitcoin.bitcoin.crypto.sha256(
Bitcoin.Buffer.Buffer.concat(
[Bitcoin.Buffer.Buffer(data.gait_path), Bitcoin.Buffer.Buffer('segwit_locked')])).toString('hex');
if (data.gait_path) {
$scope.wallet.segwit_locked_key =
Bitcoin.bitcoin.crypto.sha256(
Bitcoin.Buffer.Buffer.concat(
[Bitcoin.Buffer.Buffer(data.gait_path), Bitcoin.Buffer.Buffer('segwit_locked')])).toString('hex');
}
if (!options.signup && !options.needsPINSetup) {
// don't change URL on initial login in signup or PIN setup
walletsService.openInitialPage($scope.wallet, data.has_txs);
Expand Down

0 comments on commit a86a7e3

Please sign in to comment.