certusone
/
wormhole
mirror of https://github.com/certusone/wormhole.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

node/pkg/solana: run one Solana watcher per consistency level 

certusone/wormhole#248

Change-Id: I98abc6b4e635b8b5679fcda5342c90b0e5c96077
This commit is contained in:
Leo 2021-07-29 14:24:35 +02:00 committed by Leopold Schabel
parent 8b5e82df1b
commit 5bfa3b0055
2 changed files with 40 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bridge/cmd/guardiand/bridge.go
View File

@ -3,6 +3,7 @@ package guardiand
import (
"context"
"fmt"
"github.com/gagliardetto/solana-go/rpc"
"log"
"net/http"
_ "net/http/pprof"
@ -404,8 +405,13 @@ func runBridge(cmd *cobra.Command, args []string) {
return err
}
if err := supervisor.Run(ctx, "solwatch",
solana.NewSolanaWatcher(*solanaWsRPC, *solanaRPC, solBridgeAddress, lockC).Run); err != nil {
if err := supervisor.Run(ctx, "solwatch-confirmed",
solana.NewSolanaWatcher(*solanaWsRPC, *solanaRPC, solBridgeAddress, lockC, rpc.CommitmentConfirmed).Run); err != nil {
return err
}
if err := supervisor.Run(ctx, "solwatch-finalized",
solana.NewSolanaWatcher(*solanaWsRPC, *solanaRPC, solBridgeAddress, lockC, rpc.CommitmentFinalized).Run); err != nil {
return err
}

50
bridge/pkg/solana/client.go
View File

@ -23,6 +23,7 @@ type SolanaWatcher struct {
bridge solana.PublicKey
wsUrl string
rpcUrl string
commitment rpc.CommitmentType
messageEvent chan *common.MessagePublication
}
@ -31,7 +32,7 @@ var (
prometheus.CounterOpts{
Name: "wormhole_solana_connection_errors_total",
Help: "Total number of Solana connection errors",
}, []string{"reason"})
}, []string{"commitment", "reason"})
solanaAccountSkips = promauto.NewCounterVec(
prometheus.CounterOpts{
Name: "wormhole_solana_account_updates_skipped_total",
@ -42,11 +43,11 @@ var (
Name: "wormhole_solana_observations_confirmed_total",
Help: "Total number of verified Solana observations found",
})
currentSolanaHeight = promauto.NewGauge(
currentSolanaHeight = promauto.NewGaugeVec(
prometheus.GaugeOpts{
Name: "wormhole_solana_current_height",
Help: "Current Solana slot height (at default commitment level, not the level used for observations)",
})
Help: "Current Solana slot height",
}, []string{"commitment"})
queryLatency = promauto.NewHistogramVec(
prometheus.HistogramOpts{
Name: "wormhole_solana_query_latency",
@ -56,8 +57,23 @@ var (
const rpcTimeout = time.Second * 5
func NewSolanaWatcher(wsUrl, rpcUrl string, bridgeAddress solana.PublicKey, messageEvents chan *common.MessagePublication) *SolanaWatcher {
return &SolanaWatcher{bridge: bridgeAddress, wsUrl: wsUrl, rpcUrl: rpcUrl, messageEvent: messageEvents}
// Mappings from consistency levels constants to commitment level.
const (
consistencyLevelConfirmed = 1
consistencyLevelFinalized = 32
)
func NewSolanaWatcher(
wsUrl, rpcUrl string,
bridgeAddress solana.PublicKey,
messageEvents chan *common.MessagePublication,
commitment rpc.CommitmentType) *SolanaWatcher {
return &SolanaWatcher{
bridge: bridgeAddress,
wsUrl: wsUrl, rpcUrl: rpcUrl,
messageEvent: messageEvents,
commitment: commitment,
}
}
func (s *SolanaWatcher) Run(ctx context.Context) error {
@ -81,30 +97,28 @@ func (s *SolanaWatcher) Run(ctx context.Context) error {
case <-ctx.Done():
return
case <-timer.C:
commitment := rpc.CommitmentFinalized
// Get current slot height
rCtx, cancel := context.WithTimeout(ctx, rpcTimeout)
defer cancel()
start := time.Now()
slot, err := rpcClient.GetSlot(rCtx, commitment)
queryLatency.WithLabelValues("get_slot", string(commitment)).Observe(time.Since(start).Seconds())
slot, err := rpcClient.GetSlot(rCtx, s.commitment)
queryLatency.WithLabelValues("get_slot", string(s.commitment)).Observe(time.Since(start).Seconds())
if err != nil {
solanaConnectionErrors.WithLabelValues("get_slot_error").Inc()
solanaConnectionErrors.WithLabelValues(string(s.commitment), "get_slot_error").Inc()
errC <- err
return
}
if lastSlot == 0 {
lastSlot = slot - 1
}
currentSolanaHeight.Set(float64(slot))
currentSolanaHeight.WithLabelValues(string(s.commitment)).Set(float64(slot))
readiness.SetReady(common.ReadinessSolanaSyncing)
p2p.DefaultRegistry.SetNetworkStats(vaa.ChainIDSolana, &gossipv1.Heartbeat_Network{
Height: int64(slot),
BridgeAddress: bridgeAddr,
})
logger.Info("fetched current Solana height",
zap.String("commitment", string(commitment)),
zap.String("commitment", string(s.commitment)),
zap.Uint64("slot", slot),
zap.Uint64("lastSlot", lastSlot),
zap.Uint64("pendingSlots", slot-lastSlot),
@ -119,10 +133,10 @@ func (s *SolanaWatcher) Run(ctx context.Context) error {
rCtx, cancel = context.WithTimeout(ctx, rpcTimeout)
defer cancel()
start = time.Now()
slots, err := rpcClient.GetConfirmedBlocks(rCtx, rangeStart, &rangeEnd, commitment)
queryLatency.WithLabelValues("get_confirmed_blocks", string(commitment)).Observe(time.Since(start).Seconds())
slots, err := rpcClient.GetConfirmedBlocks(rCtx, rangeStart, &rangeEnd, s.commitment)
queryLatency.WithLabelValues("get_confirmed_blocks", string(s.commitment)).Observe(time.Since(start).Seconds())
if err != nil {
solanaConnectionErrors.WithLabelValues("get_confirmed_blocks_error").Inc()
solanaConnectionErrors.WithLabelValues(string(s.commitment), "get_confirmed_blocks_error").Inc()
errC <- err
return
}
@ -130,7 +144,7 @@ func (s *SolanaWatcher) Run(ctx context.Context) error {
logger.Info("fetched slots in range",
zap.Uint64("from", rangeStart), zap.Uint64("to", rangeEnd),
zap.Duration("took", time.Since(start)),
zap.String("commitment", string(commitment)))
zap.String("commitment", string(s.commitment)))
// Requesting each slot
for _, slot := range slots {
@ -140,7 +154,7 @@ func (s *SolanaWatcher) Run(ctx context.Context) error {
continue
}
go s.fetchBlock(ctx, logger, commitment, rpcClient, slot)
go s.fetchBlock(ctx, logger, s.commitment, rpcClient, slot)
}
lastSlot = slot