Skip to content

Commit 27912af

Browse files
simlecodesimlecode
authored
Merge pull request #6434 from filecoin-project/chore/update-f3
chore: update f3 to v0.7.3
2 parents 70208e2 + 18189ce commit 27912af

File tree

9 files changed

+214
-188
lines changed

9 files changed

+214
-188
lines changed

‎go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ require (
2727
github.com/filecoin-project/go-commp-utils v0.1.3
2828
github.com/filecoin-project/go-crypto v0.1.0
2929
github.com/filecoin-project/go-data-transfer/v2 v2.0.0-rc6
30-
github.com/filecoin-project/go-f3 v0.7.2
30+
github.com/filecoin-project/go-f3 v0.7.3
3131
github.com/filecoin-project/go-fil-commcid v0.2.0
3232
github.com/filecoin-project/go-fil-markets v1.28.2
3333
github.com/filecoin-project/go-jsonrpc v0.1.5
@@ -215,14 +215,14 @@ require (
215215
github.com/go-redis/redis_rate/v7 v7.0.1 // indirect
216216
github.com/go-resty/resty/v2 v2.4.0 // indirect
217217
github.com/go-sql-driver/mysql v1.6.0 // indirect
218-
github.com/goccy/go-json v0.10.2 // indirect
218+
github.com/goccy/go-json v0.10.3 // indirect
219219
github.com/godbus/dbus/v5 v5.1.0 // indirect
220220
github.com/gogo/protobuf v1.3.2 // indirect
221221
github.com/golang/glog v1.2.0 // indirect
222222
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
223223
github.com/golang/protobuf v1.5.4 // indirect
224224
github.com/golang/snappy v0.0.4 // indirect
225-
github.com/google/flatbuffers v23.5.26+incompatible // indirect
225+
github.com/google/flatbuffers v24.3.25+incompatible // indirect
226226
github.com/google/go-cmp v0.6.0 // indirect
227227
github.com/google/go-querystring v1.0.0 // indirect
228228
github.com/google/gopacket v1.1.19 // indirect

‎go.sum

+6-6
Original file line numberDiff line numberDiff line change
@@ -292,8 +292,8 @@ github.com/filecoin-project/go-data-transfer/v2 v2.0.0-rc6 h1:EsbXTWsBKT764qtX4M
292292
github.com/filecoin-project/go-data-transfer/v2 v2.0.0-rc6/go.mod h1:cX1acvFVWC5EXnnmFPWEFXbO7nLUdSZa+nqgi1QpTpw=
293293
github.com/filecoin-project/go-ds-versioning v0.1.2 h1:to4pTadv3IeV1wvgbCbN6Vqd+fu+7tveXgv/rCEZy6w=
294294
github.com/filecoin-project/go-ds-versioning v0.1.2/go.mod h1:C9/l9PnB1+mwPa26BBVpCjG/XQCB0yj/q5CK2J8X1I4=
295-
github.com/filecoin-project/go-f3 v0.7.2 h1:YQgxxSMzCSQniZqwDjyNkIRz3pnzCtOrtaS5ldIaUDA=
296-
github.com/filecoin-project/go-f3 v0.7.2/go.mod h1:QoxuoK4aktNZD1R/unlhNbhV6TnlNTAbA/QODCnAjak=
295+
github.com/filecoin-project/go-f3 v0.7.3 h1:nwRYRKaJs7AV3di/OQyj6tABeixBeL06DkJeoQrr5+0=
296+
github.com/filecoin-project/go-f3 v0.7.3/go.mod h1:wDo5mPi4KXVuA7kvwLpmfVVv2Aw2ZwZk3iqMWr5BOT0=
297297
github.com/filecoin-project/go-fil-commcid v0.0.0-20201016201715-d41df56b4f6a/go.mod h1:Eaox7Hvus1JgPrL5+M3+h7aSPHc0cVqpSxA+TxIEpZQ=
298298
github.com/filecoin-project/go-fil-commcid v0.1.0/go.mod h1:Eaox7Hvus1JgPrL5+M3+h7aSPHc0cVqpSxA+TxIEpZQ=
299299
github.com/filecoin-project/go-fil-commcid v0.2.0 h1:B+5UX8XGgdg/XsdUpST4pEBviKkFOw+Fvl2bLhSKGpI=
@@ -424,8 +424,8 @@ github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/me
424424
github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
425425
github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
426426
github.com/go-yaml/yaml v2.1.0+incompatible/go.mod h1:w2MrLa16VYP0jy6N7M5kHaCkaLENm+P+Tv+MfurjSw0=
427-
github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
428-
github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
427+
github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA=
428+
github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
429429
github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
430430
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
431431
github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
@@ -487,8 +487,8 @@ github.com/golangci/lint-1 v0.0.0-20181222135242-d2cdd8c08219/go.mod h1:/X8TswGS
487487
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
488488
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
489489
github.com/google/flatbuffers v1.12.1/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
490-
github.com/google/flatbuffers v23.5.26+incompatible h1:M9dgRyhJemaM4Sw8+66GHBu8ioaQmyPLg1b8VwK5WJg=
491-
github.com/google/flatbuffers v23.5.26+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
490+
github.com/google/flatbuffers v24.3.25+incompatible h1:CX395cjN9Kke9mmalRoL3d81AtFUxJM+yDthflgJGkI=
491+
github.com/google/flatbuffers v24.3.25+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
492492
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
493493
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
494494
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=

‎pkg/vf3/f3.go

+1
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ func New(mctx context.Context, params F3Params) (*F3, error) {
117117
doneCh := make(chan struct{})
118118

119119
go func() {
120+
defer close(doneCh)
120121
fff.runSigningLoop(lCtx)
121122
}()
122123

‎venus-devtool/api-gen/example.go

+25
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,31 @@ func init() {
360360
}
361361
addExample(f3Lease)
362362
addExample(&f3Lease)
363+
364+
f3Cert := certs.FinalityCertificate{
365+
GPBFTInstance: 0,
366+
ECChain: []gpbft.TipSet{
367+
{
368+
Epoch: 0,
369+
Key: tsk.Bytes(),
370+
PowerTable: c,
371+
},
372+
},
373+
SupplementalData: gpbft.SupplementalData{
374+
PowerTable: c,
375+
},
376+
Signers: bitfield.NewFromSet([]uint64{2, 3, 5, 7}),
377+
Signature: []byte("UnDadaSeA"),
378+
PowerTableDelta: []certs.PowerTableDelta{
379+
{
380+
ParticipantID: 0,
381+
PowerDelta: gpbft.StoragePower{},
382+
SigningKey: []byte("BaRrelEYe"),
383+
},
384+
},
385+
}
386+
addExample(f3Cert)
387+
addExample(&f3Cert)
363388
}
364389

365390
func ExampleValue(method string, t, parent reflect.Type) interface{} {

‎venus-devtool/go.mod

+23-23
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
module github.com/filecoin-project/venus/venus-devtool
22

3-
go 1.22
3+
go 1.22.7
44

55
toolchain go1.23.2
66

77
require (
88
github.com/filecoin-project/go-address v1.2.0
99
github.com/filecoin-project/go-bitfield v0.2.4
1010
github.com/filecoin-project/go-data-transfer/v2 v2.0.0-rc7
11-
github.com/filecoin-project/go-f3 v0.7.2
11+
github.com/filecoin-project/go-f3 v0.7.3
1212
github.com/filecoin-project/go-fil-markets v1.28.3
13-
github.com/filecoin-project/go-jsonrpc v0.6.0
13+
github.com/filecoin-project/go-jsonrpc v0.7.0
1414
github.com/filecoin-project/go-state-types v0.15.0
15-
github.com/filecoin-project/lotus v1.30.0
15+
github.com/filecoin-project/lotus v1.31.0
1616
github.com/filecoin-project/venus v0.0.0-00010101000000-000000000000
1717
github.com/google/uuid v1.6.0
1818
github.com/ipfs/go-block-format v0.2.0
1919
github.com/ipfs/go-cid v0.4.1
2020
github.com/ipfs/go-graphsync v0.16.0
2121
github.com/ipld/go-ipld-selector-text-lite v0.0.1
22-
github.com/libp2p/go-libp2p v0.35.5
22+
github.com/libp2p/go-libp2p v0.37.2
2323
github.com/libp2p/go-libp2p-pubsub v0.11.0
2424
github.com/multiformats/go-multiaddr v0.13.0
2525
github.com/urfave/cli/v2 v2.25.5
2626
github.com/whyrusleeping/cbor-gen v0.2.0
27-
golang.org/x/tools v0.24.0
27+
golang.org/x/tools v0.26.0
2828
)
2929

3030
require (
@@ -136,11 +136,11 @@ require (
136136
github.com/jessevdk/go-flags v1.4.0 // indirect
137137
github.com/jpillora/backoff v1.0.0 // indirect
138138
github.com/kilic/bls12-381 v0.1.1-0.20220929213557-ca162e8a70f4 // indirect
139-
github.com/klauspost/compress v1.17.9 // indirect
139+
github.com/klauspost/compress v1.17.11 // indirect
140140
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
141141
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
142142
github.com/libp2p/go-cidranger v1.1.0 // indirect
143-
github.com/libp2p/go-flow-metrics v0.1.0 // indirect
143+
github.com/libp2p/go-flow-metrics v0.2.0 // indirect
144144
github.com/libp2p/go-libp2p-asn-util v0.4.1 // indirect
145145
github.com/libp2p/go-libp2p-kad-dht v0.25.2 // indirect
146146
github.com/libp2p/go-libp2p-kbucket v0.6.3 // indirect
@@ -151,18 +151,18 @@ require (
151151
github.com/magefile/mage v1.13.0 // indirect
152152
github.com/mailru/easyjson v0.7.7 // indirect
153153
github.com/mattn/go-isatty v0.0.20 // indirect
154-
github.com/miekg/dns v1.1.59 // indirect
154+
github.com/miekg/dns v1.1.62 // indirect
155155
github.com/minio/sha256-simd v1.0.1 // indirect
156156
github.com/mitchellh/go-homedir v1.1.0 // indirect
157157
github.com/mr-tron/base58 v1.2.0 // indirect
158158
github.com/multiformats/go-base32 v0.1.0 // indirect
159159
github.com/multiformats/go-base36 v0.2.0 // indirect
160-
github.com/multiformats/go-multiaddr-dns v0.4.0 // indirect
160+
github.com/multiformats/go-multiaddr-dns v0.4.1 // indirect
161161
github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
162162
github.com/multiformats/go-multibase v0.2.0 // indirect
163163
github.com/multiformats/go-multicodec v0.9.0 // indirect
164164
github.com/multiformats/go-multihash v0.2.3 // indirect
165-
github.com/multiformats/go-multistream v0.5.0 // indirect
165+
github.com/multiformats/go-multistream v0.6.0 // indirect
166166
github.com/multiformats/go-varint v0.0.7 // indirect
167167
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
168168
github.com/nikkolasg/hexjson v0.1.0 // indirect
@@ -174,9 +174,9 @@ require (
174174
github.com/pkg/errors v0.9.1 // indirect
175175
github.com/pmezard/go-difflib v1.0.0 // indirect
176176
github.com/polydawn/refmt v0.89.0 // indirect
177-
github.com/prometheus/client_golang v1.19.1 // indirect
177+
github.com/prometheus/client_golang v1.20.5 // indirect
178178
github.com/prometheus/client_model v0.6.1 // indirect
179-
github.com/prometheus/common v0.55.0 // indirect
179+
github.com/prometheus/common v0.60.0 // indirect
180180
github.com/prometheus/procfs v0.15.1 // indirect
181181
github.com/prometheus/statsd_exporter v0.23.0 // indirect
182182
github.com/puzpuzpuz/xsync/v2 v2.4.1 // indirect
@@ -205,24 +205,24 @@ require (
205205
go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect
206206
go.opentelemetry.io/otel/trace v1.28.0 // indirect
207207
go.uber.org/atomic v1.11.0 // indirect
208-
go.uber.org/dig v1.17.1 // indirect
209-
go.uber.org/fx v1.22.1 // indirect
208+
go.uber.org/dig v1.18.0 // indirect
209+
go.uber.org/fx v1.23.0 // indirect
210210
go.uber.org/multierr v1.11.0 // indirect
211211
go.uber.org/zap v1.27.0 // indirect
212212
go4.org v0.0.0-20230225012048-214862532bf5 // indirect
213-
golang.org/x/crypto v0.28.0 // indirect
214-
golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e // indirect
215-
golang.org/x/mod v0.20.0 // indirect
216-
golang.org/x/net v0.29.0 // indirect
217-
golang.org/x/sync v0.8.0 // indirect
218-
golang.org/x/sys v0.26.0 // indirect
219-
golang.org/x/text v0.19.0 // indirect
213+
golang.org/x/crypto v0.29.0 // indirect
214+
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect
215+
golang.org/x/mod v0.21.0 // indirect
216+
golang.org/x/net v0.30.0 // indirect
217+
golang.org/x/sync v0.9.0 // indirect
218+
golang.org/x/sys v0.27.0 // indirect
219+
golang.org/x/text v0.20.0 // indirect
220220
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
221221
gonum.org/v1/gonum v0.15.0 // indirect
222222
google.golang.org/api v0.81.0 // indirect
223223
google.golang.org/genproto/googleapis/rpc v0.0.0-20240515191416-fc5f0ca64291 // indirect
224224
google.golang.org/grpc v1.64.0 // indirect
225-
google.golang.org/protobuf v1.34.2 // indirect
225+
google.golang.org/protobuf v1.35.1 // indirect
226226
gopkg.in/yaml.v2 v2.4.0 // indirect
227227
gopkg.in/yaml.v3 v3.0.1 // indirect
228228
lukechampine.com/blake3 v1.3.0 // indirect

0 commit comments

Comments
 (0)