Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix/fip 0084 #1093

Merged
merged 10 commits into from
Jul 31, 2024
Merged

Fix/fip 0084 #1093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3144ba4
chore: update lotus to v1.28.1
simlecode Jul 29, 2024
c718ec1
fix: Simplify logic
simlecode Jul 29, 2024
724e3df
chore: update metrics
simlecode Jul 29, 2024
c1b85ba
chore: fix lint
simlecode Jul 29, 2024
1b3de1b
fix: miss builtin market sectors
simlecode Jul 31, 2024
7727647
fix: remove DealIDs from precommitinfo
simlecode Jul 31, 2024
d5b3274
chore: make fix-worker
simlecode Jul 31, 2024
9a76fa5
chore: maek fix-worker
simlecode Jul 31, 2024
1cbfc0b
fix
simlecode Jul 31, 2024
de8aa24
chore: fix lint
simlecode Jul 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion damocles-manager/.golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ linters:
- durationcheck
- prealloc
- predeclared
- revive
- gofmt
# - revive

linters-settings:
staticcheck:
Expand Down
1 change: 0 additions & 1 deletion damocles-manager/cmd/damocles-manager/internal/util_kvstore_migrate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ func Dep(cctx *cli.Context, wants ...any) (stop func(), err error) {
DepsFromCLICtx(cctx),
dix.Override(new(dep.GlobalContext), gctx),
)

