RC1 to RC2 Comparison

src/ApplicationLogs/LogReader.cs

@@ -29,7 +29,7 @@ protected override void Configure()
 
  protected override void OnSystemLoaded(NeoSystem system)
  {
- if (system.Settings.Magic != Settings.Default.Network) return;
+ if (system.Settings.Network != Settings.Default.Network) return;
  RpcServerPlugin.RegisterMethods(this, Settings.Default.Network);
  }
 
@@ -145,7 +145,7 @@ public static JObject BlockLogToJson(Block block, IReadOnlyList<Blockchain.Appli
 
  void IPersistencePlugin.OnPersist(NeoSystem system, Block block, DataCache snapshot, IReadOnlyList<Blockchain.ApplicationExecuted> applicationExecutedList)
  {
- if (system.Settings.Magic != Settings.Default.Network) return;
+ if (system.Settings.Network != Settings.Default.Network) return;
 
  WriteBatch writeBatch = new WriteBatch();
 

src/DBFTPlugin/ConsensusContext.cs

@@ -41,11 +41,13 @@ public class ConsensusContext : IDisposable, ISerializable
  /// <summary>
  /// Store all verified unsorted transactions' senders' fee currently in the consensus context.
  /// </summary>
- public TransactionVerificationContext VerificationContext = new TransactionVerificationContext();
+ public TransactionVerificationContext VerificationContext = new();
 
  public SnapshotCache Snapshot { get; private set; }
  private KeyPair keyPair;
  private int _witnessSize;
+ private readonly NeoSystem neoSystem;
+ private readonly Settings dbftSettings;
  private readonly Wallet wallet;
  private readonly IStore store;
  private Dictionary<UInt256, ConsensusMessage> cachedMessages;
@@ -94,17 +96,19 @@ public bool ValidatorsChanged
 
  public int Size => throw new NotImplementedException();
 
- public ConsensusContext(Wallet wallet, IStore store)
+ public ConsensusContext(NeoSystem neoSystem, Settings settings, Wallet wallet)
  {
  this.wallet = wallet;
- this.store = store;
+ this.neoSystem = neoSystem;
+ this.dbftSettings = settings;
+ this.store = neoSystem.LoadStore(settings.RecoveryLogs);
  }
 
  public Block CreateBlock()
  {
  EnsureHeader();
  Contract contract = Contract.CreateMultiSigContract(M, Validators);
- ContractParametersContext sc = new ContractParametersContext(DBFTPlugin.System.StoreView, Block.Header);
+ ContractParametersContext sc = new ContractParametersContext(neoSystem.StoreView, Block.Header, dbftSettings.Network);
  for (int i = 0, j = 0; i < Validators.Length && j < M; i++)
  {
  if (GetMessage(CommitPayloads[i])?.ViewNumber != ViewNumber) continue;
@@ -148,10 +152,10 @@ public void Deserialize(BinaryReader reader)
  ViewNumber = reader.ReadByte();
  TransactionHashes = reader.ReadSerializableArray<UInt256>(ushort.MaxValue);
  Transaction[] transactions = reader.ReadSerializableArray<Transaction>(ushort.MaxValue);
- PreparationPayloads = reader.ReadNullableArray<ExtensiblePayload>(DBFTPlugin.System.Settings.ValidatorsCount);
- CommitPayloads = reader.ReadNullableArray<ExtensiblePayload>(DBFTPlugin.System.Settings.ValidatorsCount);
- ChangeViewPayloads = reader.ReadNullableArray<ExtensiblePayload>(DBFTPlugin.System.Settings.ValidatorsCount);
- LastChangeViewPayloads = reader.ReadNullableArray<ExtensiblePayload>(DBFTPlugin.System.Settings.ValidatorsCount);
+ PreparationPayloads = reader.ReadNullableArray<ExtensiblePayload>(neoSystem.Settings.ValidatorsCount);
+ CommitPayloads = reader.ReadNullableArray<ExtensiblePayload>(neoSystem.Settings.ValidatorsCount);
+ ChangeViewPayloads = reader.ReadNullableArray<ExtensiblePayload>(neoSystem.Settings.ValidatorsCount);
+ LastChangeViewPayloads = reader.ReadNullableArray<ExtensiblePayload>(neoSystem.Settings.ValidatorsCount);
  if (TransactionHashes.Length == 0 && !RequestSentOrReceived)
  TransactionHashes = null;
  Transactions = transactions.Length == 0 && !RequestSentOrReceived ? null : transactions.ToDictionary(p => p.Hash);
@@ -265,7 +269,7 @@ public ExtensiblePayload MakeCommit()
  {
  return CommitPayloads[MyIndex] ?? (CommitPayloads[MyIndex] = MakeSignedPayload(new Commit
  {
- Signature = EnsureHeader().Sign(keyPair, DBFTPlugin.System.Settings.Magic)
+ Signature = EnsureHeader().Sign(keyPair, neoSystem.Settings.Network)
  }));
  }
 
@@ -284,7 +288,7 @@ private void SignPayload(ExtensiblePayload payload)
  ContractParametersContext sc;
  try
  {
- sc = new ContractParametersContext(DBFTPlugin.System.StoreView, payload);
+ sc = new ContractParametersContext(neoSystem.StoreView, payload, dbftSettings.Network);
  wallet.Sign(sc);
  }
  catch (InvalidOperationException)
@@ -335,7 +339,7 @@ internal int GetExpectedBlockSizeWithoutTransactions(int expectedTransactions)
  /// <param name="txs">Ordered transactions</param>
  internal void EnsureMaxBlockLimitation(IEnumerable<Transaction> txs)
  {
- uint maxTransactionsPerBlock = DBFTPlugin.System.Settings.MaxTransactionsPerBlock;
+ uint maxTransactionsPerBlock = neoSystem.Settings.MaxTransactionsPerBlock;
 
  // Limit Speaker proposal to the limit `MaxTransactionsPerBlock` or all available transactions of the mempool
  txs = txs.Take((int)maxTransactionsPerBlock);
@@ -352,11 +356,11 @@ internal void EnsureMaxBlockLimitation(IEnumerable<Transaction> txs)
  {
  // Check if maximum block size has been already exceeded with the current selected set
  blockSize += tx.Size;
- if (blockSize > Settings.Default.MaxBlockSize) break;
+ if (blockSize > dbftSettings.MaxBlockSize) break;
 
  // Check if maximum block system fee has been already exceeded with the current selected set
  blockSystemFee += tx.SystemFee;
- if (blockSystemFee > Settings.Default.MaxBlockSystemFee) break;
+ if (blockSystemFee > dbftSettings.MaxBlockSystemFee) break;
 
  hashes.Add(tx.Hash);
  Transactions.Add(tx.Hash, tx);
@@ -368,7 +372,7 @@ internal void EnsureMaxBlockLimitation(IEnumerable<Transaction> txs)
 
  public ExtensiblePayload MakePrepareRequest()
  {
- EnsureMaxBlockLimitation(DBFTPlugin.System.MemPool.GetSortedVerifiedTransactions());
+ EnsureMaxBlockLimitation(neoSystem.MemPool.GetSortedVerifiedTransactions());
  Block.Header.Timestamp = Math.Max(TimeProvider.Current.UtcNow.ToTimestampMS(), PrevHeader.Timestamp + 1);
 
  return PreparationPayloads[MyIndex] = MakeSignedPayload(new PrepareRequest
@@ -403,16 +407,16 @@ public ExtensiblePayload MakeRecoveryMessage()
  TransactionHashes = TransactionHashes
  };
  }
- return MakeSignedPayload(new RecoveryMessage()
+ return MakeSignedPayload(new RecoveryMessage
  {
- ChangeViewMessages = LastChangeViewPayloads.Where(p => p != null).Select(p => GetChangeViewPayloadCompact(p)).Take(M).ToDictionary(p => (int)p.ValidatorIndex),
+ ChangeViewMessages = LastChangeViewPayloads.Where(p => p != null).Select(p => GetChangeViewPayloadCompact(p)).Take(M).ToDictionary(p => p.ValidatorIndex),
  PrepareRequestMessage = prepareRequestMessage,
  // We only need a PreparationHash set if we don't have the PrepareRequest information.
  PreparationHash = TransactionHashes == null ? PreparationPayloads.Where(p => p != null).GroupBy(p => GetMessage<PrepareResponse>(p).PreparationHash, (k, g) => new { Hash = k, Count = g.Count() }).OrderByDescending(p => p.Count).Select(p => p.Hash).FirstOrDefault() : null,
- PreparationMessages = PreparationPayloads.Where(p => p != null).Select(p => GetPreparationPayloadCompact(p)).ToDictionary(p => (int)p.ValidatorIndex),
+ PreparationMessages = PreparationPayloads.Where(p => p != null).Select(p => GetPreparationPayloadCompact(p)).ToDictionary(p => p.ValidatorIndex),
  CommitMessages = CommitSent
- ? CommitPayloads.Where(p => p != null).Select(p => GetCommitPayloadCompact(p)).ToDictionary(p => (int)p.ValidatorIndex)
- : new Dictionary<int, CommitPayloadCompact>()
+ ? CommitPayloads.Where(p => p != null).Select(p => GetCommitPayloadCompact(p)).ToDictionary(p => p.ValidatorIndex)
+ : new Dictionary<byte, CommitPayloadCompact>()
  });
  }
 
@@ -429,7 +433,7 @@ public void Reset(byte viewNumber)
  if (viewNumber == 0)
  {
  Snapshot?.Dispose();
- Snapshot = DBFTPlugin.System.GetSnapshot();
+ Snapshot = neoSystem.GetSnapshot();
  uint height = NativeContract.Ledger.CurrentIndex(Snapshot);
  Block = new Block
  {
@@ -438,17 +442,17 @@ public void Reset(byte viewNumber)
  PrevHash = NativeContract.Ledger.CurrentHash(Snapshot),
  Index = height + 1,
  NextConsensus = Contract.GetBFTAddress(
- NeoToken.ShouldRefreshCommittee(height + 1, DBFTPlugin.System.Settings.CommitteeMembersCount) ?
- NativeContract.NEO.ComputeNextBlockValidators(Snapshot, DBFTPlugin.System.Settings) :
- NativeContract.NEO.GetNextBlockValidators(Snapshot, DBFTPlugin.System.Settings.ValidatorsCount))
+ NeoToken.ShouldRefreshCommittee(height + 1, neoSystem.Settings.CommitteeMembersCount) ?
+ NativeContract.NEO.ComputeNextBlockValidators(Snapshot, neoSystem.Settings) :
+ NativeContract.NEO.GetNextBlockValidators(Snapshot, neoSystem.Settings.ValidatorsCount))
  }
  };
  var pv = Validators;
- Validators = NativeContract.NEO.GetNextBlockValidators(Snapshot, DBFTPlugin.System.Settings.ValidatorsCount);
+ Validators = NativeContract.NEO.GetNextBlockValidators(Snapshot, neoSystem.Settings.ValidatorsCount);
  if (_witnessSize == 0 || (pv != null && pv.Length != Validators.Length))
  {
  // Compute the expected size of the witness
- using (ScriptBuilder sb = new ScriptBuilder())
+ using (ScriptBuilder sb = new())
  {
  for (int x = 0; x < M; x++)
  {
@@ -519,8 +523,8 @@ public void Serialize(BinaryWriter writer)
  writer.Write(Block.PrimaryIndex);
  writer.Write(Block.NextConsensus ?? UInt160.Zero);
  writer.Write(ViewNumber);
- writer.Write(TransactionHashes ?? new UInt256[0]);
- writer.Write(Transactions?.Values.ToArray() ?? new Transaction[0]);
+ writer.Write(TransactionHashes ?? Array.Empty<UInt256>());
+ writer.Write(Transactions?.Values.ToArray() ?? Array.Empty<Transaction>());
  writer.WriteNullableArray(PreparationPayloads);
  writer.WriteNullableArray(CommitPayloads);
  writer.WriteNullableArray(ChangeViewPayloads);

src/DBFTPlugin/ConsensusMessage.cs

@@ -30,8 +30,6 @@ public virtual void Deserialize(BinaryReader reader)
  throw new FormatException();
  BlockIndex = reader.ReadUInt32();
  ValidatorIndex = reader.ReadByte();
- if (ValidatorIndex >= DBFTPlugin.System.Settings.ValidatorsCount)
- throw new FormatException();
  ViewNumber = reader.ReadByte();
  }
 
@@ -44,6 +42,11 @@ public static ConsensusMessage DeserializeFrom(byte[] data)
  return (ConsensusMessage)data.AsSerializable(t);
  }
 
+ public virtual bool Verify(ProtocolSettings protocolSettings)
+ {
+ return ValidatorIndex < protocolSettings.ValidatorsCount;
+ }
+
  public virtual void Serialize(BinaryWriter writer)
  {
  writer.Write((byte)Type);