Skip to content

Commit 6409ebc

Browse files
authored
chore: update the lotus version to 1.23.2 (#1241)
* update ffi version * update lotus version to v1.23.2 * change golangci-lint
1 parent 379acb8 commit 6409ebc

File tree

9 files changed

+178
-173
lines changed

9 files changed

+178
-173
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ jobs:
247247
- run:
248248
name: Lint
249249
command: |
250-
support/tools/bin/golangci-lint run -v --timeout 5m \
250+
golangci-lint run -v --timeout 5m \
251251
--concurrency << parameters.concurrency >> << parameters.args >>
252252
lint-all:
253253
<<: *lint

commands/net.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,8 @@ var NetReachability = &cli.Command{
228228
}
229229

230230
fmt.Println("AutoNAT status: ", i.Reachability.String())
231-
if i.PublicAddr != "" {
232-
fmt.Println("Public address: ", i.PublicAddr)
231+
if len(i.PublicAddrs) > 0 {
232+
fmt.Println("Public address: ", i.PublicAddrs)
233233
}
234234
return nil
235235
},

commands/util/import.go

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ import (
2222
"github.com/filecoin-project/lotus/storage/sealer/ffiwrapper"
2323
"github.com/mitchellh/go-homedir"
2424

25+
"github.com/filecoin-project/lotus/chain/index"
26+
2527
"github.com/filecoin-project/lotus/chain/types"
2628
"golang.org/x/xerrors"
2729
"gopkg.in/cheggaaa/pb.v1"
@@ -73,7 +75,7 @@ func ImportFromFsFile(ctx context.Context, r repo.Repo, fs fs.File, snapshot boo
7375
return err
7476
}
7577

76-
stm, err := stmgr.NewStateManager(cst, consensus.NewTipSetExecutor(filcns.RewardFunc), vm.Syscalls(ffiwrapper.ProofVerifier), filcns.DefaultUpgradeSchedule(), nil, mds)
78+
stm, err := stmgr.NewStateManager(cst, consensus.NewTipSetExecutor(filcns.RewardFunc), vm.Syscalls(ffiwrapper.ProofVerifier), filcns.DefaultUpgradeSchedule(), nil, mds, index.DummyMsgIndex)
7779
if err != nil {
7880
return err
7981
}
@@ -211,7 +213,7 @@ func ImportChain(ctx context.Context, r repo.Repo, fname string, snapshot bool,
211213
return err
212214
}
213215

214-
stm, err := stmgr.NewStateManager(cst, consensus.NewTipSetExecutor(filcns.RewardFunc), vm.Syscalls(ffiwrapper.ProofVerifier), filcns.DefaultUpgradeSchedule(), nil, mds)
216+
stm, err := stmgr.NewStateManager(cst, consensus.NewTipSetExecutor(filcns.RewardFunc), vm.Syscalls(ffiwrapper.ProofVerifier), filcns.DefaultUpgradeSchedule(), nil, mds, index.DummyMsgIndex)
215217
if err != nil {
216218
return err
217219
}
@@ -234,8 +236,9 @@ func ImportChain(ctx context.Context, r repo.Repo, fname string, snapshot bool,
234236
func backfillTipsetKey(ctx context.Context, root *types.TipSet, cs *store.ChainStore, backfillRange int) (err error) {
235237
ts := root
236238
log.Infof("backfilling the tipsetkey into chainstore, attempt to backfill the last %v epochs starting from the head.", backfillRange)
239+
tssToPersist := make([]*types.TipSet, 0, backfillRange)
237240
for i := 0; i < backfillRange; i++ {
238-
err = cs.PersistTipset(ctx, ts)
241+
tssToPersist = append(tssToPersist, ts)
239242
if err != nil {
240243
return
241244
}
@@ -246,5 +249,7 @@ func backfillTipsetKey(ctx context.Context, root *types.TipSet, cs *store.ChainS
246249
break
247250
}
248251
}
252+
253+
err = cs.PersistTipsets(ctx, tssToPersist)
249254
return
250255
}

extern/filecoin-ffi

go.mod

Lines changed: 52 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.19
44

55
require (
66
contrib.go.opencensus.io/exporter/prometheus v0.4.0
7-
github.com/BurntSushi/toml v1.1.0
7+
github.com/BurntSushi/toml v1.2.1
88
github.com/OneOfOne/xxhash v1.2.8 // indirect
99
github.com/filecoin-project/go-address v1.1.0
1010
github.com/filecoin-project/go-amt-ipld/v2 v2.1.1-0.20201006184820-924ee87a1349 // indirect
@@ -14,7 +14,7 @@ require (
1414
github.com/filecoin-project/go-jsonrpc v0.2.3
1515
github.com/filecoin-project/go-paramfetch v0.0.4
1616
github.com/filecoin-project/go-state-types v0.11.1
17-
github.com/filecoin-project/lotus v1.23.0
17+
github.com/filecoin-project/lotus v1.23.2
1818
github.com/filecoin-project/specs-actors v0.9.15
1919
github.com/filecoin-project/specs-actors/v2 v2.3.6
2020
github.com/filecoin-project/specs-actors/v3 v3.1.2
@@ -26,10 +26,10 @@ require (
2626
github.com/go-pg/migrations/v8 v8.0.1
2727
github.com/go-pg/pg/v10 v10.10.6
2828
github.com/hashicorp/golang-lru v0.6.0
29-
github.com/ipfs/go-block-format v0.1.1 // indirect
30-
github.com/ipfs/go-cid v0.4.0
29+
github.com/ipfs/go-block-format v0.1.2
30+
github.com/ipfs/go-cid v0.4.1
3131
github.com/ipfs/go-fs-lock v0.0.7
32-
github.com/ipfs/go-ipfs-blockstore v1.2.0
32+
github.com/ipfs/go-ipfs-blockstore v1.3.0
3333
github.com/ipfs/go-ipld-cbor v0.0.6
3434
github.com/ipfs/go-log/v2 v2.5.1
3535
github.com/ipfs/go-metrics-prometheus v0.0.2
@@ -38,23 +38,23 @@ require (
3838
github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1
3939
github.com/minio/sha256-simd v1.0.0
4040
github.com/mitchellh/go-homedir v1.1.0
41-
github.com/multiformats/go-multiaddr v0.8.0
41+
github.com/multiformats/go-multiaddr v0.9.0
4242
github.com/multiformats/go-multihash v0.2.1
4343
github.com/prometheus/client_golang v1.14.0
4444
github.com/raulk/clock v1.1.0
45-
github.com/stretchr/testify v1.8.1
45+
github.com/stretchr/testify v1.8.2
4646
github.com/urfave/cli/v2 v2.16.3
4747
github.com/whyrusleeping/cbor-gen v0.0.0-20230126041949-52956bd4c9aa
4848
go.opencensus.io v0.24.0
49-
go.opentelemetry.io/otel v1.12.0
49+
go.opentelemetry.io/otel v1.14.0
5050
go.opentelemetry.io/otel/bridge/opencensus v0.33.0
5151
go.opentelemetry.io/otel/exporters/jaeger v1.2.0
5252
go.opentelemetry.io/otel/sdk v1.11.1
53-
go.uber.org/fx v1.18.2
54-
go.uber.org/multierr v1.9.0
53+
go.uber.org/fx v1.19.2
54+
go.uber.org/multierr v1.11.0
5555
go.uber.org/zap v1.24.0
5656
golang.org/x/sync v0.1.0
57-
golang.org/x/text v0.7.0
57+
golang.org/x/text v0.8.0
5858
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2
5959
gopkg.in/cheggaaa/pb.v1 v1.0.28
6060
)
@@ -67,11 +67,10 @@ require (
6767
github.com/hibiken/asynq v0.23.0
6868
github.com/hibiken/asynq/x v0.0.0-20220413130846-5c723f597e01
6969
github.com/ipfs/go-ipld-format v0.4.0
70-
github.com/ipfs/go-libipfs v0.7.0
7170
github.com/jedib0t/go-pretty/v6 v6.2.7
72-
github.com/libp2p/go-libp2p v0.26.2
71+
github.com/libp2p/go-libp2p v0.27.5
7372
github.com/multiformats/go-varint v0.0.7
74-
go.opentelemetry.io/otel/trace v1.12.0
73+
go.opentelemetry.io/otel/trace v1.14.0
7574
go.uber.org/atomic v1.10.0
7675
)
7776

@@ -83,7 +82,7 @@ require (
8382
github.com/StackExchange/wmi v1.2.1 // indirect
8483
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
8584
github.com/akavel/rsrc v0.8.0 // indirect
86-
github.com/alecthomas/units v0.0.0-20210927113745-59d0afb8317a // indirect
85+
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
8786
github.com/armon/go-metrics v0.3.9 // indirect
8887
github.com/benbjohnson/clock v1.3.0 // indirect
8988
github.com/beorn7/perks v1.0.1 // indirect
@@ -92,9 +91,9 @@ require (
9291
github.com/buger/goterm v1.0.3 // indirect
9392
github.com/cespare/xxhash v1.1.0 // indirect
9493
github.com/cespare/xxhash/v2 v2.2.0 // indirect
95-
github.com/chzyer/readline v1.5.0 // indirect
96-
github.com/cilium/ebpf v0.4.0 // indirect
97-
github.com/containerd/cgroups v1.0.4 // indirect
94+
github.com/chzyer/readline v1.5.1 // indirect
95+
github.com/cilium/ebpf v0.9.1 // indirect
96+
github.com/containerd/cgroups v1.1.0 // indirect
9897
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
9998
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
10099
github.com/crackcomm/go-gitignore v0.0.0-20170627025303-887ab5e44cc3 // indirect
@@ -150,16 +149,16 @@ require (
150149
github.com/go-ole/go-ole v1.2.5 // indirect
151150
github.com/go-pg/zerochecker v0.2.0 // indirect
152151
github.com/go-redis/redis/v8 v8.11.4 // indirect
153-
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
152+
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
154153
github.com/godbus/dbus/v5 v5.1.0 // indirect
155154
github.com/gogo/protobuf v1.3.2 // indirect
156155
github.com/golang/glog v1.0.0 // indirect
157156
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
158157
github.com/golang/mock v1.6.0 // indirect
159-
github.com/golang/protobuf v1.5.2 // indirect
158+
github.com/golang/protobuf v1.5.3 // indirect
160159
github.com/golang/snappy v0.0.4 // indirect
161160
github.com/google/gopacket v1.1.19 // indirect
162-
github.com/google/pprof v0.0.0-20221203041831-ce31453925ec // indirect
161+
github.com/google/pprof v0.0.0-20230405160723-4a4c7d95572b // indirect
163162
github.com/google/uuid v1.3.0 // indirect
164163
github.com/gorilla/mux v1.8.0 // indirect
165164
github.com/gorilla/websocket v1.5.0 // indirect
@@ -174,9 +173,10 @@ require (
174173
github.com/hashicorp/golang-lru/v2 v2.0.2 // indirect
175174
github.com/hashicorp/raft v1.3.10 // indirect
176175
github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea // indirect
177-
github.com/huin/goupnp v1.0.3 // indirect
176+
github.com/huin/goupnp v1.1.0 // indirect
178177
github.com/icza/backscanner v0.0.0-20210726202459-ac2ffc679f94 // indirect
179178
github.com/ipfs/bbloom v0.0.4 // indirect
179+
github.com/ipfs/boxo v0.8.0 // indirect
180180
github.com/ipfs/go-bitfield v1.1.0 // indirect
181181
github.com/ipfs/go-blockservice v0.5.0 // indirect
182182
github.com/ipfs/go-cidutil v0.1.0 // indirect
@@ -201,17 +201,18 @@ require (
201201
github.com/ipfs/go-ipfs-util v0.0.2 // indirect
202202
github.com/ipfs/go-ipld-legacy v0.1.1 // indirect
203203
github.com/ipfs/go-ipns v0.3.0 // indirect
204+
github.com/ipfs/go-libipfs v0.7.0 // indirect
204205
github.com/ipfs/go-log v1.0.5 // indirect
205-
github.com/ipfs/go-merkledag v0.9.0 // indirect
206+
github.com/ipfs/go-merkledag v0.10.0 // indirect
206207
github.com/ipfs/go-metrics-interface v0.0.1 // indirect
207208
github.com/ipfs/go-path v0.3.1 // indirect
208209
github.com/ipfs/go-peertaskqueue v0.8.1 // indirect
209-
github.com/ipfs/go-unixfs v0.4.3 // indirect
210-
github.com/ipfs/go-unixfsnode v1.5.2 // indirect
210+
github.com/ipfs/go-unixfs v0.4.5 // indirect
211+
github.com/ipfs/go-unixfsnode v1.6.0 // indirect
211212
github.com/ipfs/go-verifcid v0.0.2 // indirect
212213
github.com/ipfs/interface-go-ipfs-core v0.11.1 // indirect
213-
github.com/ipld/go-car/v2 v2.7.0 // indirect
214-
github.com/ipld/go-codec-dagpb v1.5.0 // indirect
214+
github.com/ipld/go-car/v2 v2.10.0 // indirect
215+
github.com/ipld/go-codec-dagpb v1.6.0 // indirect
215216
github.com/ipld/go-ipld-adl-hamt v0.0.0-20220616142416-9004dbd839e0 // indirect
216217
github.com/ipld/go-ipld-prime v0.20.0 // indirect
217218
github.com/ipld/go-ipld-selector-text-lite v0.0.1 // indirect
@@ -228,17 +229,17 @@ require (
228229
github.com/jpillora/backoff v1.0.0 // indirect
229230
github.com/kelseyhightower/envconfig v1.4.0 // indirect
230231
github.com/kilic/bls12-381 v0.1.0 // indirect
231-
github.com/klauspost/compress v1.15.12 // indirect
232-
github.com/klauspost/cpuid/v2 v2.2.3 // indirect
233-
github.com/koron/go-ssdp v0.0.3 // indirect
232+
github.com/klauspost/compress v1.16.4 // indirect
233+
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
234+
github.com/koron/go-ssdp v0.0.4 // indirect
234235
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
235236
github.com/libp2p/go-cidranger v1.1.0 // indirect
236237
github.com/libp2p/go-flow-metrics v0.1.0 // indirect
237-
github.com/libp2p/go-libp2p-asn-util v0.2.0 // indirect
238+
github.com/libp2p/go-libp2p-asn-util v0.3.0 // indirect
238239
github.com/libp2p/go-libp2p-consensus v0.0.1 // indirect
239240
github.com/libp2p/go-libp2p-gorpc v0.5.0 // indirect
240241
github.com/libp2p/go-libp2p-gostream v0.6.0 // indirect
241-
github.com/libp2p/go-libp2p-kad-dht v0.21.0 // indirect
242+
github.com/libp2p/go-libp2p-kad-dht v0.21.1 // indirect
242243
github.com/libp2p/go-libp2p-kbucket v0.5.0 // indirect
243244
github.com/libp2p/go-libp2p-pubsub v0.9.3 // indirect
244245
github.com/libp2p/go-libp2p-raft v0.4.0 // indirect
@@ -254,24 +255,24 @@ require (
254255
github.com/magefile/mage v1.9.0 // indirect
255256
github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect
256257
github.com/mattn/go-colorable v0.1.13 // indirect
257-
github.com/mattn/go-isatty v0.0.17 // indirect
258+
github.com/mattn/go-isatty v0.0.18 // indirect
258259
github.com/mattn/go-runewidth v0.0.13 // indirect
259260
github.com/mattn/go-sqlite3 v1.14.16 // indirect
260261
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
261-
github.com/miekg/dns v1.1.50 // indirect
262+
github.com/miekg/dns v1.1.53 // indirect
262263
github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b // indirect
263264
github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc // indirect
264265
github.com/mr-tron/base58 v1.2.0 // indirect
265266
github.com/multiformats/go-base32 v0.1.0 // indirect
266267
github.com/multiformats/go-base36 v0.2.0 // indirect
267268
github.com/multiformats/go-multiaddr-dns v0.3.1 // indirect
268269
github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
269-
github.com/multiformats/go-multibase v0.1.1 // indirect
270-
github.com/multiformats/go-multicodec v0.8.0 // indirect
270+
github.com/multiformats/go-multibase v0.2.0 // indirect
271+
github.com/multiformats/go-multicodec v0.8.1 // indirect
271272
github.com/multiformats/go-multistream v0.4.1 // indirect
272273
github.com/nikkolasg/hexjson v0.1.0 // indirect
273274
github.com/nkovacs/streamquote v1.0.0 // indirect
274-
github.com/onsi/ginkgo/v2 v2.5.1 // indirect
275+
github.com/onsi/ginkgo/v2 v2.9.2 // indirect
275276
github.com/opencontainers/runtime-spec v1.0.2 // indirect
276277
github.com/opentracing/opentracing-go v1.2.0 // indirect
277278
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
@@ -280,12 +281,13 @@ require (
280281
github.com/pmezard/go-difflib v1.0.0 // indirect
281282
github.com/polydawn/refmt v0.89.0 // indirect
282283
github.com/prometheus/client_model v0.3.0 // indirect
283-
github.com/prometheus/common v0.37.0 // indirect
284-
github.com/prometheus/procfs v0.8.0 // indirect
284+
github.com/prometheus/common v0.42.0 // indirect
285+
github.com/prometheus/procfs v0.9.0 // indirect
285286
github.com/prometheus/statsd_exporter v0.21.0 // indirect
287+
github.com/puzpuzpuz/xsync/v2 v2.4.0 // indirect
286288
github.com/quic-go/qpack v0.4.0 // indirect
287-
github.com/quic-go/qtls-go1-19 v0.2.1 // indirect
288-
github.com/quic-go/qtls-go1-20 v0.1.1 // indirect
289+
github.com/quic-go/qtls-go1-19 v0.3.2 // indirect
290+
github.com/quic-go/qtls-go1-20 v0.2.2 // indirect
289291
github.com/quic-go/quic-go v0.33.0 // indirect
290292
github.com/quic-go/webtransport-go v0.5.2 // indirect
291293
github.com/raulk/go-watchdog v1.3.0 // indirect
@@ -320,19 +322,19 @@ require (
320322
github.com/zyedidia/generic v1.2.1 // indirect
321323
go.opentelemetry.io/otel/metric v0.33.0 // indirect
322324
go.opentelemetry.io/otel/sdk/metric v0.33.0 // indirect
323-
go.uber.org/dig v1.15.0 // indirect
325+
go.uber.org/dig v1.16.1 // indirect
324326
go4.org v0.0.0-20200411211856-f5505b9728dd // indirect
325-
golang.org/x/crypto v0.5.0 // indirect
326-
golang.org/x/exp v0.0.0-20230129154200-a960b3787bd2 // indirect
327-
golang.org/x/mod v0.7.0 // indirect
328-
golang.org/x/net v0.7.0 // indirect
329-
golang.org/x/sys v0.5.0 // indirect
330-
golang.org/x/term v0.5.0 // indirect
327+
golang.org/x/crypto v0.7.0 // indirect
328+
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
329+
golang.org/x/mod v0.10.0 // indirect
330+
golang.org/x/net v0.8.0 // indirect
331+
golang.org/x/sys v0.7.0 // indirect
332+
golang.org/x/term v0.6.0 // indirect
331333
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
332-
golang.org/x/tools v0.3.0 // indirect
334+
golang.org/x/tools v0.7.0 // indirect
333335
google.golang.org/genproto v0.0.0-20210917145530-b395a37504d4 // indirect
334336
google.golang.org/grpc v1.45.0 // indirect
335-
google.golang.org/protobuf v1.28.1 // indirect
337+
google.golang.org/protobuf v1.30.0 // indirect
336338
gopkg.in/yaml.v2 v2.4.0 // indirect
337339
gopkg.in/yaml.v3 v3.0.1 // indirect
338340
howett.net/plist v0.0.0-20181124034731-591f970eefbb // indirect

0 commit comments

Comments
 (0)