logos-storage/logos-storage-proofs-circuits
1
0
Fork 0
mirror of https://github.com/logos-storage/logos-storage-proofs-circuits.git synced 2026-01-03 22:13:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix the incorrect handling of singleton Merkle trees

Browse Source
This commit is contained in:
Balazs Komuves 2024-07-11 15:47:23 +02:00
parent fff59196b0
commit 6e9fcc632c
No known key found for this signature in database
GPG Key ID: F63B7AEF18435562
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
circuit/codex/merkle.circom
View File

@ -50,6 +50,17 @@ template RootFromMerklePath( maxDepth ) {
signal input merklePath[ maxDepth ];
signal output recRoot;
// in case of a singleton tree, we receive maskBits = [0,0,0,...,0]
// but what we really need is [1,0,0,0,...,0]
// maybe it's the best to fix that here
//
// this is a bit of hackish, but because we always expect [1,1,...,1,0,0,...,0] anyway,
// we can just set the first entry to 1 and that should fix this issue.
//
signal maskBitsCorrected[ maxDepth + 1];
maskBitsCorrected[0] <== 1;
for(var i=1; i<=maxDepth; i++) { maskBitsCorrected[i] <== maskBits[i]; }
// the sequence of reconstructed hashes along the path
signal aux[ maxDepth+1 ];
aux[0] <== leaf;
@ -96,7 +107,7 @@ template RootFromMerklePath( maxDepth ) {
var sum = 0;
signal prods[maxDepth];
for(var i=0; i<maxDepth; i++) {
prods[i] <== (maskBits[i] - maskBits[i+1]) * aux[i+1];
prods[i] <== (maskBitsCorrected[i] - maskBitsCorrected[i+1]) * aux[i+1];
sum += prods[i];
}
recRoot <== sum;

23
circuit/codex/sample_cells.circom
View File

@ -74,6 +74,19 @@ template SampleAndProve( maxDepth, maxLog2NSlots, blockTreeDepth, nFieldElemsPer
signal input cellData[nSamples][nFieldElemsPerCell]; // private input
signal input merklePaths[nSamples][maxDepth]; // private input
// -------------------------------------------------------
// sanity check for singleton trees
// we don't have to do anything here, it's fixed in `merkle.circom`
// component eqsing = IsEqual();
// eqsing.A <== nCellsPerSlot;
// eqsing.B <== (1<<blockTreeDepth); // normally 32
// signal slotTreeIsSingleton <== eqsing.out;
log("block tree (bottom) is singleton = ", blockTreeDepth == 0 );
log("slot tree (middle) is singleton = ", nCellsPerSlot == (1<<blockTreeDepth) );
log("dataset tree (top) is singleton = ", nSlotsPerDataSet == 1 );
// -------------------------------------------------------
//
// first we prove the inclusion of the slot root in the dataset-level
@ -125,11 +138,11 @@ log("top root check = ", mtop.recRoot == dataSetRoot);
calci[cnt].counter <== cnt + 1;
calci[cnt].indexBits ==> prove[cnt].indexBits;
prove[cnt].slotRoot <== slotRoot;
prove[cnt].lastBits <== lastBits;
prove[cnt].maskBits <== lg.mask;
prove[cnt].data <== cellData[cnt];
prove[cnt].merklePath <== merklePaths[cnt];
prove[cnt].slotRoot <== slotRoot;
prove[cnt].lastBits <== lastBits;
prove[cnt].maskBits <== lg.mask;
prove[cnt].data <== cellData[cnt];
prove[cnt].merklePath <== merklePaths[cnt];
}
}