Merge pull request #23 from oasisprotocol/matevz/fix/compose-volumes

compose.yaml: Use built-in docker volumes

Author: matevz

compose.localnet.yaml

@@ -4,7 +4,7 @@ services:
     ports:
       - "11434:11434"
     volumes:
-      - ~/ollama-storage:/root/.ollama
+      - ollama-storage:/root/.ollama
     entrypoint: ["/usr/bin/bash", "-c", "/bin/ollama serve & sleep 5; ollama pull deepseek-r1:1.5b; wait"]
 
   sapphire-localnet:
@@ -47,3 +47,6 @@ services:
     depends_on:
       "sapphire-localnet":
         condition: service_healthy
+
+volumes:
+  ollama-storage:

compose.yaml

@@ -4,7 +4,7 @@ services:
     ports:
       - "11434:11434"
     volumes:
-      - /storage/ollama:/root/.ollama
+      - ollama-storage:/root/.ollama
     entrypoint: ["/usr/bin/bash", "-c", "/bin/ollama serve & sleep 5; ollama pull deepseek-r1:1.5b; wait"]
 
   oracle:
@@ -16,3 +16,6 @@ services:
     restart: on-failure
     volumes:
       - /run/rofl-appd.sock:/run/rofl-appd.sock
+
+volumes:
+  ollama-storage:

contracts/README.md

@@ -1,8 +1,10 @@
 # Chat bot contracts
 
-To deploy on the Localnet run:
+## Localnet
 
-```bash
+Localnet has hardcoded accounts and ROFL app ids, so you can simply run:
+
+```shell
 forge create \
     --private-key 0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80 \
     --rpc-url http://localhost:8545 \
@@ -13,8 +15,29 @@ forge create \
 
 You can then submit a prompt from the CLI by issuing:
 
-```bash
+```shell
 cast send 0x5FbDB2315678afecb367f032d93F642f64180aa3 \
     "appendPrompt(string)" "hello" \
-    --private-key 0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
+    --private-key 0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80 \
+    --rpc-url http://localhost:8545
+```
+
+## Testnet and Mainnet
+
+First convert your `rofl1` app ID to hex, for example by using
+https://slowli.github.io/bech32-buffer/
+
+Then deploy the contract with your hex-encoded app ID and zero oracle account.
+The oracle account will be configured inside the ROFL TEE the first time it
+boots to ensure traceability:
+
+```shell
+forge create --private-key YOUR_PRIVATE_KEY \
+  --rpc-url https://testnet.sapphire.oasis.io \
+  --broadcast \
+  ChatBot \
+  --constructor-args your-domain.com YOUR_APP_ID_IN_HEX 0x0000000000000000000000000000000000000000
 ```
+
+For Mainnet deployment, deploy with your Mainnet app ID, account, domain and
+`--rpc-url https://sapphire.oasis.io` parameter.

rofl.yaml

@@ -12,11 +12,11 @@ resources:
     kind: disk-persistent
     size: 10000
 artifacts:
-  firmware: https://github.com/oasisprotocol/oasis-boot/releases/download/v0.4.1/ovmf.tdx.fd#db47100a7d6a0c1f6983be224137c3f8d7cb09b63bb1c7a5ee7829d8e994a42f
-  kernel: https://github.com/oasisprotocol/oasis-boot/releases/download/v0.4.1/stage1.bin#06e12cba9b2423b4dd5916f4d84bf9c043f30041ab03aa74006f46ef9c129d22
-  stage2: https://github.com/oasisprotocol/oasis-boot/releases/download/v0.4.1/stage2-podman.tar.bz2#6f2487aa064460384309a58c858ffea9316e739331b5c36789bb2f61117869d6
+  firmware: https://github.com/oasisprotocol/oasis-boot/releases/download/v0.5.0/ovmf.tdx.fd#db47100a7d6a0c1f6983be224137c3f8d7cb09b63bb1c7a5ee7829d8e994a42f
+  kernel: https://github.com/oasisprotocol/oasis-boot/releases/download/v0.5.0/stage1.bin#23877530413a661e9187aad2eccfc9660fc4f1a864a1fbad2f6c7d43512071ca
+  stage2: https://github.com/oasisprotocol/oasis-boot/releases/download/v0.5.0/stage2-podman.tar.bz2#631349bef06990dd6ae882812a0420f4b35f87f9fe945b274bcfb10fc08c4ea3
   container:
-    runtime: https://github.com/oasisprotocol/oasis-sdk/releases/download/rofl-containers%2Fv0.5.0/rofl-containers#800be74e543f1d10d12ef6fadce89dd0a0ce7bc798dbab4f8d7aa012d82fbff1
+    runtime: https://github.com/oasisprotocol/oasis-sdk/releases/download/rofl-containers%2Fv0.5.2/rofl-containers#3abac3e7519588c1a4e250f1bf5cbbbd58c4e4c8ee817070031b9e0e3d4e0095
     compose: compose.yaml
 deployments:
   default:
@@ -34,8 +34,8 @@ deployments:
           min_tcb_evaluation_data_number: 17
           tdx: {}
       enclaves:
-        - id: r73zDIRsJ23opSYJ1r9LXhpivvM4QFAAJKcgmjQLaTwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
-        - id: yvZEDsBeQ4pERD7zi9zcnMWFN04gB7YYuaGfPB8TAhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+        - id: XIJYBT4EHM7v5a4x7D+F9QgL88m+CpNPCItYvZ4tALsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+        - id: rTTY+55JXK7uYtyjeZGP7qirmtbiJmx6cO1EY+mYLhUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
       endorsements:
         - any: {}
       fees: endorsing_node