Skip to content

Commit 9fb2964

Browse files
committed
docker: Fixed Localnet ROFL support for sgx-raw
1 parent 47ae557 commit 9fb2964

File tree

2 files changed

+8
-14
lines changed

2 files changed

+8
-14
lines changed

docker/common/start.sh

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ if [ ! -z "${ROFL_BINARY:-}" ]; then
427427
ROFL_ADMIN_FUND=10001
428428
COMPUTE_NODE_ADDRESS="oasis1qp6tl30ljsrrqnw2awxxu2mtxk0qxyy2nymtsy90"
429429
COMPUTE_NODE_FUND=1000
430-
POLICY_PATH=/policy-localnet.yml
430+
ROFL_MANIFEST_PATH=rofl.yaml
431431

432432
echo
433433
notice "Configuring ROFL ${ROFLS[0]}:\n"
@@ -439,21 +439,14 @@ if [ ! -z "${ROFL_BINARY:-}" ]; then
439439
${OASIS_CLI_BINARY} account deposit ${COMPUTE_NODE_FUND} ${COMPUTE_NODE_ADDRESS} --account test:alice --gas-price 0 -y >/dev/null
440440
printf " Compute node ${CYAN}${COMPUTE_NODE_ADDRESS}${OFF} funded ${COMPUTE_NODE_FUND} TEST\n"
441441

442-
cat > ${POLICY_PATH} << EOF
443-
quotes:
444-
pcs:
445-
tcb_validity_period: 30
446-
min_tcb_evaluation_data_number: 16
447-
enclaves:
448-
- "${ROFL_ENCLAVE_ID}"
449-
endorsements:
450-
- any: {}
451-
fees: endorsing_node
452-
max_expiration: 3
453-
EOF
454442
# XXX: Report ROFL app ID in JSON and properly parse it.
455-
ROFL_APP_ID=$(${OASIS_CLI_BINARY} rofl create ${POLICY_PATH} --account ${ROFL_ADMIN} --scheme cn -y | tail -n1 | rev | cut -d' ' -f1 | rev)
443+
${OASIS_CLI_BINARY} rofl init --tee sgx --kind raw >/dev/null
444+
ROFL_APP_ID=$(${OASIS_CLI_BINARY} rofl create --account ${ROFL_ADMIN} --network localnet -y | grep "Created ROFL app" | rev | cut -d' ' -f1 | rev)
456445
printf " App ID: ${CYAN}${ROFL_APP_ID}${OFF}\n"
446+
447+
# Submit the hardcoded enclave ID to the chain.
448+
sed -i "s@ enclaves: \[\]@ enclaves:\n - id: ${ROFL_ENCLAVE_ID}@" ${ROFL_MANIFEST_PATH}
449+
${OASIS_CLI_BINARY} rofl update -y >/dev/null
457450
fi
458451

459452
T_END="$(date +%s)"

tests/tools/spinup-oasis-stack.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ fi
6666
if [ ! -z "${ROFL_BINARY:-}" ] && [ ! -z "${ROFL_BINARY_SGXS:-}" ]; then
6767
jq "
6868
.runtimes[${RT_IDX}].deployments[0].components[1].kind = \"rofl\" |
69+
.runtimes[${RT_IDX}].deployments[0].components[1].name = \"localnet-testing-orc\" |
6970
.runtimes[${RT_IDX}].deployments[0].components[1].binaries.\"0\" = \"${ROFL_BINARY}\" |
7071
.runtimes[${RT_IDX}].deployments[0].components[1].binaries.\"1\" = \"${ROFL_BINARY_SGXS}\"
7172
" "$FIXTURE_FILE" >"$FIXTURE_FILE.tmp"

0 commit comments

Comments
 (0)