Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support new circuit #47

Merged
merged 10 commits into from
Jan 5, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
refactor
qzhodl committed Jan 3, 2024

Verified

This commit was signed with the committer’s verified signature. The key has expired.
weihanglo Weihang Lo
commit fa9f0c3ebe14feab74b26e871db2666dac35b92d
20 changes: 13 additions & 7 deletions contracts/EthStorageContract.sol
Original file line number Diff line number Diff line change
@@ -161,6 +161,18 @@ contract EthStorageContract is StorageContract, Decoder {
return checkInclusive(kvInfo.hash, sampleIdxInKv, mask ^ uint256(encodedData), inclusiveProof);
}

function getSampleIdx(
uint256 rows,
uint256 startShardId,
bytes32 hash0
) public view returns (uint256, uint256) {
uint256 parent = uint256(hash0) % rows;
uint256 sampleIdx = parent + (startShardId << (shardEntryBits + sampleLenBits));
uint256 kvIdx = sampleIdx >> sampleLenBits;
uint256 sampleIdxInKv = sampleIdx % (1 << sampleLenBits);
return (kvIdx, sampleIdxInKv);
}

function verifySamples(
uint256 startShardId,
bytes32 hash0,
@@ -179,13 +191,7 @@ contract EthStorageContract is StorageContract, Decoder {
uint256 rows = 1 << (shardEntryBits + sampleLenBits);

for (uint256 i = 0; i < randomChecks; i++) {
uint256 kvIdx;
uint256 sampleIdxInKv;
{
uint256 sampleIdx = uint256(hash0) % rows + (startShardId << (shardEntryBits + sampleLenBits));
kvIdx = sampleIdx >> sampleLenBits;
sampleIdxInKv = sampleIdx % (1 << sampleLenBits);
}
(uint256 kvIdx, uint256 sampleIdxInKv) = getSampleIdx(rows, startShardId, hash0);

require(
decodeAndCheckInclusive(kvIdx, sampleIdxInKv, miner, encodedSamples[i], masks[i], inclusiveProofs[i], decodeProof[i]),
9 changes: 1 addition & 8 deletions contracts/EthStorageContract2.sol
Original file line number Diff line number Diff line change
@@ -44,14 +44,7 @@ contract EthStorageContract2 is EthStorageContract, Decoder2 {
uint256 rows = 1 << (shardEntryBits + sampleLenBits);

for (uint256 i = 0; i < randomChecks; i++) {
uint256 kvIdx;
uint256 sampleIdxInKv;
{
uint256 sampleIdx = uint256(hash0) % rows + (startShardId << (shardEntryBits + sampleLenBits));
kvIdx = sampleIdx >> sampleLenBits;
sampleIdxInKv = sampleIdx % (1 << sampleLenBits);
}

(uint256 kvIdx, uint256 sampleIdxInKv) = getSampleIdx(rows, startShardId, hash0);
PhyAddr memory kvInfo = kvMap[idxMap[kvIdx]];

require(