zcash-hackworks
/
bitcore-lib-zcash
mirror of https://github.com/zcash-hackworks/bitcore-lib-zcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add fix for v4 joinsplits using Groth16 proof. 

Closes https://github.com/zcash/zcash/issues/3636 where a tx with
multiple joinsplits would not be parsed correctly.
This commit is contained in:
Simon 2018-10-28 14:48:10 -07:00
parent c3bbbc3f08
commit e97ae1dd2e
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/transaction/jsdescription.js
View File

@ -8,7 +8,8 @@ var BufferWriter = require('../encoding/bufferwriter');
var BufferUtil = require('../util/buffer');
var JSUtil = require('../util/js');
var ZCProof = require('../zcash/proof');
// TODO: Update ZCProof for Groth
//var ZCProof = require('../zcash/proof');
var ZC_NUM_JS_INPUTS = 2;
var ZC_NUM_JS_OUTPUTS = 2;
@ -117,7 +118,7 @@ JSDescription.prototype._fromObject = function(params) {
this.ciphertexts = ciphertexts;
this.randomSeed = BufferUtil.reverse(new buffer.Buffer(params.randomSeed, 'hex'));
this.macs = macs;
this.proof = ZCProof.fromObject(params.proof);
this.proof = params.proof; // TODO: Update ZCProof for Groth: ZCProof.fromObject(params.proof);
return this;
};
@ -148,12 +149,12 @@ JSDescription.prototype.toObject = JSDescription.prototype.toJSON = function toO
ciphertexts: ciphertexts,
randomSeed: BufferUtil.reverse(this.randomSeed).toString('hex'),
macs: macs,
proof: this.proof.toObject(),
proof: this.proof, // TODO: Update ZCProof for Groth: this.proof.toObject(),
};
return obj;
};
JSDescription.fromBufferReader = function(br) {
JSDescription.fromBufferReader = function(br, useGrothFlagParam) {
var i;
var jsdesc = new JSDescription();
jsdesc.vpub_old = br.readUInt64LEBN();
@ -170,7 +171,15 @@ JSDescription.fromBufferReader = function(br) {
for (i = 0; i < ZC_NUM_JS_INPUTS; i++) {
jsdesc.macs.push(br.read(32));
}
jsdesc.proof = ZCProof.fromBufferReader(br);
// Default parameter requires ECMASCript 6 which might not be available, so use workaround.
var useGrothFlag = useGrothFlagParam || false;
if (!useGrothFlag) {
jsdesc.proof = br.read(296); // TODO: Update ZCProof for Groth: ZCProof.fromBufferReader(br);
} else {
jsdesc.proof = br.read(48 + 96 + 48);
}
for (i = 0; i < ZC_NUM_JS_OUTPUTS; i++) {
jsdesc.ciphertexts.push(br.read(ZC_NOTECIPHERTEXT_SIZE));
}
@ -196,7 +205,10 @@ JSDescription.prototype.toBufferWriter = function(writer) {
for (i = 0; i < ZC_NUM_JS_INPUTS; i++) {
writer.write(this.macs[i]);
}
this.proof.toBufferWriter(writer);
// TODO: Update ZCProof for Groth: this.proof.toBufferWriter(writer);
writer.write(this.proof);
for (i = 0; i < ZC_NUM_JS_OUTPUTS; i++) {
writer.write(this.ciphertexts[i]);
}

3
lib/transaction/transaction.js
View File

@ -396,10 +396,11 @@ Transaction.prototype.fromBufferReader = function(reader) {
}
}
var useGrothFlag = (this.version >= 4);
if (this.version >= 2) {
sizeJSDescs = reader.readVarintNum();
for (i = 0; i < sizeJSDescs; i++) {
this.joinSplits.push(JSDescription.fromBufferReader(reader));
this.joinSplits.push(JSDescription.fromBufferReader(reader, useGrothFlag));
}
if (sizeJSDescs > 0) {
this.joinSplitPubKey = reader.read(32);