Skip to content

Commit

Permalink
chore: add v1.1.0 contracts
Browse files Browse the repository at this point in the history
  • Loading branch information
mattstam committed Aug 3, 2024
1 parent 9dc34e8 commit 2bd074d
Show file tree
Hide file tree
Showing 15 changed files with 1,634 additions and 114 deletions.
237 changes: 137 additions & 100 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ path = "src/bin/artifacts.rs"
anyhow = "1.0.86"
dotenv = "0.15.0"
log = "0.4.21"
sp1-sdk = "1.0.1"
sp1-sdk = "1.1.0"
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ FOUNDRY_PROFILE=deploy forge script ./script/deploy/SP1VerifierGateway.s.sol:SP1
To deploy a specific SP1 Verifier version and add it to the gateway, run:

```bash
FOUNDRY_PROFILE=deploy forge script ./script/deploy/v1.0.1/SP1Verifier.s.sol:SP1VerifierScript --private-key $PRIVATE_KEY --verify --verifier etherscan --multi --broadcast
FOUNDRY_PROFILE=deploy forge script ./script/deploy/v1.1.0/SP1Verifier.s.sol:SP1VerifierScript --private-key $PRIVATE_KEY --verify --verifier etherscan --multi --broadcast
```

Change `v1.0.1` to the desired version to add.
Change `v1.1.0` to the desired version to add.

To re-verify already existing deployments, remove the `--broadcast` flag.

Expand All @@ -71,10 +71,10 @@ To re-verify already existing deployments, remove the `--broadcast` flag.
To freeze a verifier on the gateway, run:

```bash
FOUNDRY_PROFILE=deploy forge script ./script/deploy/v1.0.1/SP1Verifier.s.sol:SP1VerifierScript --private-key $PRIVATE_KEY --verify --verifier etherscan --multi --broadcast --sig "freeze()"
FOUNDRY_PROFILE=deploy forge script ./script/deploy/v1.1.0/SP1Verifier.s.sol:SP1VerifierScript --private-key $PRIVATE_KEY --verify --verifier etherscan --multi --broadcast --sig "freeze()"
```

Change `v1.0.1` to the desired version to freeze.
Change `v1.1.0` to the desired version to freeze.

## For Developers: Integrate SP1 Contracts

