merge neo3.0 master

.editorconfig

@@ -0,0 +1,17 @@
+###############################
+# Core EditorConfig Options   #
+###############################
+
+# dotnet-format requires version 3.1.37601
+# dotnet tool update -g dotnet-format
+# remember to have: git config --global core.autocrlf false  #(which is usually default)
+
+root = true
+
+# Every file
+
+[*]
+insert_final_newline = true
+trim_trailing_whitespace = true
+charset = utf-8
+end_of_line = lf

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,31 @@
+---
+name: Bug report
+about: Create a report to detail an error or unexpected behavior
+title: ''
+labels: ''
+assignees: ''
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Open the project, run '...'
+2. Type '...' or do '...'
+3. ...
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Platform:**
+ - OS: [e.g. Windows 10 x64]
+ - Version [e.g. neo-cli 2.10.2]
+
+**(Optional) Additional context**
+Add any other context about the problem here.
+
+However, if your issue does not fit these aforementioned criteria, or it can be understood in another manner, feel free to open it in a different format. 

.github/ISSUE_TEMPLATE/feature-or-enhancement-request.md

@@ -0,0 +1,27 @@
+---
+name: Feature or enhancement request
+about: Suggest an idea for Neo
+title: ''
+labels: discussion
+assignees: ''
+---
+
+**Summary**
+A summary of the problem you want to solve or metric you want to improve
+
+**Do you have any solution you want to propose?**
+A clear and concise description of what you expect with this change.
+
+**Where in the software does this update applies to?**
+- Compiler
+- Consensus
+- CLI
+- Plugins
+- Ledger
+- Network Policy
+- P2P (TCP)
+- RPC (HTTP)
+- SDK
+- VM
+- Other:
+

.github/ISSUE_TEMPLATE/questions.md

