diff --git a/cmd/curio/cli.go b/cmd/curio/cli.go index 58383e2a782..727de122d66 100644 --- a/cmd/curio/cli.go +++ b/cmd/curio/cli.go @@ -30,7 +30,7 @@ var cliCmd = &cli.Command{ Flags: []cli.Flag{ &cli.StringFlag{ 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 { diff --git a/cmd/curio/config.go b/cmd/curio/config.go index 66bb2e8b464..16b7d89c378 100644 --- a/cmd/curio/config.go +++ b/cmd/curio/config.go @@ -402,7 +402,7 @@ func diff(sourceConf, newConf 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 { return "", err } diff --git a/cmd/curio/config_test.go b/cmd/curio/config_test.go index 31c4b4bd089..e476f23d00b 100644 --- a/cmd/curio/config_test.go +++ b/cmd/curio/config_test.go @@ -12,7 +12,7 @@ import ( var baseText string = ` [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 # machines with WindowPoSt enabled which will provide redundancy, and in case of multiple partitions per deadline, # will allow for parallel processing of partitions. @@ -27,7 +27,7 @@ var baseText string = ` # type: int #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. # It is possible to mix machines with WindowPoSt and WinningPoSt enabled, for details see the EnableWindowPost # documentation. @@ -106,7 +106,7 @@ var baseText string = ` #FinalizeMaxTasks = 0 # 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 # # type: bool @@ -131,12 +131,12 @@ var baseText string = ` #PoRepProofMaxTasks = 0 # EnableSendCommitMsg enables the sending of commit messages to the chain - # from this lotus-provider instance. + # from this curio instance. # # type: bool #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. # # 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 #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. # # type: bool diff --git a/cmd/curio/storage.go b/cmd/curio/storage.go index c5fe77e1877..9a073e037b9 100644 --- a/cmd/curio/storage.go +++ b/cmd/curio/storage.go @@ -54,7 +54,7 @@ var storageAttachCmd = &cli.Command{ Usage: "attach local storage path", ArgsUsage: "[path]", 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 storage system. diff --git a/cmd/lotus-shed/deal.go b/cmd/lotus-shed/deal.go index 029e2966643..3a350976e9b 100644 --- a/cmd/lotus-shed/deal.go +++ b/cmd/lotus-shed/deal.go @@ -31,8 +31,8 @@ import ( ) var lpUtilCmd = &cli.Command{ - Name: "provider-util", - Usage: "lotus provider utility commands", + Name: "curio-util", + Usage: "curio utility commands", Subcommands: []*cli.Command{ lpUtilStartDealCmd, }, @@ -40,11 +40,11 @@ var lpUtilCmd = &cli.Command{ var lpUtilStartDealCmd = &cli.Command{ 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]", Flags: []cli.Flag{ &cli.StringFlag{ - Name: "provider-rpc", + Name: "curio-rpc", Value: "http://127.0.0.1:12300", }, }, @@ -73,7 +73,7 @@ var lpUtilStartDealCmd = &cli.Command{ // open rpc 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 { return xerrors.Errorf("open rpc: %w", err) } @@ -84,7 +84,7 @@ var lpUtilStartDealCmd = &cli.Command{ 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 data, err := homedir.Expand(cctx.Args().Get(0)) diff --git a/curiosrc/ffi/sdr_funcs.go b/curiosrc/ffi/sdr_funcs.go index 325d30ef252..74a498219e5 100644 --- a/curiosrc/ffi/sdr_funcs.go +++ b/curiosrc/ffi/sdr_funcs.go @@ -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 { alloc := storiface.FTNone 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 } diff --git a/curiosrc/market/fakelm/iface.go b/curiosrc/market/fakelm/iface.go index 4e49e09c460..1bc91b35e75 100644 --- a/curiosrc/market/fakelm/iface.go +++ b/curiosrc/market/fakelm/iface.go @@ -12,7 +12,7 @@ import ( "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 type MinimalLMApi interface { ActorAddress(context.Context) (address.Address, error) diff --git a/curiosrc/seal/README.md b/curiosrc/seal/README.md index 2f9055f865f..b148e4204d1 100644 --- a/curiosrc/seal/README.md +++ b/curiosrc/seal/README.md @@ -1,8 +1,8 @@ -# Lotus-Provider Sealer +# Curio Sealer ## 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. ## Pipeline Tasks diff --git a/documentation/en/cli-curio.md b/documentation/en/cli-curio.md index 88e8c1cce91..16b37468728 100644 --- a/documentation/en/cli-curio.md +++ b/documentation/en/cli-curio.md @@ -52,7 +52,7 @@ COMMANDS: help, h Shows a list of commands or help for one command OPTIONS: - --machine value machine host:port (lotus-provider run --listen address) + --machine value machine host:port (curio run --listen address) --help, -h show help ``` diff --git a/documentation/en/default-curio-config.toml b/documentation/en/default-curio-config.toml index f4e4c19b853..3ecadeb5280 100644 --- a/documentation/en/default-curio-config.toml +++ b/documentation/en/default-curio-config.toml @@ -1,5 +1,5 @@ [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 # machines with WindowPoSt enabled which will provide redundancy, and in case of multiple partitions per deadline, # will allow for parallel processing of partitions. @@ -14,7 +14,7 @@ # type: int #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. # It is possible to mix machines with WindowPoSt and WinningPoSt enabled, for details see the EnableWindowPost # documentation. @@ -93,7 +93,7 @@ #FinalizeMaxTasks = 0 # 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 # # type: bool @@ -118,12 +118,12 @@ #PoRepProofMaxTasks = 0 # EnableSendCommitMsg enables the sending of commit messages to the chain - # from this lotus-provider instance. + # from this curio instance. # # type: bool #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. # # 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 #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. # # type: bool diff --git a/node/config/doc_gen.go b/node/config/doc_gen.go index 3b4124f8a5a..9a4b91c4a90 100644 --- a/node/config/doc_gen.go +++ b/node/config/doc_gen.go @@ -403,7 +403,7 @@ to prove each deadline, resulting in more total gas use (but each message will h Name: "EnableWindowPost", 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 machines with WindowPoSt enabled which will provide redundancy, and in case of multiple partitions per deadline, will allow for parallel processing of partitions. @@ -422,7 +422,7 @@ partitionsPerDeadline+1 machines.`, Name: "EnableWinningPost", 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. It is possible to mix machines with WindowPoSt and WinningPoSt enabled, for details see the EnableWindowPost documentation.`, @@ -514,7 +514,7 @@ Finalize will run in parallel with the SubmitCommitMsg task.`, Type: "bool", 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`, }, { @@ -542,13 +542,13 @@ also be bounded by resources available on the machine.`, Type: "bool", Comment: `EnableSendCommitMsg enables the sending of commit messages to the chain -from this lotus-provider instance.`, +from this curio instance.`, }, { Name: "EnableMoveStorage", 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. 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", 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.`, }, { diff --git a/node/config/types.go b/node/config/types.go index 82d9f4a99cf..6d782fba454 100644 --- a/node/config/types.go +++ b/node/config/types.go @@ -94,7 +94,7 @@ type JournalConfig 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 // machines with WindowPoSt enabled which will provide redundancy, and in case of multiple partitions per deadline, // will allow for parallel processing of partitions. @@ -105,7 +105,7 @@ type CurioSubsystemsConfig struct { EnableWindowPost bool 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. // It is possible to mix machines with WindowPoSt and WinningPoSt enabled, for details see the EnableWindowPost // documentation. @@ -166,7 +166,7 @@ type CurioSubsystemsConfig struct { FinalizeMaxTasks int // 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 EnableSendPrecommitMsg bool @@ -185,10 +185,10 @@ type CurioSubsystemsConfig struct { PoRepProofMaxTasks int // EnableSendCommitMsg enables the sending of commit messages to the chain - // from this lotus-provider instance. + // from this curio instance. 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. // // 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. 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. EnableWebGui bool