Update to web version 2.3000.1013652801 and break protobufs

This includes redoing the protobuf extractor and redirecting legacy
binary/proto package to the new packages which are shared with FB
Messenger mode. The backwards compatibility is best effort only, some
things like field name capitalization changes must be updated manually.

Author: tulir

appstate.go

@@ -519,14 +519,14 @@ func (cli *Client) requestAppStateKeys(ctx context.Context, rawKeyIDs [][]byte)
 	keyIDs := make([]*waProto.AppStateSyncKeyId, len(rawKeyIDs))
 	debugKeyIDs := make([]string, len(rawKeyIDs))
 	for i, keyID := range rawKeyIDs {
-		keyIDs[i] = &waProto.AppStateSyncKeyId{KeyId: keyID}
+		keyIDs[i] = &waProto.AppStateSyncKeyId{KeyID: keyID}
 		debugKeyIDs[i] = hex.EncodeToString(keyID)
 	}
 	msg := &waProto.Message{
 		ProtocolMessage: &waProto.ProtocolMessage{
 			Type: waProto.ProtocolMessage_APP_STATE_SYNC_KEY_REQUEST.Enum(),
 			AppStateSyncKeyRequest: &waProto.AppStateSyncKeyRequest{
-				KeyIds: keyIDs,
+				KeyIDs: keyIDs,
 			},
 		},
 	}

appstate/encode.go

@@ -261,7 +261,7 @@ func (proc *Processor) EncodePatch(keyID []byte, state HashState, patchInfo Patc
 			Record: &waProto.SyncdRecord{
 				Index: &waProto.SyncdIndex{Blob: indexMac},
 				Value: &waProto.SyncdValue{Blob: append(encryptedContent, valueMac...)},
-				KeyId: &waProto.KeyId{Id: keyID},
+				KeyID: &waProto.KeyId{ID: keyID},
 			},
 		})
 	}
@@ -279,11 +279,11 @@ func (proc *Processor) EncodePatch(keyID []byte, state HashState, patchInfo Patc
 	state.Version += 1
 
 	syncdPatch := &waProto.SyncdPatch{
-		SnapshotMac: state.generateSnapshotMAC(patchInfo.Type, keys.SnapshotMAC),
-		KeyId:       &waProto.KeyId{Id: keyID},
+		SnapshotMAC: state.generateSnapshotMAC(patchInfo.Type, keys.SnapshotMAC),
+		KeyID:       &waProto.KeyId{ID: keyID},
 		Mutations:   mutations,
 	}
-	syncdPatch.PatchMac = generatePatchMAC(syncdPatch, patchInfo.Type, keys.PatchMAC, state.Version)
+	syncdPatch.PatchMAC = generatePatchMAC(syncdPatch, patchInfo.Type, keys.PatchMAC, state.Version)
 
 	result, err := proto.Marshal(syncdPatch)
 	if err != nil {

armadillomessage.go

@@ -11,10 +11,10 @@ import (
 
 	"google.golang.org/protobuf/proto"
 
-	"go.mau.fi/whatsmeow/binary/armadillo"
-	"go.mau.fi/whatsmeow/binary/armadillo/waCommon"
-	"go.mau.fi/whatsmeow/binary/armadillo/waMsgApplication"
-	"go.mau.fi/whatsmeow/binary/armadillo/waMsgTransport"
+	armadillo "go.mau.fi/whatsmeow/proto"
+	"go.mau.fi/whatsmeow/proto/waCommon"
+	"go.mau.fi/whatsmeow/proto/waMsgApplication"
+	"go.mau.fi/whatsmeow/proto/waMsgTransport"
 	"go.mau.fi/whatsmeow/types"
 	"go.mau.fi/whatsmeow/types/events"
 )