Expand Down
3 changes: 2 additions & 1 deletion contracts/deployments/1.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"SP1_VERIFIER_GATEWAY": "0x3B6041173B80E77f038f3F2C0f9744f04837185e",
"V1_0_1_SP1_VERIFIER": "0x36B353776AF6EF3A2bD707049e783F52c4209017",
"V1_0_7_TESTNET_SP1_VERIFIER": "0x331b350dDA287d0A65ce43103984CD44cb4Da9f0",
"V1_0_8_TESTNET_SP1_VERIFIER": "0xfE2bb0Ad7F2c44Bd1289234Af08aD6FDEC0d54a2",
"V1_0_1_SP1_VERIFIER": "0x36B353776AF6EF3A2bD707049e783F52c4209017"
"V1_1_0_SP1_VERIFIER": "0xc350F063C13a3Ca21331610fe159E697a5c9c2FB"
}
3 changes: 2 additions & 1 deletion contracts/deployments/11155111.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"SP1_VERIFIER_GATEWAY": "0x3B6041173B80E77f038f3F2C0f9744f04837185e",
"V1_0_1_SP1_VERIFIER": "0x36B353776AF6EF3A2bD707049e783F52c4209017",
"V1_0_7_TESTNET_SP1_VERIFIER": "0x331b350dDA287d0A65ce43103984CD44cb4Da9f0",
"V1_0_8_TESTNET_SP1_VERIFIER": "0xfE2bb0Ad7F2c44Bd1289234Af08aD6FDEC0d54a2",
"V1_0_1_SP1_VERIFIER": "0x36B353776AF6EF3A2bD707049e783F52c4209017"
"V1_1_0_SP1_VERIFIER": "0xc350F063C13a3Ca21331610fe159E697a5c9c2FB"
}
3 changes: 2 additions & 1 deletion contracts/deployments/17000.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"SP1_VERIFIER_GATEWAY": "0x3B6041173B80E77f038f3F2C0f9744f04837185e",
"V1_0_1_SP1_VERIFIER": "0x36B353776AF6EF3A2bD707049e783F52c4209017",
"V1_0_7_TESTNET_SP1_VERIFIER": "0x331b350dDA287d0A65ce43103984CD44cb4Da9f0",
"V1_0_8_TESTNET_SP1_VERIFIER": "0xfE2bb0Ad7F2c44Bd1289234Af08aD6FDEC0d54a2",
"V1_0_1_SP1_VERIFIER": "0x36B353776AF6EF3A2bD707049e783F52c4209017"
"V1_1_0_SP1_VERIFIER": "0xc350F063C13a3Ca21331610fe159E697a5c9c2FB"
}
3 changes: 2 additions & 1 deletion contracts/deployments/42161.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"SP1_VERIFIER_GATEWAY": "0x3B6041173B80E77f038f3F2C0f9744f04837185e",
"V1_0_1_SP1_VERIFIER": "0x36B353776AF6EF3A2bD707049e783F52c4209017",
"V1_0_7_TESTNET_SP1_VERIFIER": "0x331b350dDA287d0A65ce43103984CD44cb4Da9f0",
"V1_0_8_TESTNET_SP1_VERIFIER": "0xfE2bb0Ad7F2c44Bd1289234Af08aD6FDEC0d54a2",
"V1_0_1_SP1_VERIFIER": "0x36B353776AF6EF3A2bD707049e783F52c4209017"
"V1_1_0_SP1_VERIFIER": "0xc350F063C13a3Ca21331610fe159E697a5c9c2FB"
}
3 changes: 2 additions & 1 deletion contracts/deployments/421614.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"SP1_VERIFIER_GATEWAY": "0x3B6041173B80E77f038f3F2C0f9744f04837185e",
"V1_0_1_SP1_VERIFIER": "0x36B353776AF6EF3A2bD707049e783F52c4209017",
"V1_0_7_TESTNET_SP1_VERIFIER": "0x331b350dDA287d0A65ce43103984CD44cb4Da9f0",
"V1_0_8_TESTNET_SP1_VERIFIER": "0xfE2bb0Ad7F2c44Bd1289234Af08aD6FDEC0d54a2",
"V1_0_1_SP1_VERIFIER": "0x36B353776AF6EF3A2bD707049e783F52c4209017"
"V1_1_0_SP1_VERIFIER": "0xc350F063C13a3Ca21331610fe159E697a5c9c2FB"
}
3 changes: 2 additions & 1 deletion contracts/deployments/534351.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"SP1_VERIFIER_GATEWAY": "0x3B6041173B80E77f038f3F2C0f9744f04837185e",
"V1_0_1_SP1_VERIFIER": "0x36B353776AF6EF3A2bD707049e783F52c4209017",
"V1_0_7_TESTNET_SP1_VERIFIER": "0x331b350dDA287d0A65ce43103984CD44cb4Da9f0",
"V1_0_8_TESTNET_SP1_VERIFIER": "0xfE2bb0Ad7F2c44Bd1289234Af08aD6FDEC0d54a2",
"V1_0_1_SP1_VERIFIER": "0x36B353776AF6EF3A2bD707049e783F52c4209017"
"V1_1_0_SP1_VERIFIER": "0xc350F063C13a3Ca21331610fe159E697a5c9c2FB"
}
3 changes: 2 additions & 1 deletion contracts/deployments/534352.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"SP1_VERIFIER_GATEWAY": "0x3B6041173B80E77f038f3F2C0f9744f04837185e",
"V1_0_1_SP1_VERIFIER": "0x36B353776AF6EF3A2bD707049e783F52c4209017",
"V1_0_7_TESTNET_SP1_VERIFIER": "0x331b350dDA287d0A65ce43103984CD44cb4Da9f0",
"V1_0_8_TESTNET_SP1_VERIFIER": "0xfE2bb0Ad7F2c44Bd1289234Af08aD6FDEC0d54a2",
"V1_0_1_SP1_VERIFIER": "0x36B353776AF6EF3A2bD707049e783F52c4209017"
"V1_1_0_SP1_VERIFIER": "0xc350F063C13a3Ca21331610fe159E697a5c9c2FB"
}
3 changes: 2 additions & 1 deletion contracts/deployments/8453.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"SP1_VERIFIER_GATEWAY": "0x3B6041173B80E77f038f3F2C0f9744f04837185e",
"V1_0_1_SP1_VERIFIER": "0x36B353776AF6EF3A2bD707049e783F52c4209017",
"V1_0_7_TESTNET_SP1_VERIFIER": "0x331b350dDA287d0A65ce43103984CD44cb4Da9f0",
"V1_0_8_TESTNET_SP1_VERIFIER": "0xfE2bb0Ad7F2c44Bd1289234Af08aD6FDEC0d54a2",
"V1_0_1_SP1_VERIFIER": "0x36B353776AF6EF3A2bD707049e783F52c4209017"
"V1_1_0_SP1_VERIFIER": "0xc350F063C13a3Ca21331610fe159E697a5c9c2FB"
}
3 changes: 2 additions & 1 deletion contracts/deployments/84532.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"SP1_VERIFIER_GATEWAY": "0x3B6041173B80E77f038f3F2C0f9744f04837185e",
"V1_0_1_SP1_VERIFIER": "0x36B353776AF6EF3A2bD707049e783F52c4209017",
"V1_0_7_TESTNET_SP1_VERIFIER": "0x331b350dDA287d0A65ce43103984CD44cb4Da9f0",
"V1_0_8_TESTNET_SP1_VERIFIER": "0xfE2bb0Ad7F2c44Bd1289234Af08aD6FDEC0d54a2",
"V1_0_1_SP1_VERIFIER": "0x36B353776AF6EF3A2bD707049e783F52c4209017"
"V1_1_0_SP1_VERIFIER": "0xc350F063C13a3Ca21331610fe159E697a5c9c2FB"
}
38 changes: 38 additions & 0 deletions contracts/script/deploy/v1.1.0/SP1Verifier.s.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;

