anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

fix join

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2014-10-10 11:42:23 -03:00 • committed by Matias Alejo Garcia
commit 006bf4c1fa
2 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

21
js/models/Wallet.js
View file

@ -837,14 +837,19 @@ Wallet.prototype.getSecret = function() {
* @return {Object} * @return {Object}
*/ */
Wallet.decodeSecret = function(secretB) { Wallet.decodeSecret = function(secretB) {
var secret = Base58Check.decode(secretB); try {
var pubKeyBuf = secret.slice(0, 33); var secret = Base58Check.decode(secretB);
var secretNumber = secret.slice(33, 38); var pubKeyBuf = secret.slice(0, 33);
var networkName = secret.slice(38, 39).toString('hex') === '00' ? 'livenet' : 'testnet'; var secretNumber = secret.slice(33, 38);
return { var networkName = secret.slice(38, 39).toString('hex') === '00' ? 'livenet' : 'testnet';
pubKey: pubKeyBuf.toString('hex'), return {
secretNumber: secretNumber.toString('hex'), pubKey: pubKeyBuf.toString('hex'),
networkName: networkName, secretNumber: secretNumber.toString('hex'),
networkName: networkName,
}
} catch (e) {
log.debug(e.message);
return false;
} }
}; };

27
views/join.html
View file

@ -5,10 +5,8 @@
</div> </div>
<h1>{{'Join Wallet'|translate}}</h1> <h1>{{'Join Wallet'|translate}}</h1>
<div class="row collapse m0"> <div class="row collapse">
<div class="large-6 columns"> <div class="large-12 columns">
<div class="box-setup">
<h1 translate class="text-primary line-sidebar-b">Join a Wallet in Creation</h1>
<form name="joinForm" ng-submit="join(joinForm)" novalidate> <form name="joinForm" ng-submit="join(joinForm)" novalidate>
<label for="connectionId"><span translate>Wallet Secret</span> <label for="connectionId"><span translate>Wallet Secret</span>
@ -51,13 +49,15 @@
</div> </div>
</div> </div>
<a class="expand small" ng-click="hideAdv=!hideAdv"> <div class="m10b">
<i class="fi-widget m3r"></i> <a class="expand small" ng-click="hideAdv=!hideAdv">
<span translate ng-hide="!hideAdv">Show</span> <i class="fi-widget m3r"></i>
<span translate ng-hide="hideAdv">Hide</span> <span translate ng-hide="!hideAdv">Show</span>
<span translate>advanced options</span> <span translate ng-hide="hideAdv">Hide</span>
</a> <span translate>advanced options</span>
<div ng-hide="hideAdv" class="m10t"> </a>
</div>
<div ng-hide="hideAdv">
<p> <p>
<input type="text" placeholder="BIP32 master extended private key (hex)" name="private" ng-model="$parent.private"> <input type="text" placeholder="BIP32 master extended private key (hex)" name="private" ng-model="$parent.private">
</div> </div>
@ -65,12 +65,7 @@
<div class="text-right"> <div class="text-right">
<button translate type="submit" class="button primary m0" ng-disabled="joinForm.$invalid || loading">Join</button> <button translate type="submit" class="button primary m0" ng-disabled="joinForm.$invalid || loading">Join</button>
</div> </div>
</form> </form>
</div>
</div> </div>
</div> </div>
<!-- End !loading --> <!-- End !loading -->