Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix consensus payloads indexes #1837

Merged
merged 3 commits into from
Aug 13, 2020
Merged

Fix consensus payloads indexes #1837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b20c120
Fix consensus payloads indexes
erikzhang Aug 12, 2020
b41e454
Merge branch 'master' into fixes/consensus
shargon Aug 12, 2020
e86f6cc
Merge branch 'master' into fixes/consensus
shargon Aug 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/neo/Consensus/ConsensusContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,10 @@ public Block EnsureHeader()
}

[MethodImpl(MethodImplOptions.AggressiveInlining)]
public uint GetPrimaryIndex(byte viewNumber)
public byte GetPrimaryIndex(byte viewNumber)
{
int p = ((int)Block.Index - viewNumber) % Validators.Length;
return p >= 0 ? (uint)p : (uint)(p + Validators.Length);
return p >= 0 ? (byte)p : (byte)(p + Validators.Length);
}

public bool Load()
Expand Down Expand Up @@ -198,7 +198,7 @@ private ConsensusPayload MakeSignedPayload(ConsensusMessage message)
Version = Block.Version,
PrevHash = Block.PrevHash,
BlockIndex = Block.Index,
ValidatorIndex = (ushort)MyIndex,
ValidatorIndex = (byte)MyIndex,
ConsensusMessage = message
};
SignPayload(payload);
Expand Down
9 changes: 6 additions & 3 deletions src/neo/Consensus/RecoveryMessage.ChangeViewPayloadCompact.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using Neo.IO;
using Neo.Network.P2P.Payloads;
using System;
using System.IO;

