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

node/pkg/adminrpc: Need to decode hex string.

This commit is contained in:
Paul Noel 2023-11-13 16:44:06 -05:00 committed by Paul Noel
parent 80d75d96aa
commit f897196f62
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
node/pkg/adminrpc/adminserver.go
View File

@ -29,6 +29,7 @@ import (
"github.com/certusone/wormhole/node/pkg/governor" "github.com/certusone/wormhole/node/pkg/governor"
gossipv1 "github.com/certusone/wormhole/node/pkg/proto/gossip/v1" gossipv1 "github.com/certusone/wormhole/node/pkg/proto/gossip/v1"
ethcommon "github.com/ethereum/go-ethereum/common" ethcommon "github.com/ethereum/go-ethereum/common"
"github.com/mr-tron/base58"
"go.uber.org/zap" "go.uber.org/zap"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"
"google.golang.org/grpc/status" "google.golang.org/grpc/status"
@ -1092,7 +1093,14 @@ func (s *nodePrivilegedService) GetAndObserveMissingVAAs(ctx context.Context, re
} }
var obsvReq gossipv1.ObservationRequest var obsvReq gossipv1.ObservationRequest
obsvReq.ChainId = uint32(missingVAA.Chain) obsvReq.ChainId = uint32(missingVAA.Chain)
obsvReq.TxHash = []byte(missingVAA.Txhash) obsvReq.TxHash, err = hex.DecodeString(missingVAA.Txhash)
if err != nil {
obsvReq.TxHash, err = base58.Decode(missingVAA.Txhash)
if err != nil {
errMsgs += "Invalid transaction hash (neither hex nor base58)"
continue
}
}
errMsgs += fmt.Sprintf("\nAttempting to observe %s", obsvReq.String()) errMsgs += fmt.Sprintf("\nAttempting to observe %s", obsvReq.String())
// Call the following function to send the observation request // Call the following function to send the observation request
if err := common.PostObservationRequest(s.obsvReqSendC, &obsvReq); err != nil { if err := common.PostObservationRequest(s.obsvReqSendC, &obsvReq); err != nil {