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

sdk: do not require a payload in vaa Unmarshal

This commit is contained in:
Evan Gray 2022-10-26 11:02:05 +00:00 committed by Evan Gray
parent c834938f09
commit 4c25a96731
2 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sdk/vaa/structs.go
View File

@ -368,13 +368,18 @@ func Unmarshal(data []byte) (*VAA, error) {
return nil, fmt.Errorf("failed to read commitment: %w", err)
}
payload := make([]byte, InternalTruncatedPayloadSafetyLimit)
n, err := reader.Read(payload)
if err != nil || n == 0 {
return nil, fmt.Errorf("failed to read payload [%d]: %w", n, err)
}
// Make sure to only read the payload if the VAA has one; VAAs may have a 0 length payload
if reader.Len() != 0 {
payload := make([]byte, InternalTruncatedPayloadSafetyLimit)
n, err := reader.Read(payload)
if err != nil {
return nil, fmt.Errorf("failed to read payload [%d]: %w", n, err)
}
v.Payload = payload[:n]
v.Payload = payload[:n]
} else {
v.Payload = []byte{}
}
return v, nil
}

26
sdk/vaa/structs_test.go
View File

@ -198,6 +198,24 @@ func getVaa() VAA {
}
}
func getEmptyPayloadVaa() VAA {
var payload = []byte{}
var governanceEmitter = Address{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4}
return VAA{
Version: uint8(1),
GuardianSetIndex: uint32(1),
Signatures: []*Signature{},
Timestamp: time.Unix(0, 0),
Nonce: uint32(1),
Sequence: uint64(1),
ConsistencyLevel: uint8(32),
EmitterChain: ChainIDSolana,
EmitterAddress: governanceEmitter,
Payload: payload,
}
}
func TestAddSignature(t *testing.T) {
vaa := getVaa()
@ -256,6 +274,14 @@ func TestUnmarshal(t *testing.T) {
assert.Equal(t, &vaa1, vaa2)
}
func TestUnmarshalNoPayload(t *testing.T) {
vaaBytes := []byte{0x1, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x20}
vaa1 := getEmptyPayloadVaa()
vaa2, err := Unmarshal(vaaBytes)
assert.Nil(t, err)
assert.Equal(t, &vaa1, vaa2)
}
func TestUnmarshalTooBig(t *testing.T) {
vaa := getVaa()