Fix #1128 (#1129)

* Fix #1128 * Update BlockBase.cs
neo-project · Oct 30, 2019 · 1b7d1ec · 1b7d1ec
1 parent 0aed29f
commit 1b7d1ec
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/neo/Network/P2P/Payloads/BlockBase.cs b/neo/Network/P2P/Payloads/BlockBase.cs
@@ -40,7 +40,7 @@ public UInt256 Hash
             sizeof(ulong) +      //Timestamp
             sizeof(uint) +       //Index
             UInt160.Length +     //NextConsensus
-            1 +                  //
+            1 +                  //Witness array count
             Witness.Size;        //Witness   
 
         Witness[] IVerifiable.Witnesses
@@ -59,8 +59,9 @@ Witness[] IVerifiable.Witnesses
         public virtual void Deserialize(BinaryReader reader)
         {
             ((IVerifiable)this).DeserializeUnsigned(reader);
-            if (reader.ReadByte() != 1) throw new FormatException();
-            Witness = reader.ReadSerializable<Witness>();
+            Witness[] witnesses = reader.ReadSerializableArray<Witness>(1);
+            if (witnesses.Length != 1) throw new FormatException();
+            Witness = witnesses[0];
         }
 
         void IVerifiable.DeserializeUnsigned(BinaryReader reader)
@@ -84,7 +85,7 @@ UInt160[] IVerifiable.GetScriptHashesForVerifying(Snapshot snapshot)
         public virtual void Serialize(BinaryWriter writer)
         {
             ((IVerifiable)this).SerializeUnsigned(writer);
-            writer.Write((byte)1); writer.Write(Witness);
+            writer.Write(new Witness[] { Witness });
         }
 
         void IVerifiable.SerializeUnsigned(BinaryWriter writer)