From 65a1d96b720ffa2e6d167fb62527c9c8a534abbe Mon Sep 17 00:00:00 2001 From: Matt Stam Date: Fri, 1 Nov 2024 17:25:45 -0700 Subject: [PATCH] feat: separate SP1VerifierGateway for PLONK and Groth16 (#34) --- README.md | 31 +++++++++++++------ contracts/deployments/1.json | 5 +-- contracts/deployments/10.json | 5 +-- contracts/deployments/11155111.json | 5 +-- contracts/deployments/11155420.json | 5 +-- contracts/deployments/17000.json | 5 +-- contracts/deployments/42161.json | 5 +-- contracts/deployments/421614.json | 5 +-- contracts/deployments/534351.json | 5 +-- contracts/deployments/534352.json | 5 +-- contracts/deployments/8453.json | 5 +-- contracts/deployments/84532.json | 5 +-- .../deploy/SP1VerifierGatewayGroth16.s.sol | 21 +++++++++++++ ...ay.s.sol => SP1VerifierGatewayPlonk.s.sol} | 2 +- .../script/deploy/v1.0.1/SP1Verifier.s.sol | 4 +-- .../deploy/v1.0.7-testnet/SP1Verifier.s.sol | 4 +-- .../deploy/v1.0.8-testnet/SP1Verifier.s.sol | 4 +-- .../script/deploy/v1.1.0/SP1Verifier.s.sol | 4 +-- .../v1.2.0-rc1/SP1VerifierGroth16.s.sol | 4 +-- .../deploy/v1.2.0-rc1/SP1VerifierPlonk.s.sol | 4 +-- .../deploy/v1.2.0/SP1VerifierGroth16.s.sol | 4 +-- .../deploy/v1.2.0/SP1VerifierPlonk.s.sol | 4 +-- .../deploy/v2.0.0/SP1VerifierGroth16.s.sol | 4 +-- .../deploy/v2.0.0/SP1VerifierPlonk.s.sol | 4 +-- .../v3.0.0-rc1/SP1VerifierGroth16.s.sol | 4 +-- .../deploy/v3.0.0-rc1/SP1VerifierPlonk.s.sol | 4 +-- .../v3.0.0-rc3/SP1VerifierGroth16.s.sol | 4 +-- .../deploy/v3.0.0-rc3/SP1VerifierPlonk.s.sol | 4 +-- .../v3.0.0-rc4/SP1VerifierGroth16.s.sol | 4 +-- .../deploy/v3.0.0-rc4/SP1VerifierPlonk.s.sol | 4 +-- .../deploy/v3.0.0/SP1VerifierGroth16.s.sol | 4 +-- .../deploy/v3.0.0/SP1VerifierPlonk.s.sol | 4 +-- 32 files changed, 112 insertions(+), 69 deletions(-) create mode 100644 contracts/script/deploy/SP1VerifierGatewayGroth16.s.sol rename contracts/script/deploy/{SP1VerifierGateway.s.sol => SP1VerifierGatewayPlonk.s.sol} (90%) diff --git a/README.md b/README.md index fdd54c5..3de4456 100644 --- a/README.md +++ b/README.md @@ -22,13 +22,13 @@ pragma solidity ^0.8.20; import {ISP1Verifier} from "@sp1-contracts/ISP1Verifier.sol"; contract MyContract { - address public constant SP1_VERIFIER = 0x3B6041173B80E77f038f3F2C0f9744f04837185e; + address public constant SP1_VERIFIER = 0x3B6041173B80E77f038f3F2C0f9744f04837185e; - bytes32 public constant PROGRAM_VKEY = ...; + bytes32 public constant PROGRAM_VKEY = ...; - function myFunction(..., bytes calldata publicValues, bytes calldata proofBytes) external { - ISP1Verifier(SP1_VERIFIER).verifyProof(PROGRAM_VKEY, publicValues, proofBytes); - } + function myFunction(..., bytes calldata publicValues, bytes calldata proofBytes) external { + ISP1Verifier(SP1_VERIFIER).verifyProof(PROGRAM_VKEY, publicValues, proofBytes); + } } ``` @@ -46,26 +46,37 @@ You can obtain the correct `PROGRAM_VKEY` for your program calling the `setup` f To deploy the contracts, ensure your [.env](./contracts/.env.example) file is configured with all the chains you want to deploy to. -Then you can use the `forge script` command and specify the specific contract you want to deploy. For example, to deploy the SP1 Verifier Gateway you can run: +Then you can use the `forge script` command and specify the specific contract you want to deploy. For example, to deploy the SP1 Verifier Gateway for PLONK you can run: ```bash -FOUNDRY_PROFILE=deploy forge script ./script/deploy/SP1VerifierGateway.s.sol:SP1VerifierGatewayScript --private-key $PRIVATE_KEY --verify --verifier etherscan --multi --broadcast +FOUNDRY_PROFILE=deploy forge script ./script/deploy/SP1VerifierGatewayPlonk.s.sol:SP1VerifierGatewayScript --private-key $PRIVATE_KEY --verify --verifier etherscan --multi --broadcast +``` + +or to deploy the SP1 Verifier Gateway for Groth16 you can run: + +```bash +FOUNDRY_PROFILE=deploy forge script ./script/deploy/SP1VerifierGatewayGroth16.s.sol:SP1VerifierGatewayScript --private-key $PRIVATE_KEY --verify --verifier etherscan --multi --broadcast ``` ### Adding Verifiers -To deploy a specific SP1 Verifier version and add it to the gateway, run: +You can use the `forge script` command to specify which verifier you want to deploy and add to the gateway. For example to deploy the PLONK verifier and add it to the PLONK gateway you can run: ```bash FOUNDRY_PROFILE=deploy forge script ./script/deploy/v3.0.0/SP1VerifierPlonk.s.sol:SP1VerifierScript --private-key $PRIVATE_KEY --verify --verifier etherscan --multi --broadcast ``` -Change `v3.0.0` to the desired version to add. +or to deploy the Groth16 verifier and add it to the Groth16 gateway you can run: -To re-verify already existing deployments, remove the `--broadcast` flag. +```bash +FOUNDRY_PROFILE=deploy forge script ./script/deploy/v3.0.0/SP1VerifierGroth16.s.sol:SP1VerifierScript --private-key $PRIVATE_KEY --verify --verifier etherscan --multi --broadcast +``` + +Change `v3.0.0` to the desired version to add. ### Freezing Verifiers +> [!WARNING] > **BE CAREFUL** When a freezing a verifier. Once it is frozen, it cannot be unfrozen, and it can no longer be routed to. To freeze a verifier on the gateway, run: diff --git a/contracts/deployments/1.json b/contracts/deployments/1.json index 7187a19..e945a22 100644 --- a/contracts/deployments/1.json +++ b/contracts/deployments/1.json @@ -1,11 +1,12 @@ { - "SP1_VERIFIER_GATEWAY": "0x3B6041173B80E77f038f3F2C0f9744f04837185e", + "SP1_VERIFIER_GATEWAY_GROTH16": "0x397A5f7f3dBd538f23DE225B51f532c34448dA9B", + "SP1_VERIFIER_GATEWAY_PLONK": "0x3B6041173B80E77f038f3F2C0f9744f04837185e", "V1_0_1_SP1_VERIFIER": "0x36B353776AF6EF3A2bD707049e783F52c4209017", "V1_0_7_TESTNET_SP1_VERIFIER": "0x331b350dDA287d0A65ce43103984CD44cb4Da9f0", "V1_0_8_TESTNET_SP1_VERIFIER": "0xfE2bb0Ad7F2c44Bd1289234Af08aD6FDEC0d54a2", "V1_1_0_SP1_VERIFIER": "0xc350F063C13a3Ca21331610fe159E697a5c9c2FB", "V1_2_0_SP1_VERIFIER_PLONK": "0x6B6A7Ded061567d8A56279801DEA5cFB79be5bFc", "V2_0_0_SP1_VERIFIER_PLONK": "0x1764C29FBd94865198588f10FC75D4f6636d158d", - "V3_0_0_SP1_VERIFIER_GROTH16": "0x6A87EFd4e6B2Db1ed73129A8b9c51aaA583d49e3", + "V3_0_0_SP1_VERIFIER_GROTH16": "0xE780809121774D06aD9B0EEeC620fF4B3913Ced1", "V3_0_0_SP1_VERIFIER_PLONK": "0xd2832Cf1fC8bA210FfABF62Db9A8781153131d16" } \ No newline at end of file diff --git a/contracts/deployments/10.json b/contracts/deployments/10.json index 5f56655..c02d1b9 100644 --- a/contracts/deployments/10.json +++ b/contracts/deployments/10.json @@ -1,7 +1,8 @@ { - "SP1_VERIFIER_GATEWAY": "0x3B6041173B80E77f038f3F2C0f9744f04837185e", + "SP1_VERIFIER_GATEWAY_GROTH16": "0x397A5f7f3dBd538f23DE225B51f532c34448dA9B", + "SP1_VERIFIER_GATEWAY_PLONK": "0x3B6041173B80E77f038f3F2C0f9744f04837185e", "V1_2_0_SP1_VERIFIER_PLONK": "0x6B6A7Ded061567d8A56279801DEA5cFB79be5bFc", "V2_0_0_SP1_VERIFIER_PLONK": "0x1764C29FBd94865198588f10FC75D4f6636d158d", - "V3_0_0_SP1_VERIFIER_GROTH16": "0x6A87EFd4e6B2Db1ed73129A8b9c51aaA583d49e3", + "V3_0_0_SP1_VERIFIER_GROTH16": "0xE780809121774D06aD9B0EEeC620fF4B3913Ced1", "V3_0_0_SP1_VERIFIER_PLONK": "0xd2832Cf1fC8bA210FfABF62Db9A8781153131d16" } \ No newline at end of file diff --git a/contracts/deployments/11155111.json b/contracts/deployments/11155111.json index 53c6192..02e6c62 100644 --- a/contracts/deployments/11155111.json +++ b/contracts/deployments/11155111.json @@ -1,5 +1,6 @@ { - "SP1_VERIFIER_GATEWAY": "0x3B6041173B80E77f038f3F2C0f9744f04837185e", + "SP1_VERIFIER_GATEWAY_GROTH16": "0x397A5f7f3dBd538f23DE225B51f532c34448dA9B", + "SP1_VERIFIER_GATEWAY_PLONK": "0x3B6041173B80E77f038f3F2C0f9744f04837185e", "V1_0_1_SP1_VERIFIER": "0x36B353776AF6EF3A2bD707049e783F52c4209017", "V1_0_7_TESTNET_SP1_VERIFIER": "0x331b350dDA287d0A65ce43103984CD44cb4Da9f0", "V1_0_8_TESTNET_SP1_VERIFIER": "0xfE2bb0Ad7F2c44Bd1289234Af08aD6FDEC0d54a2", @@ -15,6 +16,6 @@ "V3_0_0_RC3_SP1_VERIFIER_PLONK": "0x31aeD863BecC509B9e16403c52C07560A0d4ecBf", "V3_0_0_RC4_SP1_VERIFIER_GROTH16": "0xbEe24654bF5D675D88e504a0DC148022664Ce436", "V3_0_0_RC4_SP1_VERIFIER_PLONK": "0xAF58C8Feee48f9952A444cD897Fd16e99000a4E1", - "V3_0_0_SP1_VERIFIER_GROTH16": "0x6A87EFd4e6B2Db1ed73129A8b9c51aaA583d49e3", + "V3_0_0_SP1_VERIFIER_GROTH16": "0xE780809121774D06aD9B0EEeC620fF4B3913Ced1", "V3_0_0_SP1_VERIFIER_PLONK": "0xd2832Cf1fC8bA210FfABF62Db9A8781153131d16" } \ No newline at end of file diff --git a/contracts/deployments/11155420.json b/contracts/deployments/11155420.json index c49647b..d49309b 100644 --- a/contracts/deployments/11155420.json +++ b/contracts/deployments/11155420.json @@ -1,5 +1,6 @@ { - "SP1_VERIFIER_GATEWAY": "0x3B6041173B80E77f038f3F2C0f9744f04837185e", + "SP1_VERIFIER_GATEWAY_GROTH16": "0x397A5f7f3dBd538f23DE225B51f532c34448dA9B", + "SP1_VERIFIER_GATEWAY_PLONK": "0x3B6041173B80E77f038f3F2C0f9744f04837185e", "V1_2_0_SP1_VERIFIER_PLONK": "0x6B6A7Ded061567d8A56279801DEA5cFB79be5bFc", "V2_0_0_SP1_VERIFIER_GROTH16": "0x202dd4a519b2cAaCc9455BB670FE7950c0e40026", "V2_0_0_SP1_VERIFIER_PLONK": "0xaeE21CeadF7A03b3034DAE4f190bFE5F861b6ebf", @@ -7,6 +8,6 @@ "V3_0_0_RC1_SP1_VERIFIER_PLONK": "0xCf5bB55AaE25b5A66CEfbe85d81b7b144472102A", "V3_0_0_RC3_SP1_VERIFIER_GROTH16": "0x890E1c4ff98453f1201e5cB65F6C588FD28748b0", "V3_0_0_RC3_SP1_VERIFIER_PLONK": "0x31aeD863BecC509B9e16403c52C07560A0d4ecBf", - "V3_0_0_SP1_VERIFIER_GROTH16": "0x6A87EFd4e6B2Db1ed73129A8b9c51aaA583d49e3", + "V3_0_0_SP1_VERIFIER_GROTH16": "0xE780809121774D06aD9B0EEeC620fF4B3913Ced1", "V3_0_0_SP1_VERIFIER_PLONK": "0xd2832Cf1fC8bA210FfABF62Db9A8781153131d16" } \ No newline at end of file diff --git a/contracts/deployments/17000.json b/contracts/deployments/17000.json index 96b9bca..6ff8ad1 100644 --- a/contracts/deployments/17000.json +++ b/contracts/deployments/17000.json @@ -1,5 +1,6 @@ { - "SP1_VERIFIER_GATEWAY": "0x3B6041173B80E77f038f3F2C0f9744f04837185e", + "SP1_VERIFIER_GATEWAY_GROTH16": "0x397A5f7f3dBd538f23DE225B51f532c34448dA9B", + "SP1_VERIFIER_GATEWAY_PLONK": "0x3B6041173B80E77f038f3F2C0f9744f04837185e", "V1_0_1_SP1_VERIFIER": "0x36B353776AF6EF3A2bD707049e783F52c4209017", "V1_0_7_TESTNET_SP1_VERIFIER": "0x331b350dDA287d0A65ce43103984CD44cb4Da9f0", "V1_0_8_TESTNET_SP1_VERIFIER": "0xfE2bb0Ad7F2c44Bd1289234Af08aD6FDEC0d54a2", @@ -14,6 +15,6 @@ "V3_0_0_RC1_SP1_VERIFIER_PLONK": "0xCf5bB55AaE25b5A66CEfbe85d81b7b144472102A", "V3_0_0_RC3_SP1_VERIFIER_GROTH16": "0x890E1c4ff98453f1201e5cB65F6C588FD28748b0", "V3_0_0_RC3_SP1_VERIFIER_PLONK": "0x31aeD863BecC509B9e16403c52C07560A0d4ecBf", - "V3_0_0_SP1_VERIFIER_GROTH16": "0x6A87EFd4e6B2Db1ed73129A8b9c51aaA583d49e3", + "V3_0_0_SP1_VERIFIER_GROTH16": "0xE780809121774D06aD9B0EEeC620fF4B3913Ced1", "V3_0_0_SP1_VERIFIER_PLONK": "0xd2832Cf1fC8bA210FfABF62Db9A8781153131d16" } \ No newline at end of file diff --git a/contracts/deployments/42161.json b/contracts/deployments/42161.json index 7187a19..e945a22 100644 --- a/contracts/deployments/42161.json +++ b/contracts/deployments/42161.json @@ -1,11 +1,12 @@ { - "SP1_VERIFIER_GATEWAY": "0x3B6041173B80E77f038f3F2C0f9744f04837185e", + "SP1_VERIFIER_GATEWAY_GROTH16": "0x397A5f7f3dBd538f23DE225B51f532c34448dA9B", + "SP1_VERIFIER_GATEWAY_PLONK": "0x3B6041173B80E77f038f3F2C0f9744f04837185e", "V1_0_1_SP1_VERIFIER": "0x36B353776AF6EF3A2bD707049e783F52c4209017", "V1_0_7_TESTNET_SP1_VERIFIER": "0x331b350dDA287d0A65ce43103984CD44cb4Da9f0", "V1_0_8_TESTNET_SP1_VERIFIER": "0xfE2bb0Ad7F2c44Bd1289234Af08aD6FDEC0d54a2", "V1_1_0_SP1_VERIFIER": "0xc350F063C13a3Ca21331610fe159E697a5c9c2FB", "V1_2_0_SP1_VERIFIER_PLONK": "0x6B6A7Ded061567d8A56279801DEA5cFB79be5bFc", "V2_0_0_SP1_VERIFIER_PLONK": "0x1764C29FBd94865198588f10FC75D4f6636d158d", - "V3_0_0_SP1_VERIFIER_GROTH16": "0x6A87EFd4e6B2Db1ed73129A8b9c51aaA583d49e3", + "V3_0_0_SP1_VERIFIER_GROTH16": "0xE780809121774D06aD9B0EEeC620fF4B3913Ced1", "V3_0_0_SP1_VERIFIER_PLONK": "0xd2832Cf1fC8bA210FfABF62Db9A8781153131d16" } \ No newline at end of file diff --git a/contracts/deployments/421614.json b/contracts/deployments/421614.json index 96b9bca..6ff8ad1 100644 --- a/contracts/deployments/421614.json +++ b/contracts/deployments/421614.json @@ -1,5 +1,6 @@ { - "SP1_VERIFIER_GATEWAY": "0x3B6041173B80E77f038f3F2C0f9744f04837185e", + "SP1_VERIFIER_GATEWAY_GROTH16": "0x397A5f7f3dBd538f23DE225B51f532c34448dA9B", + "SP1_VERIFIER_GATEWAY_PLONK": "0x3B6041173B80E77f038f3F2C0f9744f04837185e", "V1_0_1_SP1_VERIFIER": "0x36B353776AF6EF3A2bD707049e783F52c4209017", "V1_0_7_TESTNET_SP1_VERIFIER": "0x331b350dDA287d0A65ce43103984CD44cb4Da9f0", "V1_0_8_TESTNET_SP1_VERIFIER": "0xfE2bb0Ad7F2c44Bd1289234Af08aD6FDEC0d54a2", @@ -14,6 +15,6 @@ "V3_0_0_RC1_SP1_VERIFIER_PLONK": "0xCf5bB55AaE25b5A66CEfbe85d81b7b144472102A", "V3_0_0_RC3_SP1_VERIFIER_GROTH16": "0x890E1c4ff98453f1201e5cB65F6C588FD28748b0", "V3_0_0_RC3_SP1_VERIFIER_PLONK": "0x31aeD863BecC509B9e16403c52C07560A0d4ecBf", - "V3_0_0_SP1_VERIFIER_GROTH16": "0x6A87EFd4e6B2Db1ed73129A8b9c51aaA583d49e3", + "V3_0_0_SP1_VERIFIER_GROTH16": "0xE780809121774D06aD9B0EEeC620fF4B3913Ced1", "V3_0_0_SP1_VERIFIER_PLONK": "0xd2832Cf1fC8bA210FfABF62Db9A8781153131d16" } \ No newline at end of file diff --git a/contracts/deployments/534351.json b/contracts/deployments/534351.json index 96b9bca..6ff8ad1 100644 --- a/contracts/deployments/534351.json +++ b/contracts/deployments/534351.json @@ -1,5 +1,6 @@ { - "SP1_VERIFIER_GATEWAY": "0x3B6041173B80E77f038f3F2C0f9744f04837185e", + "SP1_VERIFIER_GATEWAY_GROTH16": "0x397A5f7f3dBd538f23DE225B51f532c34448dA9B", + "SP1_VERIFIER_GATEWAY_PLONK": "0x3B6041173B80E77f038f3F2C0f9744f04837185e", "V1_0_1_SP1_VERIFIER": "0x36B353776AF6EF3A2bD707049e783F52c4209017", "V1_0_7_TESTNET_SP1_VERIFIER": "0x331b350dDA287d0A65ce43103984CD44cb4Da9f0", "V1_0_8_TESTNET_SP1_VERIFIER": "0xfE2bb0Ad7F2c44Bd1289234Af08aD6FDEC0d54a2", @@ -14,6 +15,6 @@ "V3_0_0_RC1_SP1_VERIFIER_PLONK": "0xCf5bB55AaE25b5A66CEfbe85d81b7b144472102A", "V3_0_0_RC3_SP1_VERIFIER_GROTH16": "0x890E1c4ff98453f1201e5cB65F6C588FD28748b0", "V3_0_0_RC3_SP1_VERIFIER_PLONK": "0x31aeD863BecC509B9e16403c52C07560A0d4ecBf", - "V3_0_0_SP1_VERIFIER_GROTH16": "0x6A87EFd4e6B2Db1ed73129A8b9c51aaA583d49e3", + "V3_0_0_SP1_VERIFIER_GROTH16": "0xE780809121774D06aD9B0EEeC620fF4B3913Ced1", "V3_0_0_SP1_VERIFIER_PLONK": "0xd2832Cf1fC8bA210FfABF62Db9A8781153131d16" } \ No newline at end of file diff --git a/contracts/deployments/534352.json b/contracts/deployments/534352.json index 7187a19..e945a22 100644 --- a/contracts/deployments/534352.json +++ b/contracts/deployments/534352.json @@ -1,11 +1,12 @@ { - "SP1_VERIFIER_GATEWAY": "0x3B6041173B80E77f038f3F2C0f9744f04837185e", + "SP1_VERIFIER_GATEWAY_GROTH16": "0x397A5f7f3dBd538f23DE225B51f532c34448dA9B", + "SP1_VERIFIER_GATEWAY_PLONK": "0x3B6041173B80E77f038f3F2C0f9744f04837185e", "V1_0_1_SP1_VERIFIER": "0x36B353776AF6EF3A2bD707049e783F52c4209017", "V1_0_7_TESTNET_SP1_VERIFIER": "0x331b350dDA287d0A65ce43103984CD44cb4Da9f0", "V1_0_8_TESTNET_SP1_VERIFIER": "0xfE2bb0Ad7F2c44Bd1289234Af08aD6FDEC0d54a2", "V1_1_0_SP1_VERIFIER": "0xc350F063C13a3Ca21331610fe159E697a5c9c2FB", "V1_2_0_SP1_VERIFIER_PLONK": "0x6B6A7Ded061567d8A56279801DEA5cFB79be5bFc", "V2_0_0_SP1_VERIFIER_PLONK": "0x1764C29FBd94865198588f10FC75D4f6636d158d", - "V3_0_0_SP1_VERIFIER_GROTH16": "0x6A87EFd4e6B2Db1ed73129A8b9c51aaA583d49e3", + "V3_0_0_SP1_VERIFIER_GROTH16": "0xE780809121774D06aD9B0EEeC620fF4B3913Ced1", "V3_0_0_SP1_VERIFIER_PLONK": "0xd2832Cf1fC8bA210FfABF62Db9A8781153131d16" } \ No newline at end of file diff --git a/contracts/deployments/8453.json b/contracts/deployments/8453.json index 7187a19..e945a22 100644 --- a/contracts/deployments/8453.json +++ b/contracts/deployments/8453.json @@ -1,11 +1,12 @@ { - "SP1_VERIFIER_GATEWAY": "0x3B6041173B80E77f038f3F2C0f9744f04837185e", + "SP1_VERIFIER_GATEWAY_GROTH16": "0x397A5f7f3dBd538f23DE225B51f532c34448dA9B", + "SP1_VERIFIER_GATEWAY_PLONK": "0x3B6041173B80E77f038f3F2C0f9744f04837185e", "V1_0_1_SP1_VERIFIER": "0x36B353776AF6EF3A2bD707049e783F52c4209017", "V1_0_7_TESTNET_SP1_VERIFIER": "0x331b350dDA287d0A65ce43103984CD44cb4Da9f0", "V1_0_8_TESTNET_SP1_VERIFIER": "0xfE2bb0Ad7F2c44Bd1289234Af08aD6FDEC0d54a2", "V1_1_0_SP1_VERIFIER": "0xc350F063C13a3Ca21331610fe159E697a5c9c2FB", "V1_2_0_SP1_VERIFIER_PLONK": "0x6B6A7Ded061567d8A56279801DEA5cFB79be5bFc", "V2_0_0_SP1_VERIFIER_PLONK": "0x1764C29FBd94865198588f10FC75D4f6636d158d", - "V3_0_0_SP1_VERIFIER_GROTH16": "0x6A87EFd4e6B2Db1ed73129A8b9c51aaA583d49e3", + "V3_0_0_SP1_VERIFIER_GROTH16": "0xE780809121774D06aD9B0EEeC620fF4B3913Ced1", "V3_0_0_SP1_VERIFIER_PLONK": "0xd2832Cf1fC8bA210FfABF62Db9A8781153131d16" } \ No newline at end of file diff --git a/contracts/deployments/84532.json b/contracts/deployments/84532.json index 96b9bca..6ff8ad1 100644 --- a/contracts/deployments/84532.json +++ b/contracts/deployments/84532.json @@ -1,5 +1,6 @@ { - "SP1_VERIFIER_GATEWAY": "0x3B6041173B80E77f038f3F2C0f9744f04837185e", + "SP1_VERIFIER_GATEWAY_GROTH16": "0x397A5f7f3dBd538f23DE225B51f532c34448dA9B", + "SP1_VERIFIER_GATEWAY_PLONK": "0x3B6041173B80E77f038f3F2C0f9744f04837185e", "V1_0_1_SP1_VERIFIER": "0x36B353776AF6EF3A2bD707049e783F52c4209017", "V1_0_7_TESTNET_SP1_VERIFIER": "0x331b350dDA287d0A65ce43103984CD44cb4Da9f0", "V1_0_8_TESTNET_SP1_VERIFIER": "0xfE2bb0Ad7F2c44Bd1289234Af08aD6FDEC0d54a2", @@ -14,6 +15,6 @@ "V3_0_0_RC1_SP1_VERIFIER_PLONK": "0xCf5bB55AaE25b5A66CEfbe85d81b7b144472102A", "V3_0_0_RC3_SP1_VERIFIER_GROTH16": "0x890E1c4ff98453f1201e5cB65F6C588FD28748b0", "V3_0_0_RC3_SP1_VERIFIER_PLONK": "0x31aeD863BecC509B9e16403c52C07560A0d4ecBf", - "V3_0_0_SP1_VERIFIER_GROTH16": "0x6A87EFd4e6B2Db1ed73129A8b9c51aaA583d49e3", + "V3_0_0_SP1_VERIFIER_GROTH16": "0xE780809121774D06aD9B0EEeC620fF4B3913Ced1", "V3_0_0_SP1_VERIFIER_PLONK": "0xd2832Cf1fC8bA210FfABF62Db9A8781153131d16" } \ No newline at end of file diff --git a/contracts/script/deploy/SP1VerifierGatewayGroth16.s.sol b/contracts/script/deploy/SP1VerifierGatewayGroth16.s.sol new file mode 100644 index 0000000..55e951a --- /dev/null +++ b/contracts/script/deploy/SP1VerifierGatewayGroth16.s.sol @@ -0,0 +1,21 @@ +// SPDX-License-Identifier: MIT +pragma solidity ^0.8.20; + +import {BaseScript} from "../utils/Base.s.sol"; +import {SP1VerifierGateway} from "../../src/SP1VerifierGateway.sol"; + +contract SP1VerifierGatewayScript is BaseScript { + string internal constant KEY = "SP1_VERIFIER_GATEWAY_GROTH16"; + + function run() external multichain(KEY) broadcaster { + // Read config + bytes32 CREATE2_SALT = readBytes32("CREATE2_SALT"); + address OWNER = readAddress("OWNER"); + + // Deploy contract + address gateway = address(new SP1VerifierGateway{salt: CREATE2_SALT}(OWNER)); + + // Write address + writeAddress(KEY, gateway); + } +} diff --git a/contracts/script/deploy/SP1VerifierGateway.s.sol b/contracts/script/deploy/SP1VerifierGatewayPlonk.s.sol similarity index 90% rename from contracts/script/deploy/SP1VerifierGateway.s.sol rename to contracts/script/deploy/SP1VerifierGatewayPlonk.s.sol index 05178d9..4789972 100644 --- a/contracts/script/deploy/SP1VerifierGateway.s.sol +++ b/contracts/script/deploy/SP1VerifierGatewayPlonk.s.sol @@ -5,7 +5,7 @@ import {BaseScript} from "../utils/Base.s.sol"; import {SP1VerifierGateway} from "../../src/SP1VerifierGateway.sol"; contract SP1VerifierGatewayScript is BaseScript { - string internal constant KEY = "SP1_VERIFIER_GATEWAY"; + string internal constant KEY = "SP1_VERIFIER_GATEWAY_PLONK"; function run() external multichain(KEY) broadcaster { // Read config diff --git a/contracts/script/deploy/v1.0.1/SP1Verifier.s.sol b/contracts/script/deploy/v1.0.1/SP1Verifier.s.sol index 8cebfd8..d340469 100644 --- a/contracts/script/deploy/v1.0.1/SP1Verifier.s.sol +++ b/contracts/script/deploy/v1.0.1/SP1Verifier.s.sol @@ -12,7 +12,7 @@ contract SP1VerifierScript is BaseScript { function run() external multichain(KEY) broadcaster { // Read config bytes32 CREATE2_SALT = readBytes32("CREATE2_SALT"); - address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY"); + address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_PLONK"); // Deploy contract address verifier = address(new SP1Verifier{salt: CREATE2_SALT}()); @@ -27,7 +27,7 @@ contract SP1VerifierScript is BaseScript { function freeze() external multichain(KEY) broadcaster { // Read config - address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY"); + address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_PLONK"); address SP1_VERIFIER = readAddress(KEY); // Freeze the verifier on the gateway diff --git a/contracts/script/deploy/v1.0.7-testnet/SP1Verifier.s.sol b/contracts/script/deploy/v1.0.7-testnet/SP1Verifier.s.sol index 5f43674..c833e39 100644 --- a/contracts/script/deploy/v1.0.7-testnet/SP1Verifier.s.sol +++ b/contracts/script/deploy/v1.0.7-testnet/SP1Verifier.s.sol @@ -12,7 +12,7 @@ contract SP1VerifierScript is BaseScript { function run() external multichain(KEY) broadcaster { // Read config bytes32 CREATE2_SALT = readBytes32("CREATE2_SALT"); - address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY"); + address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_PLONK"); // Deploy contract address verifier = address(new SP1Verifier{salt: CREATE2_SALT}()); @@ -27,7 +27,7 @@ contract SP1VerifierScript is BaseScript { function freeze() external multichain(KEY) broadcaster { // Read config - address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY"); + address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_PLONK"); address SP1_VERIFIER = readAddress(KEY); // Freeze the verifier on the gateway diff --git a/contracts/script/deploy/v1.0.8-testnet/SP1Verifier.s.sol b/contracts/script/deploy/v1.0.8-testnet/SP1Verifier.s.sol index 2e547f3..5a6b3cf 100644 --- a/contracts/script/deploy/v1.0.8-testnet/SP1Verifier.s.sol +++ b/contracts/script/deploy/v1.0.8-testnet/SP1Verifier.s.sol @@ -12,7 +12,7 @@ contract SP1VerifierScript is BaseScript { function run() external multichain(KEY) broadcaster { // Read config bytes32 CREATE2_SALT = readBytes32("CREATE2_SALT"); - address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY"); + address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_PLONK"); // Deploy contract address verifier = address(new SP1Verifier{salt: CREATE2_SALT}()); @@ -27,7 +27,7 @@ contract SP1VerifierScript is BaseScript { function freeze() external multichain(KEY) broadcaster { // Read config - address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY"); + address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_PLONK"); address SP1_VERIFIER = readAddress(KEY); // Freeze the verifier on the gateway diff --git a/contracts/script/deploy/v1.1.0/SP1Verifier.s.sol b/contracts/script/deploy/v1.1.0/SP1Verifier.s.sol index c2671c6..18e0f0a 100644 --- a/contracts/script/deploy/v1.1.0/SP1Verifier.s.sol +++ b/contracts/script/deploy/v1.1.0/SP1Verifier.s.sol @@ -12,7 +12,7 @@ contract SP1VerifierScript is BaseScript { function run() external multichain(KEY) broadcaster { // Read config bytes32 CREATE2_SALT = readBytes32("CREATE2_SALT"); - address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY"); + address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_PLONK"); // Deploy contract address verifier = address(new SP1Verifier{salt: CREATE2_SALT}()); @@ -27,7 +27,7 @@ contract SP1VerifierScript is BaseScript { function freeze() external multichain(KEY) broadcaster { // Read config - address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY"); + address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_PLONK"); address SP1_VERIFIER = readAddress(KEY); // Freeze the verifier on the gateway diff --git a/contracts/script/deploy/v1.2.0-rc1/SP1VerifierGroth16.s.sol b/contracts/script/deploy/v1.2.0-rc1/SP1VerifierGroth16.s.sol index 57919fd..160106a 100644 --- a/contracts/script/deploy/v1.2.0-rc1/SP1VerifierGroth16.s.sol +++ b/contracts/script/deploy/v1.2.0-rc1/SP1VerifierGroth16.s.sol @@ -12,7 +12,7 @@ contract SP1VerifierScript is BaseScript { function run() external multichain(KEY) broadcaster { // Read config bytes32 CREATE2_SALT = readBytes32("CREATE2_SALT"); - address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY"); + address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_GROTH16"); // Deploy contract address verifier = address(new SP1Verifier{salt: CREATE2_SALT}()); @@ -27,7 +27,7 @@ contract SP1VerifierScript is BaseScript { function freeze() external multichain(KEY) broadcaster { // Read config - address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY"); + address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_GROTH16"); address SP1_VERIFIER = readAddress(KEY); // Freeze the verifier on the gateway diff --git a/contracts/script/deploy/v1.2.0-rc1/SP1VerifierPlonk.s.sol b/contracts/script/deploy/v1.2.0-rc1/SP1VerifierPlonk.s.sol index 824b08c..0387a18 100644 --- a/contracts/script/deploy/v1.2.0-rc1/SP1VerifierPlonk.s.sol +++ b/contracts/script/deploy/v1.2.0-rc1/SP1VerifierPlonk.s.sol @@ -12,7 +12,7 @@ contract SP1VerifierScript is BaseScript { function run() external multichain(KEY) broadcaster { // Read config bytes32 CREATE2_SALT = readBytes32("CREATE2_SALT"); - address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY"); + address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_PLONK"); // Deploy contract address verifier = address(new SP1Verifier{salt: CREATE2_SALT}()); @@ -27,7 +27,7 @@ contract SP1VerifierScript is BaseScript { function freeze() external multichain(KEY) broadcaster { // Read config - address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY"); + address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_PLONK"); address SP1_VERIFIER = readAddress(KEY); // Freeze the verifier on the gateway diff --git a/contracts/script/deploy/v1.2.0/SP1VerifierGroth16.s.sol b/contracts/script/deploy/v1.2.0/SP1VerifierGroth16.s.sol index 7dc46cc..93b32aa 100644 --- a/contracts/script/deploy/v1.2.0/SP1VerifierGroth16.s.sol +++ b/contracts/script/deploy/v1.2.0/SP1VerifierGroth16.s.sol @@ -12,7 +12,7 @@ contract SP1VerifierScript is BaseScript { function run() external multichain(KEY) broadcaster { // Read config bytes32 CREATE2_SALT = readBytes32("CREATE2_SALT"); - address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY"); + address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_GROTH16"); // Deploy contract address verifier = address(new SP1Verifier{salt: CREATE2_SALT}()); @@ -27,7 +27,7 @@ contract SP1VerifierScript is BaseScript { function freeze() external multichain(KEY) broadcaster { // Read config - address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY"); + address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_GROTH16"); address SP1_VERIFIER = readAddress(KEY); // Freeze the verifier on the gateway diff --git a/contracts/script/deploy/v1.2.0/SP1VerifierPlonk.s.sol b/contracts/script/deploy/v1.2.0/SP1VerifierPlonk.s.sol index 9e3b2ae..91d48a1 100644 --- a/contracts/script/deploy/v1.2.0/SP1VerifierPlonk.s.sol +++ b/contracts/script/deploy/v1.2.0/SP1VerifierPlonk.s.sol @@ -12,7 +12,7 @@ contract SP1VerifierScript is BaseScript { function run() external multichain(KEY) broadcaster { // Read config bytes32 CREATE2_SALT = readBytes32("CREATE2_SALT"); - address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY"); + address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_PLONK"); // Deploy contract address verifier = address(new SP1Verifier{salt: CREATE2_SALT}()); @@ -27,7 +27,7 @@ contract SP1VerifierScript is BaseScript { function freeze() external multichain(KEY) broadcaster { // Read config - address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY"); + address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_PLONK"); address SP1_VERIFIER = readAddress(KEY); // Freeze the verifier on the gateway diff --git a/contracts/script/deploy/v2.0.0/SP1VerifierGroth16.s.sol b/contracts/script/deploy/v2.0.0/SP1VerifierGroth16.s.sol index 4f8a6ef..c4016e2 100644 --- a/contracts/script/deploy/v2.0.0/SP1VerifierGroth16.s.sol +++ b/contracts/script/deploy/v2.0.0/SP1VerifierGroth16.s.sol @@ -12,7 +12,7 @@ contract SP1VerifierScript is BaseScript { function run() external multichain(KEY) broadcaster { // Read config bytes32 CREATE2_SALT = readBytes32("CREATE2_SALT"); - address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY"); + address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_GROTH16"); // Deploy contract address verifier = address(new SP1Verifier{salt: CREATE2_SALT}()); @@ -27,7 +27,7 @@ contract SP1VerifierScript is BaseScript { function freeze() external multichain(KEY) broadcaster { // Read config - address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY"); + address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_GROTH16"); address SP1_VERIFIER = readAddress(KEY); // Freeze the verifier on the gateway diff --git a/contracts/script/deploy/v2.0.0/SP1VerifierPlonk.s.sol b/contracts/script/deploy/v2.0.0/SP1VerifierPlonk.s.sol index e939625..6f12e57 100644 --- a/contracts/script/deploy/v2.0.0/SP1VerifierPlonk.s.sol +++ b/contracts/script/deploy/v2.0.0/SP1VerifierPlonk.s.sol @@ -12,7 +12,7 @@ contract SP1VerifierScript is BaseScript { function run() external multichain(KEY) broadcaster { // Read config bytes32 CREATE2_SALT = readBytes32("CREATE2_SALT"); - address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY"); + address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_PLONK"); // Deploy contract address verifier = address(new SP1Verifier{salt: CREATE2_SALT}()); @@ -27,7 +27,7 @@ contract SP1VerifierScript is BaseScript { function freeze() external multichain(KEY) broadcaster { // Read config - address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY"); + address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_PLONK"); address SP1_VERIFIER = readAddress(KEY); // Freeze the verifier on the gateway diff --git a/contracts/script/deploy/v3.0.0-rc1/SP1VerifierGroth16.s.sol b/contracts/script/deploy/v3.0.0-rc1/SP1VerifierGroth16.s.sol index c948c14..3586347 100644 --- a/contracts/script/deploy/v3.0.0-rc1/SP1VerifierGroth16.s.sol +++ b/contracts/script/deploy/v3.0.0-rc1/SP1VerifierGroth16.s.sol @@ -12,7 +12,7 @@ contract SP1VerifierScript is BaseScript { function run() external multichain(KEY) broadcaster { // Read config bytes32 CREATE2_SALT = readBytes32("CREATE2_SALT"); - address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY"); + address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_GROTH16"); // Deploy contract address verifier = address(new SP1Verifier{salt: CREATE2_SALT}()); @@ -27,7 +27,7 @@ contract SP1VerifierScript is BaseScript { function freeze() external multichain(KEY) broadcaster { // Read config - address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY"); + address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_GROTH16"); address SP1_VERIFIER = readAddress(KEY); // Freeze the verifier on the gateway diff --git a/contracts/script/deploy/v3.0.0-rc1/SP1VerifierPlonk.s.sol b/contracts/script/deploy/v3.0.0-rc1/SP1VerifierPlonk.s.sol index 76f3312..40f8cb6 100644 --- a/contracts/script/deploy/v3.0.0-rc1/SP1VerifierPlonk.s.sol +++ b/contracts/script/deploy/v3.0.0-rc1/SP1VerifierPlonk.s.sol @@ -12,7 +12,7 @@ contract SP1VerifierScript is BaseScript { function run() external multichain(KEY) broadcaster { // Read config bytes32 CREATE2_SALT = readBytes32("CREATE2_SALT"); - address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY"); + address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_PLONK"); // Deploy contract address verifier = address(new SP1Verifier{salt: CREATE2_SALT}()); @@ -27,7 +27,7 @@ contract SP1VerifierScript is BaseScript { function freeze() external multichain(KEY) broadcaster { // Read config - address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY"); + address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_PLONK"); address SP1_VERIFIER = readAddress(KEY); // Freeze the verifier on the gateway diff --git a/contracts/script/deploy/v3.0.0-rc3/SP1VerifierGroth16.s.sol b/contracts/script/deploy/v3.0.0-rc3/SP1VerifierGroth16.s.sol index 028fb7c..79c93cb 100644 --- a/contracts/script/deploy/v3.0.0-rc3/SP1VerifierGroth16.s.sol +++ b/contracts/script/deploy/v3.0.0-rc3/SP1VerifierGroth16.s.sol @@ -12,7 +12,7 @@ contract SP1VerifierScript is BaseScript { function run() external multichain(KEY) broadcaster { // Read config bytes32 CREATE2_SALT = readBytes32("CREATE2_SALT"); - address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY"); + address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_GROTH16"); // Deploy contract address verifier = address(new SP1Verifier{salt: CREATE2_SALT}()); @@ -27,7 +27,7 @@ contract SP1VerifierScript is BaseScript { function freeze() external multichain(KEY) broadcaster { // Read config - address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY"); + address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_GROTH16"); address SP1_VERIFIER = readAddress(KEY); // Freeze the verifier on the gateway diff --git a/contracts/script/deploy/v3.0.0-rc3/SP1VerifierPlonk.s.sol b/contracts/script/deploy/v3.0.0-rc3/SP1VerifierPlonk.s.sol index 6e6f095..3e03ede 100644 --- a/contracts/script/deploy/v3.0.0-rc3/SP1VerifierPlonk.s.sol +++ b/contracts/script/deploy/v3.0.0-rc3/SP1VerifierPlonk.s.sol @@ -12,7 +12,7 @@ contract SP1VerifierScript is BaseScript { function run() external multichain(KEY) broadcaster { // Read config bytes32 CREATE2_SALT = readBytes32("CREATE2_SALT"); - address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY"); + address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_PLONK"); // Deploy contract address verifier = address(new SP1Verifier{salt: CREATE2_SALT}()); @@ -27,7 +27,7 @@ contract SP1VerifierScript is BaseScript { function freeze() external multichain(KEY) broadcaster { // Read config - address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY"); + address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_PLONK"); address SP1_VERIFIER = readAddress(KEY); // Freeze the verifier on the gateway diff --git a/contracts/script/deploy/v3.0.0-rc4/SP1VerifierGroth16.s.sol b/contracts/script/deploy/v3.0.0-rc4/SP1VerifierGroth16.s.sol index 5878026..6a84bfc 100644 --- a/contracts/script/deploy/v3.0.0-rc4/SP1VerifierGroth16.s.sol +++ b/contracts/script/deploy/v3.0.0-rc4/SP1VerifierGroth16.s.sol @@ -12,7 +12,7 @@ contract SP1VerifierScript is BaseScript { function run() external multichain(KEY) broadcaster { // Read config bytes32 CREATE2_SALT = readBytes32("CREATE2_SALT"); - address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY"); + address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_GROTH16"); // Deploy contract address verifier = address(new SP1Verifier{salt: CREATE2_SALT}()); @@ -27,7 +27,7 @@ contract SP1VerifierScript is BaseScript { function freeze() external multichain(KEY) broadcaster { // Read config - address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY"); + address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_GROTH16"); address SP1_VERIFIER = readAddress(KEY); // Freeze the verifier on the gateway diff --git a/contracts/script/deploy/v3.0.0-rc4/SP1VerifierPlonk.s.sol b/contracts/script/deploy/v3.0.0-rc4/SP1VerifierPlonk.s.sol index cc37bdf..aab4647 100644 --- a/contracts/script/deploy/v3.0.0-rc4/SP1VerifierPlonk.s.sol +++ b/contracts/script/deploy/v3.0.0-rc4/SP1VerifierPlonk.s.sol @@ -12,7 +12,7 @@ contract SP1VerifierScript is BaseScript { function run() external multichain(KEY) broadcaster { // Read config bytes32 CREATE2_SALT = readBytes32("CREATE2_SALT"); - address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY"); + address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_PLONK"); // Deploy contract address verifier = address(new SP1Verifier{salt: CREATE2_SALT}()); @@ -27,7 +27,7 @@ contract SP1VerifierScript is BaseScript { function freeze() external multichain(KEY) broadcaster { // Read config - address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY"); + address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_PLONK"); address SP1_VERIFIER = readAddress(KEY); // Freeze the verifier on the gateway diff --git a/contracts/script/deploy/v3.0.0/SP1VerifierGroth16.s.sol b/contracts/script/deploy/v3.0.0/SP1VerifierGroth16.s.sol index d156e37..7763f49 100644 --- a/contracts/script/deploy/v3.0.0/SP1VerifierGroth16.s.sol +++ b/contracts/script/deploy/v3.0.0/SP1VerifierGroth16.s.sol @@ -12,7 +12,7 @@ contract SP1VerifierScript is BaseScript { function run() external multichain(KEY) broadcaster { // Read config bytes32 CREATE2_SALT = readBytes32("CREATE2_SALT"); - address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY"); + address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_GROTH16"); // Deploy contract address verifier = address(new SP1Verifier{salt: CREATE2_SALT}()); @@ -27,7 +27,7 @@ contract SP1VerifierScript is BaseScript { function freeze() external multichain(KEY) broadcaster { // Read config - address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY"); + address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_GROTH16"); address SP1_VERIFIER = readAddress(KEY); // Freeze the verifier on the gateway diff --git a/contracts/script/deploy/v3.0.0/SP1VerifierPlonk.s.sol b/contracts/script/deploy/v3.0.0/SP1VerifierPlonk.s.sol index 4c7e527..60aa43c 100644 --- a/contracts/script/deploy/v3.0.0/SP1VerifierPlonk.s.sol +++ b/contracts/script/deploy/v3.0.0/SP1VerifierPlonk.s.sol @@ -12,7 +12,7 @@ contract SP1VerifierScript is BaseScript { function run() external multichain(KEY) broadcaster { // Read config bytes32 CREATE2_SALT = readBytes32("CREATE2_SALT"); - address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY"); + address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_PLONK"); // Deploy contract address verifier = address(new SP1Verifier{salt: CREATE2_SALT}()); @@ -27,7 +27,7 @@ contract SP1VerifierScript is BaseScript { function freeze() external multichain(KEY) broadcaster { // Read config - address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY"); + address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_PLONK"); address SP1_VERIFIER = readAddress(KEY); // Freeze the verifier on the gateway