@@ -0,0 +1,9 @@
+---
+name: Questions
+about: Questions about Neo Platform
+title: ''
+labels: question
+assignees: ''
+---
+
+**Delete this: We would like to use GitHub for bug reports and feature requests only however if you are unable to get support from our team in: our [Discord](https://discord.io/neo) server or in our [offical documentation](https://docs.neo.org/docs/en-us/index.html), feel encouraged to create an issue here on GitHub.**

.travis.yml

@@ -10,16 +10,32 @@ osx_image: xcode9.1
 mono: none
 dotnet: 2.2.300
 
+env:
+  - TEST_SUITE="without-cultures"
+  - TEST_SUITE="cultures"
+
 before_install:
-  - cd neo.UnitTests
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ulimit -n 2048; fi
+install:
+  - dotnet tool install -g dotnet-format --version 4.0.40103 --add-source https://dotnet.myget.org/F/format/api/v3/index.json
+  - export PATH="$PATH:$HOME/.dotnet/tools"
+  - dotnet-format --version
+before_script:
+  - echo "Checking format..." 
+  - dotnet format --check --dry-run -w . -v diagnostic # check C# formatting for neo.sln
+  - cd neo.UnitTests
+script: |
+  dotnet restore
+  if [[ "$TEST_SUITE" == cultures ]]; then 
+      dotnet test
+  else
+      find * -name *.csproj | xargs -I % dotnet add % package coverlet.msbuild
+      dotnet test -v n --filter FullyQualifiedName!=Neo.UnitTests.UT_Culture.All_Tests_Cultures /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
+  fi
+after_success: |
+  if [[ "$TEST_SUITE" == "without-cultures" ]]; then 
+    echo "Test Success - Branch($TRAVIS_BRANCH) Pull Request($TRAVIS_PULL_REQUEST) Tag($TRAVIS_TAG)"
+    bash <(curl -s https://codecov.io/bash) -v
+  fi
 
-script:
- - dotnet restore
- - find * -name *.csproj | xargs -I % dotnet add % package coverlet.msbuild
- - dotnet test /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
 
-after_success:
-  # After all tests OK, Send CodeDov report
-  - echo "Test Success - Branch($TRAVIS_BRANCH) Pull Request($TRAVIS_PULL_REQUEST) Tag($TRAVIS_TAG)"
-  - bash <(curl -s https://codecov.io/bash) -v

CONTRIBUTING.md

@@ -0,0 +1,82 @@
+
+# Contributing to NEO
+Neo is an open-source project and it depends on its contributors and constant community feedback to implement the features required for a smart economy. You are more than welcome to join us in the development of Neo.  
+
+Read this document to understand how issues are organized and how you can start contributing.
+
+*This document covers this repository only and does not include community repositories or repositories managed by NGD Shanghai and NGD Seattle.*
+
+### Questions and Support
+The issue list is reserved exclusively for bug reports and features discussions. If you have questions or need support, please visit us in our [Discord](https://discord.io/neo) server.  
+
+### dApp Development
+This document does not relate to dApp development. If you are looking to build a dApp using Neo, please [start here](https://neo.org/dev).
+
+### Contributing to open source projects
+If you are new to open-source development, please [read here](https://opensource.guide/how-to-contribute/#opening-a-pull-request) how to submit your code.
+
+## Developer Guidance
+We try to have as few rules as possible,  just enough to keep the project organized:
+
+
+1.  **Discuss before coding**. Proposals must be discussed before being implemented.  
+Avoid implementing issues with the discussion tag.
+2. **Tests during code review**. We expect reviewers to test the issue before approving or requesting changes.
+
+3. **Wait for at least 2 reviews before merging**. Changes can be merged after 2 approvals, for Neo 3.x branch, and 3 approvals for Neo 2.x branch.
+
+3. **Give time to other developers review an issue**. Even if the code has been approved, you should leave at least 24 hours for others to review it before merging the code.
+
+4. **Create unit tests**. It is important that the developer includes basic unit tests so reviewers can test it.
+
+5. **Task assignment**. If a developer wants to work in a specific issue, he may ask the team to assign it to himself. The proposer of an issue has priority in task assignment.
+
+
+### Issues for beginners
+If you are looking to start contributing to NEO, we suggest you start working on issues with ![](./.github/images/cosmetic.png) or ![](./.github/images/house-keeping.png) tags since they usually do not depend on extensive NEO platform knowledge. 
+
+### Tags for Issues States
+
+![Discussion](./.github/images/discussion.png) Whenever someone posts a new feature request, the tag discussion is added. This means that there is no consensus if the feature should be implemented or not. Avoid creating PR to solve issues in this state since it may be completely discarded.
+
+![Design](./.github/images/solution-design.png) When a feature request is accepted by the team, but there is no consensus about the implementation, the issue is tagged with design. We recommend the team to agree in the solution design before anyone attempts to implement it, using text or UML. It is not recommended, but developers can also present their solution using code.  
+Note that PRs for issues in this state may also be discarded if the team disagree with the proposed solution.
+
+![Ready-to-implement](./.github/images/ready-to-implement.png) Once the team has agreed on feature and the proposed solution, the issue is tagged with ready-to-implement. When implementing it, please follow the solution accepted by the team.
+
+### Tags for Issue Types
+
+![Cosmetic](./.github/images/cosmetic.png) Issues with the cosmetic tag are usually changes in code or documentation that improve user experience without affecting current functionality. These issues are recommended for beginners because they require little to no knowledge about Neo platform.
+
+![Enhancement](./.github/images/enhancement.png) Enhancements are platform changes that may affect performance, usability or add new features to existing modules. It is recommended that developers have previous knowledge in the platform to work in these improvements, specially in more complicated modules like the compiler, ledger and consensus.
+
+![Feature](./.github/images/new-feature.png) New features may include large changes in the code base. Some are complex, but some are not. So, a few issues with new-feature may be recommended for starters, specially those related to the rpc and the sdk module.
+
+![Migration](./.github/images/migration.png) Issues related to the migration from Neo 2 to Neo 3 are tagged with migration. These issues are usually the most complicated ones since they require a deep knowledge in both versions.
+
+### Tags for Project Modules 
+These tags do not necessarily represent each module at code level. Modules consensus and compiler are not recommended for beginners.
+
+![Compiler](./.github/images/compiler.png) Issues that are related or influence the behavior of our C# compiler. Note that the compiler itself is hosted in the [neo-devpack-dotnet](https://github.com/neo-project/neo-devpack-dotnet) repository.
+
+![Consensus](./.github/images/consensus.png) Changes to consensus are usually harder to make and test. Avoid implementing issues in this module that are not yet decided.
+
+![Ledger](./.github/images/ledger.png) The ledger is our 'database', any changes in the way we store information or the data-structures have this tag.
+
+![House-keeping](./.github/images/house-keeping.png) 'Small' enhancements that need to be done in order to keep the project organised and ensure overall quality. These changes may be applied in any place in code, as long as they are small or do not alter current behavior.
+
+![Network-policy](./.github/images/network-policy.png) Identify issues that affect the network-policy like fees, access list or other related issues. Voting may also be related to the network policy module.
+
+![P2P](./.github/images/p2p.png) This module includes peer-to-peer message exchange and network optimisations, at TCP or UDP level (not HTTP).
+
+![RPC](./.github/images/rpc.png) All HTTP communication is handled by the RPC module. This module usually provides support methods since the main communication protocol takes place at the p2p module.
+
+![VM](./.github/images/vm.png) New features that affect the Neo Virtual Machine or the Interop layer.
+
+![SDK](./.github/images/sdk.png) Neo provides an SDK to help developers to interact with the blockchain. Changes in this module must not impact other parts of the software. 
+
+![Wallet](./.github/images/wallet.png) Wallets are used to track funds and interact with the blockchain. Note that this module depends on a full node implementation (data stored on local disk).
+
+
+
+

NuGet.Config

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
     <clear />

README.md

@@ -14,9 +14,6 @@
   <a href="https://codecov.io/github/neo-project/neo/branch/master/graph/badge.svg">
     <img src="https://codecov.io/github/neo-project/neo/branch/master/graph/badge.svg" alt="Current Coverage Status." />
   </a>
-  <a href="https://github.com/neo-project/neo">
-    <img src="https://tokei.rs/b1/github/neo-project/neo?category=lines" alt="Current total lines.">
-  </a>	
   <a href="https://github.com/neo-project/neo/blob/master/LICENSE">
     <img src="https://img.shields.io/badge/license-MIT-blue.svg" alt="License.">
   </a>

neo.UnitTests/UT_Consensus.cs → neo.UnitTests/Consensus/UT_Consensus.cs

@@ -18,7 +18,7 @@
 using System.Security.Cryptography;
 using ECPoint = Neo.Cryptography.ECC.ECPoint;
 
-namespace Neo.UnitTests
+namespace Neo.UnitTests.Consensus
 {
 
     [TestClass]
@@ -47,10 +47,10 @@ public void ConsensusService_Primary_Sends_PrepareRequest_After_OnStart()
             int timeIndex = 0;
             var timeValues = new[] {
               //new DateTime(1968, 06, 01, 0, 0, 15, DateTimeKind.Utc), // For tests here
-              new DateTime(1968, 06, 01, 0, 0, 1, DateTimeKind.Utc),  // For receiving block
-              new DateTime(1968, 06, 01, 0, 0, (int) Blockchain.SecondsPerBlock, DateTimeKind.Utc), // For Initialize
-              new DateTime(1968, 06, 01, 0, 0, 15, DateTimeKind.Utc), // unused
-              new DateTime(1968, 06, 01, 0, 0, 15, DateTimeKind.Utc)  // unused
+              new DateTime(1980, 06, 01, 0, 0, 1, 001, DateTimeKind.Utc),  // For receiving block
+              new DateTime(1980, 06, 01, 0, 0, (int) Blockchain.MillisecondsPerBlock / 1000, 100, DateTimeKind.Utc), // For Initialize
+              new DateTime(1980, 06, 01, 0, 0, 15, 001, DateTimeKind.Utc), // unused
+              new DateTime(1980, 06, 01, 0, 0, 15, 001, DateTimeKind.Utc)  // unused
             };
             //TimeProvider.Current.UtcNow.ToTimestamp().Should().Be(4244941711); //1968-06-01 00:00:15
 
@@ -74,14 +74,14 @@ public void ConsensusService_Primary_Sends_PrepareRequest_After_OnStart()
 
             // Creating proposed block
             Header header = new Header();
-            TestUtils.SetupHeaderWithValues(header, UInt256.Zero, out UInt256 merkRootVal, out UInt160 val160, out uint timestampVal, out uint indexVal, out Witness scriptVal);
-            header.Size.Should().Be(101);
+            TestUtils.SetupHeaderWithValues(header, UInt256.Zero, out UInt256 merkRootVal, out UInt160 val160, out ulong timestampVal, out uint indexVal, out Witness scriptVal);
+            header.Size.Should().Be(105);
 
-            Console.WriteLine($"header {header} hash {header.Hash} timstamp {timestampVal}");
+            Console.WriteLine($"header {header} hash {header.Hash} timestamp {timestampVal}");
 
-            timestampVal.Should().Be(4244941696); //1968-06-01 00:00:00
-                                                  // check basic ConsensusContext
-                                                  //mockConsensusContext.Object.block_received_time.ToTimestamp().Should().Be(4244941697); //1968-06-01 00:00:01
+            timestampVal.Should().Be(328665601001);    // GMT: Sunday, June 1, 1980 12:00:01.001 AM
+                                                       // check basic ConsensusContext
+                                                       //mockConsensusContext.Object.block_received_time.ToTimestamp().Should().Be(4244941697); //1968-06-01 00:00:01
 
             // ============================================================================
             //                      creating ConsensusService actor
@@ -151,13 +151,13 @@ public void TestSerializeAndDeserializeConsensusContext()
                 ViewNumber = 2,
                 Validators = new ECPoint[7]
                 {
-                    ECPoint.Parse("02486fd15702c4490a26703112a5cc1d0923fd697a33406bd5a1c00e0013b09a70", Cryptography.ECC.ECCurve.Secp256r1),
-                    ECPoint.Parse("024c7b7fb6c310fccf1ba33b082519d82964ea93868d676662d4a59ad548df0e7d", Cryptography.ECC.ECCurve.Secp256r1),
-                    ECPoint.Parse("02aaec38470f6aad0042c6e877cfd8087d2676b0f516fddd362801b9bd3936399e", Cryptography.ECC.ECCurve.Secp256r1),
-                    ECPoint.Parse("02ca0e27697b9c248f6f16e085fd0061e26f44da85b58ee835c110caa5ec3ba554", Cryptography.ECC.ECCurve.Secp256r1),
-                    ECPoint.Parse("02df48f60e8f3e01c48ff40b9b7f1310d7a8b2a193188befe1c2e3df740e895093", Cryptography.ECC.ECCurve.Secp256r1),
-                    ECPoint.Parse("03b209fd4f53a7170ea4444e0cb0a6bb6a53c2bd016926989cf85f9b0fba17a70c", Cryptography.ECC.ECCurve.Secp256r1),
-                    ECPoint.Parse("03b8d9d5771d8f513aa0869b9cc8d50986403b78c6da36890638c3d46a5adce04a", Cryptography.ECC.ECCurve.Secp256r1)
+                    ECPoint.Parse("02486fd15702c4490a26703112a5cc1d0923fd697a33406bd5a1c00e0013b09a70", Neo.Cryptography.ECC.ECCurve.Secp256r1),
+                    ECPoint.Parse("024c7b7fb6c310fccf1ba33b082519d82964ea93868d676662d4a59ad548df0e7d", Neo.Cryptography.ECC.ECCurve.Secp256r1),
+                    ECPoint.Parse("02aaec38470f6aad0042c6e877cfd8087d2676b0f516fddd362801b9bd3936399e", Neo.Cryptography.ECC.ECCurve.Secp256r1),
+                    ECPoint.Parse("02ca0e27697b9c248f6f16e085fd0061e26f44da85b58ee835c110caa5ec3ba554", Neo.Cryptography.ECC.ECCurve.Secp256r1),
+                    ECPoint.Parse("02df48f60e8f3e01c48ff40b9b7f1310d7a8b2a193188befe1c2e3df740e895093", Neo.Cryptography.ECC.ECCurve.Secp256r1),
+                    ECPoint.Parse("03b209fd4f53a7170ea4444e0cb0a6bb6a53c2bd016926989cf85f9b0fba17a70c", Neo.Cryptography.ECC.ECCurve.Secp256r1),
+                    ECPoint.Parse("03b8d9d5771d8f513aa0869b9cc8d50986403b78c6da36890638c3d46a5adce04a", Neo.Cryptography.ECC.ECCurve.Secp256r1)
                 },
                 MyIndex = -1
             };
@@ -197,7 +197,7 @@ public void TestSerializeAndDeserializeConsensusContext()
                 consensusContext.CommitPayloads[6] = MakeSignedPayload(consensusContext, new Commit { Signature = sha256.ComputeHash(testTx2.Hash.ToArray()) }, 3, new[] { (byte)'6', (byte)'7' });
             }
 
-            consensusContext.Block.Timestamp = TimeProvider.Current.UtcNow.ToTimestamp();
+            consensusContext.Block.Timestamp = TimeProvider.Current.UtcNow.ToTimestampMS();
 
             consensusContext.ChangeViewPayloads = new ConsensusPayload[consensusContext.Validators.Length];
             consensusContext.ChangeViewPayloads[0] = MakeSignedPayload(consensusContext, new ChangeView { ViewNumber = 1, Timestamp = 6 }, 0, new[] { (byte)'A' });