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

node: address review feedback from #2983

This commit is contained in:
tbjump 2023-06-08 17:30:22 +00:00 committed by Evan Gray
parent 697767d3a5
commit 51877302eb
2 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,10 +1,14 @@
package guardiand
import (
"encoding/hex"
"log"
"os"
"time"
"github.com/davecgh/go-spew/spew"
"github.com/spf13/cobra"
"github.com/status-im/keycard-go/hexutils"
"google.golang.org/protobuf/encoding/prototext"
"github.com/certusone/wormhole/node/pkg/adminrpc"
@ -30,5 +34,27 @@ func runGovernanceVAAVerify(cmd *cobra.Command, args []string) {
log.Fatalf("failed to deserialize: %v", err)
}
adminrpc.VerifyReq(&req)
timestamp := time.Unix(int64(req.Timestamp), 0)
for _, message := range req.Messages {
v, err := adminrpc.GovMsgToVaa(message, req.CurrentSetIndex, timestamp)
if err != nil {
log.Fatalf("invalid update: %v", err)
}
digest := v.SigningDigest().Bytes()
if err != nil {
panic(err)
}
b, err := v.Marshal()
if err != nil {
panic(err)
}
log.Printf("Serialized: %v", hex.EncodeToString(b))
log.Printf("VAA with digest %s: %+v", hexutils.BytesToHex(digest), spew.Sdump(v))
}
}

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

@ -9,7 +9,6 @@ import (
"encoding/json"
"errors"
"fmt"
"log"
"math"
"math/big"
"math/rand"
@ -19,7 +18,6 @@ import (
"github.com/certusone/wormhole/node/pkg/watchers/evm/connectors"
"github.com/holiman/uint256"
"github.com/status-im/keycard-go/hexutils"
"golang.org/x/exp/slices"
"github.com/certusone/wormhole/node/pkg/db"
@ -32,7 +30,6 @@ import (
"github.com/certusone/wormhole/node/pkg/common"
nodev1 "github.com/certusone/wormhole/node/pkg/proto/node/v1"
"github.com/davecgh/go-spew/spew"
"github.com/wormhole-foundation/wormhole/sdk/vaa"
)
@ -416,7 +413,7 @@ func ibcReceiverUpdateChannelChain(
return v, nil
}
func govMsgToVaa(message *nodev1.GovernanceMessage, currentSetIndex uint32, timestamp time.Time) (*vaa.VAA, error) {
func GovMsgToVaa(message *nodev1.GovernanceMessage, currentSetIndex uint32, timestamp time.Time) (*vaa.VAA, error) {
var (
v *vaa.VAA
err error
@ -467,7 +464,7 @@ func (s *nodePrivilegedService) InjectGovernanceVAA(ctx context.Context, req *no
digests := make([][]byte, len(req.Messages))
for i, message := range req.Messages {
v, err = govMsgToVaa(message, req.CurrentSetIndex, timestamp)
v, err = GovMsgToVaa(message, req.CurrentSetIndex, timestamp)
if err != nil {
return nil, status.Error(codes.InvalidArgument, err.Error())
@ -853,29 +850,3 @@ func (s *nodePrivilegedService) DumpRPCs(ctx context.Context, req *nodev1.DumpRP
Response: s.rpcMap,
}, nil
}
func VerifyReq(req *nodev1.InjectGovernanceVAARequest) {
timestamp := time.Unix(int64(req.Timestamp), 0)
for _, message := range req.Messages {
v, err := govMsgToVaa(message, req.CurrentSetIndex, timestamp)
if err != nil {
log.Fatalf("invalid update: %v", err)
}
digest := v.SigningDigest().Bytes()
if err != nil {
panic(err)
}
b, err := v.Marshal()
if err != nil {
panic(err)
}
log.Printf("Serialized: %v", hex.EncodeToString(b))
log.Printf("VAA with digest %s: %+v", hexutils.BytesToHex(digest), spew.Sdump(v))
}
}