Skip to content

Commit baebb75

Browse files
kev1n-peterskev1n-peters
committed
fly: updated p2p deps
1 parent b791923 commit baebb75

File tree

7 files changed

+874
-562
lines changed

7 files changed

+874
-562
lines changed

‎fly/cmd/fly/main.go

+39-2
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ func main() {
176176
sendC := make(chan []byte)
177177

178178
// Inbound observations
179-
obsvC := make(chan *gossipv1.SignedObservation, 50)
179+
obsvC := make(chan *common.MsgWithTimeStamp[gossipv1.SignedObservation], 1024)
180180

181181
// Inbound observation requests
182182
obsvReqC := make(chan *gossipv1.ObservationRequest, 50)
@@ -337,6 +337,8 @@ func main() {
337337
"height": strconv.FormatInt(network.Height, 10),
338338
"contractAddress": network.ContractAddress,
339339
"errorCount": strconv.FormatUint(network.ErrorCount, 10),
340+
"safeHeight": strconv.FormatInt(network.SafeHeight, 10),
341+
"finalizedHeight": strconv.FormatInt(network.FinalizedHeight, 10),
340342
})
341343
}
342344

@@ -497,8 +499,43 @@ func main() {
497499
}
498500

499501
// Run supervisor.
502+
components := p2p.DefaultComponents()
503+
components.Port = p2pPort
504+
// Reduce number of connected peers to reduce network egress
505+
components.GossipParams.D = 1 // default: 6
506+
components.GossipParams.Dlo = 1 // default: 5
507+
components.GossipParams.Dhi = 2 // default: 12
508+
components.GossipParams.Dout = 1 // default: 2
500509
supervisor.New(rootCtx, logger, func(ctx context.Context) error {
501-
if err := supervisor.Run(ctx, "p2p", p2p.Run(obsvC, obsvReqC, nil, sendC, signedInC, priv, nil, gst, p2pPort, p2pNetworkID, p2pBootstrap, "", false, rootCtxCancel, nil, govConfigC, govStatusC)); err != nil {
510+
if err := supervisor.Run(ctx,
511+
"p2p",
512+
p2p.Run(obsvC,
513+
obsvReqC,
514+
nil,
515+
sendC,
516+
signedInC,
517+
priv,
518+
nil,
519+
gst,
520+
p2pNetworkID,
521+
p2pBootstrap,
522+
"",
523+
false,
524+
rootCtxCancel,
525+
nil,
526+
nil,
527+
govConfigC,
528+
govStatusC,
529+
components,
530+
nil,
531+
false,
532+
false,
533+
nil,
534+
nil,
535+
"",
536+
0,
537+
"",
538+
)); err != nil {
502539
return err
503540
}
504541

‎fly/cmd/heartbeats/main.go

+34-4
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ func main() {
175175
sendC := make(chan []byte)
176176

177177
// Inbound observations
178-
obsvC := make(chan *gossipv1.SignedObservation, 1024)
178+
obsvC := make(chan *common.MsgWithTimeStamp[gossipv1.SignedObservation], 1024)
179179

180180
// Inbound observation requests
181181
obsvReqC := make(chan *gossipv1.ObservationRequest, 1024)
@@ -311,9 +311,9 @@ func main() {
311311
case <-rootCtx.Done():
312312
return
313313
case o := <-obsvC:
314-
spl := strings.Split(o.MessageId, "/")
314+
spl := strings.Split(o.Msg.MessageId, "/")
315315
emitter := strings.ToLower(spl[1])
316-
addr := "0x" + string(hex.EncodeToString(o.Addr))
316+
addr := "0x" + string(hex.EncodeToString(o.Msg.Addr))
317317
idx := guardianIndexMap[strings.ToLower(addr)]
318318
if knownEmitters[emitter] {
319319
gossipCounter[idx][GSM_tbObservation]++
@@ -510,8 +510,38 @@ func main() {
510510
}
511511

512512
// Run supervisor.
513+
components := p2p.DefaultComponents()
514+
components.Port = p2pPort
513515
supervisor.New(rootCtx, logger, func(ctx context.Context) error {
514-
if err := supervisor.Run(ctx, "p2p", p2p.Run(obsvC, obsvReqC, nil, sendC, signedInC, priv, nil, gst, p2pPort, p2pNetworkID, p2pBootstrap, "", false, rootCtxCancel, nil, govConfigC, govStatusC)); err != nil {
516+
if err := supervisor.Run(ctx,
517+
"p2p",
518+
p2p.Run(obsvC,
519+
obsvReqC,
520+
nil,
521+
sendC,
522+
signedInC,
523+
priv,
524+
nil,
525+
gst,
526+
p2pNetworkID,
527+
p2pBootstrap,
528+
"",
529+
false,
530+
rootCtxCancel,
531+
nil,
532+
nil,
533+
govConfigC,
534+
govStatusC,
535+
components,
536+
nil,
537+
false,
538+
false,
539+
nil,
540+
nil,
541+
"",
542+
0,
543+
"",
544+
)); err != nil {
515545
return err
516546
}
517547

‎fly/cmd/observation_stats/main.go

+39-9
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func main() {
7070
sendC := make(chan []byte)
7171

7272
// Inbound observations
73-
obsvC := make(chan *gossipv1.SignedObservation, 50)
73+
obsvC := make(chan *common.MsgWithTimeStamp[gossipv1.SignedObservation], 1024)
7474

7575
// Inbound observation requests
7676
obsvReqC := make(chan *gossipv1.ObservationRequest, 50)
@@ -110,16 +110,16 @@ func main() {
110110
case <-rootCtx.Done():
111111
return
112112
case o := <-obsvC:
113-
if o.MessageId[:3] != "26/" && o.MessageId[:2] != "7/" {
114-
ga := eth_common.BytesToAddress(o.Addr).String()
113+
if o.Msg.MessageId[:3] != "26/" && o.Msg.MessageId[:2] != "7/" {
114+
ga := eth_common.BytesToAddress(o.Msg.Addr).String()
115115
// logger.Warn("observation", zap.String("id",o.MessageId), zap.String("addr",ga))
116-
if _, ok := obsvByHash[o.MessageId]; !ok {
117-
obsvByHash[o.MessageId] = map[string]time.Time{}
116+
if _, ok := obsvByHash[o.Msg.MessageId]; !ok {
117+
obsvByHash[o.Msg.MessageId] = map[string]time.Time{}
118118
}
119-
if _, ok := obsvByHash[o.MessageId][ga]; !ok {
120-
obsvByHash[o.MessageId][ga] = time.Now()
119+
if _, ok := obsvByHash[o.Msg.MessageId][ga]; !ok {
120+
obsvByHash[o.Msg.MessageId][ga] = time.Now()
121121
}
122-
logger.Warn("status", zap.String("id", o.MessageId), zap.Any("msg", obsvByHash[o.MessageId]))
122+
logger.Warn("status", zap.String("id", o.Msg.MessageId), zap.Any("msg", obsvByHash[o.Msg.MessageId]))
123123
}
124124
}
125125
}
@@ -189,8 +189,38 @@ func main() {
189189
}
190190

191191
// Run supervisor.
192+
components := p2p.DefaultComponents()
193+
components.Port = p2pPort
192194
supervisor.New(rootCtx, logger, func(ctx context.Context) error {
193-
if err := supervisor.Run(ctx, "p2p", p2p.Run(obsvC, obsvReqC, nil, sendC, signedInC, priv, nil, gst, p2pPort, p2pNetworkID, p2pBootstrap, "", false, rootCtxCancel, nil, govConfigC, govStatusC)); err != nil {
195+
if err := supervisor.Run(ctx,
196+
"p2p",
197+
p2p.Run(obsvC,
198+
obsvReqC,
199+
nil,
200+
sendC,
201+
signedInC,
202+
priv,
203+
nil,
204+
gst,
205+
p2pNetworkID,
206+
p2pBootstrap,
207+
"",
208+
false,
209+
rootCtxCancel,
210+
nil,
211+
nil,
212+
govConfigC,
213+
govStatusC,
214+
components,
215+
nil,
216+
false,
217+
false,
218+
nil,
219+
nil,
220+
"",
221+
0,
222+
"",
223+
)); err != nil {
194224
return err
195225
}
196226

‎fly/cmd/track_gossip/main.go

+32-2
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ func main() {
8787
sendC := make(chan []byte)
8888

8989
// Inbound observations
90-
obsvC := make(chan *gossipv1.SignedObservation, 50)
90+
obsvC := make(chan *common.MsgWithTimeStamp[gossipv1.SignedObservation], 1024)
9191

9292
// Inbound observation requests
9393
obsvReqC := make(chan *gossipv1.ObservationRequest, 50)
@@ -234,8 +234,38 @@ func main() {
234234
}
235235

236236
// Run supervisor.
237+
components := p2p.DefaultComponents()
238+
components.Port = p2pPort
237239
supervisor.New(rootCtx, logger, func(ctx context.Context) error {
238-
if err := supervisor.Run(ctx, "p2p", p2p.Run(obsvC, obsvReqC, nil, sendC, signedInC, priv, nil, gst, p2pPort, p2pNetworkID, p2pBootstrap, "", false, rootCtxCancel, nil, govConfigC, govStatusC)); err != nil {
240+
if err := supervisor.Run(ctx,
241+
"p2p",
242+
p2p.Run(obsvC,
243+
obsvReqC,
244+
nil,
245+
sendC,
246+
signedInC,
247+
priv,
248+
nil,
249+
gst,
250+
p2pNetworkID,
251+
p2pBootstrap,
252+
"",
253+
false,
254+
rootCtxCancel,
255+
nil,
256+
nil,
257+
govConfigC,
258+
govStatusC,
259+
components,
260+
nil,
261+
false,
262+
false,
263+
nil,
264+
nil,
265+
"",
266+
0,
267+
"",
268+
)); err != nil {
239269
return err
240270
}
241271

‎fly/cmd/track_pyth/main.go

+34-11
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ func main() {
129129
sendC := make(chan []byte)
130130

131131
// Inbound observations
132-
obsvC := make(chan *gossipv1.SignedObservation, 50)
132+
obsvC := make(chan *common.MsgWithTimeStamp[gossipv1.SignedObservation], 1024)
133133

134134
// Inbound observation requests
135135
obsvReqC := make(chan *gossipv1.ObservationRequest, 50)
@@ -171,7 +171,7 @@ func main() {
171171
case <-rootCtx.Done():
172172
return
173173
case m := <-obsvC:
174-
handleObservation(logger, gs, m)
174+
handleObservation(logger, gs, m.Msg)
175175
}
176176
}
177177
}()
@@ -259,8 +259,38 @@ func main() {
259259
}
260260

261261
// Run supervisor.
262+
components := p2p.DefaultComponents()
263+
components.Port = p2pPort
262264
supervisor.New(rootCtx, logger, func(ctx context.Context) error {
263-
if err := supervisor.Run(ctx, "p2p", p2p.Run(obsvC, obsvReqC, nil, sendC, signedInC, priv, nil, gst, p2pPort, p2pNetworkID, p2pBootstrap, "", false, rootCtxCancel, nil, govConfigC, govStatusC)); err != nil {
265+
if err := supervisor.Run(ctx,
266+
"p2p",
267+
p2p.Run(obsvC,
268+
obsvReqC,
269+
nil,
270+
sendC,
271+
signedInC,
272+
priv,
273+
nil,
274+
gst,
275+
p2pNetworkID,
276+
p2pBootstrap,
277+
"",
278+
false,
279+
rootCtxCancel,
280+
nil,
281+
nil,
282+
govConfigC,
283+
govStatusC,
284+
components,
285+
nil,
286+
false,
287+
false,
288+
nil,
289+
nil,
290+
"",
291+
0,
292+
"",
293+
)); err != nil {
264294
return err
265295
}
266296

@@ -289,16 +319,9 @@ func handleSignedVAAWithQuorum(logger *zap.Logger, gs common.GuardianSet, m *gos
289319
return
290320
}
291321

292-
// Calculate digest for logging
293-
digest := v.SigningMsg()
294-
hash := hex.EncodeToString(digest.Bytes())
295-
296322
// Check if guardianSet doesn't have any keys
297323
if len(gs.Keys) == 0 {
298-
logger.Warn("dropping SignedVAAWithQuorum message since we have a guardian set without keys",
299-
zap.String("digest", hash),
300-
zap.Any("message", m),
301-
)
324+
logger.Warn("dropping SignedVAAWithQuorum message since we have a guardian set without keys")
302325
return
303326
}
304327

0 commit comments

Comments
 (0)