namespace Neo.Consensus
Expand All @@ -8,20 +9,22 @@ partial class RecoveryMessage
{
public class ChangeViewPayloadCompact : ISerializable
{
public ushort ValidatorIndex;
public byte ValidatorIndex;
public byte OriginalViewNumber;
public ulong Timestamp;
public byte[] InvocationScript;

int ISerializable.Size =>
sizeof(ushort) + //ValidatorIndex
sizeof(byte) + //ValidatorIndex
sizeof(byte) + //OriginalViewNumber
sizeof(ulong) + //Timestamp
InvocationScript.GetVarSize(); //InvocationScript

void ISerializable.Deserialize(BinaryReader reader)
{
ValidatorIndex = reader.ReadUInt16();
ValidatorIndex = reader.ReadByte();
if (ValidatorIndex >= ProtocolSettings.Default.ValidatorsCount)
throw new FormatException();
OriginalViewNumber = reader.ReadByte();
Timestamp = reader.ReadUInt64();
InvocationScript = reader.ReadVarBytes(1024);
Expand Down
9 changes: 6 additions & 3 deletions src/neo/Consensus/RecoveryMessage.CommitPayloadCompact.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using Neo.IO;
using Neo.Network.P2P.Payloads;
using System;
using System.IO;

namespace Neo.Consensus
Expand All @@ -9,20 +10,22 @@ partial class RecoveryMessage
public class CommitPayloadCompact : ISerializable
{
public byte ViewNumber;
public ushort ValidatorIndex;
public byte ValidatorIndex;
public byte[] Signature;
public byte[] InvocationScript;

int ISerializable.Size =>
sizeof(byte) + //ViewNumber
sizeof(ushort) + //ValidatorIndex
sizeof(byte) + //ValidatorIndex
Signature.Length + //Signature
InvocationScript.GetVarSize(); //InvocationScript

void ISerializable.Deserialize(BinaryReader reader)
{
ViewNumber = reader.ReadByte();
ValidatorIndex = reader.ReadUInt16();
ValidatorIndex = reader.ReadByte();
if (ValidatorIndex >= ProtocolSettings.Default.ValidatorsCount)
throw new FormatException();
Signature = reader.ReadFixedBytes(64);
InvocationScript = reader.ReadVarBytes(1024);
}
Expand Down
9 changes: 6 additions & 3 deletions src/neo/Consensus/RecoveryMessage.PreparationPayloadCompact.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using Neo.IO;
using Neo.Network.P2P.Payloads;
using System;
using System.IO;

namespace Neo.Consensus
Expand All @@ -8,16 +9,18 @@ partial class RecoveryMessage
{
public class PreparationPayloadCompact : ISerializable
{
public ushort ValidatorIndex;
public byte ValidatorIndex;
public byte[] InvocationScript;

int ISerializable.Size =>
sizeof(ushort) + //ValidatorIndex
sizeof(byte) + //ValidatorIndex
InvocationScript.GetVarSize(); //InvocationScript

void ISerializable.Deserialize(BinaryReader reader)
{
ValidatorIndex = reader.ReadUInt16();
ValidatorIndex = reader.ReadByte();
if (ValidatorIndex >= ProtocolSettings.Default.ValidatorsCount)
throw new FormatException();
InvocationScript = reader.ReadVarBytes(1024);
}

Expand Down
4 changes: 2 additions & 2 deletions src/neo/Consensus/RecoveryMessage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,14 @@ internal ConsensusPayload[] GetCommitPayloadsFromRecoveryMessage(ConsensusContex
internal ConsensusPayload GetPrepareRequestPayload(ConsensusContext context, ConsensusPayload payload)
{
if (PrepareRequestMessage == null) return null;
if (!PreparationMessages.TryGetValue((int)context.Block.ConsensusData.PrimaryIndex, out RecoveryMessage.PreparationPayloadCompact compact))
if (!PreparationMessages.TryGetValue(context.Block.ConsensusData.PrimaryIndex, out PreparationPayloadCompact compact))
return null;
return new ConsensusPayload
{
Version = payload.Version,
PrevHash = payload.PrevHash,
BlockIndex = payload.BlockIndex,
ValidatorIndex = (ushort)context.Block.ConsensusData.PrimaryIndex,
ValidatorIndex = context.Block.ConsensusData.PrimaryIndex,
ConsensusMessage = PrepareRequestMessage,
Witness = new Witness
{
Expand Down
11 changes: 7 additions & 4 deletions src/neo/Network/P2P/Payloads/ConsensusData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
using Neo.Cryptography;
using Neo.IO;
using Neo.IO.Json;
using System;
using System.IO;

namespace Neo.Network.P2P.Payloads
{
public class ConsensusData : ISerializable
{
public uint PrimaryIndex;
public byte PrimaryIndex;
public ulong Nonce;

private UInt256 _hash = null;
Expand All @@ -23,17 +24,19 @@ public UInt256 Hash
}
}

public int Size => IO.Helper.GetVarSize((int)PrimaryIndex) + sizeof(ulong);
public int Size => sizeof(byte) + sizeof(ulong);

void ISerializable.Deserialize(BinaryReader reader)
{
PrimaryIndex = (uint)reader.ReadVarInt((ulong)ProtocolSettings.Default.ValidatorsCount - 1);
PrimaryIndex = reader.ReadByte();
if (PrimaryIndex >= ProtocolSettings.Default.ValidatorsCount)
throw new FormatException();
Nonce = reader.ReadUInt64();
}

void ISerializable.Serialize(BinaryWriter writer)
{
writer.WriteVarInt(PrimaryIndex);
writer.Write(PrimaryIndex);
writer.Write(Nonce);
}

Expand Down
8 changes: 5 additions & 3 deletions src/neo/Network/P2P/Payloads/ConsensusPayload.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class ConsensusPayload : IInventory
public uint Version;
public UInt256 PrevHash;
public uint BlockIndex;
public ushort ValidatorIndex;
public byte ValidatorIndex;
public byte[] Data;
public Witness Witness;

Expand Down Expand Up @@ -57,7 +57,7 @@ public UInt256 Hash
sizeof(uint) + //Version
PrevHash.Size + //PrevHash
sizeof(uint) + //BlockIndex
sizeof(ushort) + //ValidatorIndex
sizeof(byte) + //ValidatorIndex
Data.GetVarSize() + //Data
1 + Witness.Size; //Witness

Expand Down Expand Up @@ -91,7 +91,9 @@ void IVerifiable.DeserializeUnsigned(BinaryReader reader)
Version = reader.ReadUInt32();
PrevHash = reader.ReadSerializable<UInt256>();
BlockIndex = reader.ReadUInt32();
ValidatorIndex = reader.ReadUInt16();
ValidatorIndex = reader.ReadByte();
if (ValidatorIndex >= ProtocolSettings.Default.ValidatorsCount)
throw new FormatException();
Data = reader.ReadVarBytes();
}

Expand Down
4 changes: 2 additions & 2 deletions tests/neo.UnitTests/Consensus/UT_ChangeViewPayloadCompact.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ public class UT_ChangeViewPayloadCompact
public void Size_Get()
{
var test = new RecoveryMessage.ChangeViewPayloadCompact() { Timestamp = 1, ValidatorIndex = 1, InvocationScript = new byte[0], OriginalViewNumber = 1 };
((ISerializable)test).Size.Should().Be(12);
((ISerializable)test).Size.Should().Be(11);

test = new RecoveryMessage.ChangeViewPayloadCompact() { Timestamp = 1, ValidatorIndex = 1, InvocationScript = new byte[1024], OriginalViewNumber = 1 };
((ISerializable)test).Size.Should().Be(1038);
((ISerializable)test).Size.Should().Be(1037);
}

[TestMethod]
Expand Down
6 changes: 3 additions & 3 deletions tests/neo.UnitTests/Consensus/UT_Consensus.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ public void ConsensusService_SingleNodeActors_OnStart_PrepReq_PrepResponses_Comm
/// <param name="vI">new ValidatorIndex for the cpToCopy
/// <param name="kp">KeyPair that will be used for signing the Commit message used for creating blocks
/// <param name="blockHashToSign">HashCode of the Block that is being produced and current being signed
public ConsensusPayload GetCommitPayloadModifiedAndSignedCopy(ConsensusPayload cpToCopy, ushort vI, KeyPair kp, byte[] blockHashToSign)
public ConsensusPayload GetCommitPayloadModifiedAndSignedCopy(ConsensusPayload cpToCopy, byte vI, KeyPair kp, byte[] blockHashToSign)
{
var cpCommitTemp = cpToCopy.ToArray().AsSerializable<ConsensusPayload>();
cpCommitTemp.ValidatorIndex = vI;
Expand All @@ -463,7 +463,7 @@ public ConsensusPayload GetCommitPayloadModifiedAndSignedCopy(ConsensusPayload c
/// </summary>
/// <param name="cpToCopy">ConsensusPayload that will be modified
/// <param name="vI">new ValidatorIndex for the cpToCopy
public ConsensusPayload GetPayloadAndModifyValidator(ConsensusPayload cpToCopy, ushort vI)
public ConsensusPayload GetPayloadAndModifyValidator(ConsensusPayload cpToCopy, byte vI)
{
var cpTemp = cpToCopy.ToArray().AsSerializable<ConsensusPayload>();
cpTemp.ValidatorIndex = vI;
Expand Down Expand Up @@ -910,7 +910,7 @@ public void TestSerializeAndDeserializeRecoveryMessageWithoutChangeViewsWithComm
copiedMsg.CommitMessages.Should().BeEquivalentTo(msg.CommitMessages);
}

private static ConsensusPayload MakeSignedPayload(ConsensusContext context, ConsensusMessage message, ushort validatorIndex, byte[] witnessInvocationScript)
private static ConsensusPayload MakeSignedPayload(ConsensusContext context, ConsensusMessage message, byte validatorIndex, byte[] witnessInvocationScript)
{
return new ConsensusPayload
{
Expand Down