Skip to content

Commit fead8bb

Browse files
committed
fix: fix review comments
1 parent 0473e90 commit fead8bb

File tree

2 files changed

+29
-14
lines changed

2 files changed

+29
-14
lines changed

packages/protocol/script/layer1/verifiers/README.md

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ The bash wrapper provides the same interface as the original script:
1717
PRIVATE_KEY=$PRIVATE_KEY \
1818
FORK_URL=https://ethereum-hoodi-rpc.publicnode.com \
1919
./script/layer1/verifiers/configure_sgx_verifier.sh \
20-
--env tolba-ontake \
20+
--env tolba-pacaya \
2121
--qeid /test/layer1/automata-attestation/assets/0923/identity.json \
2222
--tcb /test/layer1/automata-attestation/assets/0525/tcb_00606A000000.json \
2323
--tcb /test/layer1/automata-attestation/assets/0525/tcb_00706A100000.json \
@@ -101,6 +101,8 @@ Use `--env` to load predefined contract addresses:
101101

102102
- `dev-ontake` / `dev-ontake-sgxreth` - Dev network with sgx-reth
103103
- `dev-pacaya` / `dev-pacaya-sgxreth` - Dev network Pacaya fork with sgx-reth
104+
- `dev-shasta` / `dev-shasta-sgxreth` - Dev network Shasta with sgx-reth
105+
- `dev-shasta-sgxgeth` - Dev network Shasta with sgx-geth
104106
- `dev-sgxgeth` / `dev-pacaya-sgxgeth` - Dev network with sgx-geth
105107

106108
### Hekla Testnet
@@ -111,19 +113,30 @@ Use `--env` to load predefined contract addresses:
111113

112114
### Tolba Testnet
113115

114-
- `tolba-ontake` / `tolba-pacaya` / `tolba-pacaya-sgxreth` - Tolba with sgx-reth
116+
- `tolba-pacaya` / `tolba-pacaya-sgxreth` - Tolba with sgx-reth
115117
- `tolba-sgxgeth` / `tolba-pacaya-sgxgeth` - Tolba with sgx-geth
118+
- `tolba-shasta-sgxreth` - Tolba Shasta with sgx-reth
119+
- `tolba-shasta-sgxgeth` - Tolba Shasta with sgx-geth
120+
121+
### Transition Testnet
122+
123+
- `transition-pacaya-sgxreth` - Transition Pacaya with sgx-reth
124+
- `transition-pacaya-sgxgeth` - Transition Pacaya with sgx-geth
125+
- `transition-shasta-sgxreth` - Transition Shasta with sgx-reth
126+
- `transition-shasta-sgxgeth` - Transition Shasta with sgx-geth
116127

117128
### Mainnet
118129

119130
- `mainnet` / `mainnet-ontake` / `mainnet-ontake-sgxreth` - Mainnet Ontake with sgx-reth
120131
- `mainnet-pacaya` / `mainnet-pacaya-sgxreth` - Mainnet Pacaya fork with sgx-reth
121132
- `mainnet-sgxgeth` / `mainnet-pacaya-sgxgeth` - Mainnet with sgx-geth
133+
- `mainnet-shasta-sgxreth` - Mainnet Shasta with sgx-reth
134+
- `mainnet-shasta-sgxgeth` - Mainnet Shasta with sgx-geth
122135

123136
Example:
124137

125138
```bash
126-
--env tolba-ontake
139+
--env tolba-pacaya
127140
```
128141

129142
This automatically sets:
@@ -152,8 +165,8 @@ This automatically sets:
152165
When adding new `--env` entries or verifying previous config, derive `ATTESTATION_ADDRESS` and `PEM_CERTCHAIN_ADDRESS` from the SgxVerifier on-chain:
153166

154167
```bash
155-
cast call <SGX_VERIFIER> "automataDcapAttestation()(address)" --rpc-url <RPC>
156-
cast call <ATTESTATION_ADDRESS> "pemCertLib()(address)" --rpc-url <RPC>
168+
cast call 0x..<SGX_VERIFIER> "automataDcapAttestation()(address)" --rpc-url https://...
169+
cast call 0x..<ATTESTATION_ADDRESS> "pemCertLib()(address)" --rpc-url https://...
157170
```
158171

