fixup! proto fix, see comment in protogen

go/neo/proto/protogen.go

@@ -1757,6 +1757,8 @@ func (d *decoderM) genStructHead(path string, typ *types.Struct, userType types.
 	//	Addr isn't an Array/Struct but an extension type and this needs to be adjusted in proto.go?
 	//	We need to differentiate in 'genStructHead' between them?
 
+	d.resetPos()
+
 	d.emit("{")
 	d.emit("_, tail, err := msgp.ReadArrayHeaderBytes(data)")
 	d.emit("if err != nil {")

go/neo/proto/zproto-marshal.go

@@ -1227,6 +1227,7 @@ func (p *NotifyNodeInformation) neoMsgDecodeM(data []byte) (int, error) {
 			if op, opOk := msgpack.Op(data[3]), msgpack.FixArray_4|2; op != opOk {
 				return 0, &mstructDecodeError{"NotifyNodeInformation.Addr", op, opOk}
 			}
+			data = data[3:]
 			{
 				_, tail, err := msgp.ReadArrayHeaderBytes(data)
 				if err != nil {
@@ -1234,7 +1235,6 @@ func (p *NotifyNodeInformation) neoMsgDecodeM(data []byte) (int, error) {
 				}
 				data = tail
 			}
-			data = data[3:]
 			{
 				b, tail, err := msgp.ReadBytesZC(data)
 				if err != nil {
@@ -6935,6 +6935,7 @@ func (p *AnswerNodeList) neoMsgDecodeM(data []byte) (int, error) {
 			if op, opOk := msgpack.Op(data[3]), msgpack.FixArray_4|2; op != opOk {
 				return 0, &mstructDecodeError{"AnswerNodeList.Addr", op, opOk}
 			}
+			data = data[3:]
 			{
 				_, tail, err := msgp.ReadArrayHeaderBytes(data)
 				if err != nil {
@@ -6942,7 +6943,6 @@ func (p *AnswerNodeList) neoMsgDecodeM(data []byte) (int, error) {
 				}
 				data = tail
 			}
-			data = data[3:]
 			{
 				b, tail, err := msgp.ReadBytesZC(data)
 				if err != nil {
@@ -8411,6 +8411,7 @@ func (p *AnswerObjectUndoSerial) neoMsgDecodeM(data []byte) (int, error) {
 			if op, opOk := msgpack.Op(data[10]), msgpack.FixArray_4|3; op != opOk {
 				return 0, &mstructDecodeError{"AnswerObjectUndoSerial", op, opOk}
 			}
+			data = data[10:]
 			{
 				_, tail, err := msgp.ReadArrayHeaderBytes(data)
 				if err != nil {
@@ -8418,21 +8419,21 @@ func (p *AnswerObjectUndoSerial) neoMsgDecodeM(data []byte) (int, error) {
 				}
 				data = tail
 			}
-			if op := msgpack.Op(data[10]); op != msgpack.Bin8 {
+			if op := msgpack.Op(data[0]); op != msgpack.Bin8 {
 				return 0, mdecodeOpErr("AnswerObjectUndoSerial.CurrentSerial", op, msgpack.Bin8)
 			}
-			if l := data[11]; l != 8 {
+			if l := data[1]; l != 8 {
 				return 0, mdecodeLen8Err("AnswerObjectUndoSerial.CurrentSerial", l, 8)
 			}
-			mv.CurrentSerial = zodb.Tid(binary.BigEndian.Uint64(data[12:]))
-			if op := msgpack.Op(data[20]); op != msgpack.Bin8 {
+			mv.CurrentSerial = zodb.Tid(binary.BigEndian.Uint64(data[2:]))
+			if op := msgpack.Op(data[10]); op != msgpack.Bin8 {
 				return 0, mdecodeOpErr("AnswerObjectUndoSerial.UndoSerial", op, msgpack.Bin8)
 			}
-			if l := data[21]; l != 8 {
+			if l := data[11]; l != 8 {
 				return 0, mdecodeLen8Err("AnswerObjectUndoSerial.UndoSerial", l, 8)
 			}
-			mv.UndoSerial = zodb.Tid(binary.BigEndian.Uint64(data[22:]))
-			switch op := msgpack.Op(data[30]); op {
+			mv.UndoSerial = zodb.Tid(binary.BigEndian.Uint64(data[12:]))
+			switch op := msgpack.Op(data[20]); op {
 			default:
 				return 0, mdecodeOpErr("AnswerObjectUndoSerial.IsCurrent", op, msgpack.True, msgpack.False)
 			case msgpack.True:
@@ -8441,7 +8442,7 @@ func (p *AnswerObjectUndoSerial) neoMsgDecodeM(data []byte) (int, error) {
 				mv.IsCurrent = false
 			}
 			m[key] = mv
-			data = data[31:]
+			data = data[21:]
 		}
 	}
 	return 1 + int(nread), nil