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

Getter for full verification key #495

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from 3 commits
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
15 changes: 14 additions & 1 deletion l1-contracts/contracts/state-transition/Verifier.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

pragma solidity 0.8.24;

import {IVerifier} from "./chain-interfaces/IVerifier.sol";
import {IVerifier, VerificationKeyData} from "./chain-interfaces/IVerifier.sol";

/* solhint-disable max-line-length */
/// @author Matter Labs
Expand Down Expand Up @@ -268,6 +268,19 @@ contract Verifier is IVerifier {
}
}

/// @inheritdoc IVerifier
function verificationKey() external pure returns (VerificationKeyData memory) {
_loadVerificationKey();

assembly {
let start := VK_GATE_SETUP_0_X_SLOT
let end := VK_RECURSIVE_FLAG_SLOT
let length := add(sub(end, start), 0x20)

return(start, length)
}
}

/// @notice Load verification keys to memory in runtime.
/// @dev The constants are loaded into memory in a specific layout declared in the constants starting from
/// `VK_` prefix.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,30 @@ struct VerifierParams {
bytes32 recursionCircuitsSetVksHash;
}

/// @notice A struct that represents an elliptic curve point.
struct ECPoint {
uint256 x;
uint256 y;
}

/// @notice A struct that represents the verification key data.
struct VerificationKeyData {
/// @notice 8 points for gate setups
ECPoint[8] gateSetup;
/// @notice 2 points for gate selectors
ECPoint[2] gateSelectors;
/// @notice 4 points for permutations
ECPoint[4] permutation;
Comment on lines +22 to +25
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • setup
  • selectors
  • permutation

Should be all in plural?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure, setup I believe should be in singular. Permutations not sure cc @olesHolem

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are four distinct polynomials that define one permutation. I think permutationPolys and gateSetupPolys could be a good naming

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PS in the Plonk whitepaper they are also mentioned like permutation polynomials

/// @notice A point element for lookup selector
ECPoint lookupSelector;
/// @notice 4 points for lookup tables
ECPoint[4] lookupTable;
/// @notice A point for lookup table type
ECPoint lookupTableType;
/// @notice A flag that denotes whether recursion is supported
uint256 recursiveFlag;
}

/// @title The interface of the Verifier contract, responsible for the zero knowledge proof verification.
/// @author Matter Labs
/// @custom:security-contact [email protected]
Expand All @@ -25,4 +49,9 @@ interface IVerifier {
/// @notice Calculates a keccak256 hash of the runtime loaded verification keys.
/// @return vkHash The keccak256 hash of the loaded verification keys.
function verificationKeyHash() external pure returns (bytes32);

/// @notice Returns the verification key.
/// @dev IMPORTANT: The outside developers should not expect this method to always return result in the same
/// format. It might be changed in case of the change of the verification key format.
function verificationKey() external pure returns (VerificationKeyData memory);
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ pragma solidity 0.8.24;
import {Test} from "forge-std/Test.sol";

import {Verifier} from "contracts/state-transition/Verifier.sol";
import {VerificationKeyData} from "contracts/state-transition/chain-interfaces/IVerifier.sol";
import {VerifierTest} from "contracts/dev-contracts/test/VerifierTest.sol";

contract VerifierTestTest is Test {
Expand Down Expand Up @@ -161,4 +162,10 @@ contract VerifierTestTest is Test {
bytes32 verificationKeyHash = verifier.verificationKeyHash();
assertEq(verificationKeyHash, 0x6625fa96781746787b58306d414b1e25bd706d37d883a9b3acf57b2bd5e0de52);
}

function testVerificationKey() public virtual {
VerificationKeyData memory vkData = verifier.verificationKey();
bytes32 verificationKeyHash = keccak256(abi.encode(vkData));
assertEq(verificationKeyHash, 0x6625fa96781746787b58306d414b1e25bd706d37d883a9b3acf57b2bd5e0de52);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
pragma solidity 0.8.24;

import {VerifierTestTest} from "./Verifier.t.sol";
import {VerificationKeyData} from "contracts/state-transition/chain-interfaces/IVerifier.sol";
import {VerifierRecursiveTest} from "contracts/dev-contracts/test/VerifierRecursiveTest.sol";

contract VerifierRecursiveTestTest is VerifierTestTest {
Expand Down Expand Up @@ -52,4 +53,10 @@ contract VerifierRecursiveTestTest is VerifierTestTest {
bytes32 verificationKeyHash = verifier.verificationKeyHash();
assertEq(verificationKeyHash, 0x88b3ddc4ed85974c7e14297dcad4097169440305c05fdb6441ca8dfd77cd7fa7);
}

function testVerificationKey() public override {
VerificationKeyData memory vkData = verifier.verificationKey();
bytes32 verificationKeyHash = keccak256(abi.encode(vkData));
assertEq(verificationKeyHash, 0x88b3ddc4ed85974c7e14297dcad4097169440305c05fdb6441ca8dfd77cd7fa7);
}
}
Loading