Skip to content

Commit b9a2f78

Browse files
authored
feat: NV24 upgrade (#286)
* NV24 upgrade * docker devnet update
1 parent d7d9a32 commit b9a2f78

File tree

9 files changed

+101
-152
lines changed

9 files changed

+101
-152
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ build_lotus?=0
263263
curio_docker_user?=curio
264264
curio_base_image=$(curio_docker_user)/curio-all-in-one:latest-debug
265265
ffi_from_source?=0
266-
lotus_version?=v1.29.0
266+
lotus_version?=v1.30.0-rc2
267267

268268
ifeq ($(build_lotus),1)
269269
# v1: building lotus image with provided lotus version

api/api_chain.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ type CurioChainRPC interface {
6767
StateSectorPreCommitInfo(context.Context, address.Address, abi.SectorNumber, types.TipSetKey) (*miner.SectorPreCommitOnChainInfo, error)
6868
StateSectorGetInfo(ctx context.Context, maddr address.Address, sectorNumber abi.SectorNumber, tsk types.TipSetKey) (*miner.SectorOnChainInfo, error)
6969
StateMinerPreCommitDepositForPower(context.Context, address.Address, miner.SectorPreCommitInfo, types.TipSetKey) (big.Int, error)
70-
StateMinerInitialPledgeCollateral(context.Context, address.Address, miner.SectorPreCommitInfo, types.TipSetKey) (big.Int, error)
70+
StateMinerInitialPledgeForSector(ctx context.Context, sectorDuration abi.ChainEpoch, sectorSize abi.SectorSize, verifiedSize uint64, tsk types.TipSetKey) (types.BigInt, error)
7171
StateMinerPower(context.Context, address.Address, types.TipSetKey) (*api.MinerPower, error) //perm:read
7272
StateMinerDeadlines(context.Context, address.Address, types.TipSetKey) ([]api.Deadline, error) //perm:read
7373
StateGetAllocation(ctx context.Context, clientAddr address.Address, allocationId verifregtypes.AllocationId, tsk types.TipSetKey) (*verifregtypes.Allocation, error)

api/proxy_gen.go

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go.mod

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@ require (
1717
github.com/etclabscore/go-openrpc-reflect v0.0.36
1818
github.com/fatih/color v1.15.0
1919
github.com/filecoin-project/filecoin-ffi v1.28.0-rc2
20-
github.com/filecoin-project/go-address v1.1.0
20+
github.com/filecoin-project/go-address v1.2.0
2121
github.com/filecoin-project/go-bitfield v0.2.4
2222
github.com/filecoin-project/go-cbor-util v0.0.1
2323
github.com/filecoin-project/go-commp-utils v0.1.4
2424
github.com/filecoin-project/go-commp-utils/nonffi v0.0.0-20240802040721-2a04ffc8ffe8
2525
github.com/filecoin-project/go-commp-utils/v2 v2.1.0
26-
github.com/filecoin-project/go-fil-commcid v0.1.0
26+
github.com/filecoin-project/go-fil-commcid v0.2.0
2727
github.com/filecoin-project/go-fil-commp-hashhash v0.2.0
2828
github.com/filecoin-project/go-jsonrpc v0.6.1-0.20240820160949-2cfe810e5d2f
2929
github.com/filecoin-project/go-padreader v0.0.1
30-
github.com/filecoin-project/go-state-types v0.14.0
30+
github.com/filecoin-project/go-state-types v0.15.0-rc1
3131
github.com/filecoin-project/go-statestore v0.2.0
32-
github.com/filecoin-project/lotus v1.28.2-0.20240902200914-dde3cd9a0306
32+
github.com/filecoin-project/lotus v1.30.0-rc2.0.20241016173451-c07d2f73e436
3333
github.com/filecoin-project/specs-actors/v2 v2.3.6
3434
github.com/filecoin-project/specs-actors/v5 v5.0.6
3535
github.com/filecoin-project/specs-actors/v6 v6.0.2
@@ -50,7 +50,7 @@ require (
5050
github.com/ipfs/go-cid v0.4.1
5151
github.com/ipfs/go-datastore v0.6.0
5252
github.com/ipfs/go-fs-lock v0.0.7
53-
github.com/ipfs/go-ipld-cbor v0.1.0
53+
github.com/ipfs/go-ipld-cbor v0.2.0
5454
github.com/ipfs/go-log/v2 v2.5.1
5555
github.com/jackc/pgerrcode v0.0.0-20240316143900-6e2875d9b438
5656
github.com/kelseyhightower/envconfig v1.4.0
@@ -59,7 +59,7 @@ require (
5959
github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1
6060
github.com/minio/sha256-simd v1.0.1
6161
github.com/mitchellh/go-homedir v1.1.0
62-
github.com/multiformats/go-multiaddr v0.12.4
62+
github.com/multiformats/go-multiaddr v0.13.0
6363
github.com/open-rpc/meta-schema v0.0.0-20201029221707-1b72ef2ea333
6464
github.com/pkg/errors v0.9.1
6565
github.com/prometheus/client_golang v1.19.1
@@ -76,21 +76,20 @@ require (
7676
go.opencensus.io v0.24.0
7777
go.uber.org/multierr v1.11.0
7878
go.uber.org/zap v1.27.0
79-
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842
80-
golang.org/x/net v0.26.0
81-
golang.org/x/sync v0.7.0
82-
golang.org/x/sys v0.23.0
83-
golang.org/x/text v0.16.0
84-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d
85-
golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9
79+
golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e
80+
golang.org/x/net v0.29.0
81+
golang.org/x/sync v0.8.0
82+
golang.org/x/sys v0.25.0
83+
golang.org/x/text v0.18.0
84+
golang.org/x/tools v0.24.0
85+
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da
8686
)
8787

8888
require (
8989
github.com/GeertJohan/go.incremental v1.0.0 // indirect
9090
github.com/GeertJohan/go.rice v1.0.3 // indirect
9191
github.com/Gurpartap/async v0.0.0-20180927173644-4f7f499dd9ee // indirect
9292
github.com/Jorropo/jsync v1.0.1 // indirect
93-
github.com/Kubuxu/go-broadcast v0.0.0-20240621161059-1a8c90734cd6 // indirect
9493
github.com/Kubuxu/imtui v0.0.0-20210401140320-41663d68d0fa // indirect
9594
github.com/PuerkitoBio/purell v1.1.1 // indirect
9695
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
@@ -108,6 +107,7 @@ require (
108107
github.com/chzyer/readline v1.5.1 // indirect
109108
github.com/cilium/ebpf v0.9.1 // indirect
110109
github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0 // indirect
110+
github.com/consensys/bavard v0.1.13 // indirect
111111
github.com/containerd/cgroups v1.1.0 // indirect
112112
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
113113
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
@@ -128,10 +128,10 @@ require (
128128
github.com/etclabscore/go-jsonschema-walk v0.0.6 // indirect
129129
github.com/filecoin-project/go-amt-ipld/v2 v2.1.0 // indirect
130130
github.com/filecoin-project/go-amt-ipld/v3 v3.1.0 // indirect
131-
github.com/filecoin-project/go-amt-ipld/v4 v4.3.0 // indirect
131+
github.com/filecoin-project/go-amt-ipld/v4 v4.4.0 // indirect
132132
github.com/filecoin-project/go-clock v0.1.0 // indirect
133133
github.com/filecoin-project/go-crypto v0.1.0 // indirect
134-
github.com/filecoin-project/go-f3 v0.2.0 // indirect
134+
github.com/filecoin-project/go-f3 v0.7.0 // indirect
135135
github.com/filecoin-project/go-hamt-ipld v0.1.5 // indirect
136136
github.com/filecoin-project/go-hamt-ipld/v2 v2.0.0 // indirect
137137
github.com/filecoin-project/go-hamt-ipld/v3 v3.4.0 // indirect
@@ -212,7 +212,7 @@ require (
212212
github.com/koron/go-ssdp v0.0.4 // indirect
213213
github.com/libp2p/go-cidranger v1.1.0 // indirect
214214
github.com/libp2p/go-flow-metrics v0.1.0 // indirect
215-
github.com/libp2p/go-libp2p v0.35.4 // indirect
215+
github.com/libp2p/go-libp2p v0.35.5 // indirect
216216
github.com/libp2p/go-libp2p-asn-util v0.4.1 // indirect
217217
github.com/libp2p/go-libp2p-kad-dht v0.25.2 // indirect
218218
github.com/libp2p/go-libp2p-kbucket v0.6.3 // indirect
@@ -236,12 +236,13 @@ require (
236236
github.com/miekg/dns v1.1.59 // indirect
237237
github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b // indirect
238238
github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc // indirect
239+
github.com/mmcloughlin/addchain v0.4.0 // indirect
239240
github.com/mr-tron/base58 v1.2.0 // indirect
240241
github.com/muesli/reflow v0.3.0 // indirect
241242
github.com/muesli/termenv v0.15.2 // indirect
242243
github.com/multiformats/go-base32 v0.1.0 // indirect
243244
github.com/multiformats/go-base36 v0.2.0 // indirect
244-
github.com/multiformats/go-multiaddr-dns v0.3.1 // indirect
245+
github.com/multiformats/go-multiaddr-dns v0.4.0 // indirect
245246
github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
246247
github.com/multiformats/go-multibase v0.2.0 // indirect
247248
github.com/multiformats/go-multicodec v0.9.0 // indirect
@@ -301,6 +302,7 @@ require (
301302
github.com/zyedidia/generic v1.2.1 // indirect
302303
gitlab.com/yawning/secp256k1-voi v0.0.0-20230925100816-f2616030848b // indirect
303304
gitlab.com/yawning/tuplehash v0.0.0-20230713102510-df83abbf9a02 // indirect
305+
go.dedis.ch/kyber/v4 v4.0.0-pre2.0.20240924132404-4de33740016e // indirect
304306
go.opentelemetry.io/otel v1.28.0 // indirect
305307
go.opentelemetry.io/otel/bridge/opencensus v1.28.0 // indirect
306308
go.opentelemetry.io/otel/exporters/jaeger v1.14.0 // indirect
@@ -314,9 +316,9 @@ require (
314316
go.uber.org/fx v1.22.1 // indirect
315317
go.uber.org/mock v0.4.0 // indirect
316318
go4.org v0.0.0-20230225012048-214862532bf5 // indirect
317-
golang.org/x/crypto v0.25.0 // indirect
318-
golang.org/x/mod v0.17.0 // indirect
319-
golang.org/x/term v0.22.0 // indirect
319+
golang.org/x/crypto v0.27.0 // indirect
320+
golang.org/x/mod v0.20.0 // indirect
321+
golang.org/x/term v0.24.0 // indirect
320322
golang.org/x/time v0.5.0 // indirect
321323
gonum.org/v1/gonum v0.15.0 // indirect
322324
google.golang.org/genproto/googleapis/rpc v0.0.0-20240515191416-fc5f0ca64291 // indirect
@@ -327,6 +329,7 @@ require (
327329
gopkg.in/yaml.v3 v3.0.1 // indirect
328330
howett.net/plist v0.0.0-20181124034731-591f970eefbb // indirect
329331
lukechampine.com/blake3 v1.3.0 // indirect
332+
rsc.io/tmplfunc v0.0.3 // indirect
330333
)
331334

332335
replace github.com/filecoin-project/filecoin-ffi => ./extern/filecoin-ffi

0 commit comments

Comments
 (0)