Skip to content

Commit 1c4440b

Browse files
committed
feat: deploy AlignedProofAggregationService contract with risc0 verifier
1 parent e2dcf30 commit 1c4440b

7 files changed

+21
-8
lines changed

contracts/script/deploy/AlignedProofAggregationServiceDeployer.s.sol

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ contract AlignedProofAggregationServiceDeployer is Script {
1212

1313
address alignedAggregatorAddress = stdJson.readAddress(config_data, ".address.alignedAggregatorAddress");
1414
address sp1VerifierAddress = stdJson.readAddress(config_data, ".address.sp1VerifierAddress");
15+
address risc0VerifierAddress = stdJson.readAddress(config_data, ".address.risc0VerifierAddress");
1516

1617
address ownerAddress = stdJson.readAddress(config_data, ".permissions.owner");
1718

@@ -22,7 +23,11 @@ contract AlignedProofAggregationServiceDeployer is Script {
2223
ERC1967Proxy proxy = new ERC1967Proxy(
2324
address(alignedProofAggregationService),
2425
abi.encodeWithSignature(
25-
"initialize(address,address,address)", ownerAddress, alignedAggregatorAddress, sp1VerifierAddress
26+
"initialize(address,address,address,address)",
27+
ownerAddress,
28+
alignedAggregatorAddress,
29+
sp1VerifierAddress,
30+
risc0VerifierAddress
2631
)
2732
);
2833

contracts/script/deploy/config/devnet/proof-aggregator-service.devnet.config.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"address": {
33
"sp1VerifierAddress": "0xbC42A182543d5AF01f51040955D149A74C015098",
4+
"risc0VerifierAddress": "0x00000000000000000000000000000000000000FF",
45
"alignedAggregatorAddress": "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720",
56
"alignedAggregatorAddressPrivateKey": "0x2a871d0798f97d79848a013d4936a73bf4cc922c825d33c1cf7073dff6d409c6"
67
},

contracts/script/deploy/config/devnet/proof-aggregator-service.devnet.mock.config.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"address": {
33
"sp1VerifierAddress": "0x00000000000000000000000000000000000000FF",
4+
"risc0VerifierAddress": "0x00000000000000000000000000000000000000FF",
45
"alignedAggregatorAddress": "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720",
56
"alignedAggregatorAddressPrivateKey": "0x2a871d0798f97d79848a013d4936a73bf4cc922c825d33c1cf7073dff6d409c6"
67
},

contracts/script/output/devnet/proof_aggregation_service_deployment_output.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
"alignedProofAggregationService": "0xcbEAF3BDe82155F56486Fb5a1072cb8baAf547cc",
44
"alignedProofAggregationServiceImplementation": "0xFD471836031dc5108809D173A067e8486B9047A3"
55
}
6-
}
6+
}

contracts/script/output/devnet/proof_aggregation_service_deployment_output.mock.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
"alignedProofAggregationService": "0xB0D4afd8879eD9F52b28595d31B441D079B2Ca07",
44
"alignedProofAggregationServiceImplementation": "0x1429859428C0aBc9C2C47C8Ee9FBaf82cFA0F20f"
55
}
6-
}
6+
}

contracts/scripts/anvil/state/alignedlayer-deployed-anvil-state.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

contracts/src/core/AlignedProofAggregationService.sol

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ contract AlignedProofAggregationService is
2424
/// https://docs.succinct.xyz/onchain-verification/contract-addresses
2525
address public sp1VerifierAddress;
2626

27+
/// @notice The address of the Risc0 verifier contract
28+
/// @dev See supported verifier here:
29+
/// https://dev.risczero.com/api/blockchain-integration/contracts/verifier#contract-addresses
2730
address public risc0VerifierAddress;
2831

2932
/// @notice The address of the Wallet that is allowed to call the verify function.
@@ -37,15 +40,18 @@ contract AlignedProofAggregationService is
3740
_disableInitializers();
3841
}
3942

40-
function initialize(address newOwner, address _alignedAggregatorAddress, address _sp1VerifierAddress)
41-
public
42-
initializer
43-
{
43+
function initialize(
44+
address newOwner,
45+
address _alignedAggregatorAddress,
46+
address _sp1VerifierAddress,
47+
address _risc0VerifierAddress
48+
) public initializer {
4449
__Ownable_init();
4550
__UUPSUpgradeable_init();
4651
_transferOwnership(newOwner);
4752
alignedAggregatorAddress = _alignedAggregatorAddress;
4853
sp1VerifierAddress = _sp1VerifierAddress;
54+
risc0VerifierAddress = _risc0VerifierAddress;
4955
}
5056

5157
function verifySP1(

0 commit comments

Comments
 (0)