Skip to content

Commit

Permalink
Merge pull request #1093 from privacy-scaling-explorations/fix/protot…
Browse files Browse the repository at this point in the history 
…ype-polution

fix(crypto): get rid of potential prototype polution
  • Loading branch information
@ctrlc03
ctrlc03 authored Jan 23, 2024
2 parents a910a51 + 9b8a97c commit bb6c728
Show file tree
Hide file tree
Showing 9 changed files with 189 additions and 99 deletions.
4 changes: 2 additions & 2 deletions circuits/ts/__tests__/CeremonyParams.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ describe("Ceremony param tests", () => {
accumulatorQueue.merge(params.messageTreeDepth);

expect(poll.messageTree.root.toString()).to.be.eq(
accumulatorQueue.mainRoots[params.messageTreeDepth].toString(),
accumulatorQueue.getMainRoots()[params.messageTreeDepth].toString(),
);
});

Expand Down Expand Up @@ -316,7 +316,7 @@ describe("Ceremony param tests", () => {
accumulatorQueue.merge(params.messageTreeDepth);

expect(poll.messageTree.root.toString()).to.be.eq(
accumulatorQueue.mainRoots[params.messageTreeDepth].toString(),
accumulatorQueue.getMainRoots()[params.messageTreeDepth].toString(),
);
// Process messages
poll.processMessages(pollId);
Expand Down
2 changes: 1 addition & 1 deletion circuits/ts/__tests__/ProcessMessages.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ describe("ProcessMessage circuit", function test() {
accumulatorQueue.merge(treeDepths.messageTreeDepth);

expect(poll.messageTree.root.toString()).to.be.eq(
accumulatorQueue.mainRoots[treeDepths.messageTreeDepth].toString(),
accumulatorQueue.getMainRoots()[treeDepths.messageTreeDepth].toString(),
);
});

Expand Down
2 changes: 1 addition & 1 deletion circuits/ts/__tests__/TallyVotes.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ describe("TallyVotes circuit", function test() {
accumulatorQueue.merge(treeDepths.messageTreeDepth);

expect(poll.messageTree.root.toString()).to.be.eq(
accumulatorQueue.mainRoots[treeDepths.messageTreeDepth].toString(),
accumulatorQueue.getMainRoots()[treeDepths.messageTreeDepth].toString(),
);
// Process messages
poll.processMessages(pollId);
Expand Down
8 changes: 4 additions & 4 deletions contracts/tests/AccQueue.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ describe("AccQueues", () => {
}

aq.mergeSubRoots(0);
const expectedSmallSRTroot = aq.smallSRTroot;
const expectedSmallSRTroot = aq.getSmallSRTroot();

await expect(aqContract.getSmallSRTroot()).to.be.revertedWithCustomError(aqContract, "SubTreesNotMerged");

Expand All @@ -387,7 +387,7 @@ describe("AccQueues", () => {
aq.merge(MAIN_DEPTH);
await (await aqContract.merge(MAIN_DEPTH)).wait();

const expectedMainRoot = aq.mainRoots[MAIN_DEPTH];
const expectedMainRoot = aq.getMainRoots()[MAIN_DEPTH];
const contractMainRoot = await aqContract.getMainRoot(MAIN_DEPTH);

expect(expectedMainRoot.toString()).to.eq(contractMainRoot.toString());
Expand Down Expand Up @@ -422,7 +422,7 @@ describe("AccQueues", () => {
}

aq.mergeSubRoots(0);
const expectedSmallSRTroot = aq.smallSRTroot;
const expectedSmallSRTroot = aq.getSmallSRTroot();

await expect(aqContract.getSmallSRTroot()).to.be.revertedWithCustomError(aqContract, "SubTreesNotMerged");

Expand All @@ -436,7 +436,7 @@ describe("AccQueues", () => {
aq.merge(MAIN_DEPTH);
await (await aqContract.merge(MAIN_DEPTH)).wait();

const expectedMainRoot = aq.mainRoots[MAIN_DEPTH];
const expectedMainRoot = aq.getMainRoots()[MAIN_DEPTH];
const contractMainRoot = await aqContract.getMainRoot(MAIN_DEPTH);

expect(expectedMainRoot.toString()).to.eq(contractMainRoot.toString());
Expand Down
4 changes: 2 additions & 2 deletions contracts/tests/AccQueueBenchmark.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ const testMerge = async (
}
}

const expectedSmallSRTroot = aq.smallSRTroot;
const expectedSmallSRTroot = aq.getSmallSRTroot();

const contractSmallSRTroot = await contract.getSmallSRTroot();

Expand All @@ -90,7 +90,7 @@ const testMerge = async (
expect(receipt?.gasUsed.toString()).to.not.eq("");
expect(receipt?.gasUsed.toString()).to.not.eq("0");

const expectedMainRoot = aq.mainRoots[MAIN_DEPTH];
const expectedMainRoot = aq.getMainRoots()[MAIN_DEPTH];
const contractMainRoot = await contract.getMainRoot(MAIN_DEPTH);

expect(expectedMainRoot.toString()).to.eq(contractMainRoot.toString());
Expand Down
69 changes: 37 additions & 32 deletions contracts/tests/utils.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ export const testInsertSubTrees = async (
): Promise<void> => {
const leaves: bigint[] = [];
for (let i = 0; i < NUM_SUBTREES; i += 1) {
const subTree = new IncrementalQuinTree(aq.subDepth, aq.zeros[0], aq.hashLength, aq.hashFunc);
const subTree = new IncrementalQuinTree(aq.getSubDepth(), aq.getZeros()[0], aq.getHashLength(), aq.hashFunc);
const leaf = BigInt(i);
subTree.insert(leaf);
leaves.push(leaf);
Expand All @@ -253,12 +253,12 @@ export const testInsertSubTrees = async (

let correctRoot: string;
if (NUM_SUBTREES === 1) {
correctRoot = aq.subRoots[0].toString();
correctRoot = aq.getSubRoots()[0].toString();
} else {
const depth = calcDepthFromNumLeaves(aq.hashLength, aq.subRoots.length);
const tree = new IncrementalQuinTree(depth, aq.zeros[aq.subDepth], aq.hashLength, aq.hashFunc);
const depth = calcDepthFromNumLeaves(aq.getHashLength(), aq.getSubRoots().length);
const tree = new IncrementalQuinTree(depth, aq.getZeros()[aq.getSubDepth()], aq.getHashLength(), aq.hashFunc);

aq.subRoots.forEach((subRoot) => {
aq.getSubRoots().forEach((subRoot) => {
tree.insert(subRoot);
});

Expand All @@ -269,7 +269,7 @@ export const testInsertSubTrees = async (
aq.mergeSubRoots(0);
await aqContract.mergeSubRoots(0, { gasLimit: 8000000 }).then((tx) => tx.wait());

const expectedSmallSRTroot = aq.smallSRTroot.toString();
const expectedSmallSRTroot = aq.getSmallSRTroot().toString();

expect(correctRoot).to.eq(expectedSmallSRTroot);

Expand All @@ -280,7 +280,7 @@ export const testInsertSubTrees = async (
aq.merge(MAIN_DEPTH);
await aqContract.merge(MAIN_DEPTH, { gasLimit: 8000000 }).then((tx) => tx.wait());

const expectedMainRoot = aq.mainRoots[MAIN_DEPTH];
const expectedMainRoot = aq.getMainRoots()[MAIN_DEPTH];
const contractMainRoot = await aqContract.getMainRoot(MAIN_DEPTH);

expect(expectedMainRoot.toString()).to.eq(contractMainRoot.toString());
Expand All @@ -292,22 +292,22 @@ export const testInsertSubTrees = async (
* @param aqContract - the AccQueue contract
*/
export const testEnqueueAndInsertSubTree = async (aq: AccQueue, aqContract: AccQueueContract): Promise<void> => {
const z = aq.zeros[0];
const [z] = aq.getZeros();
const n = BigInt(1);

const leaves: bigint[] = [];

const subTree = new IncrementalQuinTree(aq.subDepth, z, aq.hashLength, aq.hashFunc);
const subTree = new IncrementalQuinTree(aq.getSubDepth(), z, aq.getHashLength(), aq.hashFunc);

for (let i = 0; i < aq.hashLength ** aq.subDepth; i += 1) {
for (let i = 0; i < aq.getHashLength() ** aq.getSubDepth(); i += 1) {
leaves.push(z);
}

leaves.push(n);
// leaves is now [z, z, z, z..., n]

const depth = calcDepthFromNumLeaves(aq.hashLength, leaves.length);
const tree = new IncrementalQuinTree(depth, z, aq.hashLength, aq.hashFunc);
const depth = calcDepthFromNumLeaves(aq.getHashLength(), leaves.length);
const tree = new IncrementalQuinTree(depth, z, aq.getHashLength(), aq.hashFunc);

leaves.forEach((leaf) => {
tree.insert(leaf);
Expand All @@ -327,7 +327,7 @@ export const testEnqueueAndInsertSubTree = async (aq: AccQueue, aqContract: AccQ
aq.mergeSubRoots(0);
await aqContract.mergeSubRoots(0, { gasLimit: 8000000 }).then((tx) => tx.wait());

expect(expectedRoot).to.eq(aq.smallSRTroot.toString());
expect(expectedRoot).to.eq(aq.getSmallSRTroot().toString());

const contractSmallSRTroot = await aqContract.getSmallSRTroot();
expect(expectedRoot).to.eq(contractSmallSRTroot.toString());
Expand Down Expand Up @@ -358,40 +358,45 @@ export const testMerge = async (

leaves.push(leaf);

for (let j = 1; j < aq.hashLength ** aq.subDepth; j += 1) {
leaves.push(aq.zeros[0]);
for (let j = 1; j < aq.getHashLength() ** aq.getSubDepth(); j += 1) {
leaves.push(aq.getZeros()[0]);
}
}

// Insert leaves into a main tree
const tree = new IncrementalQuinTree(MAIN_DEPTH, aq.zeros[0], aq.hashLength, aq.hashFunc);
const tree = new IncrementalQuinTree(MAIN_DEPTH, aq.getZeros()[0], aq.getHashLength(), aq.hashFunc);

leaves.forEach((leaf) => {
tree.insert(leaf);
});

// minHeight should be the small SRT height
const minHeight = await aqContract.calcMinHeight();
const c = calcDepthFromNumLeaves(aq.hashLength, NUM_SUBTREES);
const c = calcDepthFromNumLeaves(aq.getHashLength(), NUM_SUBTREES);
expect(minHeight.toString()).to.eq(c.toString());

// Check whether mergeSubRoots() works
aq.mergeSubRoots(0);
await (await aqContract.mergeSubRoots(0, { gasLimit: 8000000 })).wait();

const expectedSmallSRTroot = aq.smallSRTroot.toString();
const expectedSmallSRTroot = aq.getSmallSRTroot().toString();
const contractSmallSRTroot = (await aqContract.getSmallSRTroot()).toString();

expect(expectedSmallSRTroot).to.eq(contractSmallSRTroot);

if (NUM_SUBTREES === 1) {
expect(expectedSmallSRTroot).to.eq(aq.subRoots[0].toString());
expect(expectedSmallSRTroot).to.eq(aq.getSubRoots()[0].toString());
} else {
// Check whether the small SRT root is correct
const srtHeight = calcDepthFromNumLeaves(aq.hashLength, NUM_SUBTREES);
const smallTree = new IncrementalQuinTree(srtHeight, aq.zeros[aq.subDepth], aq.hashLength, aq.hashFunc);

aq.subRoots.forEach((subRoot) => {
const srtHeight = calcDepthFromNumLeaves(aq.getHashLength(), NUM_SUBTREES);
const smallTree = new IncrementalQuinTree(
srtHeight,
aq.getZeros()[aq.getSubDepth()],
aq.getHashLength(),
aq.hashFunc,
);

aq.getSubRoots().forEach((subRoot) => {
smallTree.insert(subRoot);
});

Expand All @@ -402,13 +407,13 @@ export const testMerge = async (
const aq2 = aq.copy();

aq2.mergeDirect(MAIN_DEPTH);
const directlyMergedRoot = aq2.mainRoots[MAIN_DEPTH].toString();
const directlyMergedRoot = aq2.getMainRoots()[MAIN_DEPTH].toString();
expect(directlyMergedRoot.toString()).to.eq(tree.root.toString());

// Check whether off-chain merge() works
aq.merge(MAIN_DEPTH);

const expectedMainRoot = aq.mainRoots[MAIN_DEPTH].toString();
const expectedMainRoot = aq.getMainRoots()[MAIN_DEPTH].toString();

expect(expectedMainRoot).to.eq(directlyMergedRoot);

Expand All @@ -424,7 +429,7 @@ export const testMerge = async (
* @param aqContract - the AccQueue contract
*/
export const testMergeAgain = async (aq: AccQueue, aqContract: AccQueueContract, MAIN_DEPTH: number): Promise<void> => {
const tree = new IncrementalQuinTree(MAIN_DEPTH, aq.zeros[0], aq.hashLength, aq.hashFunc);
const tree = new IncrementalQuinTree(MAIN_DEPTH, aq.getZeros()[0], aq.getHashLength(), aq.hashFunc);
const leaf = BigInt(123);

// Enqueue
Expand All @@ -437,12 +442,12 @@ export const testMergeAgain = async (aq: AccQueue, aqContract: AccQueueContract,
await aqContract.mergeSubRoots(0, { gasLimit: 8000000 }).then((tx) => tx.wait());
await aqContract.merge(MAIN_DEPTH, { gasLimit: 8000000 }).then((tx) => tx.wait());

for (let i = 1; i < aq.hashLength ** aq.subDepth; i += 1) {
tree.insert(aq.zeros[0]);
for (let i = 1; i < aq.getHashLength() ** aq.getSubDepth(); i += 1) {
tree.insert(aq.getZeros()[0]);
}

const mainRoot = (await aqContract.getMainRoot(MAIN_DEPTH)).toString();
const expectedMainRoot = aq.mainRoots[MAIN_DEPTH].toString();
const expectedMainRoot = aq.getMainRoots()[MAIN_DEPTH].toString();
expect(expectedMainRoot).to.eq(mainRoot);
expect(expectedMainRoot).to.eq(tree.root.toString());

Expand All @@ -458,12 +463,12 @@ export const testMergeAgain = async (aq: AccQueue, aqContract: AccQueueContract,
await aqContract.mergeSubRoots(0, { gasLimit: 8000000 }).then((tx) => tx.wait());
await aqContract.merge(MAIN_DEPTH, { gasLimit: 8000000 }).then((tx) => tx.wait());

for (let i = 1; i < aq.hashLength ** aq.subDepth; i += 1) {
tree.insert(aq.zeros[0]);
for (let i = 1; i < aq.getHashLength() ** aq.getSubDepth(); i += 1) {
tree.insert(aq.getZeros()[0]);
}

const mainRoot2 = (await aqContract.getMainRoot(MAIN_DEPTH)).toString();
const expectedMainRoot2 = aq.mainRoots[MAIN_DEPTH].toString();
const expectedMainRoot2 = aq.getMainRoots()[MAIN_DEPTH].toString();
expect(expectedMainRoot2).to.eq(tree.root.toString());

expect(expectedMainRoot2).not.to.eq(expectedMainRoot);
Expand Down
Loading

0 comments on commit bb6c728

Please sign in to comment.