BTCPrivate
/
bitcore
mirror of https://github.com/BTCPrivate/bitcore.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Objects passed as arguments are unmodified.

This commit is contained in:
Braydon Fuller 2015-07-06 19:24:29 -04:00
parent c47adf1c04
commit 3d1dc7aafe
4 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/transaction/input/input.js
View File

@ -40,12 +40,15 @@ Object.defineProperty(Input.prototype, 'script', {
});
Input.prototype._fromObject = function(params) {
var prevTxId;
if (_.isString(params.prevTxId) && JSUtil.isHexa(params.prevTxId)) {
params.prevTxId = new buffer.Buffer(params.prevTxId, 'hex');
prevTxId = new buffer.Buffer(params.prevTxId, 'hex');
} else {
prevTxId = params.prevTxId;
}
this.output = params.output ?
(params.output instanceof Output ? params.output : new Output(params.output)) : undefined;
this.prevTxId = params.prevTxId || params.txidbuf;
this.prevTxId = prevTxId || params.txidbuf;
this.outputIndex = _.isUndefined(params.outputIndex) ? params.txoutnum : params.outputIndex;
this.sequenceNumber = _.isUndefined(params.sequenceNumber) ?
(_.isUndefined(params.seqnum) ? DEFAULT_SEQNUMBER : params.seqnum) : params.sequenceNumber;

7
lib/transaction/output.js
View File

@ -21,10 +21,13 @@ function Output(args) {
if (bufferUtil.isBuffer(args.script)) {
this._scriptBuffer = args.script;
} else {
var script;
if (_.isString(args.script) && JSUtil.isHexa(args.script)) {
args.script = new buffer.Buffer(args.script, 'hex');
script = new buffer.Buffer(args.script, 'hex');
} else {
script = args.script;
}
this.setScript(args.script);
this.setScript(script);
}
} else if (JSUtil.isValidJSON(args)) {
return Output.fromJSON(args);

6
lib/transaction/transaction.js
View File

@ -358,11 +358,11 @@ Transaction.prototype.fromObject = function(transaction) {
self.uncheckedAddInput(new Input(input));
return;
}
input.output.script = new Script(input.output.script);
var script = new Script(input.output.script);
var txin;
if (input.output.script.isPublicKeyHashOut()) {
if (script.isPublicKeyHashOut()) {
txin = new Input.PublicKeyHash(input);
} else if (input.output.script.isScriptHashOut() && input.publicKeys && input.threshold) {
} else if (script.isScriptHashOut() && input.publicKeys && input.threshold) {
txin = new Input.MultiSigScriptHash(
input, input.publicKeys, input.threshold, input.signatures
);

6
test/transaction/transaction.js
View File

@ -63,8 +63,10 @@ describe('Transaction', function() {
});
it('serialize to Object roundtrip', function() {
new Transaction(testTransaction.toObject()).uncheckedSerialize()
.should.equal(testTransaction.uncheckedSerialize());
var a = testTransaction.toObject();
var newTransaction = new Transaction(a);
var b = newTransaction.toObject();
a.should.deep.equal(b);
});
it('constructor returns a shallow copy of another transaction', function() {