Skip to content

commented validateInclusionAuxData & computeExpectedAuxDataWithDeal #12

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.

Sign up for GitHub

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

Open
AAYUSH-GUPTA-coder wants to merge 1 commit into
base: main
Choose a base branch
from
Open

commented validateInclusionAuxData & computeExpectedAuxDataWithDeal #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 19 additions & 28 deletions contracts/data-segment/Proof.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,40 +79,31 @@ contract Proof {
* @param _verifierData is the verifier data
* @return the expected aux data
*/
function computeExpectedAuxDataWithDeal(
uint64 _dealId,
InclusionProof memory _ip,
InclusionVerifierData memory _verifierData
) public returns (InclusionAuxData memory) {
InclusionAuxData memory inclusionAuxData = computeExpectedAuxData(_ip, _verifierData);
validateInclusionAuxData(_dealId, inclusionAuxData);
return inclusionAuxData;
}
// function computeExpectedAuxDataWithDeal(
// uint64 _dealId,
// InclusionProof memory _ip,
// InclusionVerifierData memory _verifierData
// ) public returns (InclusionAuxData memory) {
// InclusionAuxData memory inclusionAuxData = computeExpectedAuxData(_ip, _verifierData);
// validateInclusionAuxData(_dealId, inclusionAuxData);
// return inclusionAuxData;
// }

/**
* @dev validateInclusionAuxData validates that the deal is activated and not terminated.
* @param _dealId is the deal ID
* @param _inclusionAuxData is the inclusion auxiliary data
*/
function validateInclusionAuxData(
uint64 _dealId,
InclusionAuxData memory _inclusionAuxData
) internal {
// check that the deal is not terminated
MarketTypes.GetDealActivationReturn memory dealActivation = MarketAPI.getDealActivation(
_dealId
);
require(dealActivation.terminated <= 0, "Deal is terminated");
require(dealActivation.activated > 0, "Deal is not activated");

MarketTypes.GetDealDataCommitmentReturn memory dealDataCommitment = MarketAPI
.getDealDataCommitment(_dealId);
require(
keccak256(dealDataCommitment.data) == keccak256(_inclusionAuxData.commPa),
"Deal commD doesn't match"
);
require(dealDataCommitment.size == _inclusionAuxData.sizePa, "Deal size doesn't match");
}
// function validateInclusionAuxData(uint64 _dealId, InclusionAuxData memory _inclusionAuxData) internal {
// // check that the deal is not terminated
// MarketTypes.GetDealActivationReturn memory dealActivation = MarketAPI.getDealActivation(_dealId);
// require(dealActivation.terminated <= 0, "Deal is terminated");
// require(dealActivation.activated > 0, "Deal is not activated");

// MarketTypes.GetDealDataCommitmentReturn memory dealDataCommitment = MarketAPI.getDealDataCommitment(_dealId);
// require(keccak256(dealDataCommitment.data) == keccak256(_inclusionAuxData.commPa), "Deal commD doesn't match");
// require(dealDataCommitment.size == _inclusionAuxData.sizePa, "Deal size doesn't match");
// }

/**
* @dev validateIndexEntry validates that the index entry is in the correct position in the index.
Expand Down