Skip to content

Commit dbadd18

Browse files
simlecodesimlecode
committed
chore: update go-f3 to 0.8.6
1 parent 65405db commit dbadd18

File tree

8 files changed

+59
-68
lines changed

8 files changed

+59
-68
lines changed

‎app/submodule/f3/f3_submodule.go

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,23 +37,17 @@ func NewF3Submodule(ctx context.Context,
3737
return nil, err
3838
}
3939

40-
provider, err := vf3.NewManifestProvider(ctx, network.F3Cfg, chain.ChainReader, network.Pubsub,
41-
repo.MetaDatastore(), chain.API(), netConf.F3InitialPowerTableCID)
42-
if err != nil {
43-
return nil, err
44-
}
4540
m, err := vf3.New(ctx, vf3.F3Params{
46-
ManifestProvider: provider,
47-
PubSub: network.Pubsub,
48-
Host: network.Host,
49-
ChainStore: chain.ChainReader,
50-
StateManager: chain.Stmgr,
51-
Datastore: repo.MetaDatastore(),
52-
WalletSign: walletSign,
53-
SyncerAPI: syncer.API(),
54-
Config: network.F3Cfg,
55-
RepoPath: repoPath,
56-
Net: network.API(),
41+
PubSub: network.Pubsub,
42+
Host: network.Host,
43+
ChainStore: chain.ChainReader,
44+
StateManager: chain.Stmgr,
45+
Datastore: repo.MetaDatastore(),
46+
WalletSign: walletSign,
47+
SyncerAPI: syncer.API(),
48+
Config: network.F3Cfg,
49+
RepoPath: repoPath,
50+
Net: network.API(),
5751
})
5852
if err != nil {
5953
return nil, err

‎go.mod

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ require (
2828
github.com/filecoin-project/go-commp-utils v0.1.3
2929
github.com/filecoin-project/go-crypto v0.1.0
3030
github.com/filecoin-project/go-data-transfer/v2 v2.0.0-rc6
31-
github.com/filecoin-project/go-f3 v0.8.3
31+
github.com/filecoin-project/go-f3 v0.8.6
3232
github.com/filecoin-project/go-fil-commcid v0.2.0
3333
github.com/filecoin-project/go-fil-markets v1.28.2
3434
github.com/filecoin-project/go-jsonrpc v0.1.5
3535
github.com/filecoin-project/go-paramfetch v0.0.4
36-
github.com/filecoin-project/go-state-types v0.16.0
36+
github.com/filecoin-project/go-state-types v0.17.0-dev2
3737
github.com/filecoin-project/pubsub v1.0.0
3838
github.com/filecoin-project/specs-actors v0.9.15-0.20220514164640-94e0d5e123bd
3939
github.com/filecoin-project/specs-actors/v2 v2.3.6
@@ -103,11 +103,11 @@ require (
103103
go.opentelemetry.io/otel/exporters/prometheus v0.50.0
104104
go.opentelemetry.io/otel/sdk v1.34.0
105105
go.uber.org/zap v1.27.0
106-
golang.org/x/crypto v0.36.0
107-
golang.org/x/net v0.36.0
106+
golang.org/x/crypto v0.38.0
107+
golang.org/x/net v0.38.0
108108
golang.org/x/oauth2 v0.24.0
109-
golang.org/x/sync v0.12.0
110-
golang.org/x/sys v0.31.0
109+
golang.org/x/sync v0.15.0
110+
golang.org/x/sys v0.33.0
111111
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da
112112
gopkg.in/cheggaaa/pb.v1 v1.0.28
113113
gorm.io/driver/mysql v1.1.1
@@ -140,13 +140,13 @@ require (
140140
github.com/pion/dtls/v3 v3.0.4 // indirect
141141
github.com/pion/ice/v2 v2.3.37 // indirect
142142
github.com/pion/ice/v4 v4.0.6 // indirect
143-
github.com/pion/interceptor v0.1.37 // indirect
143+
github.com/pion/interceptor v0.1.39 // indirect
144144
github.com/pion/logging v0.2.3 // indirect
145145
github.com/pion/mdns v0.0.12 // indirect
146146
github.com/pion/mdns/v2 v2.0.7 // indirect
147147
github.com/pion/randutil v0.1.0 // indirect
148148
github.com/pion/rtcp v1.2.15 // indirect
149-
github.com/pion/rtp v1.8.11 // indirect
149+
github.com/pion/rtp v1.8.18 // indirect
150150
github.com/pion/sctp v1.8.35 // indirect
151151
github.com/pion/sdp/v3 v3.0.10 // indirect
152152
github.com/pion/srtp/v3 v3.0.4 // indirect
@@ -203,7 +203,7 @@ require (
203203
github.com/filecoin-project/go-ds-versioning v0.1.2 // indirect
204204
github.com/filecoin-project/go-hamt-ipld v0.1.5 // indirect
205205
github.com/filecoin-project/go-hamt-ipld/v2 v2.0.0 // indirect
206-
github.com/filecoin-project/go-hamt-ipld/v3 v3.4.0 // indirect
206+
github.com/filecoin-project/go-hamt-ipld/v3 v3.4.1 // indirect
207207
github.com/filecoin-project/go-padreader v0.0.1 // indirect
208208
github.com/filecoin-project/go-statemachine v1.0.3 // indirect
209209
github.com/filecoin-project/go-statestore v0.2.0 // indirect
@@ -352,8 +352,8 @@ require (
352352
golang.org/x/arch v0.3.0 // indirect
353353
golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac // indirect
354354
golang.org/x/mod v0.23.0 // indirect
355-
golang.org/x/term v0.30.0 // indirect
356-
golang.org/x/text v0.23.0 // indirect
355+
golang.org/x/term v0.32.0 // indirect
356+
golang.org/x/text v0.25.0 // indirect
357357
golang.org/x/time v0.6.0 // indirect
358358
golang.org/x/tools v0.30.0 // indirect
359359
google.golang.org/api v0.169.0 // indirect

‎go.sum

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1710,8 +1710,8 @@ github.com/filecoin-project/go-data-transfer/v2 v2.0.0-rc6 h1:EsbXTWsBKT764qtX4M
17101710
github.com/filecoin-project/go-data-transfer/v2 v2.0.0-rc6/go.mod h1:cX1acvFVWC5EXnnmFPWEFXbO7nLUdSZa+nqgi1QpTpw=
17111711
github.com/filecoin-project/go-ds-versioning v0.1.2 h1:to4pTadv3IeV1wvgbCbN6Vqd+fu+7tveXgv/rCEZy6w=
17121712
github.com/filecoin-project/go-ds-versioning v0.1.2/go.mod h1:C9/l9PnB1+mwPa26BBVpCjG/XQCB0yj/q5CK2J8X1I4=
1713-
github.com/filecoin-project/go-f3 v0.8.3 h1:0ToWoqJDsunr+Jf945Upvk6rdXn8It5B5LcyiY1Ry1k=
1714-
github.com/filecoin-project/go-f3 v0.8.3/go.mod h1:KWksfw7CabMuL4ple/J52gK4soYBpTsL6i5WAgtJDqw=
1713+
github.com/filecoin-project/go-f3 v0.8.6 h1:sQxY5RmVRw30eMUI9sYTcjekyNF+tDl3P6tsFbhRrR4=
1714+
github.com/filecoin-project/go-f3 v0.8.6/go.mod h1:TvVqGx98n6vdDZGZ1K2Vw13TtlsyJbiTiLGX2XSQeVk=
17151715
github.com/filecoin-project/go-fil-commcid v0.0.0-20201016201715-d41df56b4f6a/go.mod h1:Eaox7Hvus1JgPrL5+M3+h7aSPHc0cVqpSxA+TxIEpZQ=
17161716
github.com/filecoin-project/go-fil-commcid v0.1.0/go.mod h1:Eaox7Hvus1JgPrL5+M3+h7aSPHc0cVqpSxA+TxIEpZQ=
17171717
github.com/filecoin-project/go-fil-commcid v0.2.0 h1:B+5UX8XGgdg/XsdUpST4pEBviKkFOw+Fvl2bLhSKGpI=
@@ -1726,8 +1726,9 @@ github.com/filecoin-project/go-hamt-ipld/v2 v2.0.0 h1:b3UDemBYN2HNfk3KOXNuxgTTxl
17261726
github.com/filecoin-project/go-hamt-ipld/v2 v2.0.0/go.mod h1:7aWZdaQ1b16BVoQUYR+eEvrDCGJoPLxFpDynFjYfBjI=
17271727
github.com/filecoin-project/go-hamt-ipld/v3 v3.0.1/go.mod h1:gXpNmr3oQx8l3o7qkGyDjJjYSRX7hp/FGOStdqrWyDI=
17281728
github.com/filecoin-project/go-hamt-ipld/v3 v3.1.0/go.mod h1:bxmzgT8tmeVQA1/gvBwFmYdT8SOFUwB3ovSUfG1Ux0g=
1729-
github.com/filecoin-project/go-hamt-ipld/v3 v3.4.0 h1:nYs6OPUF8KbZ3E8o9p9HJnQaE8iugjHR5WYVMcicDJc=
17301729
github.com/filecoin-project/go-hamt-ipld/v3 v3.4.0/go.mod h1:s0qiHRhFyrgW0SvdQMSJFQxNa4xEIG5XvqCBZUEgcbc=
1730+
github.com/filecoin-project/go-hamt-ipld/v3 v3.4.1 h1:wl+ZHruCcE9LvwU7blpwWn35XOcRS6+IBg75G7ZzxzY=
1731+
github.com/filecoin-project/go-hamt-ipld/v3 v3.4.1/go.mod h1:AqjryNfkxffpnqsa5mwnJHlazhVqF6W2nilu+VYKIq8=
17311732
github.com/filecoin-project/go-padreader v0.0.0-20200903213702-ed5fae088b20/go.mod h1:mPn+LRRd5gEKNAtc+r3ScpW2JRU/pj4NBKdADYWHiak=
17321733
github.com/filecoin-project/go-padreader v0.0.1 h1:8h2tVy5HpoNbr2gBRr+WD6zV6VD6XHig+ynSGJg8ZOs=
17331734
github.com/filecoin-project/go-padreader v0.0.1/go.mod h1:VYVPJqwpsfmtoHnAmPx6MUwmrK6HIcDqZJiuZhtmfLQ=
@@ -1741,8 +1742,9 @@ github.com/filecoin-project/go-state-types v0.1.4/go.mod h1:xCA/WfKlC2zcn3fUmDv4
17411742
github.com/filecoin-project/go-state-types v0.1.6/go.mod h1:UwGVoMsULoCK+bWjEdd/xLCvLAQFBC7EDT477SKml+Q=
17421743
github.com/filecoin-project/go-state-types v0.1.10/go.mod h1:UwGVoMsULoCK+bWjEdd/xLCvLAQFBC7EDT477SKml+Q=
17431744
github.com/filecoin-project/go-state-types v0.14.0/go.mod h1:cDbxwjbmVtV+uNi5D/cFtxKlsRqibnQNlz7xQA1EqYg=
1744-
github.com/filecoin-project/go-state-types v0.16.0 h1:ajIREDzTGfq71ofIQ29iZR1WXxmkvd2nQNc6ApcP1wI=
17451745
github.com/filecoin-project/go-state-types v0.16.0/go.mod h1:YCESyrqnyu17y0MazbV6Uwma5+BrMvEKEQp5QWeIf9g=
1746+
github.com/filecoin-project/go-state-types v0.17.0-dev2 h1:2P7UxGmjmo8dTHtC6mn7I1/HYd6MNPgMMt4jTQ/Juds=
1747+
github.com/filecoin-project/go-state-types v0.17.0-dev2/go.mod h1:em4yo9mglrdyHbcsxelHCSKMjLdJLddLERWQe6J8vYc=
17461748
github.com/filecoin-project/go-statemachine v0.0.0-20200925024713-05bd7c71fbfe/go.mod h1:FGwQgZAt2Gh5mjlwJUlVB62JeYdo+if0xWxSEfBD9ig=
17471749
github.com/filecoin-project/go-statemachine v1.0.3 h1:N07o6alys+V1tNoSTi4WuuoeNC4erS/6jE74+NsgQuk=
17481750
github.com/filecoin-project/go-statemachine v1.0.3/go.mod h1:jZdXXiHa61n4NmgWFG4w8tnqgvZVHYbJ3yW7+y8bF54=
@@ -3225,8 +3227,8 @@ github.com/pion/ice/v4 v4.0.6 h1:jmM9HwI9lfetQV/39uD0nY4y++XZNPhvzIPCb8EwxUM=
32253227
github.com/pion/ice/v4 v4.0.6/go.mod h1:y3M18aPhIxLlcO/4dn9X8LzLLSma84cx6emMSu14FGw=
32263228
github.com/pion/interceptor v0.1.25/go.mod h1:wkbPYAak5zKsfpVDYMtEfWEy8D4zL+rpxCxPImLOg3Y=
32273229
github.com/pion/interceptor v0.1.29/go.mod h1:ri+LGNjRUc5xUNtDEPzfdkmSqISixVTBF/z/Zms/6T4=
3228-
github.com/pion/interceptor v0.1.37 h1:aRA8Zpab/wE7/c0O3fh1PqY0AJI3fCSEM5lRWJVorwI=
3229-
github.com/pion/interceptor v0.1.37/go.mod h1:JzxbJ4umVTlZAf+/utHzNesY8tmRkM2lVmkS82TTj8Y=
3230+
github.com/pion/interceptor v0.1.39 h1:Y6k0bN9Y3Lg/Wb21JBWp480tohtns8ybJ037AGr9UuA=
3231+
github.com/pion/interceptor v0.1.39/go.mod h1:Z6kqH7M/FYirg3frjGJ21VLSRJGBXB/KqaTIrdqnOic=
32303232
github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms=
32313233
github.com/pion/logging v0.2.3 h1:gHuf0zpoh1GW67Nr6Gj4cv5Z9ZscU7g/EaoC/Ke/igI=
32323234
github.com/pion/logging v0.2.3/go.mod h1:z8YfknkquMe1csOrxK5kc+5/ZPAzMxbKLX5aXpbpC90=
@@ -3245,8 +3247,8 @@ github.com/pion/rtp v1.8.2/go.mod h1:pBGHaFt/yW7bf1jjWAoUjpSNoDnw98KTMg+jWWvziqU
32453247
github.com/pion/rtp v1.8.3/go.mod h1:pBGHaFt/yW7bf1jjWAoUjpSNoDnw98KTMg+jWWvziqU=
32463248
github.com/pion/rtp v1.8.5/go.mod h1:pBGHaFt/yW7bf1jjWAoUjpSNoDnw98KTMg+jWWvziqU=
32473249
github.com/pion/rtp v1.8.6/go.mod h1:pBGHaFt/yW7bf1jjWAoUjpSNoDnw98KTMg+jWWvziqU=
3248-
github.com/pion/rtp v1.8.11 h1:17xjnY5WO5hgO6SD3/NTIUPvSFw/PbLsIJyz1r1yNIk=
3249-
github.com/pion/rtp v1.8.11/go.mod h1:8uMBJj32Pa1wwx8Fuv/AsFhn8jsgw+3rUC2PfoBZ8p4=
3250+
github.com/pion/rtp v1.8.18 h1:yEAb4+4a8nkPCecWzQB6V/uEU18X1lQCGAQCjP+pyvU=
3251+
github.com/pion/rtp v1.8.18/go.mod h1:bAu2UFKScgzyFqvUKmbvzSdPr+NGbZtv6UB2hesqXBk=
32503252
github.com/pion/sctp v1.8.5/go.mod h1:SUFFfDpViyKejTAdwD1d/HQsCu+V/40cCs2nZIvC3s0=
32513253
github.com/pion/sctp v1.8.13/go.mod h1:YKSgO/bO/6aOMP9LCie1DuD7m+GamiK2yIiPM6vH+GA=
32523254
github.com/pion/sctp v1.8.16/go.mod h1:P6PbDVA++OJMrVNg2AL3XtYHV4uD6dvfyOovCgMs0PE=
@@ -3920,8 +3922,9 @@ golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v
39203922
golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
39213923
golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
39223924
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
3923-
golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
39243925
golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
3926+
golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
3927+
golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
39253928
golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
39263929
golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
39273930
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -4131,8 +4134,8 @@ golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
41314134
golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
41324135
golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
41334136
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
4134-
golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA=
4135-
golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I=
4137+
golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
4138+
golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
41364139
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
41374140
golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
41384141
golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -4204,8 +4207,9 @@ golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
42044207
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
42054208
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
42064209
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
4207-
golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
42084210
golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
4211+
golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8=
4212+
golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
42094213
golang.org/x/sys v0.0.0-20180202135801-37707fdb30a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
42104214
golang.org/x/sys v0.0.0-20180810173357-98c5dad5d1a0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
42114215
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -4368,8 +4372,9 @@ golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
43684372
golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
43694373
golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
43704374
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
4371-
golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
43724375
golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
4376+
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
4377+
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
43734378
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
43744379
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
43754380
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -4398,8 +4403,9 @@ golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
43984403
golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4=
43994404
golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk=
44004405
golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
4401-
golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y=
44024406
golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=
4407+
golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg=
4408+
golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ=
44034409
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
44044410
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
44054411
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -4425,8 +4431,9 @@ golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
44254431
golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
44264432
golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
44274433
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
4428-
golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
44294434
golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
4435+
golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
4436+
golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
44304437
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
44314438
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
44324439
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

‎pkg/net/gossipsub.go

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package net
22

33
import (
44
"context"
5-
"fmt"
65
"net"
76
"time"
87

@@ -295,21 +294,11 @@ func NewGossipSub(ctx context.Context,
295294
allowTopics = append(allowTopics, drandTopics...)
296295

297296
if f3Config != nil {
298-
if f3Config.StaticManifest != nil || f3Config.ContractAddress != "" {
297+
if f3Config.StaticManifest != nil {
299298
gpbftTopic := manifest.PubSubTopicFromNetworkName(f3Config.BaseNetworkName)
300299
chainexTopic := manifest.ChainExchangeTopicFromNetworkName(f3Config.BaseNetworkName)
301300
allowTopics = append(allowTopics, gpbftTopic, chainexTopic)
302301
}
303-
if f3Config.DynamicManifestProvider != "" {
304-
gpbftTopicPrefix := manifest.PubSubTopicFromNetworkName(f3Config.BaseNetworkName)
305-
chainexTopicPrefix := manifest.ChainExchangeTopicFromNetworkName(f3Config.BaseNetworkName)
306-
allowTopics = append(allowTopics, manifest.ManifestPubSubTopicName)
307-
for i := range vf3.MaxDynamicManifestChangesAllowed {
308-
gpbftTopic := fmt.Sprintf("%s/%d", gpbftTopicPrefix, i)
309-
chainexTopic := fmt.Sprintf("%s/%d", chainexTopicPrefix, i)
310-
allowTopics = append(allowTopics, gpbftTopic, chainexTopic)
311-
}
312-
}
313302
}
314303

315304
options = append(options,

‎pkg/vf3/participation_lease.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"github.com/filecoin-project/venus/venus-shared/types"
1515
)
1616

17-
type f3Status = func() (*manifest.Manifest, gpbft.InstanceProgress)
17+
type f3Status = func() (manifest.Manifest, gpbft.InstanceProgress)
1818

1919
type leaser struct {
2020
mutex sync.Mutex
@@ -45,9 +45,6 @@ func (l *leaser) getOrRenewParticipationTicket(participant uint64, previous type
4545
}
4646

4747
manifest, instant := l.status()
48-
if manifest == nil {
49-
return nil, types.ErrF3NotReady
50-
}
5148
currentInstance := instant.ID
5249
if len(previous) != 0 {
5350
// A previous ticket is present. To avoid overlapping lease across multiple
@@ -88,9 +85,6 @@ func (l *leaser) getOrRenewParticipationTicket(participant uint64, previous type
8885

8986
func (l *leaser) participate(ticket types.F3ParticipationTicket) (types.F3ParticipationLease, error) {
9087
manifest, instant := l.status()
91-
if manifest == nil {
92-
return types.F3ParticipationLease{}, types.ErrF3NotReady
93-
}
9488
newLease, err := l.validateTicket(manifest.NetworkName, instant.ID, ticket)
9589
if err != nil {
9690
return types.F3ParticipationLease{}, err

‎pkg/vf3/participation_lease_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,8 @@ var testManifest = NewManifest("fakenet", 30, 30, 30*time.Second, cid.Undef)
199199

200200
type mockProgress struct{ currentInstance uint64 }
201201

202-
func (m *mockProgress) Progress() (*manifest.Manifest, gpbft.InstanceProgress) {
203-
return testManifest, gpbft.InstanceProgress{
202+
func (m *mockProgress) Progress() (manifest.Manifest, gpbft.InstanceProgress) {
203+
return *testManifest, gpbft.InstanceProgress{
204204
Instant: gpbft.Instant{
205205
ID: m.currentInstance,
206206
Round: 0,

‎venus-shared/compatible-checks/api-checksum.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -244,10 +244,10 @@ api.FullNode:
244244
EthGetBalance: In=3, Out=2, CheckSum=80912669b93ebbd53024dbc6b4f39d94
245245
EthGetBlockByHash: In=3, Out=2, CheckSum=606bca6c962d8e2d4e0b8bb14e8fa0a9
246246
EthGetBlockByNumber: In=3, Out=2, CheckSum=9d82b96bb03c2de85dc7a31e7d4c45d2
247-
EthGetBlockReceipts: In=2, Out=2, CheckSum=e2817ae4c1a093339a0fd251150de95a
248-
EthGetBlockReceiptsLimited: In=3, Out=2, CheckSum=f5992631f35a54511e4a494b84e66b33
247+
EthGetBlockReceipts: In=2, Out=2, CheckSum=706a2761ee1e72997f4d3665ef027f1f
248+
EthGetBlockReceiptsLimited: In=3, Out=2, CheckSum=69f326d2bac39e0c81593941b04303d5
249249
EthGetBlockTransactionCountByHash: In=2, Out=2, CheckSum=aea75f99eaccb878b97512a29568c204
250-
EthGetBlockTransactionCountByNumber: In=2, Out=2, CheckSum=2c3bfb8fef7edce8563d84eab6e9bf4f
250+
EthGetBlockTransactionCountByNumber: In=2, Out=2, CheckSum=9d61e1ee40881f6fae3601b8065d7a0b
251251
EthGetCode: In=3, Out=2, CheckSum=a186786e31338dc69207e934b426cc67
252252
EthGetFilterChanges: In=2, Out=2, CheckSum=7900665c8164ddcc00b0b3934b35dc45
253253
EthGetFilterLogs: In=2, Out=2, CheckSum=7900665c8164ddcc00b0b3934b35dc45
@@ -260,8 +260,8 @@ api.FullNode:
260260
EthGetTransactionByHashLimited: In=3, Out=2, CheckSum=7c1fa7b8fe17eaf73eaea1f6ccdf927b
261261
EthGetTransactionCount: In=3, Out=2, CheckSum=d4f884ecece2de5517137c49d12be2c9
262262
EthGetTransactionHashByCid: In=2, Out=2, CheckSum=89cd0fe449cbdd9630c413e6d0888da4
263-
EthGetTransactionReceipt: In=2, Out=2, CheckSum=af6d9dda90fdb0f9427498580b9481a6
264-
EthGetTransactionReceiptLimited: In=3, Out=2, CheckSum=99f66b4b8a94d6a6e61198953ddf75e8
263+
EthGetTransactionReceipt: In=2, Out=2, CheckSum=2c51b071c703d913177a956c6f036d79
264+
EthGetTransactionReceiptLimited: In=3, Out=2, CheckSum=0b8afccf0f5b959bf98ce4dd37e4b1b9
265265
EthMaxPriorityFeePerGas: In=1, Out=2, CheckSum=e2f5588dddfc36a9cdef0fad6f4db93e
266266
EthNewBlockFilter: In=1, Out=2, CheckSum=0b236ca49b91eef3180d6b4082640f0f
267267
EthNewFilter: In=2, Out=2, CheckSum=bb78bd1380d703c64ed4573a220daea0

0 commit comments

Comments
 (0)