Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry pick #849 #850 to release/v0.8 #851

Merged
merged 3 commits into from
Jul 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.zh.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 3 additions & 1 deletion damocles-manager/core/types_wdpost.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion damocles-manager/ver/ver.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package ver

import "fmt"

const Version = "0.8.0-rc1"
const Version = "0.8.0-rc2"

var Commit string

Expand Down
2 changes: 1 addition & 1 deletion damocles-worker/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion damocles-worker/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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 = [
Expand Down
3 changes: 2 additions & 1 deletion docs/zh/09.独立运行的poster节点.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ JobLifetime = "25h0m0s"
```

### damocles-worker 配置

```toml
[[sealing_thread]]
# 配置使用 wdpost plan
Expand Down Expand Up @@ -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 任务列表
Expand Down
Loading