if err != nil {
gcancel()
return
Expand Down
2 changes: 1 addition & 1 deletion damocles-manager/extern/filecoin-ffi
Open in desktop
Submodule filecoin-ffi updated 2 files
+9 −9 rust/Cargo.lock
+2 −5 rust/Cargo.toml
45 changes: 23 additions & 22 deletions damocles-manager/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ require (
github.com/filecoin-project/go-fil-commcid v0.1.0
github.com/filecoin-project/go-jsonrpc v0.3.2
github.com/filecoin-project/go-paramfetch v0.0.4
github.com/filecoin-project/go-state-types v0.14.0-rc5
github.com/filecoin-project/lotus v1.28.0-rc5
github.com/filecoin-project/go-state-types v0.14.0
github.com/filecoin-project/lotus v1.28.1
github.com/filecoin-project/specs-storage v0.4.1
github.com/filecoin-project/venus v1.16.0-rc1
github.com/golang/mock v1.6.0
github.com/google/uuid v1.6.0
github.com/hako/durafmt v0.0.0-20200710122514-c0fb7b4da026
github.com/hashicorp/go-multierror v1.1.1
github.com/ipfs-force-community/damocles/manager-plugin v0.0.0-20231108073455-ac8eebc7d237
github.com/ipfs-force-community/metrics v1.0.1-0.20231207081445-30178e706d09
github.com/ipfs-force-community/metrics v1.0.1-0.20240725062356-39b286636574
github.com/ipfs-force-community/venus-cluster-assets v0.1.0
github.com/ipfs/boxo v0.20.0
github.com/ipfs/go-cid v0.4.1
Expand All @@ -37,7 +37,7 @@ require (
github.com/ipfs/go-ipld-cbor v0.1.0
github.com/ipfs/go-log/v2 v2.5.1
github.com/jbenet/go-random v0.0.0-20190219211222-123a90aedc0c
github.com/libp2p/go-libp2p v0.35.0
github.com/libp2p/go-libp2p v0.35.4
github.com/mitchellh/go-homedir v1.1.0
github.com/mr-tron/base58 v1.2.0
github.com/mroth/weightedrand v0.4.1
Expand All @@ -52,7 +52,7 @@ require (
github.com/urfave/cli/v2 v2.25.5
go.mongodb.org/mongo-driver v1.10.1
go.opencensus.io v0.24.0
go.uber.org/fx v1.21.1
go.uber.org/fx v1.22.1
go.uber.org/zap v1.27.0
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842
golang.org/x/sync v0.7.0
Expand Down Expand Up @@ -89,7 +89,7 @@ require (
github.com/filecoin-project/go-amt-ipld/v4 v4.3.0 // indirect
github.com/filecoin-project/go-crypto v0.0.1 // indirect
github.com/filecoin-project/go-data-transfer/v2 v2.0.0-rc7 // indirect
github.com/filecoin-project/go-f3 v0.0.3-0.20240702063402-d48771055cf4 // indirect
github.com/filecoin-project/go-f3 v0.0.7 // indirect
github.com/filecoin-project/go-fil-markets v1.28.3 // indirect
github.com/filecoin-project/go-hamt-ipld v0.1.5 // indirect
github.com/filecoin-project/go-hamt-ipld/v2 v2.0.0 // indirect
Expand All @@ -111,7 +111,7 @@ require (
github.com/georgysavva/scany/v2 v2.1.3 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.6.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/godbus/dbus/v5 v5.1.0 // indirect
Expand All @@ -122,7 +122,7 @@ require (
github.com/golang/snappy v0.0.4 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/gorilla/mux v1.8.1 // indirect
github.com/gorilla/websocket v1.5.1 // indirect
github.com/gorilla/websocket v1.5.3 // indirect
github.com/hannahhoward/cbor-gen-for v0.0.0-20230214144701-5d17c9d5243c // indirect
github.com/hannahhoward/go-pubsub v0.0.0-20200423002714-8d62886cc36e // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
Expand Down Expand Up @@ -184,6 +184,7 @@ require (
github.com/multiformats/go-multicodec v0.9.0 // indirect
github.com/multiformats/go-multistream v0.5.0 // indirect
github.com/multiformats/go-varint v0.0.7 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/nkovacs/streamquote v1.0.0 // indirect
github.com/onsi/gomega v1.33.0 // indirect
github.com/opencontainers/runtime-spec v1.2.0 // indirect
Expand All @@ -195,8 +196,8 @@ require (
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
github.com/prometheus/client_golang v1.19.1 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.53.0 // indirect
github.com/prometheus/procfs v0.15.0 // indirect
github.com/prometheus/common v0.55.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/prometheus/statsd_exporter v0.23.0 // indirect
github.com/puzpuzpuz/xsync/v2 v2.4.1 // indirect
github.com/raulk/clock v1.1.0 // indirect
Expand All @@ -221,26 +222,26 @@ require (
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
github.com/yugabyte/pgx/v5 v5.5.3-yb-2 // indirect
github.com/yusufpapurcu/wmi v1.2.2 // indirect
go.opentelemetry.io/otel v1.26.0 // indirect
go.opentelemetry.io/otel/bridge/opencensus v0.39.0 // indirect
go.opentelemetry.io/otel v1.28.0 // indirect
go.opentelemetry.io/otel/bridge/opencensus v1.28.0 // indirect
go.opentelemetry.io/otel/exporters/jaeger v1.14.0 // indirect
go.opentelemetry.io/otel/metric v1.26.0 // indirect
go.opentelemetry.io/otel/sdk v1.26.0 // indirect
go.opentelemetry.io/otel/sdk/metric v0.39.0 // indirect
go.opentelemetry.io/otel/trace v1.26.0 // indirect
go.opentelemetry.io/otel/metric v1.28.0 // indirect
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect
go.opentelemetry.io/otel/trace v1.28.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/dig v1.17.1 // indirect
go.uber.org/multierr v1.11.0 // indirect
go4.org v0.0.0-20230225012048-214862532bf5 // indirect
golang.org/x/crypto v0.23.0 // indirect
golang.org/x/crypto v0.24.0 // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/net v0.25.0 // indirect
golang.org/x/sys v0.20.0 // indirect
golang.org/x/text v0.15.0 // indirect
golang.org/x/tools v0.21.0 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
google.golang.org/api v0.155.0 // indirect
google.golang.org/protobuf v1.34.1 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/cheggaaa/pb.v1 v1.0.28 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
Loading