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

Ensure that the block is valid before relay it on CheckCommits #1220

Merged
merged 16 commits into from
Nov 24, 2019
Merged

Ensure that the block is valid before relay it on CheckCommits #1220

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
bebf26b
Fix 1219
shargon Nov 11, 2019
f49ccad
Refactor
shargon Nov 11, 2019
5cab7ef
Update ConsensusContext.cs
erikzhang Nov 13, 2019
89153d4
Merge branch 'master' into fix-null-1219
erikzhang Nov 13, 2019
296ad5d
Remove if
shargon Nov 13, 2019
cbfc861
Merge branch 'master' into fix-null-1219
lock9 Nov 13, 2019
af99ac7
Merge branch 'master' into fix-null-1219
erikzhang Nov 14, 2019
188bebc
UT
shargon Nov 14, 2019
51af5be
Fix CheckPreparations
shargon Nov 14, 2019
4cba7ff
Ensure load only this view
shargon Nov 14, 2019
84ec52a
Clean ut
shargon Nov 14, 2019
058df1f
Fix UT
shargon Nov 14, 2019
07b0bef
Revert ConsensusContext changes
shargon Nov 15, 2019
db67038
Merge branch 'master' into fix-null-1219
shargon Nov 19, 2019
4e9fa00
Merge branch 'master' into fix-null-1219
shargon Nov 21, 2019
ad67b13
Merge branch 'master' into fix-null-1219
erikzhang Nov 24, 2019
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
17 changes: 3 additions & 14 deletions neo.UnitTests/Consensus/UT_ConsensusContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using Neo.Consensus;
using Neo.IO;
using Neo.Network.P2P.Payloads;
using Neo.SmartContract;
using Neo.SmartContract.Native;
using Neo.Wallets;
using System;
Expand Down Expand Up @@ -119,6 +118,8 @@ private Block SignBlock(ConsensusContext context)
{
context.Block.MerkleRoot = null;

// Fake commits

for (int x = 0; x < _validatorKeys.Length; x++)
{
_context.MyIndex = x;
Expand All @@ -127,19 +128,7 @@ private Block SignBlock(ConsensusContext context)
_context.CommitPayloads[_context.MyIndex] = com;
}

// Manual block sign

Contract contract = Contract.CreateMultiSigContract(context.M, context.Validators);
ContractParametersContext sc = new ContractParametersContext(context.Block);
for (int i = 0, j = 0; i < context.Validators.Length && j < context.M; i++)
{
if (context.CommitPayloads[i]?.ConsensusMessage.ViewNumber != context.ViewNumber) continue;
sc.AddSignature(contract, context.Validators[i], context.CommitPayloads[i].GetDeserializedMessage<Commit>().Signature);
j++;
}
context.Block.Witness = sc.GetWitnesses()[0];
context.Block.Transactions = context.TransactionHashes.Select(p => context.Transactions[p]).ToArray();
return context.Block;
return context.CreateBlock();
}

private void EnsureContext(ConsensusContext context, params Transaction[] expected)
Expand Down
1 change: 1 addition & 0 deletions neo/Consensus/ConsensusContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ public ConsensusContext(Wallet wallet, Store store)

public Block CreateBlock()
{
EnsureHeader();
Contract contract = Contract.CreateMultiSigContract(M, Validators);
ContractParametersContext sc = new ContractParametersContext(Block);
for (int i = 0, j = 0; i < Validators.Length && j < M; i++)
Expand Down