chore(docs): update docs for pacaya fork (#513)

Author: RogerLamTd

docs/README_Docker_and_RA.md

@@ -296,12 +296,14 @@ docker compose build raiko
 
 If you do not wish to build the image locally, you can optionally pull them from our registry.
 
+If you are using a SGX2 machine, please use `1.6.0-rc1-edmm`. If you are using a SGX1 machine, please use `1.6.0-rc1-non-edmm`.
+
 ```
-docker pull us-docker.pkg.dev/evmchain/images/raiko:1.4.0
+docker pull us-docker.pkg.dev/evmchain/images/raiko:{TAG}
 docker pull us-docker.pkg.dev/evmchain/images/pccs:latest
 ```
 
-If you do this step, you need to change your raiko docker-compose.yml to use this image. Navigate to `raiko/docker` and search for `raiko:latest` and change all instances to `raiko:1.4.0`.
+If you do this step, you need to change your raiko docker-compose.yml to use this image. Navigate to `raiko/docker` and search for `raiko:latest` and change all instances to `raiko:{TAG}`.
 
 You can continue on with the following steps as usual after this.
 
@@ -347,7 +349,6 @@ You've now prepared your machine for running Raiko through Docker. Now, you need
 cd ~
 git clone https://github.com/taikoxyz/taiko-mono.git
 cd taiko-mono
-git checkout tags/{release-tag}
 cd packages/protocol
 ```
 
@@ -367,21 +368,28 @@ pnpm install
 pnpm compile
 ```
 
-3. Ensure the values in the `script/layer1/config_dcap_sgx_verifier.sh` script match whichever network you are registering for.
+3. Ensure the values in the `script/layer1/provers/config_dcap_sgx_verifier.sh` script match whichever network you are registering for.
+
+> **_NOTE:_** You will have to do this step twice for Hekla: once for the Ontake addresses and once for the Pacaya addresses. Please keep both SGX_INSTANCE_IDs.
 
-Hekla Addresses:
+Hekla Ontake Addresses:
 `SGX_VERIFIER_ADDRESS`=0x532EFBf6D62720D0B2a2Bb9d11066E8588cAE6D9 
 `ATTESTATION_ADDRESS`=0xC6cD3878Fc56F2b2BaB0769C580fc230A95e1398 
 `PEM_CERTCHAIN_ADDRESS`=0x08d7865e7F534d743Aba5874A9AD04bcB223a92E 
 
+Hekla Pacaya Addresses:
+`SGX_VERIFIER_ADDRESS`=0xa8cD459E3588D6edE42177193284d40332c3bcd4
+`ATTESTATION_ADDRESS`=0xC6cD3878Fc56F2b2BaB0769C580fc230A95e1398
+`PEM_CERTCHAIN_ADDRESS`=0x08d7865e7F534d743Aba5874A9AD04bcB223a92E
+
 Mainnet Addresses:
 `SGX_VERIFIER_ADDRESS`=0xb0f3186FC1963f774f52ff455DC86aEdD0b31F81
 `ATTESTATION_ADDRESS`=0x8d7C954960a36a7596d7eA4945dDf891967ca8A3
 `PEM_CERTCHAIN_ADDRESS`=0x02772b7B3a5Bea0141C993Dbb8D0733C19F46169
 
 These values are already in the script, it defaults to Hekla; please comment those lines out and uncomment the Mainnet ones if performing RA on Mainnet.
 
-4. In the `script/layer1/config_dcap_sgx_verifier.sh` script, replace `--fork-url https://any-holesky-rpc-url/` with the RPC URL of the hekla/mainnet network. Alternatively, export it like so: `export FORK_URL="https://any-holesky-rpc-url/"`.
+4. In the `script/layer1/provers/config_dcap_sgx_verifier.sh` script, replace `--fork-url https://any-holesky-rpc-url/` with the RPC URL of the hekla/mainnet network. Alternatively, export it like so: `export FORK_URL="https://any-holesky-rpc-url/"`.
 
 5. If you've followed the Raiko Docker guide, you will have bootstrapped raiko and obtained a quote:
 
@@ -397,6 +405,8 @@ Copy your quote and use in the following step.
 
 6. Call the script with `PRIVATE_KEY=0x{YOUR_PRIVATE_KEY} ./script/layer1/config_dcap_sgx_verifier.sh --quote {YOUR_QUOTE_HERE}`. "YOUR_QUOTE_HERE" comes from above step 5.
 
+> **_NOTE:_** You can use the same command for registering both verifiers, just comment out the Ontake addresses and uncomment the Pacaya ones in the script and re-run. 
+
 7. If you've been successful, you will get a SGX instance `id` which can be used to run Raiko!
 
 It should look like this:
@@ -414,7 +424,8 @@ Once you've completed the above steps, you can actually run a prover.
 
 Raiko now supports more configurations, which need to be carefully checked to avoid errors.
 
-    - SGX_INSTANCE_ID: Your `SGX_INSTANCE_ID` is the one emitted in the `InstanceAdded` event above. (Deprecated)
+> **_NOTE:_** We have deprecated `SGX_INSTANCE_ID`, if you only register with the Ontake addresses please export to `SGX_ONTAKE_INSTANCE_ID`.
+
     - SGX_ONTAKE_INSTANCE_ID: SGX registered ID for ontake fork. (if raiko start before/in ontake, set this one)
     - SGX_PACAYA_INSTANCE_ID: SGX registered ID for pacaya fork. (if raiko start before/in pacaya, set this one)
     - ETHEREUM_RPC: ethereum node url, from which you query the ethereum data.
@@ -466,6 +477,21 @@ Opt {
     cache_path: None,
     log_level: "info",
 }
+
+...
+
+ + jq --arg update_value {SGX_ONTAKE_INSTANCE_ID} '.sgx.instance_ids.ONTAKE = ($update_value | tonumber)' /etc/raiko/config.sgx.json
+raiko  | + mv /tmp/config_tmp.json /etc/raiko/config.sgx.json
+raiko  | + echo 'Update ontake sgx instance id to {SGX_ONTAKE_INSTANCE_ID}'
+raiko  | Update ontake sgx instance id to {SGX_ONTAKE_INSTANCE_ID}
+raiko  | + [[ -n 1 ]]
+raiko  | + jq --arg update_value {SGX_PACAYA_INSTANCE_ID} '.sgx.instance_ids.PACAYA = ($update_value | tonumber)' /etc/raiko/config.sgx.json
+raiko  | + mv /tmp/config_tmp.json /etc/raiko/config.sgx.json
+raiko  | + echo 'Update pacaya sgx instance id to {SGX_PACAYA_INSTANCE_ID}'
+raiko  | Update pacaya sgx instance id to {SGX_PACAYA_INSTANCE_ID}
+
+...
+
 2024-04-18T12:50:09.400319Z  INFO raiko_host::server: Listening on http://0.0.0.0:8080
 ```