Skip to content
This repository has been archived by the owner on Apr 20, 2022. It is now read-only.

Commit

Permalink
Use Compressed Addresses By Default
Browse files Browse the repository at this point in the history
  • Loading branch information
Ben Reeves committed Dec 21, 2014
1 parent 5203ab5 commit 1c04bef
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 14 deletions.
7 changes: 4 additions & 3 deletions sharedcoin.js
Expand Up @@ -673,11 +673,12 @@ var SharedCoin = new function() {
return address;
},
generateChangeAddress : function() {
var key = MyWallet.generateNewKey();
var obj = MyWallet.generateNewKey();

var change_address = key.getBitcoinAddress();
if (!obj || !obj.addr)
throw 'Error Generating Change Address';

this.generated_addresses.push(change_address.toString());
this.generated_addresses.push(obj.addr);

return change_address;
},
Expand Down
2 changes: 1 addition & 1 deletion sharedcoin.min.js

Large diffs are not rendered by default.

9 changes: 6 additions & 3 deletions signer.js
Expand Up @@ -719,7 +719,7 @@ function startTxUI(el, type, pending_transaction, dont_ask_for_anon) {

if (changeAddressVal.length > 0) {
if (changeAddressVal == 'new') {
var key = MyWallet.generateNewKey();
var key = MyWallet.getBitcoinAddressCompressed(null, {compressed : true});

var bitcoin_address = key.getBitcoinAddress();

Expand Down Expand Up @@ -908,10 +908,13 @@ function startTxUI(el, type, pending_transaction, dont_ask_for_anon) {

if (validateEmail(send_to_email)) {
//Send to email address
var key = MyWallet.generateNewKey();
var obj = MyWallet.generateNewKey();

if (!obj || !obj.addr)
throw 'Error Generating New Address';

//Fetch the newly generated address
var address = key.getBitcoinAddress().toString();
var address = obj.addr;

//Archive the address
MyWallet.setAddressTag(address, 2);
Expand Down
2 changes: 1 addition & 1 deletion signer.min.js

Large diffs are not rendered by default.

14 changes: 9 additions & 5 deletions wallet.js
Expand Up @@ -637,8 +637,10 @@ var MyWallet = new function() {

var key = new Bitcoin.ECKey(false);

if (MyWallet.addPrivateKey(key)) {
return key;
var addr = MyWallet.addPrivateKey(key, {compressed : true});

if (addr) {
return {key : key, addr : addr};
}
}

Expand Down Expand Up @@ -4134,9 +4136,12 @@ var MyWallet = new function() {
$("#new-addr").click(function() {
getWallet(function() {
MyWallet.getSecondPassword(function() {
var key = MyWallet.generateNewKey();
var obj = MyWallet.generateNewKey();

if (!obj || !obj.addr)
throw 'Error Generating New Address';

var address = key.getBitcoinAddress().toString();
var address = obj.addr;

MyWallet.backupWallet('update', function() {
MyWallet.makeNotice('info', 'new-address', 'Generated new Bitcoin Address ' + address);
Expand Down Expand Up @@ -4419,7 +4424,6 @@ var MyWallet = new function() {
return;
}


try { var isFileSaverSupported = !!new Blob(); } catch(e) {}

if (isFileSaverSupported) {
Expand Down
2 changes: 1 addition & 1 deletion wallet.min.js

Large diffs are not rendered by default.

0 comments on commit 1c04bef

Please sign in to comment.