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

Remove solana and pythnet websocket flags (#1649) 

They're both unused since the solana watcher uses http and not a
websocket for getting info.
This commit is contained in:
Jeff Schroeder 2022-09-26 14:56:39 +01:00 committed by GitHub
parent 5993a231fa
commit 239e27ca91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tiltfile
View File

@ -183,8 +183,6 @@ def build_node_yaml():
if solana:
container["command"] += [
"--solanaWS",
"ws://solana-devnet:8900",
"--solanaRPC",
"http://solana-devnet:8899",
]

4
devnet/node.yaml
View File

@ -121,14 +121,10 @@ spec:
# - wormhole.test.near
- --solanaContract
- Bridge1p5gheXUvJ6jGWGeCsgPKgnE3YgdGKRVCMY9o
# - --solanaWS
# - ws://solana-devnet:8900
# - --solanaRPC
# - http://solana-devnet:8899
- --pythnetContract
- Bridge1p5gheXUvJ6jGWGeCsgPKgnE3YgdGKRVCMY9o
# - --pythnetWS
# - ws://solana-devnet:8900
# - --pythnetRPC
# - http://solana-devnet:8899
- --unsafeDevMode

28
node/cmd/guardiand/node.go
View File

@ -129,11 +129,9 @@ var (
nearRPC *string
nearContract *string
solanaWsRPC *string
solanaRPC *string
solanaRPC *string
pythnetContract *string
pythnetWsRPC *string
pythnetRPC *string
logLevel *string
@ -246,11 +244,9 @@ func init() {
nearRPC = NodeCmd.Flags().String("nearRPC", "", "near RPC URL")
nearContract = NodeCmd.Flags().String("nearContract", "", "near contract")
solanaWsRPC = NodeCmd.Flags().String("solanaWS", "", "Solana Websocket URL (required")
solanaRPC = NodeCmd.Flags().String("solanaRPC", "", "Solana RPC URL (required")
pythnetContract = NodeCmd.Flags().String("pythnetContract", "", "Address of the PythNet program (required)")
pythnetWsRPC = NodeCmd.Flags().String("pythnetWS", "", "PythNet Websocket URL (required")
pythnetRPC = NodeCmd.Flags().String("pythnetRPC", "", "PythNet RPC URL (required")
logLevel = NodeCmd.Flags().String("logLevel", "info", "Logging level (debug, info, warn, error, dpanic, panic, fatal)")
@ -373,10 +369,10 @@ func runNode(cmd *cobra.Command, args []string) {
// Register components for readiness checks.
readiness.RegisterComponent(common.ReadinessEthSyncing)
if *solanaWsRPC != "" {
if *solanaRPC != "" {
readiness.RegisterComponent(common.ReadinessSolanaSyncing)
}
if *pythnetWsRPC != "" {
if *pythnetRPC != "" {
readiness.RegisterComponent(common.ReadinessPythNetSyncing)
}
if *terraWS != "" {
@ -603,9 +599,6 @@ func runNode(cmd *cobra.Command, args []string) {
if *solanaContract == "" {
logger.Fatal("Please specify --solanaContract")
}
if *solanaWsRPC == "" {
logger.Fatal("Please specify --solanaWS")
}
if *solanaRPC == "" {
logger.Fatal("Please specify --solanaRPC")
}
@ -649,9 +642,6 @@ func runNode(cmd *cobra.Command, args []string) {
if *pythnetContract == "" {
logger.Fatal("Please specify --pythnetContract")
}
if *pythnetWsRPC == "" {
logger.Fatal("Please specify --pythnetWS")
}
if *pythnetRPC == "" {
logger.Fatal("Please specify --pythnetRPC")
}
@ -1033,26 +1023,26 @@ func runNode(cmd *cobra.Command, args []string) {
}
}
if *solanaWsRPC != "" {
if *solanaRPC != "" {
if err := supervisor.Run(ctx, "solwatch-confirmed",
solana.NewSolanaWatcher(*solanaWsRPC, *solanaRPC, solAddress, lockC, nil, rpc.CommitmentConfirmed, common.ReadinessSolanaSyncing, vaa.ChainIDSolana).Run); err != nil {
solana.NewSolanaWatcher(*solanaRPC, solAddress, lockC, nil, rpc.CommitmentConfirmed, common.ReadinessSolanaSyncing, vaa.ChainIDSolana).Run); err != nil {
return err
}
if err := supervisor.Run(ctx, "solwatch-finalized",
solana.NewSolanaWatcher(*solanaWsRPC, *solanaRPC, solAddress, lockC, chainObsvReqC[vaa.ChainIDSolana], rpc.CommitmentFinalized, common.ReadinessSolanaSyncing, vaa.ChainIDSolana).Run); err != nil {
solana.NewSolanaWatcher(*solanaRPC, solAddress, lockC, chainObsvReqC[vaa.ChainIDSolana], rpc.CommitmentFinalized, common.ReadinessSolanaSyncing, vaa.ChainIDSolana).Run); err != nil {
return err
}
}
if *pythnetWsRPC != "" {
if *pythnetRPC != "" {
if err := supervisor.Run(ctx, "pythwatch-confirmed",
solana.NewSolanaWatcher(*pythnetWsRPC, *pythnetRPC, pythnetAddress, lockC, nil, rpc.CommitmentConfirmed, common.ReadinessPythNetSyncing, vaa.ChainIDPythNet).Run); err != nil {
solana.NewSolanaWatcher(*pythnetRPC, pythnetAddress, lockC, nil, rpc.CommitmentConfirmed, common.ReadinessPythNetSyncing, vaa.ChainIDPythNet).Run); err != nil {
return err
}
if err := supervisor.Run(ctx, "pythwatch-finalized",
solana.NewSolanaWatcher(*pythnetWsRPC, *pythnetRPC, pythnetAddress, lockC, chainObsvReqC[vaa.ChainIDPythNet], rpc.CommitmentFinalized, common.ReadinessPythNetSyncing, vaa.ChainIDPythNet).Run); err != nil {
solana.NewSolanaWatcher(*pythnetRPC, pythnetAddress, lockC, chainObsvReqC[vaa.ChainIDPythNet], rpc.CommitmentFinalized, common.ReadinessPythNetSyncing, vaa.ChainIDPythNet).Run); err != nil {
return err
}
}

7
node/pkg/solana/client.go
View File

@ -25,7 +25,6 @@ import (
type SolanaWatcher struct {
contract solana.PublicKey
wsUrl string
rpcUrl string
commitment rpc.CommitmentType
messageEvent chan *common.MessagePublication
@ -109,7 +108,7 @@ type PostMessageData struct {
}
func NewSolanaWatcher(
wsUrl, rpcUrl string,
rpcUrl string,
contractAddress solana.PublicKey,
messageEvents chan *common.MessagePublication,
obsvReqC chan *gossipv1.ObservationRequest,
@ -117,8 +116,8 @@ func NewSolanaWatcher(
readiness readiness.Component,
chainID vaa.ChainID) *SolanaWatcher {
return &SolanaWatcher{
contract: contractAddress,
wsUrl: wsUrl, rpcUrl: rpcUrl,
rpcUrl: rpcUrl,
contract: contractAddress,
messageEvent: messageEvents,
obsvReqC: obsvReqC,
commitment: commitment,