Skip to content

feat: soc dispersed replica #283

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

Draft
nugaon wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

feat: soc dispersed replica #283

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
18 changes: 14 additions & 4 deletions src/Redistribution.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,11 @@ contract Redistribution is AccessControl, Pausable {
bytes signature;
bytes32 identifier; //
bytes32 chunkAddr; // wrapped chunk address
SOCDispersedParams[] dispersedParams; // either with length 1 or 0
}

struct SOCDispersedParams {
uint8 nonce; // hashed with SOC address
}

struct PostageProof {
Expand Down Expand Up @@ -1051,10 +1056,11 @@ contract Redistribution is AccessControl, Pausable {
revert SocVerificationFailed(entryProof.socProof[0].chunkAddr);
}

if (
calculateSocAddress(entryProof.socProof[0].identifier, entryProof.socProof[0].signer) !=
entryProof.proveSegment
) {
socAddress = calculateSocAddress(entryProof.socProof[0].identifier, entryProof.socProof[0].signer);
if (entryProof.socProof[0].dispersedParams.length > 0) {
socAddress = calculateDispersedSocAddress(socAddress, entryProof.socProof[0].dispersedParams[0]);
}
if (socAddress != entryProof.proveSegment) {
revert SocCalcNotMatching(entryProof.socProof[0].chunkAddr);
}
}
Expand Down Expand Up @@ -1120,6 +1126,10 @@ contract Redistribution is AccessControl, Pausable {
return keccak256(abi.encodePacked(identifier, signer));
}

function calculateDispersedSocAddress(bytes32 socAddress, uint8 nonce) internal pure returns (bytes32) {
return keccak256(abi.encodePacked(nonce, socAddress));
}

function checkOrder(uint256 a, uint256 b, bytes32 trA1, bytes32 trA2, bytes32 trALast) internal pure {
if (a < b) {
if (uint256(trA1) >= uint256(trA2)) {
Expand Down
Loading