159172
## Examples
@@ -166,7 +179,7 @@ This replicates the original workflow shown in the task description:
166179
PRIVATE_KEY=$PRIVATE_KEY \
167180
FORK_URL=https://ethereum-hoodi-rpc.publicnode.com \
168181
./script/layer1/verifiers/configure_sgx_verifier.sh \
169-
--env tolba-ontake \
182+
--env tolba-pacaya \
170183
--qeid /test/layer1/automata-attestation/assets/0923/identity.json \
171184
--tcb /test/layer1/automata-attestation/assets/0525/tcb_00606A000000.json \
172185
--tcb /test/layer1/automata-attestation/assets/0525/tcb_00706A100000.json \

packages/protocol/script/layer1/verifiers/configure_sgx_verifier.sh

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,11 @@ Options:
3030
--toggle-check Toggle local enclave report check
3131
3232
Available Environments:
33-
dev-ontake, dev-pacaya, dev-sgxgeth - Development networks
34-
hekla-ontake, hekla-pacaya, hekla-sgxgeth - Hekla testnet
35-
tolba-pacaya, tolba-sgxgeth - Tolba testnet
36-
mainnet, mainnet-pacaya, mainnet-sgxgeth - Mainnet
33+
dev-ontake, dev-pacaya, dev-shasta, dev-sgxgeth - Development networks
34+
hekla-ontake, hekla-pacaya, hekla-sgxgeth - Hekla testnet
35+
tolba-pacaya, tolba-sgxgeth, tolba-shasta-sgxreth, tolba-shasta-sgxgeth - Tolba testnet
36+
transition-pacaya-sgxreth, transition-pacaya-sgxgeth, transition-shasta-sgxreth, transition-shasta-sgxgeth - Transition network
37+
mainnet, mainnet-pacaya, mainnet-sgxgeth, mainnet-shasta-sgxreth, mainnet-shasta-sgxgeth - Mainnet
3738
3839
Examples:
3940
# Example from the original usage:
@@ -77,7 +78,7 @@ load_env() {
7778
export ATTESTATION_ADDRESS=0x00A9F4767a69cA3C219854ca1bfD5440930b2beD
7879
export PEM_CERTCHAIN_ADDRESS=0x795330bA9B6184E13eBb3A4253E00Adb665830F5
7980
;;
80-
dev-shasta-sgxgeth|dev-shasta-sgxgeth)
81+
dev-shasta-sgxgeth)
8182
export SGX_VERIFIER_ADDRESS=0x6B455442C8C4cAC2e09c40409E8bf7FfcdB1Fc50
8283
export ATTESTATION_ADDRESS=0xef8AE6522678e44c0eE299d0835238CE5cb8c036
8384
export PEM_CERTCHAIN_ADDRESS=0x795330bA9B6184E13eBb3A4253E00Adb665830F5
@@ -155,10 +156,11 @@ load_env() {
155156
*)
156157
echo "Unknown environment: $1"
157158
echo "Available environments:"
158-
echo " dev: dev-ontake, dev-pacaya, dev-sgxgeth"
159+
echo " dev: dev-ontake, dev-pacaya, dev-shasta, dev-sgxgeth"
159160
echo " hekla: hekla-ontake, hekla-pacaya, hekla-sgxgeth"
160-
echo " tolba: tolba-ontake, tolba-sgxgeth"
161-
echo " mainnet: mainnet, mainnet-pacaya, mainnet-sgxgeth"
161+
echo " tolba: tolba-pacaya, tolba-sgxgeth, tolba-shasta-sgxreth, tolba-shasta-sgxgeth"
162+
echo " transition: transition-pacaya-sgxreth, transition-pacaya-sgxgeth, transition-shasta-sgxreth, transition-shasta-sgxgeth"
163+
echo " mainnet: mainnet, mainnet-pacaya, mainnet-sgxgeth, mainnet-shasta-sgxreth, mainnet-shasta-sgxgeth"
162164
exit 1
163165
;;
164166
esac

0 commit comments

Comments
 (0)