cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

v1.27.0-a #10

Closed
jonathanface wants to merge 473 commits from v1.27.0-a into master
pull from: v1.27.0-a
merge into: cerc-io:master
Conversation 0 Commits 473 Files Changed 452 +38 -38
12 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 800ae977d3 - Show all commits

2
cmd/curio/cli.go
View File

@ -30,7 +30,7 @@ var cliCmd = &cli.Command{
Flags: []cli.Flag{ Flags: []cli.Flag{
&cli.StringFlag{ &cli.StringFlag{
Name: "machine", Name: "machine",
Usage: "machine host:port (lotus-provider run --listen address)", Usage: "machine host:port (curio run --listen address)",
}, },
}, },
Before: func(cctx *cli.Context) error { Before: func(cctx *cli.Context) error {

2
cmd/curio/config.go
View File

@ -402,7 +402,7 @@ func diff(sourceConf, newConf string) (string, error) {
} }
func edit(editor, cfg string) (string, error) { func edit(editor, cfg string) (string, error) {
file, err := os.CreateTemp("", "lotus-provider-config-*.toml") file, err := os.CreateTemp("", "curio-config-*.toml")
if err != nil { if err != nil {
return "", err return "", err
} }

12
cmd/curio/config_test.go
View File

@ -12,7 +12,7 @@ import (
var baseText string = ` var baseText string = `
[Subsystems] [Subsystems]
# EnableWindowPost enables window post to be executed on this lotus-provider instance. Each machine in the cluster # EnableWindowPost enables window post to be executed on this curio instance. Each machine in the cluster
# with WindowPoSt enabled will also participate in the window post scheduler. It is possible to have multiple # with WindowPoSt enabled will also participate in the window post scheduler. It is possible to have multiple
# machines with WindowPoSt enabled which will provide redundancy, and in case of multiple partitions per deadline, # machines with WindowPoSt enabled which will provide redundancy, and in case of multiple partitions per deadline,
# will allow for parallel processing of partitions. # will allow for parallel processing of partitions.
@ -27,7 +27,7 @@ var baseText string = `
# type: int # type: int
#WindowPostMaxTasks = 0 #WindowPostMaxTasks = 0
# EnableWinningPost enables winning post to be executed on this lotus-provider instance. # EnableWinningPost enables winning post to be executed on this curio instance.
# Each machine in the cluster with WinningPoSt enabled will also participate in the winning post scheduler. # Each machine in the cluster with WinningPoSt enabled will also participate in the winning post scheduler.
# It is possible to mix machines with WindowPoSt and WinningPoSt enabled, for details see the EnableWindowPost # It is possible to mix machines with WindowPoSt and WinningPoSt enabled, for details see the EnableWindowPost
# documentation. # documentation.
@ -106,7 +106,7 @@ var baseText string = `
#FinalizeMaxTasks = 0 #FinalizeMaxTasks = 0
# EnableSendPrecommitMsg enables the sending of precommit messages to the chain # EnableSendPrecommitMsg enables the sending of precommit messages to the chain
# from this lotus-provider instance. # from this curio instance.
# This runs after SDRTrees and uses the output CommD / CommR (roots of TreeD / TreeR) for the message # This runs after SDRTrees and uses the output CommD / CommR (roots of TreeD / TreeR) for the message
# #
# type: bool # type: bool
@ -131,12 +131,12 @@ var baseText string = `
#PoRepProofMaxTasks = 0 #PoRepProofMaxTasks = 0
# EnableSendCommitMsg enables the sending of commit messages to the chain # EnableSendCommitMsg enables the sending of commit messages to the chain
# from this lotus-provider instance. # from this curio instance.
# #
# type: bool # type: bool
#EnableSendCommitMsg = false #EnableSendCommitMsg = false
# EnableMoveStorage enables the move-into-long-term-storage task to run on this lotus-provider instance. # EnableMoveStorage enables the move-into-long-term-storage task to run on this curio instance.
# This tasks should only be enabled on nodes with long-term storage. # This tasks should only be enabled on nodes with long-term storage.
# #
# The MoveStorage task is the last task in the sealing pipeline. It moves the sealed sector data from the # The MoveStorage task is the last task in the sealing pipeline. It moves the sealed sector data from the
@ -152,7 +152,7 @@ var baseText string = `
# type: int # type: int
#MoveStorageMaxTasks = 0 #MoveStorageMaxTasks = 0
# EnableWebGui enables the web GUI on this lotus-provider instance. The UI has minimal local overhead, but it should # EnableWebGui enables the web GUI on this curio instance. The UI has minimal local overhead, but it should
# only need to be run on a single machine in the cluster. # only need to be run on a single machine in the cluster.
# #
# type: bool # type: bool

2
cmd/curio/storage.go
View File

@ -54,7 +54,7 @@ var storageAttachCmd = &cli.Command{
Usage: "attach local storage path", Usage: "attach local storage path",
ArgsUsage: "[path]", ArgsUsage: "[path]",
Description: `Storage can be attached to the miner using this command. The storage volume Description: `Storage can be attached to the miner using this command. The storage volume
list is stored local to the miner in storage.json set in lotus-provider run. We do not list is stored local to the miner in storage.json set in curio run. We do not
recommend manually modifying this value without further understanding of the recommend manually modifying this value without further understanding of the
storage system. storage system.

12
cmd/lotus-shed/deal.go
View File

@ -31,8 +31,8 @@ import (
) )
var lpUtilCmd = &cli.Command{ var lpUtilCmd = &cli.Command{
Name: "provider-util", Name: "curio-util",
Usage: "lotus provider utility commands", Usage: "curio utility commands",
Subcommands: []*cli.Command{ Subcommands: []*cli.Command{
lpUtilStartDealCmd, lpUtilStartDealCmd,
}, },
@ -40,11 +40,11 @@ var lpUtilCmd = &cli.Command{
var lpUtilStartDealCmd = &cli.Command{ var lpUtilStartDealCmd = &cli.Command{
Name: "start-deal", Name: "start-deal",
Usage: "start a deal with a specific lotus-provider instance", Usage: "start a deal with a specific curio instance",
ArgsUsage: "[dataFile] [miner]", ArgsUsage: "[dataFile] [miner]",
Flags: []cli.Flag{ Flags: []cli.Flag{
&cli.StringFlag{ &cli.StringFlag{
Name: "provider-rpc", Name: "curio-rpc",
Value: "http://127.0.0.1:12300", Value: "http://127.0.0.1:12300",
}, },
}, },
@ -73,7 +73,7 @@ var lpUtilStartDealCmd = &cli.Command{
// open rpc // open rpc
var rpc api.CurioStruct var rpc api.CurioStruct
closer2, err := jsonrpc.NewMergeClient(ctx, cctx.String("provider-rpc"), "Filecoin", []interface{}{&rpc.Internal}, nil) closer2, err := jsonrpc.NewMergeClient(ctx, cctx.String("curio-rpc"), "Filecoin", []interface{}{&rpc.Internal}, nil)
if err != nil { if err != nil {
return xerrors.Errorf("open rpc: %w", err) return xerrors.Errorf("open rpc: %w", err)
} }
@ -84,7 +84,7 @@ var lpUtilStartDealCmd = &cli.Command{
return xerrors.Errorf("rpc version: %w", err) return xerrors.Errorf("rpc version: %w", err)
} }
fmt.Printf("* provider version: %s\n", v.String()) fmt.Printf("* curio version: %s\n", v.String())
// open data file // open data file
data, err := homedir.Expand(cctx.Args().Get(0)) data, err := homedir.Expand(cctx.Args().Get(0))

2
curiosrc/ffi/sdr_funcs.go
View File

@ -393,7 +393,7 @@ func (sb *SealCalls) LocalStorage(ctx context.Context) ([]storiface.StoragePath,
func (sb *SealCalls) FinalizeSector(ctx context.Context, sector storiface.SectorRef, keepUnsealed bool) error { func (sb *SealCalls) FinalizeSector(ctx context.Context, sector storiface.SectorRef, keepUnsealed bool) error {
alloc := storiface.FTNone alloc := storiface.FTNone
if keepUnsealed { if keepUnsealed {
// note: In lotus-provider we don't write the unsealed file in any of the previous stages, it's only written here from tree-d // note: In Curio we don't write the unsealed file in any of the previous stages, it's only written here from tree-d
alloc = storiface.FTUnsealed alloc = storiface.FTUnsealed
} }

2
curiosrc/market/fakelm/iface.go
View File

@ -12,7 +12,7 @@ import (
"github.com/filecoin-project/lotus/storage/sealer/storiface" "github.com/filecoin-project/lotus/storage/sealer/storiface"
) )
// MinimalLMApi is a subset of the LotusMiner API that is exposed by lotus-provider // MinimalLMApi is a subset of the LotusMiner API that is exposed by Curio
// for consumption by boost // for consumption by boost
type MinimalLMApi interface { type MinimalLMApi interface {
ActorAddress(context.Context) (address.Address, error) ActorAddress(context.Context) (address.Address, error)

4
curiosrc/seal/README.md
View File

@ -1,8 +1,8 @@
# Lotus-Provider Sealer # Curio Sealer
## Overview ## Overview
The lotus-provider sealer is a collection of harmony tasks and a common poller The Curio sealer is a collection of harmony tasks and a common poller
which implement the sealing functionality of the Filecoin protocol. which implement the sealing functionality of the Filecoin protocol.
## Pipeline Tasks ## Pipeline Tasks

2
documentation/en/cli-curio.md
View File

@ -52,7 +52,7 @@ COMMANDS:
help, h Shows a list of commands or help for one command help, h Shows a list of commands or help for one command
OPTIONS: OPTIONS:
--machine value machine host:port (lotus-provider run --listen address) --machine value machine host:port (curio run --listen address)
--help, -h show help --help, -h show help
``` ```

12
documentation/en/default-curio-config.toml
View File

@ -1,5 +1,5 @@
[Subsystems] [Subsystems]
# EnableWindowPost enables window post to be executed on this lotus-provider instance. Each machine in the cluster # EnableWindowPost enables window post to be executed on this curio instance. Each machine in the cluster
# with WindowPoSt enabled will also participate in the window post scheduler. It is possible to have multiple # with WindowPoSt enabled will also participate in the window post scheduler. It is possible to have multiple
# machines with WindowPoSt enabled which will provide redundancy, and in case of multiple partitions per deadline, # machines with WindowPoSt enabled which will provide redundancy, and in case of multiple partitions per deadline,
# will allow for parallel processing of partitions. # will allow for parallel processing of partitions.
@ -14,7 +14,7 @@
# type: int # type: int
#WindowPostMaxTasks = 0 #WindowPostMaxTasks = 0
# EnableWinningPost enables winning post to be executed on this lotus-provider instance. # EnableWinningPost enables winning post to be executed on this curio instance.
# Each machine in the cluster with WinningPoSt enabled will also participate in the winning post scheduler. # Each machine in the cluster with WinningPoSt enabled will also participate in the winning post scheduler.
# It is possible to mix machines with WindowPoSt and WinningPoSt enabled, for details see the EnableWindowPost # It is possible to mix machines with WindowPoSt and WinningPoSt enabled, for details see the EnableWindowPost
# documentation. # documentation.
@ -93,7 +93,7 @@
#FinalizeMaxTasks = 0 #FinalizeMaxTasks = 0
# EnableSendPrecommitMsg enables the sending of precommit messages to the chain # EnableSendPrecommitMsg enables the sending of precommit messages to the chain
# from this lotus-provider instance. # from this curio instance.
# This runs after SDRTrees and uses the output CommD / CommR (roots of TreeD / TreeR) for the message # This runs after SDRTrees and uses the output CommD / CommR (roots of TreeD / TreeR) for the message
# #
# type: bool # type: bool
@ -118,12 +118,12 @@
#PoRepProofMaxTasks = 0 #PoRepProofMaxTasks = 0
# EnableSendCommitMsg enables the sending of commit messages to the chain # EnableSendCommitMsg enables the sending of commit messages to the chain
# from this lotus-provider instance. # from this curio instance.
# #
# type: bool # type: bool
#EnableSendCommitMsg = false #EnableSendCommitMsg = false
# EnableMoveStorage enables the move-into-long-term-storage task to run on this lotus-provider instance. # EnableMoveStorage enables the move-into-long-term-storage task to run on this curio instance.
# This tasks should only be enabled on nodes with long-term storage. # This tasks should only be enabled on nodes with long-term storage.
# #
# The MoveStorage task is the last task in the sealing pipeline. It moves the sealed sector data from the # The MoveStorage task is the last task in the sealing pipeline. It moves the sealed sector data from the
@ -160,7 +160,7 @@
# type: []string # type: []string
#BoostAdapters = [] #BoostAdapters = []
# EnableWebGui enables the web GUI on this lotus-provider instance. The UI has minimal local overhead, but it should # EnableWebGui enables the web GUI on this curio instance. The UI has minimal local overhead, but it should
# only need to be run on a single machine in the cluster. # only need to be run on a single machine in the cluster.
# #
# type: bool # type: bool

12
node/config/doc_gen.go
View File

@ -403,7 +403,7 @@ to prove each deadline, resulting in more total gas use (but each message will h
Name: "EnableWindowPost", Name: "EnableWindowPost",
Type: "bool", Type: "bool",
Comment: `EnableWindowPost enables window post to be executed on this lotus-provider instance. Each machine in the cluster Comment: `EnableWindowPost enables window post to be executed on this curio instance. Each machine in the cluster
with WindowPoSt enabled will also participate in the window post scheduler. It is possible to have multiple with WindowPoSt enabled will also participate in the window post scheduler. It is possible to have multiple
machines with WindowPoSt enabled which will provide redundancy, and in case of multiple partitions per deadline, machines with WindowPoSt enabled which will provide redundancy, and in case of multiple partitions per deadline,
will allow for parallel processing of partitions. will allow for parallel processing of partitions.
@ -422,7 +422,7 @@ partitionsPerDeadline+1 machines.`,
Name: "EnableWinningPost", Name: "EnableWinningPost",
Type: "bool", Type: "bool",
Comment: `EnableWinningPost enables winning post to be executed on this lotus-provider instance. Comment: `EnableWinningPost enables winning post to be executed on this curio instance.
Each machine in the cluster with WinningPoSt enabled will also participate in the winning post scheduler. Each machine in the cluster with WinningPoSt enabled will also participate in the winning post scheduler.
It is possible to mix machines with WindowPoSt and WinningPoSt enabled, for details see the EnableWindowPost It is possible to mix machines with WindowPoSt and WinningPoSt enabled, for details see the EnableWindowPost
documentation.`, documentation.`,
@ -514,7 +514,7 @@ Finalize will run in parallel with the SubmitCommitMsg task.`,
Type: "bool", Type: "bool",
Comment: `EnableSendPrecommitMsg enables the sending of precommit messages to the chain Comment: `EnableSendPrecommitMsg enables the sending of precommit messages to the chain
from this lotus-provider instance. from this curio instance.
This runs after SDRTrees and uses the output CommD / CommR (roots of TreeD / TreeR) for the message`, This runs after SDRTrees and uses the output CommD / CommR (roots of TreeD / TreeR) for the message`,
}, },
{ {
@ -542,13 +542,13 @@ also be bounded by resources available on the machine.`,
Type: "bool", Type: "bool",
Comment: `EnableSendCommitMsg enables the sending of commit messages to the chain Comment: `EnableSendCommitMsg enables the sending of commit messages to the chain
from this lotus-provider instance.`, from this curio instance.`,
}, },
{ {
Name: "EnableMoveStorage", Name: "EnableMoveStorage",
Type: "bool", Type: "bool",
Comment: `EnableMoveStorage enables the move-into-long-term-storage task to run on this lotus-provider instance. Comment: `EnableMoveStorage enables the move-into-long-term-storage task to run on this curio instance.
This tasks should only be enabled on nodes with long-term storage. This tasks should only be enabled on nodes with long-term storage.
The MoveStorage task is the last task in the sealing pipeline. It moves the sealed sector data from the The MoveStorage task is the last task in the sealing pipeline. It moves the sealed sector data from the
@ -588,7 +588,7 @@ a machine which handles ParkPiece tasks.`,
Name: "EnableWebGui", Name: "EnableWebGui",
Type: "bool", Type: "bool",
Comment: `EnableWebGui enables the web GUI on this lotus-provider instance. The UI has minimal local overhead, but it should Comment: `EnableWebGui enables the web GUI on this curio instance. The UI has minimal local overhead, but it should
only need to be run on a single machine in the cluster.`, only need to be run on a single machine in the cluster.`,
}, },
{ {

12
node/config/types.go
View File

@ -94,7 +94,7 @@ type JournalConfig struct {
} }
type CurioSubsystemsConfig struct { type CurioSubsystemsConfig struct {
// EnableWindowPost enables window post to be executed on this lotus-provider instance. Each machine in the cluster // EnableWindowPost enables window post to be executed on this curio instance. Each machine in the cluster
// with WindowPoSt enabled will also participate in the window post scheduler. It is possible to have multiple // with WindowPoSt enabled will also participate in the window post scheduler. It is possible to have multiple
// machines with WindowPoSt enabled which will provide redundancy, and in case of multiple partitions per deadline, // machines with WindowPoSt enabled which will provide redundancy, and in case of multiple partitions per deadline,
// will allow for parallel processing of partitions. // will allow for parallel processing of partitions.
@ -105,7 +105,7 @@ type CurioSubsystemsConfig struct {
EnableWindowPost bool EnableWindowPost bool
WindowPostMaxTasks int WindowPostMaxTasks int
// EnableWinningPost enables winning post to be executed on this lotus-provider instance. // EnableWinningPost enables winning post to be executed on this curio instance.
// Each machine in the cluster with WinningPoSt enabled will also participate in the winning post scheduler. // Each machine in the cluster with WinningPoSt enabled will also participate in the winning post scheduler.
// It is possible to mix machines with WindowPoSt and WinningPoSt enabled, for details see the EnableWindowPost // It is possible to mix machines with WindowPoSt and WinningPoSt enabled, for details see the EnableWindowPost
// documentation. // documentation.
@ -166,7 +166,7 @@ type CurioSubsystemsConfig struct {
FinalizeMaxTasks int FinalizeMaxTasks int
// EnableSendPrecommitMsg enables the sending of precommit messages to the chain // EnableSendPrecommitMsg enables the sending of precommit messages to the chain
// from this lotus-provider instance. // from this curio instance.
// This runs after SDRTrees and uses the output CommD / CommR (roots of TreeD / TreeR) for the message // This runs after SDRTrees and uses the output CommD / CommR (roots of TreeD / TreeR) for the message
EnableSendPrecommitMsg bool EnableSendPrecommitMsg bool
@ -185,10 +185,10 @@ type CurioSubsystemsConfig struct {
PoRepProofMaxTasks int PoRepProofMaxTasks int
// EnableSendCommitMsg enables the sending of commit messages to the chain // EnableSendCommitMsg enables the sending of commit messages to the chain
// from this lotus-provider instance. // from this curio instance.
EnableSendCommitMsg bool EnableSendCommitMsg bool
// EnableMoveStorage enables the move-into-long-term-storage task to run on this lotus-provider instance. // EnableMoveStorage enables the move-into-long-term-storage task to run on this curio instance.
// This tasks should only be enabled on nodes with long-term storage. // This tasks should only be enabled on nodes with long-term storage.
// //
// The MoveStorage task is the last task in the sealing pipeline. It moves the sealed sector data from the // The MoveStorage task is the last task in the sealing pipeline. It moves the sealed sector data from the
@ -219,7 +219,7 @@ type CurioSubsystemsConfig struct {
// a machine which handles ParkPiece tasks. // a machine which handles ParkPiece tasks.
BoostAdapters []string BoostAdapters []string
// EnableWebGui enables the web GUI on this lotus-provider instance. The UI has minimal local overhead, but it should // EnableWebGui enables the web GUI on this curio instance. The UI has minimal local overhead, but it should
// only need to be run on a single machine in the cluster. // only need to be run on a single machine in the cluster.
EnableWebGui bool EnableWebGui bool