+
+ ${this.message? html`
${this.message}
`: html``}
`;
}
-}
+ getCookieMessage() {
+ const name = 'message';
+ const cookies = document.cookie.split(';');
+ for (let i = 0; i < cookies.length; i++) {
+ const cookie = cookies[i].trim();
+ if (cookie.startsWith(name + '=')) {
+ var val = cookie.substring(name.length + 1);
+ document.cookie = name + '=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;';
+ return val;
+ }
+ }
+ return null;
+ }
+
+};
customElements.define('curio-ux', CurioUX);
\ No newline at end of file
diff --git a/curiosrc/winning/winning_task.go b/curiosrc/winning/winning_task.go
index 064696727e1..7eab7132911 100644
--- a/curiosrc/winning/winning_task.go
+++ b/curiosrc/winning/winning_task.go
@@ -21,7 +21,7 @@ import (
"github.com/filecoin-project/lotus/api"
"github.com/filecoin-project/lotus/build"
- "github.com/filecoin-project/lotus/chain/gen"
+ "github.com/filecoin-project/lotus/chain/gen/genutils"
lrand "github.com/filecoin-project/lotus/chain/rand"
"github.com/filecoin-project/lotus/chain/types"
"github.com/filecoin-project/lotus/lib/harmony/harmonydb"
@@ -213,7 +213,7 @@ func (t *WinPostTask) Do(taskID harmonytask.TaskID, stillOwned func() bool) (don
rbase = bvals[len(bvals)-1]
}
- eproof, err = gen.IsRoundWinner(ctx, round, maddr, rbase, mbi, t.api)
+ eproof, err = genutils.IsRoundWinner(ctx, round, maddr, rbase, mbi, t.api)
if err != nil {
log.Warnw("WinPoSt failed to check if we win next round", "error", err)
return false, xerrors.Errorf("failed to check if we win next round: %w", err)
@@ -655,7 +655,7 @@ func (t *WinPostTask) computeTicket(ctx context.Context, maddr address.Address,
return nil, err
}
- vrfOut, err := gen.ComputeVRF(ctx, t.api.WalletSign, mbi.WorkerKey, input)
+ vrfOut, err := genutils.ComputeVRF(ctx, t.api.WalletSign, mbi.WorkerKey, input)
if err != nil {
return nil, err
}
diff --git a/documentation/en/cli-curio.md b/documentation/en/cli-curio.md
index 385056c33e8..6dced244188 100644
--- a/documentation/en/cli-curio.md
+++ b/documentation/en/cli-curio.md
@@ -159,10 +159,77 @@ OPTIONS:
### curio cli log
```
+NAME:
+ curio cli log - Manage logging
+
+USAGE:
+ curio cli log command [command options] [arguments...]
+
+COMMANDS:
+ list List log systems
+ set-level Set log level
+ help, h Shows a list of commands or help for one command
+
+OPTIONS:
+ --help, -h show help
+```
+
+#### curio cli log list
+```
+NAME:
+ curio cli log list - List log systems
+
+USAGE:
+ curio cli log list [command options] [arguments...]
+
+OPTIONS:
+ --help, -h show help
+```
+
+#### curio cli log set-level
+```
+NAME:
+ curio cli log set-level - Set log level
+
+USAGE:
+ curio cli log set-level [command options] [level]
+
+DESCRIPTION:
+ Set the log level for logging systems:
+
+ The system flag can be specified multiple times.
+
+ eg) log set-level --system chain --system chainxchg debug
+
+ Available Levels:
+ debug
+ info
+ warn
+ error
+
+ Environment Variables:
+ GOLOG_LOG_LEVEL - Default log level for all log systems
+ GOLOG_LOG_FMT - Change output log format (json, nocolor)
+ GOLOG_FILE - Write logs to file
+ GOLOG_OUTPUT - Specify whether to output to file, stderr, stdout or a combination, i.e. file+stderr
+
+
+OPTIONS:
+ --system value [ --system value ] limit to log system
+ --help, -h show help
```
### curio cli wait-api
```
+NAME:
+ curio cli wait-api - Wait for Curio api to come online
+
+USAGE:
+ curio cli wait-api [command options] [arguments...]
+
+OPTIONS:
+ --timeout value duration to wait till fail (default: 30s)
+ --help, -h show help
```
## curio run
diff --git a/gen/bundle/bundle.go b/gen/bundle/bundle.go
index f57ced15b43..ac0eff1080f 100644
--- a/gen/bundle/bundle.go
+++ b/gen/bundle/bundle.go
@@ -6,7 +6,7 @@ import (
"strings"
"text/template"
- "github.com/filecoin-project/lotus/build"
+ "github.com/filecoin-project/lotus/build/actors"
)
var tmpl *template.Template = template.Must(template.New("actor-metadata").Parse(`
@@ -41,7 +41,7 @@ func splitOverride(override string) (string, string) {
func main() {
// read metadata from the embedded bundle, includes all info except git tags
- metadata, err := build.ReadEmbeddedBuiltinActorsMetadata()
+ metadata, err := actors.ReadEmbeddedBuiltinActorsMetadata()
if err != nil {
panic(err)
}
@@ -90,8 +90,8 @@ func main() {
}
}
-func getOldGitTagFromEmbeddedMetadata(m *build.BuiltinActorsMetadata) string {
- for _, v := range build.EmbeddedBuiltinActorsMetadata {
+func getOldGitTagFromEmbeddedMetadata(m *actors.BuiltinActorsMetadata) string {
+ for _, v := range actors.EmbeddedBuiltinActorsMetadata {
// if we agree on the manifestCid for the previously embedded metadata, use the previously set tag
if m.Version == v.Version && m.Network == v.Network && m.ManifestCid == v.ManifestCid {
return m.BundleGitTag
diff --git a/itests/kit/ensemble.go b/itests/kit/ensemble.go
index 03a36dc4525..ba286431f88 100644
--- a/itests/kit/ensemble.go
+++ b/itests/kit/ensemble.go
@@ -36,6 +36,7 @@ import (
"github.com/filecoin-project/lotus/api"
"github.com/filecoin-project/lotus/api/v1api"
"github.com/filecoin-project/lotus/build"
+ actors2 "github.com/filecoin-project/lotus/build/actors"
"github.com/filecoin-project/lotus/chain"
"github.com/filecoin-project/lotus/chain/actors"
"github.com/filecoin-project/lotus/chain/actors/builtin/miner"
@@ -172,9 +173,9 @@ func NewEnsemble(t *testing.T, opts ...EnsembleOpt) *Ensemble {
// Ensure we're using the right actors. This really shouldn't be some global thing, but it's
// the best we can do for now.
if n.options.mockProofs {
- require.NoError(t, build.UseNetworkBundle("testing-fake-proofs"))
+ require.NoError(t, actors2.UseNetworkBundle("testing-fake-proofs"))
} else {
- require.NoError(t, build.UseNetworkBundle("testing"))
+ require.NoError(t, actors2.UseNetworkBundle("testing"))
}
build.EquivocationDelaySecs = 0
diff --git a/miner/miner.go b/miner/miner.go
index d11e9d4aa04..8158e10eb2b 100644
--- a/miner/miner.go
+++ b/miner/miner.go
@@ -28,6 +28,7 @@ import (
"github.com/filecoin-project/lotus/chain/actors/builtin"
"github.com/filecoin-project/lotus/chain/actors/policy"
"github.com/filecoin-project/lotus/chain/gen"
+ "github.com/filecoin-project/lotus/chain/gen/genutils"
"github.com/filecoin-project/lotus/chain/gen/slashfilter"
lrand "github.com/filecoin-project/lotus/chain/rand"
"github.com/filecoin-project/lotus/chain/types"
@@ -534,7 +535,7 @@ func (m *Miner) mineOne(ctx context.Context, base *MiningBase) (minedBlock *type
return nil, err
}
- winner, err = gen.IsRoundWinner(ctx, round, m.address, rbase, mbi, m.api)
+ winner, err = genutils.IsRoundWinner(ctx, round, m.address, rbase, mbi, m.api)
if err != nil {
err = xerrors.Errorf("failed to check if we win next round: %w", err)
return nil, err
@@ -688,7 +689,7 @@ func (m *Miner) computeTicket(ctx context.Context, brand *types.BeaconEntry, rou
return nil, err
}
- vrfOut, err := gen.ComputeVRF(ctx, m.api.WalletSign, mbi.WorkerKey, input)
+ vrfOut, err := genutils.ComputeVRF(ctx, m.api.WalletSign, mbi.WorkerKey, input)
if err != nil {
return nil, err
}
diff --git a/node/builder_chain.go b/node/builder_chain.go
index 0b40e4530c4..6cf72f39832 100644
--- a/node/builder_chain.go
+++ b/node/builder_chain.go
@@ -55,7 +55,7 @@ var ChainNode = Options(
// Consensus settings
Override(new(dtypes.DrandSchedule), modules.BuiltinDrandConfig),
- Override(new(stmgr.UpgradeSchedule), modules.UpgradeSchedule),
+ Override(new(stmgr.UpgradeSchedule), filcns.DefaultUpgradeSchedule()),
Override(new(dtypes.NetworkName), modules.NetworkName),
Override(new(modules.Genesis), modules.ErrorGenesis),
Override(new(dtypes.AfterGenesisSet), modules.SetGenesis),
diff --git a/node/bundle/bundle.go b/node/bundle/bundle.go
index 716c9043bb6..c6c429889c3 100644
--- a/node/bundle/bundle.go
+++ b/node/bundle/bundle.go
@@ -15,6 +15,7 @@ import (
"github.com/filecoin-project/lotus/blockstore"
"github.com/filecoin-project/lotus/build"
+ actors2 "github.com/filecoin-project/lotus/build/actors"
"github.com/filecoin-project/lotus/chain/actors"
)
@@ -69,7 +70,7 @@ func LoadBundles(ctx context.Context, bs blockstore.Blockstore, versions ...acto
)
if path, ok := build.BundleOverrides[av]; ok {
root, err = LoadBundleFromFile(ctx, bs, path)
- } else if embedded, ok := build.GetEmbeddedBuiltinActorsBundle(av, build.NetworkBundle); ok {
+ } else if embedded, ok := actors2.GetEmbeddedBuiltinActorsBundle(av, build.NetworkBundle); ok {
root, err = LoadBundle(ctx, bs, bytes.NewReader(embedded))
} else {
err = xerrors.Errorf("bundle for actors version v%d not found", av)
diff --git a/node/modules/chain.go b/node/modules/chain.go
index 70cb9b58541..2d40bbc3b52 100644
--- a/node/modules/chain.go
+++ b/node/modules/chain.go
@@ -18,7 +18,6 @@ import (
"github.com/filecoin-project/lotus/chain"
"github.com/filecoin-project/lotus/chain/beacon"
"github.com/filecoin-project/lotus/chain/consensus"
- "github.com/filecoin-project/lotus/chain/consensus/filcns"
"github.com/filecoin-project/lotus/chain/exchange"
"github.com/filecoin-project/lotus/chain/gen/slashfilter"
"github.com/filecoin-project/lotus/chain/index"
@@ -179,10 +178,6 @@ func NewSlashFilter(ds dtypes.MetadataDS) *slashfilter.SlashFilter {
return slashfilter.New(ds)
}
-func UpgradeSchedule() stmgr.UpgradeSchedule {
- return filcns.DefaultUpgradeSchedule()
-}
-
func EnableStoringEvents(cs *store.ChainStore) {
cs.StoreEvents(true)
}
diff --git a/storage/paths/local.go b/storage/paths/local.go
index 006854bbfe0..7e955ccfe51 100644
--- a/storage/paths/local.go
+++ b/storage/paths/local.go
@@ -500,6 +500,7 @@ func (st *Local) Reserve(ctx context.Context, sid storiface.SectorRef, ft storif
}()
for _, fileType := range ft.AllSet() {
+ fileType := fileType
id := storiface.ID(storiface.PathByType(storageIDs, fileType))
p, ok := st.paths[id]