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

v1.27.0-a #10

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

15
cmd/lotus-provider/deps/deps.go
View File

@ -7,12 +7,6 @@ import (
"encoding/base64" "encoding/base64"
"errors" "errors"
"fmt" "fmt"
"net"
"net/http"
"os"
"regexp"
"strings"
"github.com/BurntSushi/toml" "github.com/BurntSushi/toml"
"github.com/gbrlsnchs/jwt/v3" "github.com/gbrlsnchs/jwt/v3"
ds "github.com/ipfs/go-datastore" ds "github.com/ipfs/go-datastore"
@ -20,6 +14,11 @@ import (
logging "github.com/ipfs/go-log/v2" logging "github.com/ipfs/go-log/v2"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"golang.org/x/xerrors" "golang.org/x/xerrors"
"net"
"net/http"
"os"
"regexp"
"strings"
"github.com/filecoin-project/go-address" "github.com/filecoin-project/go-address"
"github.com/filecoin-project/go-jsonrpc/auth" "github.com/filecoin-project/go-jsonrpc/auth"
@ -235,7 +234,9 @@ Get it with: jq .PrivateKey ~/.lotus-miner/keystore/MF2XI2BNNJ3XILLQOJUXMYLUMU`,
// todo localWorker isn't the abstraction layer we want to use here, we probably want to go straight to ffiwrapper // todo localWorker isn't the abstraction layer we want to use here, we probably want to go straight to ffiwrapper
// maybe with a lotus-provider specific abstraction. LocalWorker does persistent call tracking which we probably // maybe with a lotus-provider specific abstraction. LocalWorker does persistent call tracking which we probably
// don't need (ehh.. maybe we do, the async callback system may actually work decently well with harmonytask) // don't need (ehh.. maybe we do, the async callback system may actually work decently well with harmonytask)
deps.LW = sealer.NewLocalWorker(sealer.WorkerConfig{}, deps.Stor, deps.LocalStore, deps.Si, nil, wstates) deps.LW = sealer.NewLocalWorker(sealer.WorkerConfig{
MaxParallelChallengeReads: deps.Cfg.Proving.ParallelCheckLimit,
}, deps.Stor, deps.LocalStore, deps.Si, nil, wstates)
} }
if deps.Maddrs == nil { if deps.Maddrs == nil {
deps.Maddrs = map[dtypes.MinerAddress]bool{} deps.Maddrs = map[dtypes.MinerAddress]bool{}

1
provider/lpseal/task_submit_precommit.go
View File

@ -91,7 +91,6 @@ func (s *SubmitPrecommitTask) Do(taskID harmonytask.TaskID, stillOwned func() bo
if err != nil { if err != nil {
return false, xerrors.Errorf("parsing unsealed CID: %w", err) return false, xerrors.Errorf("parsing unsealed CID: %w", err)
} }
_ = unsealedCID
params := miner.PreCommitSectorBatchParams2{} params := miner.PreCommitSectorBatchParams2{}