import {BaseScript} from "../../utils/Base.s.sol";
import {SP1Verifier} from "../../../src/v1.1.0/SP1Verifier.sol";
import {SP1VerifierGateway} from "../../../src/SP1VerifierGateway.sol";
import {ISP1VerifierWithHash} from "../../../src/ISP1Verifier.sol";

contract SP1VerifierScript is BaseScript {
string internal constant KEY = "V1_1_0_SP1_VERIFIER";

function run() external multichain(KEY) broadcaster {
// Read config
bytes32 CREATE2_SALT = readBytes32("CREATE2_SALT");
address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY");

// Deploy contract
address verifier = address(new SP1Verifier{salt: CREATE2_SALT}());

// Add the verifier to the gateway
SP1VerifierGateway gateway = SP1VerifierGateway(SP1_VERIFIER_GATEWAY);
gateway.addRoute(verifier);

// Write address
writeAddress(KEY, verifier);
}

function freeze() external multichain(KEY) broadcaster {
// Read config
address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY");
address SP1_VERIFIER = readAddress(KEY);

// Freeze the verifier on the gateway
SP1VerifierGateway gateway = SP1VerifierGateway(SP1_VERIFIER_GATEWAY);
bytes4 selector = bytes4(ISP1VerifierWithHash(SP1_VERIFIER).VERIFIER_HASH());
gateway.freezeRoute(selector);
}
}
Loading

0 comments on commit 2bd074d

Please sign in to comment.