Merge pull request #851 from ipfs-force-community/cherry-pick-849-850…

…-to-release/v0.8 Cherry pick #849 #850 to release/v0.8
ipfs-force-community · Jul 31, 2023 · b2a6dd8 · b2a6dd8
2 parents 2b7f21f + d16a6e0
commit b2a6dd8
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 5 deletions.
diff --git a/CHANGELOG.zh.md b/CHANGELOG.zh.md
@@ -1,5 +1,9 @@
 # Changelog 
 
+## v0.8.0-rc2
+- damocles-manager
+  worker-prover 模块 cli 修复 MinerID 显示问题 [#850](https://github.com/ipfs-force-community/damocles/pull/850)
+
 ## v0.8.0-rc1
 - 新增 worker-prover 模块支持多机 wdpost [#483](https://github.com/ipfs-force-community/damocles/issues/483)
 - damocles-manager

diff --git a/damocles-manager/core/types_wdpost.go b/damocles-manager/core/types_wdpost.go
@@ -86,7 +86,9 @@ type WdPoStJobBrief struct {
 }
 
 func (j *WdPoStJobBrief) MarshalJSON() ([]byte, error) {
-	j.WdPoStJob.Input = WdPoStInput{}
+	j.WdPoStJob.Input = WdPoStInput{
+		MinerID: j.WdPoStJob.Input.MinerID,
+	}
 	j.WdPoStJob.Output = &stage.WindowPoStOutput{}
 	return json.Marshal(&j.WdPoStJob)
 }

diff --git a/damocles-manager/ver/ver.go b/damocles-manager/ver/ver.go
@@ -2,7 +2,7 @@ package ver
 
 import "fmt"
 
-const Version = "0.8.0-rc1"
+const Version = "0.8.0-rc2"
 
 var Commit string
 

diff --git a/damocles-worker/Cargo.lock b/damocles-worker/Cargo.lock
diff --git a/damocles-worker/Cargo.toml b/damocles-worker/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "damocles-worker"
-version = "0.8.0-rc1"
+version = "0.8.0-rc2"
 authors = ["dtynn <[email protected]>"]
 edition = "2021"
 exclude = [

diff --git a/docs/zh/09.独立运行的poster节点.md b/docs/zh/09.独立运行的poster节点.md
@@ -81,6 +81,7 @@ JobLifetime = "25h0m0s"
 ```
 
 ### damocles-worker 配置
+
 ```toml
 [[sealing_thread]]
 # 配置使用 wdpost plan
@@ -130,7 +131,7 @@ sealing.recover_interval = "15s"
 name = "miner-6666-store"
 location = "/mnt/miner-6666-store"
 ```
-
+damocles-worker 在运行 wdpost plan 时不需要使用 `damocles-worker store sealing-init -l` 命令初始化封装过程中数据的本地存储目录。
 
 ### 管理 window post 任务
 - #### 显示 window post 任务列表