-
Lotus Provider Cluster
+ Curio Cluster
version [todo]
diff --git a/provider/lpweb/static/main.css b/curiosrc/web/static/main.css
similarity index 100%
rename from provider/lpweb/static/main.css
rename to curiosrc/web/static/main.css
diff --git a/provider/lpweb/static/pipeline_porep.html b/curiosrc/web/static/pipeline_porep.html
similarity index 100%
rename from provider/lpweb/static/pipeline_porep.html
rename to curiosrc/web/static/pipeline_porep.html
diff --git a/provider/lpwindow/compute_do.go b/curiosrc/window/compute_do.go
similarity index 99%
rename from provider/lpwindow/compute_do.go
rename to curiosrc/window/compute_do.go
index 7089ceb02..2c861ad3d 100644
--- a/provider/lpwindow/compute_do.go
+++ b/curiosrc/window/compute_do.go
@@ -1,4 +1,4 @@
-package lpwindow
+package window
import (
"bytes"
@@ -24,7 +24,7 @@ import (
"github.com/filecoin-project/lotus/build"
"github.com/filecoin-project/lotus/chain/actors/builtin/miner"
- types "github.com/filecoin-project/lotus/chain/types"
+ "github.com/filecoin-project/lotus/chain/types"
"github.com/filecoin-project/lotus/storage/sealer"
"github.com/filecoin-project/lotus/storage/sealer/storiface"
)
diff --git a/provider/lpwindow/compute_task.go b/curiosrc/window/compute_task.go
similarity index 98%
rename from provider/lpwindow/compute_task.go
rename to curiosrc/window/compute_task.go
index 65102d0f0..541a2d5e2 100644
--- a/provider/lpwindow/compute_task.go
+++ b/curiosrc/window/compute_task.go
@@ -1,4 +1,4 @@
-package lpwindow
+package window
import (
"bytes"
@@ -22,20 +22,20 @@ import (
"github.com/filecoin-project/lotus/api"
"github.com/filecoin-project/lotus/chain/actors/builtin/miner"
"github.com/filecoin-project/lotus/chain/types"
+ "github.com/filecoin-project/lotus/curiosrc/chainsched"
"github.com/filecoin-project/lotus/lib/harmony/harmonydb"
"github.com/filecoin-project/lotus/lib/harmony/harmonytask"
"github.com/filecoin-project/lotus/lib/harmony/resources"
"github.com/filecoin-project/lotus/lib/harmony/taskhelp"
"github.com/filecoin-project/lotus/lib/promise"
"github.com/filecoin-project/lotus/node/modules/dtypes"
- "github.com/filecoin-project/lotus/provider/chainsched"
"github.com/filecoin-project/lotus/storage/sealer"
"github.com/filecoin-project/lotus/storage/sealer/sealtasks"
"github.com/filecoin-project/lotus/storage/sealer/storiface"
"github.com/filecoin-project/lotus/storage/wdpost"
)
-var log = logging.Logger("lpwindow")
+var log = logging.Logger("curio/window")
var EpochsPerDeadline = miner.WPoStProvingPeriod() / abi.ChainEpoch(miner.WPoStPeriodDeadlines)
@@ -86,7 +86,7 @@ func NewWdPostTask(db *harmonydb.DB,
faultTracker sealer.FaultTracker,
prover ProverPoSt,
verifier storiface.Verifier,
- pcs *chainsched.ProviderChainSched,
+ pcs *chainsched.CurioChainSched,
actors map[dtypes.MinerAddress]bool,
max int,
) (*WdPostTask, error) {
diff --git a/provider/lpwindow/faults_simple.go b/curiosrc/window/faults_simple.go
similarity index 99%
rename from provider/lpwindow/faults_simple.go
rename to curiosrc/window/faults_simple.go
index b596fb5a7..64f5e8650 100644
--- a/provider/lpwindow/faults_simple.go
+++ b/curiosrc/window/faults_simple.go
@@ -1,4 +1,4 @@
-package lpwindow
+package window
import (
"context"
diff --git a/provider/lpwindow/recover_task.go b/curiosrc/window/recover_task.go
similarity index 96%
rename from provider/lpwindow/recover_task.go
rename to curiosrc/window/recover_task.go
index 27c501dde..1ed110978 100644
--- a/provider/lpwindow/recover_task.go
+++ b/curiosrc/window/recover_task.go
@@ -1,4 +1,4 @@
-package lpwindow
+package window
import (
"context"
@@ -15,20 +15,20 @@ import (
"github.com/filecoin-project/lotus/chain/actors"
"github.com/filecoin-project/lotus/chain/actors/builtin/miner"
"github.com/filecoin-project/lotus/chain/types"
+ "github.com/filecoin-project/lotus/curiosrc/chainsched"
+ "github.com/filecoin-project/lotus/curiosrc/message"
+ "github.com/filecoin-project/lotus/curiosrc/multictladdr"
"github.com/filecoin-project/lotus/lib/harmony/harmonydb"
"github.com/filecoin-project/lotus/lib/harmony/harmonytask"
"github.com/filecoin-project/lotus/lib/harmony/resources"
"github.com/filecoin-project/lotus/lib/promise"
"github.com/filecoin-project/lotus/node/modules/dtypes"
- "github.com/filecoin-project/lotus/provider/chainsched"
- "github.com/filecoin-project/lotus/provider/lpmessage"
- "github.com/filecoin-project/lotus/provider/multictladdr"
"github.com/filecoin-project/lotus/storage/sealer"
"github.com/filecoin-project/lotus/storage/wdpost"
)
type WdPostRecoverDeclareTask struct {
- sender *lpmessage.Sender
+ sender *message.Sender
db *harmonydb.DB
api WdPostRecoverDeclareTaskApi
faultTracker sealer.FaultTracker
@@ -57,12 +57,12 @@ type WdPostRecoverDeclareTaskApi interface {
StateLookupID(context.Context, address.Address, types.TipSetKey) (address.Address, error)
}
-func NewWdPostRecoverDeclareTask(sender *lpmessage.Sender,
+func NewWdPostRecoverDeclareTask(sender *message.Sender,
db *harmonydb.DB,
api WdPostRecoverDeclareTaskApi,
faultTracker sealer.FaultTracker,
as *multictladdr.MultiAddressSelector,
- pcs *chainsched.ProviderChainSched,
+ pcs *chainsched.CurioChainSched,
maxDeclareRecoveriesGasFee types.FIL,
actors map[dtypes.MinerAddress]bool) (*WdPostRecoverDeclareTask, error) {
diff --git a/provider/lpwindow/submit_task.go b/curiosrc/window/submit_task.go
similarity index 95%
rename from provider/lpwindow/submit_task.go
rename to curiosrc/window/submit_task.go
index 8d39c40ab..330fd0509 100644
--- a/provider/lpwindow/submit_task.go
+++ b/curiosrc/window/submit_task.go
@@ -1,4 +1,4 @@
-package lpwindow
+package window
import (
"bytes"
@@ -15,13 +15,13 @@ import (
"github.com/filecoin-project/lotus/api"
"github.com/filecoin-project/lotus/chain/types"
+ "github.com/filecoin-project/lotus/curiosrc/chainsched"
+ "github.com/filecoin-project/lotus/curiosrc/message"
+ "github.com/filecoin-project/lotus/curiosrc/multictladdr"
"github.com/filecoin-project/lotus/lib/harmony/harmonydb"
"github.com/filecoin-project/lotus/lib/harmony/harmonytask"
"github.com/filecoin-project/lotus/lib/harmony/resources"
"github.com/filecoin-project/lotus/lib/promise"
- "github.com/filecoin-project/lotus/provider/chainsched"
- "github.com/filecoin-project/lotus/provider/lpmessage"
- "github.com/filecoin-project/lotus/provider/multictladdr"
"github.com/filecoin-project/lotus/storage/wdpost"
)
@@ -42,7 +42,7 @@ type WdPoStSubmitTaskApi interface {
}
type WdPostSubmitTask struct {
- sender *lpmessage.Sender
+ sender *message.Sender
db *harmonydb.DB
api WdPoStSubmitTaskApi
@@ -52,7 +52,7 @@ type WdPostSubmitTask struct {
submitPoStTF promise.Promise[harmonytask.AddTaskFunc]
}
-func NewWdPostSubmitTask(pcs *chainsched.ProviderChainSched, send *lpmessage.Sender, db *harmonydb.DB, api WdPoStSubmitTaskApi, maxWindowPoStGasFee types.FIL, as *multictladdr.MultiAddressSelector) (*WdPostSubmitTask, error) {
+func NewWdPostSubmitTask(pcs *chainsched.CurioChainSched, send *message.Sender, db *harmonydb.DB, api WdPoStSubmitTaskApi, maxWindowPoStGasFee types.FIL, as *multictladdr.MultiAddressSelector) (*WdPostSubmitTask, error) {
res := &WdPostSubmitTask{
sender: send,
db: db,
diff --git a/provider/lpwinning/winning_task.go b/curiosrc/winning/winning_task.go
similarity index 99%
rename from provider/lpwinning/winning_task.go
rename to curiosrc/winning/winning_task.go
index 7f3c97616..064696727 100644
--- a/provider/lpwinning/winning_task.go
+++ b/curiosrc/winning/winning_task.go
@@ -1,4 +1,4 @@
-package lpwinning
+package winning
import (
"bytes"
@@ -32,7 +32,7 @@ import (
"github.com/filecoin-project/lotus/storage/sealer/storiface"
)
-var log = logging.Logger("lpwinning")
+var log = logging.Logger("curio/winning")
type WinPostTask struct {
max int
diff --git a/documentation/en/api-v0-methods-provider.md b/documentation/en/api-v0-methods-curio.md
similarity index 99%
rename from documentation/en/api-v0-methods-provider.md
rename to documentation/en/api-v0-methods-curio.md
index a1ccc17c2..84cc20595 100644
--- a/documentation/en/api-v0-methods-provider.md
+++ b/documentation/en/api-v0-methods-curio.md
@@ -16,6 +16,7 @@
### Shutdown
+Trigger shutdown
Perms: admin
diff --git a/documentation/en/cli-lotus-provider.md b/documentation/en/cli-curio.md
similarity index 55%
rename from documentation/en/cli-lotus-provider.md
rename to documentation/en/cli-curio.md
index be3b5ec6e..08ed8ab90 100644
--- a/documentation/en/cli-lotus-provider.md
+++ b/documentation/en/cli-curio.md
@@ -1,24 +1,26 @@
-# lotus-provider
+# curio
```
NAME:
- lotus-provider - Filecoin decentralized storage network provider
+ curio - Filecoin decentralized storage network provider
USAGE:
- lotus-provider [global options] command [command options] [arguments...]
+ curio [global options] command [command options] [arguments...]
VERSION:
1.27.0-dev
COMMANDS:
- cli Execute cli commands
- run Start a lotus provider process
- stop Stop a running lotus provider
- config Manage node config by layers. The layer 'base' will always be applied at Curio start-up.
- test Utility functions for testing
- web Start lotus provider web interface
- seal Manage the sealing pipeline
- version Print version
- help, h Shows a list of commands or help for one command
+ cli Execute cli commands
+ run Start a Curio process
+ stop Stop a running Curio process
+ config Manage node config by layers. The layer 'base' will always be applied at Curio start-up.
+ test Utility functions for testing
+ web Start Curio web interface
+ guided-setup Run the guided setup for migrating from lotus-miner to Curio
+ from-miner Express a database config (for curio) from an existing miner.
+ seal Manage the sealing pipeline
+ version Print version
+ help, h Shows a list of commands or help for one command
DEVELOPER:
auth Manage RPC permissions
log Manage logging
@@ -27,23 +29,23 @@ COMMANDS:
GLOBAL OPTIONS:
--color use color in display output (default: depends on output being a TTY)
- --db-host value Command separated list of hostnames for yugabyte cluster (default: "yugabyte") [$LOTUS_DB_HOST]
- --db-name value (default: "yugabyte") [$LOTUS_DB_NAME, $LOTUS_HARMONYDB_HOSTS]
- --db-user value (default: "yugabyte") [$LOTUS_DB_USER, $LOTUS_HARMONYDB_USERNAME]
- --db-password value (default: "yugabyte") [$LOTUS_DB_PASSWORD, $LOTUS_HARMONYDB_PASSWORD]
- --repo-path value (default: "~/.lotusprovider") [$LOTUS_REPO_PATH]
+ --db-host value Command separated list of hostnames for yugabyte cluster (default: "yugabyte") [$CURIO_DB_HOST, $CURIO_HARMONYDB_HOSTS]
+ --db-name value (default: "yugabyte") [$CURIO_DB_NAME, $CURIO_HARMONYDB_NAME]
+ --db-user value (default: "yugabyte") [$CURIO_DB_USER, $CURIO_HARMONYDB_USERNAME]
+ --db-password value (default: "yugabyte") [$CURIO_DB_PASSWORD, $CURIO_HARMONYDB_PASSWORD]
+ --repo-path value (default: "~/.curio") [$CURIO_REPO_PATH]
--vv enables very verbose mode, useful for debugging the CLI (default: false)
--help, -h show help
--version, -v print the version
```
-## lotus-provider cli
+## curio cli
```
NAME:
- lotus-provider cli - Execute cli commands
+ curio cli - Execute cli commands
USAGE:
- lotus-provider cli command [command options] [arguments...]
+ curio cli command [command options] [arguments...]
COMMANDS:
storage manage sector storage
@@ -54,57 +56,57 @@ OPTIONS:
--help, -h show help
```
-### lotus-provider cli storage
+### curio cli storage
```
```
-## lotus-provider run
+## curio run
```
NAME:
- lotus-provider run - Start a lotus provider process
+ curio run - Start a Curio process
USAGE:
- lotus-provider run [command options] [arguments...]
+ curio run [command options] [arguments...]
OPTIONS:
--listen value host address and port the worker api will listen on (default: "0.0.0.0:12300") [$LOTUS_WORKER_LISTEN]
--nosync don't check full-node sync status (default: false)
--manage-fdlimit manage open file limit (default: true)
- --storage-json value path to json file containing storage config (default: "~/.lotus-provider/storage.json")
- --journal value path to journal files (default: "~/.lotus-provider/")
+ --storage-json value path to json file containing storage config (default: "~/.curio/storage.json")
+ --journal value path to journal files (default: "~/.curio/")
--layers value [ --layers value ] list of layers to be interpreted (atop defaults). Default: base
--help, -h show help
```
-## lotus-provider stop
+## curio stop
```
NAME:
- lotus-provider stop - Stop a running lotus provider
+ curio stop - Stop a running Curio process
USAGE:
- lotus-provider stop [command options] [arguments...]
+ curio stop [command options] [arguments...]
OPTIONS:
--help, -h show help
```
-## lotus-provider config
+## curio config
```
NAME:
- lotus-provider config - Manage node config by layers. The layer 'base' will always be applied at Curio start-up.
+ curio config - Manage node config by layers. The layer 'base' will always be applied at Curio start-up.
USAGE:
- lotus-provider config command [command options] [arguments...]
+ curio config command [command options] [arguments...]
COMMANDS:
default, defaults Print default node config
set, add, update, create Set a config layer or the base by providing a filename or stdin.
get, cat, show Get a config layer by name. You may want to pipe the output to a file, or use 'less'
list, ls List config layers present in the DB.
- interpret, view, stacked, stack Interpret stacked config layers by this version of lotus-provider, with system-generated comments.
+ interpret, view, stacked, stack Interpret stacked config layers by this version of curio, with system-generated comments.
remove, rm, del, delete Remove a named config layer.
edit edit a config layer
- from-miner Express a database config (for lotus-provider) from an existing miner.
+ from-miner Express a database config (for curio) from an existing miner.
new-cluster Create new configuration for a new cluster
help, h Shows a list of commands or help for one command
@@ -112,88 +114,88 @@ OPTIONS:
--help, -h show help
```
-### lotus-provider config default
+### curio config default
```
NAME:
- lotus-provider config default - Print default node config
+ curio config default - Print default node config
USAGE:
- lotus-provider config default [command options] [arguments...]
+ curio config default [command options] [arguments...]
OPTIONS:
--no-comment don't comment default values (default: false)
--help, -h show help
```
-### lotus-provider config set
+### curio config set
```
NAME:
- lotus-provider config set - Set a config layer or the base by providing a filename or stdin.
+ curio config set - Set a config layer or the base by providing a filename or stdin.
USAGE:
- lotus-provider config set [command options] a layer's file name
+ curio config set [command options] a layer's file name
OPTIONS:
--title value title of the config layer (req'd for stdin)
--help, -h show help
```
-### lotus-provider config get
+### curio config get
```
NAME:
- lotus-provider config get - Get a config layer by name. You may want to pipe the output to a file, or use 'less'
+ curio config get - Get a config layer by name. You may want to pipe the output to a file, or use 'less'
USAGE:
- lotus-provider config get [command options] layer name
+ curio config get [command options] layer name
OPTIONS:
--help, -h show help
```
-### lotus-provider config list
+### curio config list
```
NAME:
- lotus-provider config list - List config layers present in the DB.
+ curio config list - List config layers present in the DB.
USAGE:
- lotus-provider config list [command options] [arguments...]
+ curio config list [command options] [arguments...]
OPTIONS:
--help, -h show help
```
-### lotus-provider config interpret
+### curio config interpret
```
NAME:
- lotus-provider config interpret - Interpret stacked config layers by this version of lotus-provider, with system-generated comments.
+ curio config interpret - Interpret stacked config layers by this version of curio, with system-generated comments.
USAGE:
- lotus-provider config interpret [command options] a list of layers to be interpreted as the final config
+ curio config interpret [command options] a list of layers to be interpreted as the final config
OPTIONS:
--layers value [ --layers value ] comma or space separated list of layers to be interpreted (base is always applied)
--help, -h show help
```
-### lotus-provider config remove
+### curio config remove
```
NAME:
- lotus-provider config remove - Remove a named config layer.
+ curio config remove - Remove a named config layer.
USAGE:
- lotus-provider config remove [command options] [arguments...]
+ curio config remove [command options] [arguments...]
OPTIONS:
--help, -h show help
```
-### lotus-provider config edit
+### curio config edit
```
NAME:
- lotus-provider config edit - edit a config layer
+ curio config edit - edit a config layer
USAGE:
- lotus-provider config edit [command options] [layer name]
+ curio config edit [command options] [layer name]
OPTIONS:
--editor value editor to use (default: "vim") [$EDITOR]
@@ -204,43 +206,43 @@ OPTIONS:
--help, -h show help
```
-### lotus-provider config from-miner
+### curio config from-miner
```
NAME:
- lotus-provider config from-miner - Express a database config (for lotus-provider) from an existing miner.
+ curio from-miner - Express a database config (for curio) from an existing miner.
USAGE:
- lotus-provider config from-miner [command options] [arguments...]
+ curio from-miner [command options] [arguments...]
DESCRIPTION:
- Express a database config (for lotus-provider) from an existing miner.
+ Express a database config (for curio) from an existing miner.
OPTIONS:
- --miner-repo value, --storagerepo value Miner repo path (default: "~/.lotusminer") [$LOTUS_MINER_PATH, $LOTUS_STORAGE_PATH]
+ --miner-repo value, --storagerepo value Specify miner repo path. flag(storagerepo) and env(LOTUS_STORAGE_PATH) are DEPRECATION, will REMOVE SOON (default: "~/.lotusminer") [$LOTUS_MINER_PATH, $LOTUS_STORAGE_PATH]
--to-layer value, -t value The layer name for this data push. 'base' is recommended for single-miner setup.
--overwrite, -o Use this with --to-layer to replace an existing layer (default: false)
--help, -h show help
```
-### lotus-provider config new-cluster
+### curio config new-cluster
```
NAME:
- lotus-provider config new-cluster - Create new configuration for a new cluster
+ curio config new-cluster - Create new configuration for a new cluster
USAGE:
- lotus-provider config new-cluster [command options] [SP actor address...]
+ curio config new-cluster [command options] [SP actor address...]
OPTIONS:
--help, -h show help
```
-## lotus-provider test
+## curio test
```
NAME:
- lotus-provider test - Utility functions for testing
+ curio test - Utility functions for testing
USAGE:
- lotus-provider test command [command options] [arguments...]
+ curio test command [command options] [arguments...]
COMMANDS:
window-post, wd, windowpost, wdpost Compute a proof-of-spacetime for a sector (requires the sector to be pre-sealed). These will not send to the chain.
@@ -250,30 +252,30 @@ OPTIONS:
--help, -h show help
```
-### lotus-provider test window-post
+### curio test window-post
```
NAME:
- lotus-provider test window-post - Compute a proof-of-spacetime for a sector (requires the sector to be pre-sealed). These will not send to the chain.
+ curio test window-post - Compute a proof-of-spacetime for a sector (requires the sector to be pre-sealed). These will not send to the chain.
USAGE:
- lotus-provider test window-post command [command options] [arguments...]
+ curio test window-post command [command options] [arguments...]
COMMANDS:
here, cli Compute WindowPoSt for performance and configuration testing.
- task, scheduled, schedule, async, asynchronous Test the windowpost scheduler by running it on the next available lotus-provider.
+ task, scheduled, schedule, async, asynchronous Test the windowpost scheduler by running it on the next available curio.
help, h Shows a list of commands or help for one command
OPTIONS:
--help, -h show help
```
-#### lotus-provider test window-post here
+#### curio test window-post here
```
NAME:
- lotus-provider test window-post here - Compute WindowPoSt for performance and configuration testing.
+ curio test window-post here - Compute WindowPoSt for performance and configuration testing.
USAGE:
- lotus-provider test window-post here [command options] [deadline index]
+ curio test window-post here [command options] [deadline index]
DESCRIPTION:
Note: This command is intended to be used to verify PoSt compute performance.
@@ -282,18 +284,18 @@ DESCRIPTION:
OPTIONS:
--deadline value deadline to compute WindowPoSt for (default: 0)
--layers value [ --layers value ] list of layers to be interpreted (atop defaults). Default: base
- --storage-json value path to json file containing storage config (default: "~/.lotus-provider/storage.json")
+ --storage-json value path to json file containing storage config (default: "~/.curio/storage.json")
--partition value partition to compute WindowPoSt for (default: 0)
--help, -h show help
```
-#### lotus-provider test window-post task
+#### curio test window-post task
```
NAME:
- lotus-provider test window-post task - Test the windowpost scheduler by running it on the next available lotus-provider.
+ curio test window-post task - Test the windowpost scheduler by running it on the next available curio.
USAGE:
- lotus-provider test window-post task [command options] [arguments...]
+ curio test window-post task [command options] [arguments...]
OPTIONS:
--deadline value deadline to compute WindowPoSt for (default: 0)
@@ -301,16 +303,16 @@ OPTIONS:
--help, -h show help
```
-## lotus-provider web
+## curio web
```
NAME:
- lotus-provider web - Start lotus provider web interface
+ curio web - Start Curio web interface
USAGE:
- lotus-provider web [command options] [arguments...]
+ curio web [command options] [arguments...]
DESCRIPTION:
- Start an instance of lotus provider web interface.
+ Start an instance of Curio web interface.
This creates the 'web' layer if it does not exist, then calls run with that layer.
OPTIONS:
@@ -320,13 +322,43 @@ OPTIONS:
--help, -h show help
```
-## lotus-provider seal
+## curio guided-setup
```
NAME:
- lotus-provider seal - Manage the sealing pipeline
+ curio guided-setup - Run the guided setup for migrating from lotus-miner to Curio
USAGE:
- lotus-provider seal command [command options] [arguments...]
+ curio guided-setup [command options] [arguments...]
+
+OPTIONS:
+ --help, -h show help
+```
+
+## curio from-miner
+```
+NAME:
+ curio from-miner - Express a database config (for curio) from an existing miner.
+
+USAGE:
+ curio from-miner [command options] [arguments...]
+
+DESCRIPTION:
+ Express a database config (for curio) from an existing miner.
+
+OPTIONS:
+ --miner-repo value, --storagerepo value Specify miner repo path. flag(storagerepo) and env(LOTUS_STORAGE_PATH) are DEPRECATION, will REMOVE SOON (default: "~/.lotusminer") [$LOTUS_MINER_PATH, $LOTUS_STORAGE_PATH]
+ --to-layer value, -t value The layer name for this data push. 'base' is recommended for single-miner setup.
+ --overwrite, -o Use this with --to-layer to replace an existing layer (default: false)
+ --help, -h show help
+```
+
+## curio seal
+```
+NAME:
+ curio seal - Manage the sealing pipeline
+
+USAGE:
+ curio seal command [command options] [arguments...]
COMMANDS:
start Start new sealing operations manually
@@ -336,13 +368,13 @@ OPTIONS:
--help, -h show help
```
-### lotus-provider seal start
+### curio seal start
```
NAME:
- lotus-provider seal start - Start new sealing operations manually
+ curio seal start - Start new sealing operations manually
USAGE:
- lotus-provider seal start [command options] [arguments...]
+ curio seal start [command options] [arguments...]
OPTIONS:
--actor value Specify actor address to start sealing sectors for
@@ -354,25 +386,25 @@ OPTIONS:
--help, -h show help
```
-## lotus-provider version
+## curio version
```
NAME:
- lotus-provider version - Print version
+ curio version - Print version
USAGE:
- lotus-provider version [command options] [arguments...]
+ curio version [command options] [arguments...]
OPTIONS:
--help, -h show help
```
-## lotus-provider auth
+## curio auth
```
NAME:
- lotus-provider auth - Manage RPC permissions
+ curio auth - Manage RPC permissions
USAGE:
- lotus-provider auth command [command options] [arguments...]
+ curio auth command [command options] [arguments...]
COMMANDS:
create-token Create token
@@ -383,39 +415,39 @@ OPTIONS:
--help, -h show help
```
-### lotus-provider auth create-token
+### curio auth create-token
```
NAME:
- lotus-provider auth create-token - Create token
+ curio auth create-token - Create token
USAGE:
- lotus-provider auth create-token [command options] [arguments...]
+ curio auth create-token [command options] [arguments...]
OPTIONS:
--perm value permission to assign to the token, one of: read, write, sign, admin
--help, -h show help
```
-### lotus-provider auth api-info
+### curio auth api-info
```
NAME:
- lotus-provider auth api-info - Get token with API info required to connect to this node
+ curio auth api-info - Get token with API info required to connect to this node
USAGE:
- lotus-provider auth api-info [command options] [arguments...]
+ curio auth api-info [command options] [arguments...]
OPTIONS:
--perm value permission to assign to the token, one of: read, write, sign, admin
--help, -h show help
```
-## lotus-provider log
+## curio log
```
NAME:
- lotus-provider log - Manage logging
+ curio log - Manage logging
USAGE:
- lotus-provider log command [command options] [arguments...]
+ curio log command [command options] [arguments...]
COMMANDS:
list List log systems
@@ -427,25 +459,25 @@ OPTIONS:
--help, -h show help
```
-### lotus-provider log list
+### curio log list
```
NAME:
- lotus-provider log list - List log systems
+ curio log list - List log systems
USAGE:
- lotus-provider log list [command options] [arguments...]
+ curio log list [command options] [arguments...]
OPTIONS:
--help, -h show help
```
-### lotus-provider log set-level
+### curio log set-level
```
NAME:
- lotus-provider log set-level - Set log level
+ curio log set-level - Set log level
USAGE:
- lotus-provider log set-level [command options] [level]
+ curio log set-level [command options] [level]
DESCRIPTION:
Set the log level for logging systems:
@@ -472,26 +504,26 @@ OPTIONS:
--help, -h show help
```
-### lotus-provider log alerts
+### curio log alerts
```
NAME:
- lotus-provider log alerts - Get alert states
+ curio log alerts - Get alert states
USAGE:
- lotus-provider log alerts [command options] [arguments...]
+ curio log alerts [command options] [arguments...]
OPTIONS:
--all get all (active and inactive) alerts (default: false)
--help, -h show help
```
-## lotus-provider wait-api
+## curio wait-api
```
NAME:
- lotus-provider wait-api - Wait for lotus api to come online
+ curio wait-api - Wait for lotus api to come online
USAGE:
- lotus-provider wait-api [command options] [arguments...]
+ curio wait-api [command options] [arguments...]
CATEGORY:
DEVELOPER
@@ -501,13 +533,13 @@ OPTIONS:
--help, -h show help
```
-## lotus-provider fetch-params
+## curio fetch-params
```
NAME:
- lotus-provider fetch-params - Fetch proving parameters
+ curio fetch-params - Fetch proving parameters
USAGE:
- lotus-provider fetch-params [command options] [sectorSize]
+ curio fetch-params [command options] [sectorSize]
CATEGORY:
DEVELOPER
diff --git a/documentation/en/default-lotus-provider-config.toml b/documentation/en/default-curio-config.toml
similarity index 100%
rename from documentation/en/default-lotus-provider-config.toml
rename to documentation/en/default-curio-config.toml
diff --git a/go.mod b/go.mod
index b8f6c38f2..19483b332 100644
--- a/go.mod
+++ b/go.mod
@@ -17,6 +17,7 @@ require (
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d
github.com/alecthomas/jsonschema v0.0.0-20200530073317-71f438968921
github.com/buger/goterm v1.0.3
+ github.com/charmbracelet/lipgloss v0.9.1
github.com/chzyer/readline v1.5.1
github.com/containerd/cgroups v1.1.0
github.com/coreos/go-systemd/v22 v22.5.0
@@ -115,6 +116,7 @@ require (
github.com/libp2p/go-libp2p-routing-helpers v0.7.0
github.com/libp2p/go-maddr-filter v0.1.0
github.com/libp2p/go-msgio v0.3.0
+ github.com/manifoldco/promptui v0.9.0
github.com/mattn/go-isatty v0.0.19
github.com/mattn/go-sqlite3 v1.14.16
github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1
@@ -160,6 +162,7 @@ require (
golang.org/x/sync v0.3.0
golang.org/x/sys v0.16.0
golang.org/x/term v0.16.0
+ golang.org/x/text v0.14.0
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9
golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2
@@ -174,6 +177,7 @@ require (
github.com/StackExchange/wmi v1.2.1 // indirect
github.com/akavel/rsrc v0.8.0 // indirect
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
+ github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
github.com/benbjohnson/clock v1.3.5 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bep/debounce v1.2.1 // indirect
@@ -265,17 +269,19 @@ require (
github.com/libp2p/go-netroute v0.2.1 // indirect
github.com/libp2p/go-reuseport v0.4.0 // indirect
github.com/libp2p/go-yamux/v4 v4.0.1 // indirect
- github.com/lucasb-eyer/go-colorful v1.0.3 // indirect
+ github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
github.com/magefile/mage v1.9.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
- github.com/mattn/go-runewidth v0.0.10 // indirect
+ github.com/mattn/go-runewidth v0.0.15 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/miekg/dns v1.1.55 // indirect
github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b // indirect
github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc // indirect
github.com/mr-tron/base58 v1.2.0 // indirect
+ github.com/muesli/reflow v0.3.0 // indirect
+ github.com/muesli/termenv v0.15.2 // indirect
github.com/multiformats/go-base36 v0.2.0 // indirect
github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
github.com/multiformats/go-multistream v0.4.1 // indirect
@@ -295,7 +301,7 @@ require (
github.com/quic-go/qtls-go1-20 v0.3.3 // indirect
github.com/quic-go/quic-go v0.38.2 // indirect
github.com/quic-go/webtransport-go v0.5.3 // indirect
- github.com/rivo/uniseg v0.1.0 // indirect
+ github.com/rivo/uniseg v0.2.0 // indirect
github.com/rs/cors v1.7.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/shirou/gopsutil v2.18.12+incompatible // indirect
@@ -320,7 +326,6 @@ require (
go4.org v0.0.0-20230225012048-214862532bf5 // indirect
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
golang.org/x/mod v0.12.0 // indirect
- golang.org/x/text v0.14.0 // indirect
gonum.org/v1/gonum v0.13.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
google.golang.org/grpc v1.55.0 // indirect
diff --git a/go.sum b/go.sum
index 3efa6b8e2..932c70fff 100644
--- a/go.sum
+++ b/go.sum
@@ -106,6 +106,8 @@ github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6l
github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU=
github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
+github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
+github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
github.com/benbjohnson/clock v1.3.5 h1:VvXlSJBzZpA/zum6Sj74hxwYI2DIxRWuNIoXAzHZz5o=
@@ -159,6 +161,8 @@ github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL
github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/charmbracelet/lipgloss v0.9.1 h1:PNyd3jvaJbg4jRHKWXnCj1akQm4rh8dbEzN1p/u1KWg=
+github.com/charmbracelet/lipgloss v0.9.1/go.mod h1:1mPmG4cxScwUQALAAnacHaigiiHB9Pmr+v1VEawJl6I=
github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ=
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
github.com/chzyer/logex v1.2.1 h1:XHDu3E6q+gdHgsdTPH6ImJMIp436vR6MPtH8gP05QzM=
@@ -1175,8 +1179,9 @@ github.com/libp2p/go-yamux/v4 v4.0.1/go.mod h1:NWjl8ZTLOGlozrXSOZ/HlfG++39iKNnM5
github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM=
github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4=
github.com/lucas-clemente/quic-go v0.19.3/go.mod h1:ADXpNbTQjq1hIzCpB+y/k5iz4n4z4IwqoLb94Kh5Hu8=
-github.com/lucasb-eyer/go-colorful v1.0.3 h1:QIbQXiugsb+q10B+MI+7DI1oQLdmnep86tWFlaaUAac=
github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
+github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
+github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI=
github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ=
github.com/magefile/mage v1.9.0 h1:t3AU2wNwehMCW97vuqQLtw6puppWXHO+O2MHo5a50XE=
@@ -1192,6 +1197,8 @@ github.com/mailru/easyjson v0.7.1/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7
github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
+github.com/manifoldco/promptui v0.9.0 h1:3V4HzJk1TtXW1MTZMP7mdlwbBpIinw3HztaIlYthEiA=
+github.com/manifoldco/promptui v0.9.0/go.mod h1:ka04sppxSGFAtxX0qhlYQjISsg9mR4GWtQEhdbn6Pgg=
github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc=
github.com/marten-seemann/qtls v0.10.0/go.mod h1:UvMd1oaYDACI99/oZUYLzMCkBXQVT0aGm99sJhbT8hs=
github.com/marten-seemann/qtls-go1-15 v0.1.1/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
@@ -1214,8 +1221,10 @@ github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APP
github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
-github.com/mattn/go-runewidth v0.0.10 h1:CoZ3S2P7pvtP45xOtBw+/mDL2z0RKI576gSkzRRpdGg=
github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
+github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
+github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
+github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y=
github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
@@ -1265,6 +1274,10 @@ github.com/mr-tron/base58 v1.1.2/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjW
github.com/mr-tron/base58 v1.1.3/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o=
github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
+github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s=
+github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8=
+github.com/muesli/termenv v0.15.2 h1:GohcuySI0QmI3wN8Ok9PtKGkgkFIk7y6Vpb5PvrY+Wo=
+github.com/muesli/termenv v0.15.2/go.mod h1:Epx+iuz8sNs7mNKhxzH4fWXGNpZwUaJKRS1noLXviQ8=
github.com/multiformats/go-base32 v0.0.3/go.mod h1:pLiuGC8y0QR3Ue4Zug5UzK9LjgbkL8NSQj0zQ5Nz/AA=
github.com/multiformats/go-base32 v0.0.4/go.mod h1:jNLFzjPZtp3aIARHbJRZIaPuspdH0J6q39uUM5pnABM=
github.com/multiformats/go-base32 v0.1.0 h1:pVx9xoSPqEIQG8o+UbAe7DNi51oej1NtK+aGkbLYxPE=
@@ -1485,8 +1498,9 @@ github.com/raulk/clock v1.1.0/go.mod h1:3MpVxdZ/ODBQDxbN+kzshf5OSZwPjtMDx6BBXBmO
github.com/raulk/go-watchdog v1.3.0 h1:oUmdlHxdkXRJlwfG0O9omj8ukerm8MEQavSiDTEtBsk=
github.com/raulk/go-watchdog v1.3.0/go.mod h1:fIvOnLbF0b0ZwkB9YU4mOW9Did//4vPZtDqv66NfsMU=
github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
-github.com/rivo/uniseg v0.1.0 h1:+2KBaVoUmb9XzDsrx/Ct0W/EYOSFf/nWTauy++DprtY=
github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
+github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
+github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
diff --git a/itests/kit/ensemble.go b/itests/kit/ensemble.go
index c315b21c9..9588d2526 100644
--- a/itests/kit/ensemble.go
+++ b/itests/kit/ensemble.go
@@ -46,9 +46,9 @@ import (
"github.com/filecoin-project/lotus/chain/stmgr"
"github.com/filecoin-project/lotus/chain/types"
"github.com/filecoin-project/lotus/chain/wallet/key"
- "github.com/filecoin-project/lotus/cmd/lotus-provider/deps"
- "github.com/filecoin-project/lotus/cmd/lotus-provider/rpc"
- "github.com/filecoin-project/lotus/cmd/lotus-provider/tasks"
+ "github.com/filecoin-project/lotus/cmd/curio/deps"
+ "github.com/filecoin-project/lotus/cmd/curio/rpc"
+ "github.com/filecoin-project/lotus/cmd/curio/tasks"
"github.com/filecoin-project/lotus/cmd/lotus-seed/seed"
"github.com/filecoin-project/lotus/cmd/lotus-worker/sealworker"
"github.com/filecoin-project/lotus/gateway"
diff --git a/itests/kit/node_full.go b/itests/kit/node_full.go
index 697c59aed..c36f05a75 100644
--- a/itests/kit/node_full.go
+++ b/itests/kit/node_full.go
@@ -22,7 +22,7 @@ import (
"github.com/filecoin-project/lotus/chain/types"
"github.com/filecoin-project/lotus/chain/wallet/key"
cliutil "github.com/filecoin-project/lotus/cli/util"
- "github.com/filecoin-project/lotus/cmd/lotus-provider/deps"
+ "github.com/filecoin-project/lotus/cmd/curio/deps"
"github.com/filecoin-project/lotus/gateway"
"github.com/filecoin-project/lotus/node"
)
@@ -57,7 +57,7 @@ type TestFullNode struct {
// TestProviderNode represents a Provider node enrolled in an Ensemble.
type TestProviderNode struct {
- v1api.LotusProviderStruct
+ v1api.CurioStruct
t *testing.T
diff --git a/lib/harmony/harmonydb/harmonydb.go b/lib/harmony/harmonydb/harmonydb.go
index a043e903f..3d05f04fb 100644
--- a/lib/harmony/harmonydb/harmonydb.go
+++ b/lib/harmony/harmonydb/harmonydb.go
@@ -84,7 +84,7 @@ func New(hosts []string, username, password, database, port string, itestID ITes
}
}
- schema := "lotus"
+ schema := "curio"
if itest != "" {
schema = "itest_" + itest
}
diff --git a/lib/harmony/harmonydb/sql/20240212-common-layers.sql b/lib/harmony/harmonydb/sql/20240212-common-layers.sql
new file mode 100644
index 000000000..cf72e1750
--- /dev/null
+++ b/lib/harmony/harmonydb/sql/20240212-common-layers.sql
@@ -0,0 +1,42 @@
+INSERT INTO harmony_config (title, config) VALUES
+ ('post', '
+ [Subsystems]
+ EnableWindowPost = true
+ EnableWinningPost = true
+ '),
+
+ ('gui', '
+ [Subsystems]
+ EnableWebGui = true
+ '),
+
+ ('seal', '
+ [Subsystems]
+ EnableSealSDR = true
+ EnableSealSDRTrees = true
+ EnableSendPrecommitMsg = true
+ EnablePoRepProof = true
+ EnableSendCommitMsg = true
+ EnableMoveStorage = true
+ '),
+
+ ('seal-gpu', '
+ [Subsystems]
+ EnableSealSDRTrees = true
+ EnableSendPrecommitMsg = true
+ '),
+ ('seal-snark', '
+ [Subsystems]
+ EnablePoRepProof = true
+ EnableSendCommitMsg = true
+ '),
+ ('sdr', '
+ [Subsystems]
+ EnableSealSDR = true
+ '),
+
+ ('storage', '
+ [Subsystems]
+ EnableMoveStorage = true
+ ')
+ ON CONFLICT (title) DO NOTHING; -- SPs may have these names defined already.
\ No newline at end of file
diff --git a/lib/harmony/resources/resources.go b/lib/harmony/resources/resources.go
index 4f67a26af..33bc80d6f 100644
--- a/lib/harmony/resources/resources.go
+++ b/lib/harmony/resources/resources.go
@@ -131,7 +131,7 @@ func getResources() (res Resources, err error) {
}
}
if found > 1 {
- logger.Warn("lotus-provider's defaults are for running alone. Use task maximums or CGroups.")
+ logger.Warn("curio's defaults are for running alone. Use task maximums or CGroups.")
}
}
diff --git a/node/config/def.go b/node/config/def.go
index 475f37517..2e5fb8032 100644
--- a/node/config/def.go
+++ b/node/config/def.go
@@ -329,12 +329,12 @@ const (
ResourceFilteringDisabled = ResourceFilteringStrategy("disabled")
)
-func DefaultLotusProvider() *LotusProviderConfig {
- return &LotusProviderConfig{
- Subsystems: ProviderSubsystemsConfig{
+func DefaultCurioConfig() *CurioConfig {
+ return &CurioConfig{
+ Subsystems: CurioSubsystemsConfig{
GuiAddress: ":4701",
},
- Fees: LotusProviderFees{
+ Fees: CurioFees{
DefaultMaxFee: DefaultDefaultMaxFee,
MaxPreCommitGasFee: types.MustParseFIL("0.025"),
MaxCommitGasFee: types.MustParseFIL("0.05"),
@@ -352,7 +352,7 @@ func DefaultLotusProvider() *LotusProviderConfig {
MaxWindowPoStGasFee: types.MustParseFIL("5"),
MaxPublishDealsFee: types.MustParseFIL("0.05"),
},
- Addresses: []LotusProviderAddresses{{
+ Addresses: []CurioAddresses{{
PreCommitControl: []string{},
CommitControl: []string{},
TerminateControl: []string{},
diff --git a/node/config/doc_gen.go b/node/config/doc_gen.go
index f28c5abd8..092af75c7 100644
--- a/node/config/doc_gen.go
+++ b/node/config/doc_gen.go
@@ -165,6 +165,298 @@ of automatically performing on-chain operations.`,
Comment: ``,
},
},
+ "CurioAddresses": {
+ {
+ Name: "PreCommitControl",
+ Type: "[]string",
+
+ Comment: `Addresses to send PreCommit messages from`,
+ },
+ {
+ Name: "CommitControl",
+ Type: "[]string",
+
+ Comment: `Addresses to send Commit messages from`,
+ },
+ {
+ Name: "TerminateControl",
+ Type: "[]string",
+
+ Comment: ``,
+ },
+ {
+ Name: "DisableOwnerFallback",
+ Type: "bool",
+
+ Comment: `DisableOwnerFallback disables usage of the owner address for messages
+sent automatically`,
+ },
+ {
+ Name: "DisableWorkerFallback",
+ Type: "bool",
+
+ Comment: `DisableWorkerFallback disables usage of the worker address for messages
+sent automatically, if control addresses are configured.
+A control address that doesn't have enough funds will still be chosen
+over the worker address if this flag is set.`,
+ },
+ {
+ Name: "MinerAddresses",
+ Type: "[]string",
+
+ Comment: `MinerAddresses are the addresses of the miner actors to use for sending messages`,
+ },
+ },
+ "CurioConfig": {
+ {
+ Name: "Subsystems",
+ Type: "CurioSubsystemsConfig",
+
+ Comment: ``,
+ },
+ {
+ Name: "Fees",
+ Type: "CurioFees",
+
+ Comment: ``,
+ },
+ {
+ Name: "Addresses",
+ Type: "[]CurioAddresses",
+
+ Comment: `Addresses of wallets per MinerAddress (one of the fields).`,
+ },
+ {
+ Name: "Proving",
+ Type: "ProvingConfig",
+
+ Comment: ``,
+ },
+ {
+ Name: "Journal",
+ Type: "JournalConfig",
+
+ Comment: ``,
+ },
+ {
+ Name: "Apis",
+ Type: "ApisConfig",
+
+ Comment: ``,
+ },
+ },
+ "CurioFees": {
+ {
+ Name: "DefaultMaxFee",
+ Type: "types.FIL",
+
+ Comment: ``,
+ },
+ {
+ Name: "MaxPreCommitGasFee",
+ Type: "types.FIL",
+
+ Comment: ``,
+ },
+ {
+ Name: "MaxCommitGasFee",
+ Type: "types.FIL",
+
+ Comment: ``,
+ },
+ {
+ Name: "MaxPreCommitBatchGasFee",
+ Type: "BatchFeeConfig",
+
+ Comment: `maxBatchFee = maxBase + maxPerSector * nSectors`,
+ },
+ {
+ Name: "MaxCommitBatchGasFee",
+ Type: "BatchFeeConfig",
+
+ Comment: ``,
+ },
+ {
+ Name: "MaxTerminateGasFee",
+ Type: "types.FIL",
+
+ Comment: ``,
+ },
+ {
+ Name: "MaxWindowPoStGasFee",
+ Type: "types.FIL",
+
+ Comment: `WindowPoSt is a high-value operation, so the default fee should be high.`,
+ },
+ {
+ Name: "MaxPublishDealsFee",
+ Type: "types.FIL",
+
+ Comment: ``,
+ },
+ },
+ "CurioSubsystemsConfig": {
+ {
+ Name: "EnableWindowPost",
+ Type: "bool",
+
+ Comment: `EnableWindowPost enables window post to be executed on this lotus-provider 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.
+
+It is possible to have instances handling both WindowPoSt and WinningPoSt, which can provide redundancy without
+the need for additional machines. In setups like this it is generally recommended to run
+partitionsPerDeadline+1 machines.`,
+ },
+ {
+ Name: "WindowPostMaxTasks",
+ Type: "int",
+
+ Comment: ``,
+ },
+ {
+ Name: "EnableWinningPost",
+ Type: "bool",
+
+ Comment: `EnableWinningPost enables winning post to be executed on this lotus-provider 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.`,
+ },
+ {
+ Name: "WinningPostMaxTasks",
+ Type: "int",
+
+ Comment: ``,
+ },
+ {
+ Name: "EnableSealSDR",
+ Type: "bool",
+
+ Comment: `EnableSealSDR enables SDR tasks to run. SDR is the long sequential computation
+creating 11 layer files in sector cache directory.
+
+SDR is the first task in the sealing pipeline. It's inputs are just the hash of the
+unsealed data (CommD), sector number, miner id, and the seal proof type.
+It's outputs are the 11 layer files in the sector cache directory.
+
+In lotus-miner this was run as part of PreCommit1.`,
+ },
+ {
+ Name: "SealSDRMaxTasks",
+ Type: "int",
+
+ Comment: `The maximum amount of SDR tasks that can run simultaneously. Note that the maximum number of tasks will
+also be bounded by resources available on the machine.`,
+ },
+ {
+ Name: "EnableSealSDRTrees",
+ Type: "bool",
+
+ Comment: `EnableSealSDRTrees enables the SDR pipeline tree-building task to run.
+This task handles encoding of unsealed data into last sdr layer and building
+of TreeR, TreeC and TreeD.
+
+This task runs after SDR
+TreeD is first computed with optional input of unsealed data
+TreeR is computed from replica, which is first computed as field
+addition of the last SDR layer and the bottom layer of TreeD (which is the unsealed data)
+TreeC is computed from the 11 SDR layers
+The 3 trees will later be used to compute the PoRep proof.
+
+In case of SyntheticPoRep challenges for PoRep will be pre-generated at this step, and trees and layers
+will be dropped. SyntheticPoRep works by pre-generating a very large set of challenges (~30GiB on disk)
+then using a small subset of them for the actual PoRep computation. This allows for significant scratch space
+saving between PreCommit and PoRep generation at the expense of more computation (generating challenges in this step)
+
+In lotus-miner this was run as part of PreCommit2 (TreeD was run in PreCommit1).
+Note that nodes with SDRTrees enabled will also answer to Finalize tasks,
+which just remove unneeded tree data after PoRep is computed.`,
+ },
+ {
+ Name: "SealSDRTreesMaxTasks",
+ Type: "int",
+
+ Comment: `The maximum amount of SealSDRTrees tasks that can run simultaneously. Note that the maximum number of tasks will
+also be bounded by resources available on the machine.`,
+ },
+ {
+ Name: "FinalizeMaxTasks",
+ Type: "int",
+
+ Comment: `FinalizeMaxTasks is the maximum amount of finalize tasks that can run simultaneously.
+The finalize task is enabled on all machines which also handle SDRTrees tasks. Finalize ALWAYS runs on whichever
+machine holds sector cache files, as it removes unneeded tree data after PoRep is computed.
+Finalize will run in parallel with the SubmitCommitMsg task.`,
+ },
+ {
+ Name: "EnableSendPrecommitMsg",
+ Type: "bool",
+
+ Comment: `EnableSendPrecommitMsg enables the sending of precommit messages to the chain
+from this lotus-provider instance.
+This runs after SDRTrees and uses the output CommD / CommR (roots of TreeD / TreeR) for the message`,
+ },
+ {
+ Name: "EnablePoRepProof",
+ Type: "bool",
+
+ Comment: `EnablePoRepProof enables the computation of the porep proof
+
+This task runs after interactive-porep seed becomes available, which happens 150 epochs (75min) after the
+precommit message lands on chain. This task should run on a machine with a GPU. Vanilla PoRep proofs are
+requested from the machine which holds sector cache files which most likely is the machine which ran the SDRTrees
+task.
+
+In lotus-miner this was Commit1 / Commit2`,
+ },
+ {
+ Name: "PoRepProofMaxTasks",
+ Type: "int",
+
+ Comment: `The maximum amount of PoRepProof tasks that can run simultaneously. Note that the maximum number of tasks will
+also be bounded by resources available on the machine.`,
+ },
+ {
+ Name: "EnableSendCommitMsg",
+ Type: "bool",
+
+ Comment: `EnableSendCommitMsg enables the sending of commit messages to the chain
+from this lotus-provider instance.`,
+ },
+ {
+ Name: "EnableMoveStorage",
+ Type: "bool",
+
+ Comment: `EnableMoveStorage enables the move-into-long-term-storage task to run on this lotus-provider 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
+SDRTrees machine into long-term storage. This task runs after the Finalize task.`,
+ },
+ {
+ Name: "MoveStorageMaxTasks",
+ Type: "int",
+
+ Comment: `The maximum amount of MoveStorage tasks that can run simultaneously. Note that the maximum number of tasks will
+also be bounded by resources available on the machine. It is recommended that this value is set to a number which
+uses all available network (or disk) bandwidth on the machine without causing bottlenecks.`,
+ },
+ {
+ Name: "EnableWebGui",
+ Type: "bool",
+
+ Comment: `EnableWebGui enables the web GUI on this lotus-provider instance. The UI has minimal local overhead, but it should
+only need to be run on a single machine in the cluster.`,
+ },
+ {
+ Name: "GuiAddress",
+ Type: "string",
+
+ Comment: `The address that should listen for Web GUI requests.`,
+ },
+ },
"DAGStoreConfig": {
{
Name: "RootDir",
@@ -699,136 +991,6 @@ closed by the connection manager.`,
Comment: `SubsystemLevels specify per-subsystem log levels`,
},
},
- "LotusProviderAddresses": {
- {
- Name: "PreCommitControl",
- Type: "[]string",
-
- Comment: `Addresses to send PreCommit messages from`,
- },
- {
- Name: "CommitControl",
- Type: "[]string",
-
- Comment: `Addresses to send Commit messages from`,
- },
- {
- Name: "TerminateControl",
- Type: "[]string",
-
- Comment: ``,
- },
- {
- Name: "DisableOwnerFallback",
- Type: "bool",
-
- Comment: `DisableOwnerFallback disables usage of the owner address for messages
-sent automatically`,
- },
- {
- Name: "DisableWorkerFallback",
- Type: "bool",
-
- Comment: `DisableWorkerFallback disables usage of the worker address for messages
-sent automatically, if control addresses are configured.
-A control address that doesn't have enough funds will still be chosen
-over the worker address if this flag is set.`,
- },
- {
- Name: "MinerAddresses",
- Type: "[]string",
-
- Comment: `MinerAddresses are the addresses of the miner actors to use for sending messages`,
- },
- },
- "LotusProviderConfig": {
- {
- Name: "Subsystems",
- Type: "ProviderSubsystemsConfig",
-
- Comment: ``,
- },
- {
- Name: "Fees",
- Type: "LotusProviderFees",
-
- Comment: ``,
- },
- {
- Name: "Addresses",
- Type: "[]LotusProviderAddresses",
-
- Comment: `Addresses of wallets per MinerAddress (one of the fields).`,
- },
- {
- Name: "Proving",
- Type: "ProvingConfig",
-
- Comment: ``,
- },
- {
- Name: "Journal",
- Type: "JournalConfig",
-
- Comment: ``,
- },
- {
- Name: "Apis",
- Type: "ApisConfig",
-
- Comment: ``,
- },
- },
- "LotusProviderFees": {
- {
- Name: "DefaultMaxFee",
- Type: "types.FIL",
-
- Comment: ``,
- },
- {
- Name: "MaxPreCommitGasFee",
- Type: "types.FIL",
-
- Comment: ``,
- },
- {
- Name: "MaxCommitGasFee",
- Type: "types.FIL",
-
- Comment: ``,
- },
- {
- Name: "MaxPreCommitBatchGasFee",
- Type: "BatchFeeConfig",
-
- Comment: `maxBatchFee = maxBase + maxPerSector * nSectors`,
- },
- {
- Name: "MaxCommitBatchGasFee",
- Type: "BatchFeeConfig",
-
- Comment: ``,
- },
- {
- Name: "MaxTerminateGasFee",
- Type: "types.FIL",
-
- Comment: ``,
- },
- {
- Name: "MaxWindowPoStGasFee",
- Type: "types.FIL",
-
- Comment: `WindowPoSt is a high-value operation, so the default fee should be high.`,
- },
- {
- Name: "MaxPublishDealsFee",
- Type: "types.FIL",
-
- Comment: ``,
- },
- },
"MinerAddressConfig": {
{
Name: "PreCommitControl",
@@ -998,168 +1160,6 @@ When disabled and no external block producers are configured, all potential
block rewards will be missed!`,
},
},
- "ProviderSubsystemsConfig": {
- {
- Name: "EnableWindowPost",
- Type: "bool",
-
- Comment: `EnableWindowPost enables window post to be executed on this lotus-provider 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.
-
-It is possible to have instances handling both WindowPoSt and WinningPoSt, which can provide redundancy without
-the need for additional machines. In setups like this it is generally recommended to run
-partitionsPerDeadline+1 machines.`,
- },
- {
- Name: "WindowPostMaxTasks",
- Type: "int",
-
- Comment: ``,
- },
- {
- Name: "EnableWinningPost",
- Type: "bool",
-
- Comment: `EnableWinningPost enables winning post to be executed on this lotus-provider 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.`,
- },
- {
- Name: "WinningPostMaxTasks",
- Type: "int",
-
- Comment: ``,
- },
- {
- Name: "EnableSealSDR",
- Type: "bool",
-
- Comment: `EnableSealSDR enables SDR tasks to run. SDR is the long sequential computation
-creating 11 layer files in sector cache directory.
-
-SDR is the first task in the sealing pipeline. It's inputs are just the hash of the
-unsealed data (CommD), sector number, miner id, and the seal proof type.
-It's outputs are the 11 layer files in the sector cache directory.
-
-In lotus-miner this was run as part of PreCommit1.`,
- },
- {
- Name: "SealSDRMaxTasks",
- Type: "int",
-
- Comment: `The maximum amount of SDR tasks that can run simultaneously. Note that the maximum number of tasks will
-also be bounded by resources available on the machine.`,
- },
- {
- Name: "EnableSealSDRTrees",
- Type: "bool",
-
- Comment: `EnableSealSDRTrees enables the SDR pipeline tree-building task to run.
-This task handles encoding of unsealed data into last sdr layer and building
-of TreeR, TreeC and TreeD.
-
-This task runs after SDR
-TreeD is first computed with optional input of unsealed data
-TreeR is computed from replica, which is first computed as field
-addition of the last SDR layer and the bottom layer of TreeD (which is the unsealed data)
-TreeC is computed from the 11 SDR layers
-The 3 trees will later be used to compute the PoRep proof.
-
-In case of SyntheticPoRep challenges for PoRep will be pre-generated at this step, and trees and layers
-will be dropped. SyntheticPoRep works by pre-generating a very large set of challenges (~30GiB on disk)
-then using a small subset of them for the actual PoRep computation. This allows for significant scratch space
-saving between PreCommit and PoRep generation at the expense of more computation (generating challenges in this step)
-
-In lotus-miner this was run as part of PreCommit2 (TreeD was run in PreCommit1).
-Note that nodes with SDRTrees enabled will also answer to Finalize tasks,
-which just remove unneeded tree data after PoRep is computed.`,
- },
- {
- Name: "SealSDRTreesMaxTasks",
- Type: "int",
-
- Comment: `The maximum amount of SealSDRTrees tasks that can run simultaneously. Note that the maximum number of tasks will
-also be bounded by resources available on the machine.`,
- },
- {
- Name: "FinalizeMaxTasks",
- Type: "int",
-
- Comment: `FinalizeMaxTasks is the maximum amount of finalize tasks that can run simultaneously.
-The finalize task is enabled on all machines which also handle SDRTrees tasks. Finalize ALWAYS runs on whichever
-machine holds sector cache files, as it removes unneeded tree data after PoRep is computed.
-Finalize will run in parallel with the SubmitCommitMsg task.`,
- },
- {
- Name: "EnableSendPrecommitMsg",
- Type: "bool",
-
- Comment: `EnableSendPrecommitMsg enables the sending of precommit messages to the chain
-from this lotus-provider instance.
-This runs after SDRTrees and uses the output CommD / CommR (roots of TreeD / TreeR) for the message`,
- },
- {
- Name: "EnablePoRepProof",
- Type: "bool",
-
- Comment: `EnablePoRepProof enables the computation of the porep proof
-
-This task runs after interactive-porep seed becomes available, which happens 150 epochs (75min) after the
-precommit message lands on chain. This task should run on a machine with a GPU. Vanilla PoRep proofs are
-requested from the machine which holds sector cache files which most likely is the machine which ran the SDRTrees
-task.
-
-In lotus-miner this was Commit1 / Commit2`,
- },
- {
- Name: "PoRepProofMaxTasks",
- Type: "int",
-
- Comment: `The maximum amount of PoRepProof tasks that can run simultaneously. Note that the maximum number of tasks will
-also be bounded by resources available on the machine.`,
- },
- {
- Name: "EnableSendCommitMsg",
- Type: "bool",
-
- Comment: `EnableSendCommitMsg enables the sending of commit messages to the chain
-from this lotus-provider instance.`,
- },
- {
- Name: "EnableMoveStorage",
- Type: "bool",
-
- Comment: `EnableMoveStorage enables the move-into-long-term-storage task to run on this lotus-provider 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
-SDRTrees machine into long-term storage. This task runs after the Finalize task.`,
- },
- {
- Name: "MoveStorageMaxTasks",
- Type: "int",
-
- Comment: `The maximum amount of MoveStorage tasks that can run simultaneously. Note that the maximum number of tasks will
-also be bounded by resources available on the machine. It is recommended that this value is set to a number which
-uses all available network (or disk) bandwidth on the machine without causing bottlenecks.`,
- },
- {
- Name: "EnableWebGui",
- Type: "bool",
-
- Comment: `EnableWebGui enables the web GUI on this lotus-provider instance. The UI has minimal local overhead, but it should
-only need to be run on a single machine in the cluster.`,
- },
- {
- Name: "GuiAddress",
- Type: "string",
-
- Comment: `The address that should listen for Web GUI requests.`,
- },
- },
"ProvingConfig": {
{
Name: "ParallelCheckLimit",
diff --git a/node/config/load.go b/node/config/load.go
index fd015d533..96a042941 100644
--- a/node/config/load.go
+++ b/node/config/load.go
@@ -266,6 +266,7 @@ func ConfigUpdate(cfgCur, cfgDef interface{}, opts ...UpdateCfgOpt) ([]byte, err
}
// sanity-check that the updated config parses the same way as the current one
+
if cfgDef != nil {
cfgUpdated, err := FromReader(strings.NewReader(nodeStr), cfgDef)
if err != nil {
@@ -273,7 +274,7 @@ func ConfigUpdate(cfgCur, cfgDef interface{}, opts ...UpdateCfgOpt) ([]byte, err
}
if !reflect.DeepEqual(cfgCur, cfgUpdated) {
- return nil, xerrors.Errorf("updated config didn't match current config")
+ return nil, xerrors.Errorf("updated config didn't match current config:")
}
}
diff --git a/node/config/types.go b/node/config/types.go
index 789d24103..2d108c7de 100644
--- a/node/config/types.go
+++ b/node/config/types.go
@@ -66,13 +66,13 @@ type StorageMiner struct {
HarmonyDB HarmonyDB
}
-type LotusProviderConfig struct {
- Subsystems ProviderSubsystemsConfig
+type CurioConfig struct {
+ Subsystems CurioSubsystemsConfig
- Fees LotusProviderFees
+ Fees CurioFees
// Addresses of wallets per MinerAddress (one of the fields).
- Addresses []LotusProviderAddresses
+ Addresses []CurioAddresses
Proving ProvingConfig
Journal JournalConfig
Apis ApisConfig
@@ -93,7 +93,7 @@ type JournalConfig struct {
DisabledEvents string
}
-type ProviderSubsystemsConfig struct {
+type CurioSubsystemsConfig struct {
// EnableWindowPost enables window post to be executed on this lotus-provider 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,
@@ -663,7 +663,7 @@ type MinerFeeConfig struct {
MaximizeWindowPoStFeeCap bool
}
-type LotusProviderFees struct {
+type CurioFees struct {
DefaultMaxFee types.FIL
MaxPreCommitGasFee types.FIL
MaxCommitGasFee types.FIL
@@ -695,7 +695,7 @@ type MinerAddressConfig struct {
DisableWorkerFallback bool
}
-type LotusProviderAddresses struct {
+type CurioAddresses struct {
// Addresses to send PreCommit messages from
PreCommitControl []string
// Addresses to send Commit messages from
diff --git a/node/modules/storageminer_svc.go b/node/modules/storageminer_svc.go
index 99a435a0c..1a909b4ec 100644
--- a/node/modules/storageminer_svc.go
+++ b/node/modules/storageminer_svc.go
@@ -15,11 +15,11 @@ import (
"github.com/filecoin-project/lotus/api/v1api"
"github.com/filecoin-project/lotus/chain/types"
cliutil "github.com/filecoin-project/lotus/cli/util"
+ "github.com/filecoin-project/lotus/curiosrc/market"
+ "github.com/filecoin-project/lotus/curiosrc/market/fakelm"
"github.com/filecoin-project/lotus/lib/harmony/harmonydb"
"github.com/filecoin-project/lotus/node/config"
"github.com/filecoin-project/lotus/node/modules/helpers"
- "github.com/filecoin-project/lotus/provider/lpmarket"
- "github.com/filecoin-project/lotus/provider/lpmarket/fakelm"
"github.com/filecoin-project/lotus/storage/paths"
"github.com/filecoin-project/lotus/storage/sealer/storiface"
"github.com/filecoin-project/lotus/storage/sectorblocks"
@@ -69,7 +69,7 @@ func connectHarmony(apiInfo string, fapi v1api.FullNode, mctx helpers.MetricsCtx
return nil, xerrors.Errorf("parsing miner address: %w", err)
}
- pin := lpmarket.NewPieceIngester(db, fapi)
+ pin := market.NewPieceIngester(db, fapi)
si := paths.NewDBIndex(nil, db)
diff --git a/node/repo/fsrepo.go b/node/repo/fsrepo.go
index d8e41fb2b..6cac14c01 100644
--- a/node/repo/fsrepo.go
+++ b/node/repo/fsrepo.go
@@ -185,28 +185,28 @@ func (worker) APIInfoEnvVars() (primary string, fallbacks []string, deprecated [
return "WORKER_API_INFO", nil, nil
}
-type provider struct{}
+type curio struct{}
-var Provider provider
+var Curio curio
-func (provider) Type() string {
- return "Provider"
+func (curio) Type() string {
+ return "Curio"
}
-func (provider) Config() interface{} {
+func (curio) Config() interface{} {
return &struct{}{}
}
-func (provider) APIFlags() []string {
- return []string{"provider-api-url"}
+func (curio) APIFlags() []string {
+ return []string{"curio-api-url"}
}
-func (provider) RepoFlags() []string {
- return []string{"provider-repo"}
+func (curio) RepoFlags() []string {
+ return []string{"curio-repo"}
}
-func (provider) APIInfoEnvVars() (primary string, fallbacks []string, deprecated []string) {
- return "PROVIDER_API_INFO", nil, nil
+func (curio) APIInfoEnvVars() (primary string, fallbacks []string, deprecated []string) {
+ return "CURIO_API_INFO", nil, nil
}
var Wallet wallet
diff --git a/node/repo/interface.go b/node/repo/interface.go
index 328862b92..11c965bf5 100644
--- a/node/repo/interface.go
+++ b/node/repo/interface.go
@@ -28,7 +28,7 @@ const (
var (
ErrNoAPIEndpoint = errors.New("API not running (no endpoint)")
ErrNoAPIToken = errors.New("API token not set")
- ErrRepoAlreadyLocked = errors.New("repo is already locked (lotus daemon already running)")
+ ErrRepoAlreadyLocked = errors.New("repo is already locked (process is already running)")
ErrClosedRepo = errors.New("repo is no longer open")
// ErrInvalidBlockstoreDomain is returned by LockedRepo#Blockstore() when
diff --git a/provider/builder.go b/provider/builder.go
deleted file mode 100644
index 08f18a5d8..000000000
--- a/provider/builder.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package provider
-
-import (
- "context"
- "time"
-
- "github.com/filecoin-project/lotus/api"
- "github.com/filecoin-project/lotus/lib/harmony/harmonydb"
- "github.com/filecoin-project/lotus/node/config"
- dtypes "github.com/filecoin-project/lotus/node/modules/dtypes"
- "github.com/filecoin-project/lotus/provider/chainsched"
- "github.com/filecoin-project/lotus/provider/lpmessage"
- "github.com/filecoin-project/lotus/provider/lpwindow"
- "github.com/filecoin-project/lotus/provider/multictladdr"
- "github.com/filecoin-project/lotus/storage/paths"
- "github.com/filecoin-project/lotus/storage/sealer"
- "github.com/filecoin-project/lotus/storage/sealer/storiface"
-)
-
-//var log = logging.Logger("provider")
-
-func WindowPostScheduler(ctx context.Context, fc config.LotusProviderFees, pc config.ProvingConfig,
- api api.FullNode, verif storiface.Verifier, lw *sealer.LocalWorker, sender *lpmessage.Sender, chainSched *chainsched.ProviderChainSched,
- as *multictladdr.MultiAddressSelector, addresses map[dtypes.MinerAddress]bool, db *harmonydb.DB,
- stor paths.Store, idx paths.SectorIndex, max int) (*lpwindow.WdPostTask, *lpwindow.WdPostSubmitTask, *lpwindow.WdPostRecoverDeclareTask, error) {
-
- // todo config
- ft := lpwindow.NewSimpleFaultTracker(stor, idx, pc.ParallelCheckLimit, time.Duration(pc.SingleCheckTimeout), time.Duration(pc.PartitionCheckTimeout))
-
- computeTask, err := lpwindow.NewWdPostTask(db, api, ft, lw, verif, chainSched, addresses, max)
- if err != nil {
- return nil, nil, nil, err
- }
-
- submitTask, err := lpwindow.NewWdPostSubmitTask(chainSched, sender, db, api, fc.MaxWindowPoStGasFee, as)
- if err != nil {
- return nil, nil, nil, err
- }
-
- recoverTask, err := lpwindow.NewWdPostRecoverDeclareTask(sender, db, api, ft, as, chainSched, fc.MaxWindowPoStGasFee, addresses)
- if err != nil {
- return nil, nil, nil, err
- }
-
- return computeTask, submitTask, recoverTask, nil
-}
diff --git a/provider/lpweb/api/routes.go b/provider/lpweb/api/routes.go
deleted file mode 100644
index 85b17486f..000000000
--- a/provider/lpweb/api/routes.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Package api provides the HTTP API for the lotus provider web gui.
-package api
-
-import (
- "github.com/gorilla/mux"
-
- "github.com/filecoin-project/lotus/cmd/lotus-provider/deps"
- "github.com/filecoin-project/lotus/provider/lpweb/api/debug"
-)
-
-func Routes(r *mux.Router, deps *deps.Deps) {
- debug.Routes(r.PathPrefix("/debug").Subrouter(), deps)
-}
diff --git a/scripts/lotus-provider.service b/scripts/curio.service
similarity index 55%
rename from scripts/lotus-provider.service
rename to scripts/curio.service
index ddec181ba..967a788fa 100644
--- a/scripts/lotus-provider.service
+++ b/scripts/curio.service
@@ -1,11 +1,11 @@
[Unit]
-Description=Lotus Provider
+Description=Curio
After=network.target
After=lotus-daemon.service
[Service]
-ExecStart=/usr/local/bin/lotus-provider run
-Environment=GOLOG_FILE="/var/log/lotus/provider.log"
+ExecStart=/usr/local/bin/curio run
+Environment=GOLOG_FILE="/var/log/curio/curio.log"
Environment=GOLOG_LOG_FMT="json"
LimitNOFILE=1000000
[Install]
diff --git a/scripts/generate-lotus-cli.py b/scripts/generate-lotus-cli.py
index 1e1fee9a6..305716b09 100644
--- a/scripts/generate-lotus-cli.py
+++ b/scripts/generate-lotus-cli.py
@@ -55,4 +55,4 @@ if __name__ == "__main__":
generate_lotus_cli('lotus')
generate_lotus_cli('lotus-miner')
generate_lotus_cli('lotus-worker')
- generate_lotus_cli('lotus-provider')
\ No newline at end of file
+ generate_lotus_cli('curio')
\ No newline at end of file