From b48e35d08bcb81bb8259b604e97a9d1f32070312 Mon Sep 17 00:00:00 2001
From: kayryu <lukayryu@gmail.com>
Date: Tue, 26 Sep 2023 10:22:32 +0000
Subject: [PATCH] update toml and docker-compose

---
 configs/db.toml      |  8 --------
 configs/key.toml     | 14 --------------
 configs/monitor.toml |  8 --------
 configs/watcher.toml | 39 ++++++++++++++++++++++-----------------
 docker-compose.yml   | 33 ++++-----------------------------
 5 files changed, 26 insertions(+), 76 deletions(-)
 delete mode 100644 configs/db.toml
 delete mode 100644 configs/key.toml
 delete mode 100644 configs/monitor.toml

diff --git a/configs/db.toml b/configs/db.toml
deleted file mode 100644
index dd6d42b..0000000
--- a/configs/db.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-port = 18710
-num_workers = 20
-db_path = "/bnk/data"
-token = ""
-
-[options]
-create_if_missing = true
-atomic_flush = true
diff --git a/configs/key.toml b/configs/key.toml
deleted file mode 100644
index 3ada671..0000000
--- a/configs/key.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-version = 1
-attestation_style = 1
-port = 18730
-executors = 2
-db_url = "http://10.0.0.5:18710"
-msg_pool_url = "http://10.0.0.5:18720"
-db_token = ""
-cert_path = "../servers/test-ca/ca.cert"
-round_time_limit = 60
-clear_msg_interval = 180
-time_check_interval = 30
-retry_interval = 10
-retry_times = 2
-max_conn = 250
diff --git a/configs/monitor.toml b/configs/monitor.toml
deleted file mode 100644
index aa3a5a2..0000000
--- a/configs/monitor.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-port = 18740
-database_url = "/bnk/data/sqlite.db"
-
-[default_watcher]
-enabled = true
-polling_interval = 30000
-max_step = 2000
-begin_height = 0
diff --git a/configs/watcher.toml b/configs/watcher.toml
index 5e1ffb1..f4fee44 100644
--- a/configs/watcher.toml
+++ b/configs/watcher.toml
@@ -1,22 +1,27 @@
-# local msg_pool server port.
-msg_pool_port = 18720
-# local node url for watcher
-node_ws_url = "ws://10.0.0.5:9945"
-# local database url for data storage.
-db_url = "http://10.0.0.5:18710"
-# local database token for database usage.
-db_token = ""
-# local sgx key server url
-key_server_url = "https://10.0.0.5:18730"
+node_ws_url = "ws://test-rpc-node-ws.bool.network:80"
+# local node_call server port.
+node_call_port = 8720
 # used to generate LocalKeyStore, used to get AccountId in substrate.
 identity = "0x0000000000000000000000000000000000000000000000000000000000000000"
-# seconds per block
-block_time = 3
-# blocks per epoch
-epoch_duration = 200
+# database path
+db_path = "/bnk/data"
+# tokio console port
+console_port = 5555
+# database start option
+[db_option]
+create_if_missing = true
+atomic_flush = true
 
 [network_config]
-port = 48700
-boot_nodes = []
+port = 38700
+boot_nodes = ["/ip4/40.117.78.134/tcp/38700/p2p/12D3KooWRCdgTk5C6d4txvmfJbGKR2SFpiF5HgbpCVEEUUQGWR1c"]
 share_peer_interval = 30
-only_global_ips = true
\ No newline at end of file
+only_global_ips = true
+
+[key_server_config]
+version = 7
+attestation_style = 1
+seal_policy = "MRSIGNER"
+exe_policy = { Multiply = { executors = 8 } }
+round_time_limit = 60
+clear_msg_interval = 180
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index a58dd4b..9681c9c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,39 +1,14 @@
 version: "3"
 services:
-  bnk-database:
-    image: boolnetwork/bnk-database:latest
-    network_mode: "host"
-    # ports:
-    #   - "8710:8710"
-    environment:
-      RUST_LOG: info
-    volumes:
-      - ./configs/db.toml:/bnk/db.toml
-      - ./data:/bnk/data
-
-  bnk-watcher:
-    image: boolnetwork/bnk-watcher:latest
-    network_mode: "host"
-    # ports:
-    #     - "8720:8720"
-    environment:
-        RUST_LOG: info
-    volumes:
-        - ./configs/watcher.toml:/bnk/watcher.toml
-    depends_on:
-        - bnk-database
-
-  bnk-sgx-key-server:
-    image: boolnetwork/bnk-sgx-key-server:latest
+  bnk-occlum-keyring:
+    image: boolnetwork/bnk-occlum-keyring-epid:v0.5.2
     network_mode: "host"
     # ports:
     #     - "8730:8730"
     environment:
         RUST_LOG: info
     volumes:
-        - ./configs/key.toml:/bnk/key.toml
+        - ./configs/watcher.toml:/bnk/watcher.toml
     devices:
         - /dev/sgx/enclave
-        - /dev/sgx/provision
-    depends_on:
-        - bnk-watcher
\ No newline at end of file
+        - /dev/sgx/provision
\ No newline at end of file