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

node/cmd/guardiand: improve send-observation-request arg parser 

Accept chain names (i.e. "solana") and base58 tx hashes.

commit-id:d7114740
This commit is contained in:
Leopold Schabel 2022-04-27 13:39:56 +02:00 committed by Evan Gray
parent f61997e846
commit eb3b777520
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
node/cmd/guardiand/adminclient.go
View File

@ -4,18 +4,21 @@ import (
"context"
"encoding/hex"
"fmt"
"github.com/certusone/wormhole/node/pkg/common"
gossipv1 "github.com/certusone/wormhole/node/pkg/proto/gossip/v1"
publicrpcv1 "github.com/certusone/wormhole/node/pkg/proto/publicrpc/v1"
"github.com/certusone/wormhole/node/pkg/vaa"
"github.com/davecgh/go-spew/spew"
"github.com/spf13/pflag"
"io/ioutil"
"log"
"strconv"
"strings"
"time"
"github.com/davecgh/go-spew/spew"
"github.com/mr-tron/base58"
"github.com/spf13/pflag"
"github.com/certusone/wormhole/node/pkg/common"
gossipv1 "github.com/certusone/wormhole/node/pkg/proto/gossip/v1"
publicrpcv1 "github.com/certusone/wormhole/node/pkg/proto/publicrpc/v1"
"github.com/certusone/wormhole/node/pkg/vaa"
"github.com/spf13/cobra"
"github.com/status-im/keycard-go/hexutils"
"google.golang.org/grpc"
@ -82,7 +85,7 @@ var DumpVAAByMessageID = &cobra.Command{
}
var SendObservationRequest = &cobra.Command{
Use: "send-observation-request [CHAIN_ID] [TX_HASH_HEX]",
Use: "send-observation-request [CHAIN_ID|CHAIN_NAME] [TX_HASH_HEX]",
Short: "Broadcast an observation request for the given chain ID and chain-specific tx_hash",
Run: runSendObservationRequest,
Args: cobra.ExactArgs(2),
@ -226,14 +229,17 @@ func runDumpVAAByMessageID(cmd *cobra.Command, args []string) {
}
func runSendObservationRequest(cmd *cobra.Command, args []string) {
chainID, err := strconv.Atoi(args[0])
chainID, err := parseChainID(args[0])
if err != nil {
log.Fatalf("invalid chain ID: %v", err)
}
txHash, err := hex.DecodeString(args[1])
if err != nil {
log.Fatalf("invalid transaction hash: %v", err)
txHash, err = base58.Decode(args[1])
if err != nil {
log.Fatalf("invalid transaction hash (neither hex nor base58): %v", err)
}
}
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)