Merge vbuterin/master

This commit is contained in:
Kyle Drake 2014-02-02 11:33:46 -08:00
commit cb3653105a
5 changed files with 7 additions and 4 deletions

6
bitcoinjs-min.js vendored

File diff suppressed because one or more lines are too long

View file

@ -14,6 +14,7 @@ var p2sh_types = {
};
var Address = function (bytes, version) {
if (!(this instanceof Address)) { return new Address(bytes, version); }
if (arguments[0] instanceof Address) {
this.hash = arguments[0].hash;
this.version = arguments[0].version;

View file

@ -12,7 +12,7 @@ var ecparams = sec("secp256k1");
// input can be nothing, array of bytes, hex string, or base58 string
var ECKey = function (input,compressed) {
if (!(this instanceof ECKey)) { return new ECKey(input); }
if (!(this instanceof ECKey)) { return new ECKey(input,compressed); }
if (!input) {
// Generate new key
var n = ecparams.getN();

View file

@ -9,6 +9,7 @@ var ECDSA = require('./ecdsa');
var Address = require('./address');
var Transaction = function (doc) {
if (!(this instanceof Transaction)) { return new Transaction(doc); }
this.version = 1;
this.lock_time = 0;
this.ins = [];

View file

@ -14,6 +14,7 @@ var SecureRandom = require('./jsbn/rng');
var rng = new SecureRandom();
var Wallet = function (seed) {
if (!(this instanceof Wallet)) { return new Wallet(seed); }
// Stored in a closure to make accidental serialization less likely
var keys = [];