From ac115a5bb4d038a2571aebebdd22bc3203300706 Mon Sep 17 00:00:00 2001 From: fys05 <58808893+fys05@users.noreply.github.com> Date: Tue, 5 Mar 2024 18:57:21 +0800 Subject: [PATCH 01/10] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c028084..9c00429 100644 --- a/README.md +++ b/README.md @@ -149,7 +149,7 @@ only_global_ips = true [key_server_config] version = 1 -attestation_style = 1 +attestation_style = 1 #This corresponds to using an image, epid=1, dcap=2 seal_policy = "MRSIGNER" exe_policy = { Multiply = { executors = 8 } } round_time_limit = 60 From 4ca9d165d46f01257a946de021e8934ca198a8fa Mon Sep 17 00:00:00 2001 From: fys05 <58808893+fys05@users.noreply.github.com> Date: Tue, 5 Mar 2024 19:00:41 +0800 Subject: [PATCH 02/10] Update docker-compose.yml --- docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9573cc2..c7bf4ef 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,8 @@ version: "3" services: bnk-occlum-keyring: - image: boolnetwork/bnk-occlum-keyring-epid:v0.5.2 + image: boolnetwork/bnk-occlum-keyring-epid:v0.5.2 #Different images result in different values for the attestation_style parameter in the configuration file + # image: boolnetwork/bnk-occlum-keyring-dcap:pre-release restart: always network_mode: "host" # ports: From 30325aed27cfffb44e221b080470db687ac97500 Mon Sep 17 00:00:00 2001 From: fys05 <58808893+fys05@users.noreply.github.com> Date: Fri, 8 Mar 2024 09:35:26 +0800 Subject: [PATCH 03/10] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9c00429..9738336 100644 --- a/README.md +++ b/README.md @@ -148,8 +148,8 @@ share_peer_interval = 30 only_global_ips = true [key_server_config] -version = 1 -attestation_style = 1 #This corresponds to using an image, epid=1, dcap=2 +version = 2 +attestation_style = 2 #This corresponds to using an image, epid=1, dcap=2 seal_policy = "MRSIGNER" exe_policy = { Multiply = { executors = 8 } } round_time_limit = 60 From d5d300e3d283013f36caa63306b305029a0d3ab7 Mon Sep 17 00:00:00 2001 From: fys05 <58808893+fys05@users.noreply.github.com> Date: Fri, 8 Mar 2024 09:37:41 +0800 Subject: [PATCH 04/10] Update docker-compose.yml --- docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index c7bf4ef..81b2bbc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,8 +1,8 @@ version: "3" services: bnk-occlum-keyring: - image: boolnetwork/bnk-occlum-keyring-epid:v0.5.2 #Different images result in different values for the attestation_style parameter in the configuration file - # image: boolnetwork/bnk-occlum-keyring-dcap:pre-release + #image: boolnetwork/bnk-occlum-keyring-epid:v0.5.2 #Different images result in different values for the attestation_style parameter in the configuration file + image: boolnetwork/bnk-occlum-keyring-dcap:v0.6.4 restart: always network_mode: "host" # ports: @@ -16,4 +16,4 @@ services: devices: - /dev/sgx/enclave:/dev/sgx/enclave - /dev/sgx/provision:/dev/sgx/provision - command: bash -c 'cp /configs/keyring.toml /root/occlum_instance; source /root/.bashrc; cd /root/occlum_instance; occlum print mrsigner; occlum print mrenclave; occlum run /bin/bnk-watcher /host/keyring.toml' + command: bash -c 'cp /configs/keyring.toml /root/occlum_instance; apt update; apt install curl -y; source /root/.bashrc; cd /root/occlum_instance; occlum print mrsigner; occlum print mrenclave; occlum run /bin/bnk-watcher /host/keyring.toml' From c7201583887290f74d8dbcfbc1c87260922ad9bb Mon Sep 17 00:00:00 2001 From: fys05 <58808893+fys05@users.noreply.github.com> Date: Wed, 13 Mar 2024 15:49:17 +0800 Subject: [PATCH 05/10] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9738336..5917f73 100644 --- a/README.md +++ b/README.md @@ -148,7 +148,7 @@ share_peer_interval = 30 only_global_ips = true [key_server_config] -version = 2 +version = 3 attestation_style = 2 #This corresponds to using an image, epid=1, dcap=2 seal_policy = "MRSIGNER" exe_policy = { Multiply = { executors = 8 } } From 27e8f4a5279f31235d9413663f33993d5c28b861 Mon Sep 17 00:00:00 2001 From: fys05 <58808893+fys05@users.noreply.github.com> Date: Wed, 13 Mar 2024 15:50:07 +0800 Subject: [PATCH 06/10] Update docker-compose.yml --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 81b2bbc..159f216 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: bnk-occlum-keyring: #image: boolnetwork/bnk-occlum-keyring-epid:v0.5.2 #Different images result in different values for the attestation_style parameter in the configuration file - image: boolnetwork/bnk-occlum-keyring-dcap:v0.6.4 + image: boolnetwork/bnk-occlum-keyring-dcap:v0.6.6 restart: always network_mode: "host" # ports: From 73d9c4d15e84ff54567f0e257fb6be240e91b849 Mon Sep 17 00:00:00 2001 From: fys05 <58808893+fys05@users.noreply.github.com> Date: Fri, 22 Mar 2024 10:33:48 +0800 Subject: [PATCH 07/10] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5917f73..075bd84 100644 --- a/README.md +++ b/README.md @@ -148,7 +148,7 @@ share_peer_interval = 30 only_global_ips = true [key_server_config] -version = 3 +version = 1 attestation_style = 2 #This corresponds to using an image, epid=1, dcap=2 seal_policy = "MRSIGNER" exe_policy = { Multiply = { executors = 8 } } From 275bf0f4bca7b56157d7ff0c01a25f3d1d6f377a Mon Sep 17 00:00:00 2001 From: fys05 <58808893+fys05@users.noreply.github.com> Date: Fri, 22 Mar 2024 10:34:35 +0800 Subject: [PATCH 08/10] Update keyring.toml --- configs/keyring.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/keyring.toml b/configs/keyring.toml index 398edca..499d405 100644 --- a/configs/keyring.toml +++ b/configs/keyring.toml @@ -20,8 +20,8 @@ only_global_ips = true [key_server_config] version = 1 -attestation_style = 1 +attestation_style = 2 seal_policy = "MRSIGNER" exe_policy = { Multiply = { executors = 8 } } round_time_limit = 60 -clear_msg_interval = 180 \ No newline at end of file +clear_msg_interval = 180 From 5df89896c69b9d9cb4e750d44d819505b990a423 Mon Sep 17 00:00:00 2001 From: fys05 <58808893+fys05@users.noreply.github.com> Date: Mon, 20 May 2024 19:47:34 +0800 Subject: [PATCH 09/10] Update README.md --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 075bd84..00589a1 100644 --- a/README.md +++ b/README.md @@ -126,11 +126,11 @@ Open the `keyring.toml` file under the `configs` directory and replace `0x000000 The default configuration file, encompassing identity information, service ports, P2P network, service launch types, etc., is as follows： ```toml -node_ws_url = "ws://172.210.130.200:9944" +node_ws_url = "ws://127.0.0.1:9944" # local node_call server port. node_call_port = 8720 -# used to generate LocalKeyStore, used to get AccountId in substrate. -identity = "0x0000000000000000000000000000000000000000000000000000000000000000" +# device_owner is a wallet address +device_owner = "0x0000000000000000000000000000000000000000" # database path db_path = "/host/data" # tokio console port @@ -143,12 +143,12 @@ atomic_flush = true [network_config] port = 38700 -boot_nodes = ["/ip4/172.210.130.200/tcp/38700/p2p/12D3KooWJVjkr19spLuvmWb68zdxki2qucnubPzbHRjxRi8jhwzF"] +boot_nodes =["/ip4/172.210.130.200/tcp/38701/p2p/12D3KooWJVjkr19spLuvmWb68zdxki2qucnubPzbHRjxRi8jhwzF","/ip4/20.81.161.179/tcp/38701/p2p/12D3KooWMDqap7HMjA6nos1HpHpWt8JBcPepnZgYSd5PPmovAqD7"] share_peer_interval = 30 only_global_ips = true +protocol_id = "betatestnet" [key_server_config] -version = 1 attestation_style = 2 #This corresponds to using an image, epid=1, dcap=2 seal_policy = "MRSIGNER" exe_policy = { Multiply = { executors = 8 } } From b093c21a40576cb41b150961e77fd8af48f319ad Mon Sep 17 00:00:00 2001 From: fys05 <58808893+fys05@users.noreply.github.com> Date: Mon, 20 May 2024 19:50:12 +0800 Subject: [PATCH 10/10] Update keyring.toml --- configs/keyring.toml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/configs/keyring.toml b/configs/keyring.toml index 499d405..38f96df 100644 --- a/configs/keyring.toml +++ b/configs/keyring.toml @@ -1,8 +1,8 @@ -node_ws_url = "ws://172.210.130.200:9944" +node_ws_url = "ws://127.0.0.1:9944" # local node_call server port. node_call_port = 8720 -# used to generate LocalKeyStore, used to get AccountId in substrate. -identity = "0x0000000000000000000000000000000000000000000000000000000000000000" +# device_owner is a wallet address +device_owner = "0x0000000000000000000000000000000000000000" # database path db_path = "/host/data" # tokio console port @@ -14,14 +14,16 @@ atomic_flush = true [network_config] port = 38700 -boot_nodes = ["/ip4/172.210.130.200/tcp/38700/p2p/12D3KooWJVjkr19spLuvmWb68zdxki2qucnubPzbHRjxRi8jhwzF"] +boot_nodes =["/ip4/172.210.130.200/tcp/38701/p2p/12D3KooWJVjkr19spLuvmWb68zdxki2qucnubPzbHRjxRi8jhwzF","/ip4/20.81.161.179/tcp/38701/p2p/12D3KooWMDqap7HMjA6nos1HpHpWt8JBcPepnZgYSd5PPmovAqD7"] share_peer_interval = 30 only_global_ips = true +protocol_id = "betatestnet" [key_server_config] -version = 1 -attestation_style = 2 +attestation_style = 2 #This corresponds to using an image, epid=1, dcap=2 seal_policy = "MRSIGNER" exe_policy = { Multiply = { executors = 8 } } round_time_limit = 60 clear_msg_interval = 180 + +