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.

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

Jump to bottom

EDAA-02 fix. #29

Merged
merged 5 commits into from
Oct 25, 2024
Merged

EDAA-02 fix. #29

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c564eaf
Update OneStepProverHostIo.sol to fix edaa-01
anupsv Oct 18, 2024
f9f22df
Update OneStepProverHostIo.sol
anupsv Oct 18, 2024
fa73eb7
Update OneStepProverHostIo.sol
anupsv Oct 18, 2024
2abe8c7
Update OneStepProverHostIo.sol
anupsv Oct 18, 2024
a23f1e8
Merge remote-tracking branch 'origin/eigenda-v2.1.0' into EDAA-02
Oct 25, 2024
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
16 changes: 11 additions & 5 deletions src/osp/OneStepProverHostIo.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ contract OneStepProverHostIo is IOneStepProver {
uint256 z,
uint256 y,
uint256[2] memory p,
uint256[4] memory alpha_minus_z_g2
uint256[4] memory alpha_minus_z_g2,
uint256[2] memory proof,
BN254.G1Point memory alpha_minus_z_g1
) internal pure returns (uint256) {
// Encode the variables and compute the keccak256 hash
bytes32 hash = keccak256(
Expand All @@ -60,7 +62,11 @@ contract OneStepProverHostIo is IOneStepProver {
alpha_minus_z_g2[0],
alpha_minus_z_g2[1],
alpha_minus_z_g2[2],
alpha_minus_z_g2[3]
alpha_minus_z_g2[3],
proof[0],
proof[1],
alpha_minus_z_g1.X,
alpha_minus_z_g1.Y
)
);
return uint256(hash) % BN254.FR_MODULUS;
Expand All @@ -87,7 +93,7 @@ contract OneStepProverHostIo is IOneStepProver {
BN254.G1Point memory alpha_minus_z_g1 = BN254.plus(ALPHA_G1, zG1Neg);

// gamma
uint256 gamma = computeGamma(z, y, commitment, alpha_minus_z_g2);
uint256 gamma = computeGamma(z, y, commitment, alpha_minus_z_g2, proof, alpha_minus_z_g1);

// gamma . (alpha - z)G1
BN254.G1Point memory gamma_alpha_minus_z_g1 = BN254.scalar_mul(alpha_minus_z_g1, gamma);
Expand All @@ -99,11 +105,11 @@ contract OneStepProverHostIo is IOneStepProver {
BN254.G1Point memory q_plus_gamma = BN254.plus(BN254.G1Point(proof[0], proof[1]), gammaG1);
BN254.G1Point memory lhsG1 = BN254.plus(P_minus_y, gamma_alpha_minus_z_g1);
// The order is switched in the arbitrator already. It is passed as x_c1, x_c0, y_c1, y_c0
BN254.G2Point memory alpha_minus_z_g22 = BN254.G2Point(
BN254.G2Point memory alpha_minus_z_g2_point = BN254.G2Point(
[alpha_minus_z_g2[0], alpha_minus_z_g2[1]],
[alpha_minus_z_g2[2], alpha_minus_z_g2[3]]
);
return BN254.pairing(lhsG1, BN254.negGeneratorG2(), q_plus_gamma, alpha_minus_z_g22);
return BN254.pairing(lhsG1, BN254.negGeneratorG2(), q_plus_gamma, alpha_minus_z_g2_point);
}

function setLeafByte(
Expand Down
Loading