Skip to content

Commit 9ef485e

Browse files
johntaikosmtmfftRogerLamTd
authored
chore(main): prerelease v1.8.0 (#563)
* chore: update subproject commit reference for gaiko * fix: allow non-zero exist code * fix: downgrade itertools version to 0.11.0 for compatibility * fix: update dependencies for reth packages to latest commit * fix: update proc-macro-crate version and adjust taiko-reth dependencies * fix: refactor gramine command handling and improve input serialization for proof * fix: update subproject commit reference for gaiko * update mainnet pacaya fork height & its reth dependency * fix: update subproject commit reference for gaiko * fix: update dependencies for sgx-prover and improve configuration handling (#564) * update pacaya verifier address * fix: update subproject commit reference for gaiko * chore: update release notes for v1.8.0-edmm and v1.8.0 * add zk image id * update chainspec * fix: update subproject commit reference for gaiko * fix: update mrenclave references for gaiko and raiko in release notes * update zk image ID * docs update (#565) --------- Co-authored-by: smtmfft <[email protected]> Co-authored-by: Roger <[email protected]>
1 parent b703d9a commit 9ef485e

File tree

9 files changed

+252
-179
lines changed

9 files changed

+252
-179
lines changed

Cargo.lock

Lines changed: 68 additions & 59 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

RELEASE.md

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,64 @@
1+
# v1.8.0
2+
3+
## image
4+
5+
us-docker.pkg.dev/evmchain/images/raiko:1.8.0
6+
7+
## gaiko
8+
9+
- mrenclave: fda8bb1fc9938700c25353c0a5fabc96a238e69ce8e35f08e558831a20db33a6
10+
- mrsigner: ca0583a715534a8c981b914589a7f0dc5d60959d9ae79fb5353299a4231673d5
11+
12+
## raiko
13+
14+
- mrenclave: dcd483d3406d9b1871bb92420f5a080c4372e0d6b8522a4a2cb91a0f736669c6
15+
- mrsigner: ca0583a715534a8c981b914589a7f0dc5d60959d9ae79fb5353299a4231673d5
16+
17+
# v1.8.0-edmm
18+
19+
## image
20+
21+
us-docker.pkg.dev/evmchain/images/raiko:1.8.0-edmm
22+
23+
## gaiko
24+
25+
- mrenclave: fda8bb1fc9938700c25353c0a5fabc96a238e69ce8e35f08e558831a20db33a6
26+
- mrsigner: ca0583a715534a8c981b914589a7f0dc5d60959d9ae79fb5353299a4231673d5
27+
28+
## raiko
29+
30+
- mrenclave: 3b589538b775ddbfc5fb028167ff846116159e6687aef9f849ca5a70a7871ea5
31+
- mrsigner: ca0583a715534a8c981b914589a7f0dc5d60959d9ae79fb5353299a4231673d5
32+
33+
# v1.8.0-zk
34+
35+
-risc0
36+
risc0 elf image id: 49c8f13fdfbec7c03fc8516ef7d32d8fa43fa4f495d62e9ff6bf63710df402d4
37+
"/opt/raiko/provers/risc0/guest/target/riscv32im-risc0-zkvm-elf/release/risc0-aggregation"
38+
39+
risc0 elf image id: 052010a130f9957a9d218a173242070c47af1c5d2c3ccae1d8e8d85ce6c7d78e
40+
"/opt/raiko/provers/risc0/guest/target/riscv32im-risc0-zkvm-elf/release/risc0-batch"
41+
42+
risc0 elf image id: 2548c096b0c3f17c5c879dd9524da88d68cfeb4ddcaeb72561c880801497a776
43+
"/opt/raiko/provers/risc0/guest/target/riscv32im-risc0-zkvm-elf/release/risc0-guest"
44+
45+
-sp1
46+
"/opt/raiko/provers/sp1/guest/target/riscv32im-succinct-zkvm-elf/release/sp1-aggregation"
47+
sp1 elf vk bn256 is: 0x00380861a3c05aa16421c66921e7b952005ddad5b91b81e56d1a5f92a88db099
48+
sp1 elf vk hash_bytes is: 1c0430d17016a8590438cd241e7b952002eed6ad646e07955a34bf25288db099
49+
50+
"/opt/raiko/provers/sp1/guest/target/riscv32im-succinct-zkvm-elf/release/sp1-batch"
51+
sp1 elf vk bn256 is: 0x00745853e47349fb2ddb364dae473e099c19890da8c786490da83066a0959689
52+
sp1 elf vk hash_bytes is: 3a2c29f21cd27ecb3b66c9b56473e09960cc486d231e19241b5060cd20959689
53+
54+
"/opt/raiko/provers/sp1/guest/target/riscv32im-succinct-zkvm-elf/release/sp1-guest"
55+
sp1 elf vk bn256 is: 0x0034ec939d3130695cae1cbc4e8cc5fe729a99ded3370a3e1a4d53a23043cea3
56+
sp1 elf vk hash_bytes is: 1a7649ce4c4c1a5715c3978968cc5fe714d4cef64cdc28f8349aa7443043cea3
57+
158
# v1.7.4-zk
259

360
## zk image
61+
462
"/opt/raiko/provers/risc0/guest/target/riscv32im-risc0-zkvm-elf/release/risc0-aggregation"
563
risc0 elf image id: 02ca31a77475bbef11606b3a35464b0d94d5042f33cb483c4ba10de924a204fb
664
"/opt/raiko/provers/risc0/guest/target/riscv32im-risc0-zkvm-elf/release/risc0-batch"

docs/README_Docker_and_RA.md

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -284,15 +284,15 @@ mkdir ~/.config/raiko/config
284284
mkdir ~/.config/raiko/secrets
285285
```
286286

287-
5. Now, clone raiko and check out the `tags/v1.7.3` branch and navigate to the `docker` folder. From here you can pull the images from our registry.
287+
5. Now, clone raiko and check out the `tags/v1.8.0` branch and navigate to the `docker` folder. From here you can pull the images from our registry.
288288

289289
```
290290
git clone https://github.com/taikoxyz/raiko.git
291291
cd raiko/docker
292-
git checkout tags/v1.7.3
292+
git checkout tags/v1.8.0
293293
```
294294

295-
> **_NOTE:_** For Taiko Alethia AND Hekla: You will need to modify your raiko `docker-compose.yml` to use the images you pull. If you are using a SGX2 machine, please use `1.7.3-edmm`. If you are using a SGX1 machine, please use `1.7.3`.
295+
> **_NOTE:_** For Taiko Alethia AND Hekla: You will need to modify your raiko `docker-compose.yml` to use the images you pull. If you are using a SGX2 machine, please use `1.8.0-edmm`. If you are using a SGX1 machine, please use `1.8.0`.
296296
297297
In your `docker-compose.yml` file, search for `raiko:latest` and change all instances to `raiko:{TAG}`. Use the following commands to pull the respective images.
298298

@@ -320,7 +320,7 @@ cp .env.sample .env
320320
```
321321

322322
If you are running Raiko for Taiko Hekla, ensure `SGXGETH=true`, `NETWORK=taiko_a7` and `L1_NETWORK=holesky` in `.env`.
323-
If you are running Raiko for Taiko Alethia, **delete `SGXGETH=true` line entirely**, and ensure `NETWORK=taiko_mainnet` and `L1_NETWORK=ethereum` in `.env`.
323+
If you are running Raiko for Taiko Alethia, ensure `SGXGETH=true`, `NETWORK=taiko_mainnet` and `L1_NETWORK=ethereum` in `.env`.
324324

325325
8. Bootstrap Raiko with the following command:
326326

@@ -336,17 +336,14 @@ ls ~/.config/raiko/config
336336

337337
You've now prepared your machine for running Raiko through Docker. Now, you need to perform On-Chain Remote Attestation to receive TTKOh from moderators and begin proving for Taiko!
338338

339-
> **_NOTE:_** If you are running Raiko for Taiko Alethia, you can ignore `bootstrap.gaiko.json`. You will only use `bootstrap.json` for the following steps.
340-
341339
## On-Chain RA
342340

343-
1. Clone [taiko-mono](https://github.com/taikoxyz/taiko-mono/tree/main), checkout the appropriate tag and navigate to the protocol directory.
341+
1. Clone [taiko-mono](https://github.com/taikoxyz/taiko-mono/tree/main) and navigate to the protocol directory.
344342

345343
```
346344
cd ~
347345
git clone https://github.com/taikoxyz/taiko-mono.git
348346
cd taiko-mono
349-
git checkout tags/taiko-alethia-protocol-v2.3.0
350347
cd packages/protocol
351348
```
352349

@@ -366,7 +363,7 @@ pnpm install
366363
pnpm compile
367364
```
368365

369-
3. If you've followed the Raiko Docker guide, you will have bootstrapped raiko and obtained two bootstrap.json files. Both will look like the following:
366+
3. If you've followed the Raiko Docker guide, you will have bootstrapped raiko and obtained two bootstrap.json files. (`bootstrap.json` and `bootstrap.gaiko.json`) Both will look like the following:
370367

371368
```
372369
"public_key": "0x02ab85f14dcdc93832f4bb9b40ad908a5becb840d36f64d21645550ba4a2b28892",
@@ -380,11 +377,9 @@ You can find it with `cat ~/.config/raiko/config/bootstrap.json` or `cat ~/.con
380377

381378
5. Call the script with `PRIVATE_KEY=0x{YOUR_PRIVATE_KEY} ./script/layer1/provers/config_dcap_sgx_verifier.sh --env {NETWORK} --quote {YOUR_QUOTE_HERE}`. "YOUR_QUOTE_HERE" comes from above step 5.
382379

383-
`NETWORK` will be `hekla-pacaya<sgxreth|sgxgeth>` or `mainnet` depending on which verifier you are registering to.
384-
385-
You will have to do this step twice for Hekla: once for SgxGeth and once for Pacaya. Please use the quote in `bootstrap.gaiko.json` to register for `hekla-pacaya-sgxgeth` and the quote from `bootstrap.json` to register for `hekla-pacaya-sgxreth`. Keep both instance IDs.
380+
`NETWORK` will be `hekla-pacaya<sgxreth|sgxgeth>` or `mainnet-pacaya<sgxreth|sgxgeth>` depending on which verifier you are registering to.
386381

387-
For Taiko Alethia, you only need to do this step once. Copy the quote from `bootstrap.json` and use `--env mainnet` for the script.
382+
You will have to do this step twice: once for SgxGeth and once for Pacaya. Please use the quote in `bootstrap.gaiko.json` to register for `<mainnet|hekla>-pacaya-sgxgeth` and the quote from `bootstrap.json` to register for `<mainnet|hekla>-pacaya-sgxreth`. Keep both instance IDs.
388383

389384
6. If you've been successful, you will get a SGX instance `id` which can be used to run Raiko!
390385

@@ -492,7 +487,7 @@ Remove your previously autogenerated priv.key:
492487

493488
2. Checkout the relevant tag/branch
494489

495-
`git checkout tags/v1.7.3` (SGX1) or `git checkout tags/v1.7.3-edmm` (SGX2) for the upcoming Mainnet upgrade.
490+
`git checkout tags/v1.8.0` for the upcoming Mainnet upgrade.
496491

497492
3. Copy the sample `.env` and make the following changes:
498493

@@ -504,33 +499,38 @@ vi .env
504499
- L1_NETWORK=ethereum
505500
```
506501

507-
4. Build the image locally or pull the image from our registry:
502+
4. Pull the image from our registry or build the image locally:
503+
504+
Pull the image from the registry, use `docker compose pull us-docker.pkg.dev/evmchain/images/raiko:{TAG}`
508505

509-
You can build the image with the following command: `docker compose build raiko`.
506+
`TAG` should be `1.8.0` if you are using SGX1, `1.8.0-edmm` if you are using SGX2.
510507

511-
If you want to pull the image from the registry, use `docker compose pull us-docker.pkg.dev/evmchain/images/raiko:{TAG}`
508+
If you prefer, you can build the image with the following command: `docker compose build raiko`.
512509

513510
5. Modify your docker-compose.yml file to use the image.
514511

515512
`vi docker-compose.yml`
516-
set all instances of raiko image to raiko:1.7.3 or raiko:1.7.3-edmm
513+
514+
set all instances of raiko image to raiko:1.8.0 or raiko:1.8.0-edmm
517515

518516
6. Bootstrap your instance
519517

520518
`docker compose up init`
521-
If there are no errors, you will use ~/.config/raiko/config/bootstrap.json to do the following steps. You can safely ignore ~/.config/raiko/config/bootstrap.gaiko.json.
519+
520+
If there are no errors, please use `ls ~/.config/raiko/config` to check that the files `bootstrap.json` and `bootstrap.gaiko.json` exist.
522521

523522
7. Navigate to `taiko-mono` and register your instance.
524523

525-
If you haven't done so yet, clone `taiko-mono`. Checkout `taiko-alethia-protocol-v2.3.0`.
524+
If you haven't done so yet, clone `taiko-mono`. Checkout `main`.
526525

527526
```bash
528527
cd packages/protocol
529528
export PRIVATE_KEY=0x{YOUR_PRIVATE_KEY}
530529
export FORK_URL={ETH_RPC_URL}
531-
./script/layer1/provers/config_dcap_sgx_verifier.sh --env mainnet --quote {QUOTE_FROM_BOOTSTRAP.JSON}
530+
./script/layer1/provers/config_dcap_sgx_verifier.sh --env mainnet-sgxreth --quote {QUOTE_FROM_BOOTSTRAP.JSON}
531+
./script/layer1/provers/config_dcap_sgx_verifier.sh --env mainnet-sgxgeth --quote {QUOTE_FROM_BOOTSTRAP.GAIKO.JSON}
532532
```
533-
You will use the instance id for the next step.
533+
You will use the instance ids for the next step.
534534

535535
8. Navigate back to Raiko and modify .env again.
536536

@@ -539,13 +539,12 @@ cd raiko/docker
539539
vi .env
540540
```
541541

542-
Set SGX_ONTAKE_INSTANCE_ID= the instance id from previous step.
542+
Set `SGX_PACAYA_INSTANCE_ID` to the instance id from the sgxreth run, and `SGXGETH_PACAYA_INSTANCE_ID` to the instance id from the sgxgeth run.
543543

544544
9. Start your Raiko instance again
545545

546546
`docker compose up raiko -d`. You can verify if it's running properly with the tests described in the guide below.
547547

548-
549548
## Verify that your Raiko instance is running properly
550549

551550
Once your Raiko instance is running, you can verify if it was started properly as follows:

host/config/chain_spec_list_default.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
{
126126
"name": "taiko_mainnet",
127127
"chain_id": 167000,
128-
"max_spec_id": "ONTAKE",
128+
"max_spec_id": "PACAYA",
129129
"hard_forks": {
130130
"HEKLA": {
131131
"Block": 0
@@ -134,7 +134,7 @@
134134
"Block": 538304
135135
},
136136
"PACAYA": {
137-
"Block": 99999999
137+
"Block": 1166000
138138
},
139139
"CANCUN": "TBD"
140140
},
@@ -160,9 +160,10 @@
160160
"RISC0": "0x55902b2D3DF2A65370A89C86Ae9dd71Ecd508edc"
161161
},
162162
"PACAYA": {
163-
"SGX": "0xb0f3186FC1963f774f52ff455DC86aEdD0b31F81",
164-
"SP1": "0x5c44f2239925b0d86d2BFEe539f19CD0A08Af452",
165-
"RISC0": "0x55902b2D3DF2A65370A89C86Ae9dd71Ecd508edc"
163+
"SGX": "0x9e322fC59b8f4A29e6b25c3a166ac1892AA30136",
164+
"SP1": "0xbee1040D0Aab17AE19454384904525aE4A3602B9",
165+
"RISC0": "0x73Ee496dA20e5C65340c040B0D8c3C891C1f74AE",
166+
"SGXGETH": "0x7e6409e9b6c5e2064064a6cC994f9a2e95680782"
166167
}
167168
},
168169
"genesis_time": 0,

0 commit comments

Comments
 (0)