Updated deterministic wallet; theoretically works now if properly combined with server
This commit is contained in:
parent
397de49089
commit
1780f4a98f
4 changed files with 165 additions and 289 deletions
4
bitcoinjs-min.js
vendored
4
bitcoinjs-min.js
vendored
File diff suppressed because one or more lines are too long
|
@ -75,9 +75,9 @@ BIP32key.prototype.ckd = function(i) {
|
|||
|
||||
if (i >= 2147483648) {
|
||||
if (this.priv) throw new Error("Can't do private derivation on public key!")
|
||||
blob = [0].concat(priv.slice(0,32),util.numToBytes(this.i,4).reverse())
|
||||
blob = [0].concat(priv.slice(0,32),util.numToBytes(i,4).reverse())
|
||||
}
|
||||
else blob = pub.concat(util.numToBytes(this.i,4).reverse())
|
||||
else blob = pub.concat(util.numToBytes(i,4).reverse())
|
||||
|
||||
I = Crypto.HMAC(Crypto.SHA512,blob,this.chaincode,{ asBytes: true })
|
||||
|
||||
|
|
|
@ -110,21 +110,6 @@ Transaction.prototype.addOutput = function (address, value) {
|
|||
}));
|
||||
};
|
||||
|
||||
// TODO(shtylman) crypto sha uses this also
|
||||
// Convert a byte array to big-endian 32-bit words
|
||||
var bytesToWords = function (bytes) {
|
||||
for (var words = [], i = 0, b = 0; i < bytes.length; i++, b += 8)
|
||||
words[b >>> 5] |= bytes[i] << (24 - b % 32);
|
||||
return words;
|
||||
};
|
||||
|
||||
// Convert big-endian 32-bit words to a byte array
|
||||
var wordsToBytes = function (words) {
|
||||
for (var bytes = [], b = 0; b < words.length * 32; b += 8)
|
||||
bytes.push((words[b >>> 5] >>> (24 - b % 32)) & 0xFF);
|
||||
return bytes;
|
||||
};
|
||||
|
||||
/**
|
||||
* Serialize this transaction.
|
||||
*
|
||||
|
@ -132,35 +117,34 @@ var wordsToBytes = function (words) {
|
|||
* format. This method is byte-perfect, i.e. the resulting byte array can
|
||||
* be hashed to get the transaction's standard Bitcoin hash.
|
||||
*/
|
||||
Transaction.prototype.serialize = function ()
|
||||
{
|
||||
var buffer = [];
|
||||
buffer = buffer.concat(util.numToBytes(parseInt(this.version),4));
|
||||
buffer = buffer.concat(util.numToVarInt(this.ins.length));
|
||||
for (var i = 0; i < this.ins.length; i++) {
|
||||
var txin = this.ins[i];
|
||||
Transaction.prototype.serialize = function () {
|
||||
var buffer = [];
|
||||
buffer = buffer.concat(util.numToBytes(parseInt(this.version),4));
|
||||
buffer = buffer.concat(util.numToVarInt(this.ins.length));
|
||||
for (var i = 0; i < this.ins.length; i++) {
|
||||
var txin = this.ins[i];
|
||||
|
||||
// Why do blockchain.info, blockexplorer.com, sx and just about everybody
|
||||
// else use little-endian hashes? No idea...
|
||||
buffer = buffer.concat(conv.hexToBytes(txin.outpoint.hash).reverse());
|
||||
// Why do blockchain.info, blockexplorer.com, sx and just about everybody
|
||||
// else use little-endian hashes? No idea...
|
||||
buffer = buffer.concat(conv.hexToBytes(txin.outpoint.hash).reverse());
|
||||
|
||||
buffer = buffer.concat(util.numToBytes(parseInt(txin.outpoint.index),4));
|
||||
var scriptBytes = txin.script.buffer;
|
||||
buffer = buffer.concat(util.numToVarInt(scriptBytes.length));
|
||||
buffer = buffer.concat(scriptBytes);
|
||||
buffer = buffer.concat(util.numToBytes(parseInt(txin.sequence),4));
|
||||
}
|
||||
buffer = buffer.concat(util.numToVarInt(this.outs.length));
|
||||
for (var i = 0; i < this.outs.length; i++) {
|
||||
var txout = this.outs[i];
|
||||
buffer = buffer.concat(util.numToBytes(txout.value,8));
|
||||
var scriptBytes = txout.script.buffer;
|
||||
buffer = buffer.concat(util.numToVarInt(scriptBytes.length));
|
||||
buffer = buffer.concat(scriptBytes);
|
||||
}
|
||||
buffer = buffer.concat(util.numToBytes(parseInt(this.lock_time),4));
|
||||
buffer = buffer.concat(util.numToBytes(parseInt(txin.outpoint.index),4));
|
||||
var scriptBytes = txin.script.buffer;
|
||||
buffer = buffer.concat(util.numToVarInt(scriptBytes.length));
|
||||
buffer = buffer.concat(scriptBytes);
|
||||
buffer = buffer.concat(util.numToBytes(parseInt(txin.sequence),4));
|
||||
}
|
||||
buffer = buffer.concat(util.numToVarInt(this.outs.length));
|
||||
for (var i = 0; i < this.outs.length; i++) {
|
||||
var txout = this.outs[i];
|
||||
buffer = buffer.concat(util.numToBytes(txout.value,8));
|
||||
var scriptBytes = txout.script.buffer;
|
||||
buffer = buffer.concat(util.numToVarInt(scriptBytes.length));
|
||||
buffer = buffer.concat(scriptBytes);
|
||||
}
|
||||
buffer = buffer.concat(util.numToBytes(parseInt(this.lock_time),4));
|
||||
|
||||
return buffer;
|
||||
return buffer;
|
||||
};
|
||||
|
||||
Transaction.prototype.serializeHex = function() {
|
||||
|
|
380
src/wallet.js
380
src/wallet.js
|
@ -14,265 +14,157 @@ var TransactionOut = require('./transaction').TransactionOut;
|
|||
var SecureRandom = require('./jsbn/rng');
|
||||
var rng = new SecureRandom();
|
||||
|
||||
var Wallet = function () {
|
||||
// Keychain
|
||||
//
|
||||
// The keychain is stored as a var in this closure to make accidental
|
||||
// serialization less likely.
|
||||
//
|
||||
// Any functions accessing this value therefore have to be defined in
|
||||
// the closure of this constructor.
|
||||
var keys = [];
|
||||
var masterkey = null;
|
||||
var Wallet = function (seed) {
|
||||
|
||||
// Public hashes of our keys
|
||||
this.addressHashes = [];
|
||||
// Stored in a closure to make accidental serialization less likely
|
||||
var keys = [];
|
||||
var masterkey = null;
|
||||
var me = this;
|
||||
|
||||
// Transaction data
|
||||
this.txIndex = {};
|
||||
this.unspentOuts = [];
|
||||
// Addresses
|
||||
this.addresses = [];
|
||||
|
||||
// Other fields
|
||||
this.addressPointer = 0;
|
||||
// Transaction output data
|
||||
this.outputs = {};
|
||||
|
||||
this.genMasterkey = function(seed) {
|
||||
if (!seed) {
|
||||
var seedBytes = new Array(32);
|
||||
rng.nextBytes(seedBytes);
|
||||
seed = conv.bytesToString(seedBytes)
|
||||
}
|
||||
masterkey = new BIP32key(seed);
|
||||
}
|
||||
|
||||
this.generateAddress = function() {
|
||||
keys.push(masterkey.ckd(keys.length))
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the key chain.
|
||||
*
|
||||
* Returns an array of hex-encoded private values.
|
||||
*/
|
||||
this.getKeys = function () {
|
||||
var keyExport = [];
|
||||
|
||||
for (var i = 0; i < keys.length; i++) {
|
||||
keyExport.push(keys[i].toString());
|
||||
}
|
||||
|
||||
return keyExport;
|
||||
};
|
||||
|
||||
this.privateSerialize = function() {
|
||||
return {
|
||||
masterkey: masterkey,
|
||||
keys: this.getKeys()
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the public keys.
|
||||
*
|
||||
* Returns an array of hex-encoded public keys.
|
||||
*/
|
||||
this.getPubKeys = function () {
|
||||
var pubs = [];
|
||||
|
||||
for (var i = 0; i < keys.length; i++) {
|
||||
pubs.push(conv.bytesToHex(keys[i].getPub()));
|
||||
}
|
||||
|
||||
return pubs;
|
||||
};
|
||||
|
||||
/**
|
||||
* Delete all keys.
|
||||
*/
|
||||
this.clear = function () {
|
||||
keys = [];
|
||||
masterkey = null;
|
||||
};
|
||||
|
||||
/**
|
||||
* Return the number of keys in this wallet.
|
||||
*/
|
||||
this.getLength = function () {
|
||||
return keys.length;
|
||||
};
|
||||
|
||||
/**
|
||||
* Get the addresses for this wallet.
|
||||
*
|
||||
* Returns an array of Address objects.
|
||||
*/
|
||||
this.getAllAddresses = function () {
|
||||
var addresses = [];
|
||||
for (var i = 0; i < keys.length; i++) {
|
||||
addresses.push(keys[i].getBitcoinAddress());
|
||||
}
|
||||
return addresses;
|
||||
};
|
||||
|
||||
this.getCurAddress = function () {
|
||||
if (keys[keys.length - 1]) {
|
||||
return keys[keys.length - 1].getBitcoinAddress();
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* Sign a hash with a key.
|
||||
*
|
||||
* This method expects the pubKeyHash as the first parameter and the hash
|
||||
* to be signed as the second parameter.
|
||||
*/
|
||||
this.signWithKey = function (pubKeyHash, hash) {
|
||||
pubKeyHash = conv.bytesToHex(pubKeyHash);
|
||||
for (var i = 0; i < this.addressHashes.length; i++) {
|
||||
if (this.addressHashes[i] == pubKeyHash) {
|
||||
return keys[i].sign(hash);
|
||||
}
|
||||
}
|
||||
throw new Error("Missing key for signature");
|
||||
};
|
||||
|
||||
/**
|
||||
* Retrieve the corresponding pubKey for a pubKeyHash.
|
||||
*
|
||||
* This function only works if the pubKey in question is part of this
|
||||
* wallet.
|
||||
*/
|
||||
this.getPubKeyFromHash = function (pubKeyHash) {
|
||||
pubKeyHash = conv.bytesToHex(pubKeyHash);
|
||||
for (var i = 0; i < this.addressHashes.length; i++) {
|
||||
if (this.addressHashes[i] == pubKeyHash) {
|
||||
return keys[i].getPub();
|
||||
}
|
||||
}
|
||||
throw new Error("Hash unknown");
|
||||
};
|
||||
};
|
||||
|
||||
// return unspent transactions
|
||||
Wallet.prototype.unspentTx = function() {
|
||||
return this.unspentOuts;
|
||||
};
|
||||
|
||||
/**
|
||||
* Add a transaction to the wallet's processed transaction.
|
||||
*
|
||||
* This will add a transaction to the wallet, updating its balance and
|
||||
* available unspent outputs.
|
||||
*/
|
||||
Wallet.prototype.process = function (tx) {
|
||||
if (this.txIndex[tx.hash]) return;
|
||||
|
||||
var j;
|
||||
var k;
|
||||
var hash;
|
||||
// Gather outputs
|
||||
for (j = 0; j < tx.out.length; j++) {
|
||||
var raw_tx = tx.out[j];
|
||||
var txout = new TransactionOut(raw_tx);
|
||||
// this hash is the hash of the pubkey which is the address the output when to
|
||||
hash = conv.bytesToHex(txout.script.simpleOutPubKeyHash());
|
||||
for (k = 0; k < this.addressHashes.length; k++) {
|
||||
// if our address, then we add the unspent out to a list of unspent outputs
|
||||
if (this.addressHashes[k] === hash) {
|
||||
this.unspentOuts.push({tx: tx, index: j, output: txout});
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Remove spent outputs
|
||||
for (j = 0; j < tx.in.length; j++) {
|
||||
var raw_tx = tx.in[j];
|
||||
|
||||
// mangle into the format TransactionIn expects
|
||||
raw_tx.outpoint = {
|
||||
hash: raw_tx.prev_out.hash,
|
||||
index: raw_tx.prev_out.n
|
||||
};
|
||||
|
||||
var txin = new TransactionIn(raw_tx);
|
||||
var pubkey = txin.script.simpleInPubKey();
|
||||
hash = conv.bytesToHex(util.sha256ripe160(pubkey));
|
||||
for (k = 0; k < this.addressHashes.length; k++) {
|
||||
if (this.addressHashes[k] === hash) {
|
||||
for (var l = 0; l < this.unspentOuts.length; l++) {
|
||||
if (txin.outpoint.hash == this.unspentOuts[l].tx.hash &&
|
||||
txin.outpoint.index == this.unspentOuts[l].index) {
|
||||
this.unspentOuts.splice(l, 1);
|
||||
}
|
||||
// Make a new master key
|
||||
this.newMasterKey = function(seed) {
|
||||
if (!seed) {
|
||||
var seedBytes = new Array(32);
|
||||
rng.nextBytes(seedBytes);
|
||||
seed = conv.bytesToString(seedBytes)
|
||||
}
|
||||
break;
|
||||
}
|
||||
masterkey = new BIP32key(seed);
|
||||
keys = []
|
||||
}
|
||||
}
|
||||
this.newMasterKey(seed)
|
||||
|
||||
// Index transaction
|
||||
this.txIndex[tx.hash] = tx;
|
||||
};
|
||||
// Add a new address
|
||||
this.generateAddress = function() {
|
||||
keys.push(masterkey.ckd(keys.length).key)
|
||||
this.addresses.push(keys[keys.length-1].getBitcoinAddress().toString())
|
||||
return this.addresses[this.addresses.length - 1]
|
||||
}
|
||||
|
||||
// Processes a transaction object
|
||||
// If "verified" is true, then we trust the transaction as "final"
|
||||
this.processTx = function(tx, verified) {
|
||||
var txhash = conv.bytesToHex(tx.getHash())
|
||||
for (var i = 0; i < tx.outs.length; i++) {
|
||||
if (this.addresses.indexOf(tx.outs[i].address.toString()) >= 0) {
|
||||
me.outputs[txhash+':'+i] = {
|
||||
output: txhash+':'+i,
|
||||
value: tx.outs[i].value,
|
||||
address: tx.outs[i].address.toString(),
|
||||
timestamp: new Date().getTime() / 1000,
|
||||
pending: true
|
||||
}
|
||||
}
|
||||
}
|
||||
for (var i = 0; i < tx.ins.length; i++) {
|
||||
var op = tx.ins[i].outpoint
|
||||
var o = me.outputs[op.hash+':'+op.index]
|
||||
if (o) {
|
||||
o.spend = txhash+':'+i
|
||||
o.spendpending = true
|
||||
o.timestamp = new Date().getTime() / 1000
|
||||
}
|
||||
}
|
||||
}
|
||||
// Processes an output from an external source of the form
|
||||
// { output: txhash:index, value: integer, address: address }
|
||||
// Excellent compatibility with SX and pybitcointools
|
||||
this.processOutput = function(o) {
|
||||
if (!this.outputs[o.output] || this.outputs[o.output].pending)
|
||||
this.outputs[o.output] = o;
|
||||
}
|
||||
|
||||
Wallet.prototype.getBalance = function () {
|
||||
return this.unspentOuts.reduce(function(t,o) { return t + o.output.value },0);
|
||||
};
|
||||
this.processExistingOutputs = function() {
|
||||
var t = new Date().getTime() / 1000
|
||||
for (var o in this.outputs) {
|
||||
if (o.pending && t > o.timestamp + 1200)
|
||||
delete this.outputs[o]
|
||||
if (o.spendpending && t > o.timestamp + 1200) {
|
||||
o.spendpending = false
|
||||
o.spend = false
|
||||
delete o.timestamp
|
||||
}
|
||||
}
|
||||
}
|
||||
var peoInterval = setInterval(this.processExistingOutputs, 10000)
|
||||
|
||||
Wallet.prototype.createSend = function (address, sendValue, feeValue) {
|
||||
var selectedOuts = [];
|
||||
var txValue = sendValue + feeValue;
|
||||
var availableValue = 0;
|
||||
var i;
|
||||
for (i = 0; i < this.unspentOuts.length; i++) {
|
||||
var txout = this.unspentOuts[i];
|
||||
selectedOuts.push(txout);
|
||||
availableValue += txout.output.value;
|
||||
this.getUtxoToPay = function(value) {
|
||||
var h = []
|
||||
for (var out in this.outputs) h.push(this.outputs[out])
|
||||
var utxo = h.filter(function(x) { return !x.spend });
|
||||
var valuecompare = function(a,b) { return a.value > b.value; }
|
||||
var high = utxo.filter(function(o) { return o.value >= value; })
|
||||
.sort(valuecompare);
|
||||
if (high.length > 0) return [high[0]];
|
||||
utxo.sort(valuecompare);
|
||||
var totalval = 0;
|
||||
for (var i = 0; i < utxo.length; i++) {
|
||||
totalval += utxo[i].value;
|
||||
if (totalval >= value) return utxo.slice(0,i+1);
|
||||
}
|
||||
throw ("Not enough money to send funds including transaction fee. Have: "
|
||||
+ (totalval / 100000000) + ", needed: " + (value / 100000000));
|
||||
}
|
||||
|
||||
this.mkSend = function(to, value, fee) {
|
||||
var utxo = this.getUtxoToPay(value + fee)
|
||||
var sum = utxo.reduce(function(t,o) { return t + o.value },0),
|
||||
remainder = sum - value - fee
|
||||
if (value < 5430) throw new Error("Amount below dust threshold!")
|
||||
var unspentOuts = 0;
|
||||
for (var o in this.outputs) {
|
||||
if (!this.outputs[o].spend) unspentOuts += 1
|
||||
if (unspentOuts >= 5) return
|
||||
}
|
||||
var change = this.addresses[this.addresses.length - 1]
|
||||
var toOut = { address: to, value: value },
|
||||
changeOut = { address: change, value: remainder }
|
||||
halfChangeOut = { address: change, value: Math.floor(remainder/2) };
|
||||
|
||||
if (availableValue >= txValue) break;
|
||||
}
|
||||
var outs =
|
||||
remainder < 5430 ? [toOut]
|
||||
: remainder < 10860 ? [toOut, changeOut]
|
||||
: unspentOuts == 5 ? [toOut, changeOut]
|
||||
: [toOut, halfChangeOut, halfChangeOut]
|
||||
|
||||
if (availableValue < txValue) {
|
||||
throw new Error('Insufficient funds.');
|
||||
}
|
||||
var tx = new Bitcoin.Transaction({
|
||||
ins: utxo.map(function(x) { return x.output }),
|
||||
outs: outs
|
||||
})
|
||||
this.sign(tx)
|
||||
return tx
|
||||
}
|
||||
|
||||
var changeValue = availableValue - txValue;
|
||||
this.sign = function(tx) {
|
||||
tx.ins.map(function(inp,i) {
|
||||
var inp = inp.outpoint.hash+':'+inp.outpoint.index;
|
||||
if (me.outputs[inp]) {
|
||||
var address = me.outputs[inp].address,
|
||||
ind = me.addresses.indexOf(address);
|
||||
if (ind >= 0) {
|
||||
var key = keys[ind]
|
||||
tx.sign(ind,key)
|
||||
}
|
||||
}
|
||||
})
|
||||
return tx;
|
||||
}
|
||||
|
||||
var sendTx = new Transaction();
|
||||
this.getMasterKey = function() { return masterkey }
|
||||
|
||||
for (i = 0; i < selectedOuts.length; i++) {
|
||||
sendTx.addInput(selectedOuts[i].tx, selectedOuts[i].index);
|
||||
}
|
||||
this.getPrivateKey = function(index) {
|
||||
if (typeof index == "string")
|
||||
return keys.filter(function(i,k){ return addresses[i] == index })[0]
|
||||
else
|
||||
return keys[index]
|
||||
}
|
||||
|
||||
sendTx.addOutput(address, sendValue);
|
||||
if (changeValue > 0) {
|
||||
sendTx.addOutput(this.getCurAddress(), changeValue);
|
||||
}
|
||||
|
||||
var hashType = 1; // SIGHASH_ALL
|
||||
|
||||
sendTx.signWithKeys(this.getKeys(), selectedOuts, hashType)
|
||||
|
||||
return sendTx;
|
||||
};
|
||||
|
||||
Wallet.prototype.clearTransactions = function () {
|
||||
this.txIndex = {};
|
||||
this.unspentOuts = [];
|
||||
};
|
||||
|
||||
/**
|
||||
* Check to see if a pubKeyHash belongs to this wallet.
|
||||
*/
|
||||
Wallet.prototype.hasHash = function (hash) {
|
||||
if (util.isArray(hash)) hash = conv.bytesToHex(hash);
|
||||
|
||||
// TODO: Just create an object with hashes as keys for faster lookup
|
||||
for (var k = 0; k < this.addressHashes.length; k++) {
|
||||
if (this.addressHashes[k] === hash) return true;
|
||||
}
|
||||
return false;
|
||||
this.getPrivateKeys = function() { return keys }
|
||||
};
|
||||
|
||||
module.exports = Wallet;
|
||||
|
|
Loading…
Add table
Reference in a new issue