Skip to content

Commit

Permalink
node: replace use of vaa.AddSigner with guardian signer
Browse files Browse the repository at this point in the history
  • Loading branch information
pleasew8t committed Sep 19, 2024
1 parent 399d954 commit 3e8c035
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 32 deletions.
18 changes: 13 additions & 5 deletions node/pkg/adminrpc/adminserver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package adminrpc
import (
"bytes"
"context"
"crypto/ecdsa"
"encoding/base64"
"encoding/hex"
"encoding/json"
Expand All @@ -19,6 +18,7 @@ import (
"sync"
"time"

"github.com/certusone/wormhole/node/pkg/guardiansigner"
"github.com/certusone/wormhole/node/pkg/watchers/evm/connectors"
"github.com/holiman/uint256"
"github.com/prometheus/client_golang/prometheus"
Expand Down Expand Up @@ -61,7 +61,7 @@ type nodePrivilegedService struct {
governor *governor.ChainGovernor
evmConnector connectors.Connector
gsCache sync.Map
gk *ecdsa.PrivateKey
guardianSigner guardiansigner.GuardianSigner
guardianAddress ethcommon.Address
rpcMap map[string]string
}
Expand All @@ -74,7 +74,7 @@ func NewPrivService(
signedInC chan<- *gossipv1.SignedVAAWithQuorum,
governor *governor.ChainGovernor,
evmConnector connectors.Connector,
gk *ecdsa.PrivateKey,
guardianSigner guardiansigner.GuardianSigner,
guardianAddress ethcommon.Address,
rpcMap map[string]string,

Expand All @@ -87,7 +87,7 @@ func NewPrivService(
signedInC: signedInC,
governor: governor,
evmConnector: evmConnector,
gk: gk,
guardianSigner: guardianSigner,
guardianAddress: guardianAddress,
rpcMap: rpcMap,
}
Expand Down Expand Up @@ -1162,7 +1162,15 @@ func (s *nodePrivilegedService) SignExistingVAA(ctx context.Context, req *nodev1
}

// Add local signature
newVAA.AddSignature(s.gk, uint8(localGuardianIndex))
sig, err := s.guardianSigner.Sign(v.SigningDigest().Bytes())

Check failure on line 1165 in node/pkg/adminrpc/adminserver.go

View workflow job for this annotation

GitHub Actions / node-lint 

ineffectual assignment to err (ineffassign)

sigData := [65]byte{}
copy(sigData[:], sig)

newVAA.Signatures = append(v.Signatures, &vaa.Signature{
Index: uint8(localGuardianIndex),
Signature: sigData,
})

// Sort VAA signatures by guardian ID
slices.SortFunc(newVAA.Signatures, func(a, b *vaa.Signature) int {
Expand Down
66 changes: 39 additions & 27 deletions node/pkg/adminrpc/adminserver_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ package adminrpc
import (
"bytes"
"context"
"crypto/ecdsa"
"testing"
"time"

wh_common "github.com/certusone/wormhole/node/pkg/common"
"github.com/certusone/wormhole/node/pkg/db"
"github.com/certusone/wormhole/node/pkg/governor"
"github.com/certusone/wormhole/node/pkg/guardiansigner"
nodev1 "github.com/certusone/wormhole/node/pkg/proto/node/v1"
"github.com/certusone/wormhole/node/pkg/watchers/evm/connectors"
"github.com/certusone/wormhole/node/pkg/watchers/evm/connectors/ethabi"
Expand Down Expand Up @@ -88,14 +88,14 @@ func (c mockEVMConnector) SubscribeNewHead(ctx context.Context, ch chan<- *types
panic("unimplemented")
}

func generateGS(num int) (keys []*ecdsa.PrivateKey, addrs []common.Address) {
func generateGuardianSigners(num int) (signers []guardiansigner.GuardianSigner, addrs []common.Address) {
for i := 0; i < num; i++ {
key, err := ethcrypto.GenerateKey()
signer, err := guardiansigner.GenerateSignerWithPrivatekey(nil)
if err != nil {
panic(err)
}
keys = append(keys, key)
addrs = append(addrs, ethcrypto.PubkeyToAddress(key.PublicKey))
signers = append(signers, signer)
addrs = append(addrs, ethcrypto.PubkeyToAddress(signer.PublicKey()))
}
return
}
Expand All @@ -107,7 +107,7 @@ func addrsToHexStrings(addrs []common.Address) (out []string) {
return
}

func generateMockVAA(gsIndex uint32, gsKeys []*ecdsa.PrivateKey) []byte {
func generateMockVAA(gsIndex uint32, signers []guardiansigner.GuardianSigner) []byte {
v := &vaa.VAA{
Version: 1,
GuardianSetIndex: gsIndex,
Expand All @@ -120,8 +120,20 @@ func generateMockVAA(gsIndex uint32, gsKeys []*ecdsa.PrivateKey) []byte {
EmitterAddress: vaa.Address{},
Payload: []byte("test"),
}
for i, key := range gsKeys {
v.AddSignature(key, uint8(i))
for i, signer := range signers {
sig, err := signer.Sign(v.SigningDigest().Bytes())
if err != nil {
panic(err)
}

sigData := [65]byte{}
copy(sigData[:], sig)

v.Signatures = append(v.Signatures, &vaa.Signature{
Index: uint8(i),
Signature: sigData,
})

}

vBytes, err := v.Marshal()
Expand All @@ -132,7 +144,7 @@ func generateMockVAA(gsIndex uint32, gsKeys []*ecdsa.PrivateKey) []byte {
}

func setupAdminServerForVAASigning(gsIndex uint32, gsAddrs []common.Address) *nodePrivilegedService {
gk, err := ethcrypto.GenerateKey()
guardianSigner, err := guardiansigner.GenerateSignerWithPrivatekey(nil)
if err != nil {
panic(err)
}
Expand All @@ -150,8 +162,8 @@ func setupAdminServerForVAASigning(gsIndex uint32, gsAddrs []common.Address) *no
signedInC: nil,
governor: nil,
evmConnector: connector,
gk: gk,
guardianAddress: ethcrypto.PubkeyToAddress(gk.PublicKey),
guardianSigner: guardianSigner,
guardianAddress: ethcrypto.PubkeyToAddress(guardianSigner.PublicKey()),
}
}

Expand All @@ -167,10 +179,10 @@ func TestSignExistingVAA_NoVAA(t *testing.T) {
}

func TestSignExistingVAA_NotGuardian(t *testing.T) {
gsKeys, gsAddrs := generateGS(5)
signers, gsAddrs := generateGuardianSigners(5)
s := setupAdminServerForVAASigning(0, gsAddrs)

v := generateMockVAA(0, gsKeys)
v := generateMockVAA(0, signers)

_, err := s.SignExistingVAA(context.Background(), &nodev1.SignExistingVAARequest{
Vaa: v,
Expand All @@ -181,10 +193,10 @@ func TestSignExistingVAA_NotGuardian(t *testing.T) {
}

func TestSignExistingVAA_InvalidVAA(t *testing.T) {
gsKeys, gsAddrs := generateGS(5)
signers, gsAddrs := generateGuardianSigners(5)
s := setupAdminServerForVAASigning(0, gsAddrs)

v := generateMockVAA(0, gsKeys[:2])
v := generateMockVAA(0, signers[:2])

gsAddrs = append(gsAddrs, s.guardianAddress)
_, err := s.SignExistingVAA(context.Background(), &nodev1.SignExistingVAARequest{
Expand All @@ -196,10 +208,10 @@ func TestSignExistingVAA_InvalidVAA(t *testing.T) {
}

func TestSignExistingVAA_DuplicateGuardian(t *testing.T) {
gsKeys, gsAddrs := generateGS(5)
signers, gsAddrs := generateGuardianSigners(5)
s := setupAdminServerForVAASigning(0, gsAddrs)

v := generateMockVAA(0, gsKeys)
v := generateMockVAA(0, signers)

gsAddrs = append(gsAddrs, s.guardianAddress)
gsAddrs = append(gsAddrs, s.guardianAddress)
Expand All @@ -212,14 +224,14 @@ func TestSignExistingVAA_DuplicateGuardian(t *testing.T) {
}

func TestSignExistingVAA_AlreadyGuardian(t *testing.T) {
gsKeys, gsAddrs := generateGS(5)
signers, gsAddrs := generateGuardianSigners(5)
s := setupAdminServerForVAASigning(0, gsAddrs)
s.evmConnector = mockEVMConnector{
guardianAddrs: append(gsAddrs, s.guardianAddress),
guardianSetIndex: 0,
}

v := generateMockVAA(0, append(gsKeys, s.gk))
v := generateMockVAA(0, append(signers, s.guardianSigner))

gsAddrs = append(gsAddrs, s.guardianAddress)
_, err := s.SignExistingVAA(context.Background(), &nodev1.SignExistingVAARequest{
Expand All @@ -231,10 +243,10 @@ func TestSignExistingVAA_AlreadyGuardian(t *testing.T) {
}

func TestSignExistingVAA_NotAFutureGuardian(t *testing.T) {
gsKeys, gsAddrs := generateGS(5)
signers, gsAddrs := generateGuardianSigners(5)
s := setupAdminServerForVAASigning(0, gsAddrs)

v := generateMockVAA(0, gsKeys)
v := generateMockVAA(0, signers)

_, err := s.SignExistingVAA(context.Background(), &nodev1.SignExistingVAARequest{
Vaa: v,
Expand All @@ -245,10 +257,10 @@ func TestSignExistingVAA_NotAFutureGuardian(t *testing.T) {
}

func TestSignExistingVAA_CantReachQuorum(t *testing.T) {
gsKeys, gsAddrs := generateGS(5)
signers, gsAddrs := generateGuardianSigners(5)
s := setupAdminServerForVAASigning(0, gsAddrs)

v := generateMockVAA(0, gsKeys)
v := generateMockVAA(0, signers)

gsAddrs = append(gsAddrs, s.guardianAddress)
_, err := s.SignExistingVAA(context.Background(), &nodev1.SignExistingVAARequest{
Expand All @@ -260,10 +272,10 @@ func TestSignExistingVAA_CantReachQuorum(t *testing.T) {
}

func TestSignExistingVAA_Valid(t *testing.T) {
gsKeys, gsAddrs := generateGS(5)
signers, gsAddrs := generateGuardianSigners(5)
s := setupAdminServerForVAASigning(0, gsAddrs)

v := generateMockVAA(0, gsKeys)
v := generateMockVAA(0, signers)

gsAddrs = append(gsAddrs, s.guardianAddress)
res, err := s.SignExistingVAA(context.Background(), &nodev1.SignExistingVAARequest{
Expand All @@ -273,7 +285,7 @@ func TestSignExistingVAA_Valid(t *testing.T) {
})

require.NoError(t, err)
v2 := generateMockVAA(1, append(gsKeys, s.gk))
v2 := generateMockVAA(1, append(signers, s.guardianSigner))
require.Equal(t, v2, res.Vaa)
}

Expand Down Expand Up @@ -332,7 +344,7 @@ func newNodePrivilegedServiceForGovernorTests() *nodePrivilegedService {
signedInC: nil,
governor: gov,
evmConnector: nil,
gk: nil,
guardianSigner: nil,
guardianAddress: common.Address{},
}
}
Expand Down

0 comments on commit 3e8c035

Please sign in to comment.