add 0x check

Author: erhant

.env.example

@@ -1,12 +1,12 @@
 ## DRIA (required) ##
-# Secret key of your compute node (32 byte, hexadecimal, without 0x prefix).
-# e.g.: DKN_WALLET_SECRET_KEY=ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
+# Secret key of your compute node, 32 byte in hexadecimal.
+# e.g.: DKN_WALLET_SECRET_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
 DKN_WALLET_SECRET_KEY=
-# model1,model2,model3,... (comma separated, case-insensitive)
-DKN_MODELS=phi3:3.8b
-# Public key of Dria Admin node (33-byte compressed, hexadecimal, without 0x prefix).
+# Public key of Dria Admin node, 33-byte (compressed) in hexadecimal.
 # You don't need to change this, simply copy and paste it.
 DKN_ADMIN_PUBLIC_KEY=0208ef5e65a9c656a6f92fb2c770d5d5e2ecffe02a6aade19207f75110be6ae658
+# model1,model2,model3,... (comma separated, case-insensitive)
+DKN_MODELS=phi3:3.8b
 
 ## DRIA (optional) ##
 # info | debug | error | none,dkn_compute=debug
@@ -22,7 +22,7 @@ DKN_BOOTSTRAP_NODES=
 OPENAI_API_KEY=
 
 ## Ollama (if used, optional) ##
-# do not change the host, it is used by Docker
+# do not change this, it is used by Docker
 OLLAMA_HOST=http://host.docker.internal
 # you can change the port if you would like
 OLLAMA_PORT=11434

compose.yml

@@ -16,7 +16,7 @@ services:
       JINA_API_KEY: ${JINA_API_KEY}
       OLLAMA_HOST: ${OLLAMA_HOST}
       OLLAMA_PORT: ${OLLAMA_PORT}
-      OLLAMA_AUTO_PULL: ${OLLAMA_AUTO_PULL}
+      OLLAMA_AUTO_PULL: ${OLLAMA_AUTO_PULL:-true}
     network_mode: "host"
     extra_hosts:
       # for Linux, we need to add this line manually

src/config/mod.rs

@@ -37,8 +37,8 @@ impl DriaComputeNodeConfig {
     pub fn new() -> Self {
         let secret_key = match env::var("DKN_WALLET_SECRET_KEY") {
             Ok(secret_env) => {
-                let secret_dec =
-                    hex::decode(secret_env).expect("Secret key should be 32-bytes hex encoded.");
+                let secret_dec = hex::decode(secret_env.trim_start_matches("0x"))
+                    .expect("Secret key should be 32-bytes hex encoded.");
                 SecretKey::parse_slice(&secret_dec).expect("Secret key should be parseable.")
             }
             Err(err) => {
@@ -60,7 +60,7 @@ impl DriaComputeNodeConfig {
 
         let admin_public_key = match env::var("DKN_ADMIN_PUBLIC_KEY") {
             Ok(admin_public_key) => {
-                let pubkey_dec = hex::decode(admin_public_key)
+                let pubkey_dec = hex::decode(admin_public_key.trim_start_matches("0x"))
                     .expect("Admin public key should be 33-bytes hex encoded.");
                 PublicKey::parse_slice(&pubkey_dec, None)
                     .expect("Admin public key should be parseable.")