diff --git a/packages/page-sworkerVersion/src/assets/version_v2.0.1_en.png b/packages/page-sworkerVersion/src/assets/version_v2.0.1_en.png new file mode 100644 index 000000000..9633ab905 Binary files /dev/null and b/packages/page-sworkerVersion/src/assets/version_v2.0.1_en.png differ diff --git a/packages/page-sworkerVersion/src/assets/version_v2.0.1_zh.png b/packages/page-sworkerVersion/src/assets/version_v2.0.1_zh.png new file mode 100644 index 000000000..7d8a635c1 Binary files /dev/null and b/packages/page-sworkerVersion/src/assets/version_v2.0.1_zh.png differ diff --git a/packages/page-sworkerVersion/src/md/basic.md b/packages/page-sworkerVersion/src/md/basic.md index 728837580..cdaf68909 100644 --- a/packages/page-sworkerVersion/src/md/basic.md +++ b/packages/page-sworkerVersion/src/md/basic.md @@ -22,7 +22,7 @@ Q: What versions are currently available? - V1.1.1 : Protect Diskdrop (0xa61ea2065a26a3f9f1e45ad02d8b2965c377b85ba409f6de7185c485d36dc503) - V1.1.2 : Fix Bugs (0x72041ba321cb982168beab2b3994f8b0b83a54e6dafaa95b444a3c273b490fb1) - V2.0.0 : Support ECDSA DCAP Attestation (0x69f72f97fc90b6686e53b64cd0b5325c8c8c8d7eed4ecdaa3827b4ff791694c0) - +- V2.0.1 : Fix IAS URL (0x6346d79537bbac9919cfa962c53c618000e876abd62402fce027ea8151472645) # **Nodes** @@ -30,13 +30,14 @@ Q: What versions are currently available? # **Recommended version** -V1.1.2 : Fix Bugs (0x72041ba321cb982168beab2b3994f8b0b83a54e6dafaa95b444a3c273b490fb1) +V2.0.1 : Fix IAS URL (0x6346d79537bbac9919cfa962c53c618000e876abd62402fce027ea8151472645) # **Upgrade Guides** - [V1.0.0->V1.1.1](#v100tov111) - [V1.1.0->V1.1.1](#v110tov111) - [V1.1.0/V1.1.1->V1.1.2](#v111tov112) - [V1.x.x->V2.0.0](#v1xxtov200) +- [V2.0.0->V2.0.1](#v200tov201) # **2 Upgrade guide V1.0.0 -> V1.1.1** ## **2.1 Time** @@ -214,4 +215,49 @@ The upgrade process is a background process, which takes time ranging from 1000s
-![sworker_version](../assets/version_v2.0.0_en.png) \ No newline at end of file +![sworker_version](../assets/version_v2.0.0_en.png) + +# **6 Upgrade guide V2.0.0 -> V2.0.1** + +## **6.1 Steps** + +## Note: + +sworker v2.0.x supports ECDSA-based DCAP attestation, but also compatible with EPID IAS attestation, so you can upgrade from old v1.x to v2.0.x directly with the following instructions which won't trigger re-entrynetwork. + +But if you want to use the ECDSA-based DCAP attestation for your new servers or re-entrynetwork for current servers, please refer to [Crust Wiki: EPID & ECDSA](https://wiki.crust.network/docs/en/Q&AForEPID-ECDSA) for more information. + +### **6.1.1 Check sworker sending work report successfully** +Make sure that the sworker sent the work report successfully in the past hours. If not, please fix the error first before doing the upgrade steps. + +Use the following command to check whether the workload is reported successfully + +
sudo crust logs --tail 10 sworker +
+
+ +![workreport_status](../assets/workreport_status.png) + +### **6.1.2 sWorker Upgrade** +The upgrade process is a background process, which takes time ranging from 1000s to 10000s. **It is strongly recommended to execute the upgrade command manually** to avoid unnecessary errors. If the upgrade is abnormal, **do not restart the sworker service, which will cause data loss**. + +**CAUTION:** +
+**DO NOT run 'crust reload sworker' command during upgrade, which may cause data loss and then require to re-srd the whole disk.** + +
+
nohup sudo crust tools sworker-ab-upgrade 6346d79537bbac9919cfa962c53c618000e876abd62402fce027ea8151472645 > upgrade.log 2>&1 &
+
+ +## **6.2 Upgrade status detection** +
+
tail 100 upgrade.log -f
+
+ +![sworker_version](../assets/upgrade_status.png) + +
sudo crust version +
+
+ +![sworker_version](../assets/version_v2.0.1_en.png) \ No newline at end of file diff --git a/packages/page-sworkerVersion/src/md/basic_zh.md b/packages/page-sworkerVersion/src/md/basic_zh.md index 4489d947c..f2062e59b 100644 --- a/packages/page-sworkerVersion/src/md/basic_zh.md +++ b/packages/page-sworkerVersion/src/md/basic_zh.md @@ -22,6 +22,7 @@ - V1.1.1 : Protect Diskdrop (0xa61ea2065a26a3f9f1e45ad02d8b2965c377b85ba409f6de7185c485d36dc503) - V1.1.2 : Fix Bugs (0x72041ba321cb982168beab2b3994f8b0b83a54e6dafaa95b444a3c273b490fb1) - V2.0.0 : Support ECDSA DCAP Attestation (0x69f72f97fc90b6686e53b64cd0b5325c8c8c8d7eed4ecdaa3827b4ff791694c0) +- V2.0.1 : Fix IAS URL (0x6346d79537bbac9919cfa962c53c618000e876abd62402fce027ea8151472645) # **升级对象** @@ -29,13 +30,14 @@ # **推荐版本** -V1.1.2 : Fix Bugs (0x72041ba321cb982168beab2b3994f8b0b83a54e6dafaa95b444a3c273b490fb1) +V2.0.1 : Fix IAS URL (0x6346d79537bbac9919cfa962c53c618000e876abd62402fce027ea8151472645) # **Upgrade Guides** - [V1.0.0->V1.1.1](#v100tov111) - [V1.1.0->V1.1.1](#v110tov111) - [V1.1.0/V1.1.1->V1.1.2](#v111tov112) - [V1.x.x->V2.0.0](#v1xxtov200) +- [V2.0.0->V2.0.1](#v200tov201) # **2 升级指南 V1.0.0 -> V1.1.1** @@ -220,3 +222,47 @@ sworker v2.0.0版本支持基于ECDSA的DCAP认证，同时兼容即将过期的 ![sworker_version](../assets/version_v2.0.0_zh.png) +# **6 升级指南 V2.0.0 -> V2.0.1** + +## **6.1 升级步骤** + +## 注意： + +sworker v2.0.x版本支持基于ECDSA的DCAP认证，同时兼容即将过期的EPID IAS认证，所以你可以直接从旧版本v1.x直接升级到v2.0.x，不会触发重新入网。 + +但是如果要对新服务器入网或者旧服务器重新入网时使用ECDSA-based DCAP attestation，请按照[Crust Wiki: EPID & ECDSA](https://wiki.crust.network/docs/zh-CN/Q&AForEPID-ECDSA)中的说明进行。 + +### **6.1.1 确认sworker上报工作量正常** +通过sworker日志文件来确认近期工作量处于正常上报状态。如不正常，请优先修复后再进行升级操作。 +通过命令查询工作量是否上报成功 +
+
sudo crust logs --tail 100 sworker
+
+ +![workreport_status](../assets/workreport_status_zh.png) + +### **6.1.2 sWorker升级** +
+ + 升级过程是一个后台进程，耗时在100s-10000s不等，**强烈建议手动执行升级命令**，避免出现不必要的错误，如果升级出现异常，**切记不能reload sworker服务，以防数据丢失**。 + +**注意:** +
+**升级期间不要执行'crust reload sworker'操作，这可能会引起数据丢失，从而导致需要重新SRD整个磁盘。** + +
+
nohup sudo crust tools sworker-ab-upgrade 6346d79537bbac9919cfa962c53c618000e876abd62402fce027ea8151472645 > upgrade.log 2>&1 &
+
+ +## **6.2 升级状态检测** +br> +
tail 100 upgrade.log -f
+
+ +![upgrade_status](../assets/upgrade_status_zh.png) + +
sudo crust version +
+
+ +![sworker_version](../assets/version_v2.0.1_zh.png) \ No newline at end of file diff --git a/packages/page-sworkerVersion/src/versionQuery/VersionsState.tsx b/packages/page-sworkerVersion/src/versionQuery/VersionsState.tsx index 096385c96..2f880e835 100644 --- a/packages/page-sworkerVersion/src/versionQuery/VersionsState.tsx +++ b/packages/page-sworkerVersion/src/versionQuery/VersionsState.tsx @@ -47,7 +47,8 @@ export const versionsRecord: Record = { '0xff2c145fd797e1aef56b47a91adf3d3294c433bb29b035b3020d04a76200da0a': 'V1.1.0 : Support Metaverse', '0xa61ea2065a26a3f9f1e45ad02d8b2965c377b85ba409f6de7185c485d36dc503': 'V1.1.1 : Protect Diskdrop', '0x72041ba321cb982168beab2b3994f8b0b83a54e6dafaa95b444a3c273b490fb1': 'V1.1.2 : Fix Bugs', - '0x69f72f97fc90b6686e53b64cd0b5325c8c8c8d7eed4ecdaa3827b4ff791694c0': 'V2.0.0 : Support ECDSA DCAP Attestation' + '0x69f72f97fc90b6686e53b64cd0b5325c8c8c8d7eed4ecdaa3827b4ff791694c0': 'V2.0.0 : Support ECDSA DCAP Attestation', + '0x6346d79537bbac9919cfa962c53c618000e876abd62402fce027ea8151472645': 'V2.0.1 : Fix IAS URL' }; export const versionsStartBlockRecord: Record = { @@ -55,7 +56,8 @@ export const versionsStartBlockRecord: Record = { '0xff2c145fd797e1aef56b47a91adf3d3294c433bb29b035b3020d04a76200da0a': 1382305, '0xa61ea2065a26a3f9f1e45ad02d8b2965c377b85ba409f6de7185c485d36dc503': 2143559, '0x72041ba321cb982168beab2b3994f8b0b83a54e6dafaa95b444a3c273b490fb1': 14391273, - '0x69f72f97fc90b6686e53b64cd0b5325c8c8c8d7eed4ecdaa3827b4ff791694c0': 14563310 + '0x69f72f97fc90b6686e53b64cd0b5325c8c8c8d7eed4ecdaa3827b4ff791694c0': 14563310, + '0x6346d79537bbac9919cfa962c53c618000e876abd62402fce027ea8151472645': 17136000 }; export const versionsReleaseRecord: Record = { @@ -63,7 +65,8 @@ export const versionsReleaseRecord: Record = { '0xff2c145fd797e1aef56b47a91adf3d3294c433bb29b035b3020d04a76200da0a': 'https://github.com/crustio/crust-sworker/releases/tag/v1.1.0', '0xa61ea2065a26a3f9f1e45ad02d8b2965c377b85ba409f6de7185c485d36dc503': 'https://github.com/crustio/crust-sworker/releases/tag/v1.1.1', '0x72041ba321cb982168beab2b3994f8b0b83a54e6dafaa95b444a3c273b490fb1': 'https://github.com/crustio/crust-sworker/releases/tag/v1.1.2', - '0x69f72f97fc90b6686e53b64cd0b5325c8c8c8d7eed4ecdaa3827b4ff791694c0': 'https://github.com/crustio/crust-sworker/releases/tag/v2.0.0' + '0x69f72f97fc90b6686e53b64cd0b5325c8c8c8d7eed4ecdaa3827b4ff791694c0': 'https://github.com/crustio/crust-sworker/releases/tag/v2.0.0', + '0x6346d79537bbac9919cfa962c53c618000e876abd62402fce027ea8151472645': 'https://github.com/crustio/crust-sworker/releases/tag/v2.0.1' }; function VersionState ({ address, className = '', current, isLoading: summaryLoading, pkInfos, setMessage, setStatus, setStatusOpen }: Props): React.ReactElement {