Skip to content

Merge dev into master #1237

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

Jump to bottom
Merged
sudhirtibrewal merged 146 commits into from
May 4, 2020
Merged

Merge dev into master #1237

sudhirtibrewal merged 146 commits into from
May 4, 2020

Conversation

@Xela101
Copy link

@Xela101 Xela101 commented May 4, 2020 •
edited
Loading

New Pull Request Submissions:

  1. Have you followed the guidelines in our Contributing document?
  2. Have you checked to ensure there aren't other open Pull Requests for the same update/change?
  3. I have added tests to cover my changes.
  4. All new and existing tests passed.
  5. Have you lint your code locally prior to submission?
  6. Does your code follows the code style of this project?
  7. Does your change require a change to the documentation.
    • I have updated the documentation accordingly.
  8. Have you added an explanation of what your changes do and why you'd like us to include them?
  9. Have you inserted a keyword and link to the issues the PR closes in its descriptions (ex closes #1) ?
  10. Is you branch up to date, have you integrated all the latest changes from develop and resolved conflicts ?

  • What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)
    Update to testnet

  • What is the current behavior? (You can also link to an open issue here)
    Old version

  • What is the new behavior (if this is a feature change)?
    New version

  • Does this PR introduce a breaking change? (What changes might users need to make in their application due to this PR?)

  • Other information:

nshCore and others added 30 commits November 16, 2019 00:19
@nshCore
Delta height peer query (#1019)
1c38063
@nshCore
Update nuget-pre-release-azure-pipelines.yml for Azure Pipelines
717aa0a
@nshCore
Update pr-test-suite-azure-pipelines.yml for Azure Pipelines (#1100)
9e5ed59
@nshCore
Delta index query and p2p protocols refactor
4d80e48
@nshCore
Add attribute to daobase to map to documentdb id (#1099)
4183375
@franssl @nshCore
Update error codes and descriptions. (#1105)
5436b61
@nshCore
Merge contract entries into public entries (#1106)
d51848c
@franssl @nshCore
754 unit test config value parser (#1109)
d9b16e4 
* Add ConfigValueParser tests

* Add test on empty config

* remove unused imports
@nshCore
Remove repository wrapper (#1108)
ac0add5
@Scooletz @nshCore
consensus and crypto perf optimizations (#1111)
310c0e8 
* Benchmarks added

* Non-allocating extensions added

* A few usages of ToByteArray replaced with the new extensions for hashing

* ICryptoContext got extensions to directly work on messages

* Tests amended to use the proper Verify method

* File headers

* Tests use now IMessage based overloads

* Review remarks amended.

* API span field

* KeySigner just lost two more ToByteArray

* Benchmarks amended to comply to code rules

* C# bumped up to 8.0 which allows using ref struct for scoping lifetime of serialized messages.
@allcontributors @nshCore
docs: add Scooletz as a contributor (#1112)
01723eb
@Scooletz @nshCore
Better substitutes for spanified interfaces (#1118)
4013bd6
@nshCore
Use PublicEntry as mempool item instead of TransactionBroadcast (#1110)
3bbd3b5
@nshCore
merge-master
b37f614
@nshCore
update protocol
b5e9b67
@nshCore
Fix consensus poa test (#1122)
084bade
@nshCore
Rename public key entries in public transactions to address (#1127)
9afab8f
@nshCore
Send exists response to client if transaction exists in mempool (#1126)
a59e9c0
@nshCore
Fix codacy warnings (#1128)
7306031
@nshCore
Add unit tests for json converters and turn CidHelper into Dfs Extens…
f972482 
…ions (#1125)
@Scooletz
rebased on top of develop and squashed
37cc76b
@Scooletz
Leading space in licenses
d05d702
@Scooletz
Substitute registered in PoaTestNode
9e63da8
@nshCore
Derep peers that vote out of delta producers (#1132)
0a8fea5
@Scooletz
StateRoot added to DeltaProto; DeltaExecutor properly configured
c8c385e
@Scooletz
LedgerModule no longer registerd EF repository explicitly, leaving th…
56e9d62 
…e config to the SharpRepository
@Scooletz
StateRootResolver removed as Delta has the root now; all web3Api is d…
2fc3083 
…one under one lock now
@Scooletz
Initial getStorageAt
9cf48ca
@Scooletz
getTransactionCount
4e18646
@Scooletz
Cleaning
25234f4
sudhirtibrewal and others added 22 commits March 12, 2020 11:28
Merge remote-tracking branch 'origin/add-catalyst-provider-support' i…
200c200 
…nto develop
@tkstanczak @sudhirtibrewal
fixed error results for Ed25519 and returned value is bool now (#1173)
f5d133d 
Co-authored-by: sudhirtibrewal <sudhirtibrewal@gmail.com>
@franssl
Test change to PR test trigger (#1194)
a33076c
@franssl
Batch verification (#1186)
ec72724 
Adds functionality for batch verification of signatures
@franssl
Fix pr test triggers (#1198)
c143855
@franssl
Update native library to remove warning message when node starts (#1202)
7027eca
@nshCore @tkstanczak
@franssl @kearneyjj1
Sync, + Eth Json RPC and other changes for TestNet (#1179)
92bde85 
* Use dfs for PoaConsensusTest

* Correct dfs directory structure

* Remove hash provider inside dfs

* Fix receiving blocks with correct hash format

* Add hash provider to add file to dfs test

* Connecting successfully to IPFS and receiving files :)

* Fix AddFile unit test

* Add license header to files

* Update rust submodule

* Update POA Concensus test to remove time barrier

* Use test scheduler for rep manager unit tests

* Remove doc gen from libp2p

* Update Libp2p props

* Update libp2p

* Update rust submodule

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* Fix unit tests

* Do not generate assembly info

* Do not generate assembly info

* Quick Fix for SIGINT blocked by ApiModule

* Update dfs unit tests for CI

* Test CI

* Starting of Sync ;)

* Core classes for Sync

* Add unit test to continue sync from previous delta index

* Add unit test signatures to SyncUnitTests

* Add more unit test signatures

* Remove race condition from Wants and UnWants unit tests

* Add more functionality to sync

* Update for CI

* Update yml files for CI

* Update yml files for CI

* Update yml files for CI

* Remove dfs tests to test ci

* Revert sln

* CI Test

* CI Test

* CI Test

* CI Test

* CI Test

* CI Test

* CI Test

* CI Test

* CI Test

* CI Test

* CI Test

* CI Test

* Update POA unit test

* Update TestDfs stub

* Refactor dfs

* Fix unit tests

* Fix POA unit tests

* Refactor to use more DI

* Update POA unit test

* Increase timeout on dns dotclient

* Update unit test

* Use DnsClient instead of DotClient to test ci

* Remove libp2p unit tests and multihash as they are unchanged 3rd party and libp2p contains race condition

* Remove test files for 3rd party

* Refactor for Codeacy

* Add debug info to response of poa consensus test

* Add debug info to response of poa consensus test

* Refactor for autofac

* Update DfsModule

* Refactor for autofac

* Merge develop

* Skip unit tests

* Add debugging info

* Add debugging info

* Add debugging info

* Remove debug info

* Debug info

* Skip Run_Conccensus intergration test as sockets are getting disposed some how in the ci - Will fix this later but using to much time and need to move on

* Skip Run_Conccensus intergration test as sockets are getting disposed some how in the ci - Will fix this later but using to much time and need to move on

* Codacy fixes

* WIP

* Update  yaml files for pipeline

* Update yaml pipeline

* Codacy issues

* clean up dfs controllers

* Update unit tests

* Sync unit test

* Add more unit tests to sync

* codacy

* Refactor code into seperate classes

* Update sync unit tests

* Update sync

* Use three nodes in intergration test

* Apply suggestions from code review

* Refactor ranking logic

* Remove comments

* Update delta height watcher

* Update serilog

* Update wait peer

* Update to test sync

* Test on multi-node

* Test on multi-node

* Check timestamp between nodes

* Fix date time issue

* Small update for remote node testing

* Add debug info for height

* Add debug info for height

* Add debug info for height

* Increase challenge count peer

* Forign PingRequests are added to PeerRepo for PoaDiscovery, Sync updates - MongoDb

* comments from discussion

* Migrate changes from truffle branch

* Update sync

* Fix some unit tests and remove dfs blacklisting

* Update ethcontroller for stephen

* Comment out validation in delta

* Update byteextensions to use dag instead of raw

* Update ContentType of cid

* Update bootstrap nodes

* Add eth sync and peer count calls

* Merge LedgerSync into Sync

* Merge LedgerSync into Sync

* Fix cachebetween

* Add json rpc calls for chain id and pending transactions

* Use peer count from dfs

* Turn off blacklisting in ipfs

* Refactor sync

* Rename sync files and set minimum peers for network to 3

* Revert max ping count limit

* Change peer count to two

* Revert max ping count limit

* Add more users to configs

* Add myself

* Update inactive for to test concensus

* DI min peer count and null reference exception temp fix

* Fix unit tests

* only known authority nodes can produce a delta

* Update sync unit tests

* Update add fields to Peer: IsSync, Height and IsPoaNode

* Update poa unit test

* Update submodule

* Revert is sync in PeerRepo ActivePoaNodes

* Update CandidateDeltaObserver

* Test ping system

* Increase ping speed

* Revsert POA peer call

* PingRequest update

* Don't remove peer from counter

* Slow down ping

* Update peer id in sync

* Remove if statement

* Add more sync blocks

* Test

* Awol

* Add issync

* Remove self from broadcast

* Add self

* Test

* Update only allow POA Nodes in producer pool

* Derep

* Remove data from pingresponse

* Revert protocol

* Update ping tests

* Update hashing from Blake2b to keccak

* Fix intergration tests

* fixed error results for Ed25519 and returned value is bool now

* Remove Messenger classes and use PeerClient instead

* Fix dfs delta downloader

* Resolve conflicts

* Persistant state

* Remove Rocks IRepo

* Fix transaction with persistant state

* Add updates to sync

* Update directory delete to include files

* Add check to see if dir exists

* Fix to sync issue

* Also skip empty di's ;)

* Update poa nodes

* Make range smaller

* Null reference fix

* Reset back to 20 min for range

* Test faster cycle

* Reduce content router timespan

* Turn off mdns

* Test 1 second block time

* Revert

* Update timings

* Delete mempool items

* Disable mdns

* Updates to lib p2p and discovery

* use im memory for mempool

* update events provider and concensus

* Only evict non poa nodes

* Update intergration tests

* Add classes for StateResetter

* Update kernel

* fix for #1187

* Add protocol changes

* Update unit test

* Sync update

* Add delay to concensus

* sync update

* Add GasUsed

* Update code to match proto updates

* update submodule and add node to list of authority nodes

* Update protocol submodule

* Update peer black list to match proto

* Use public address for peer id not bind address

* use state memory

* Remove non poa node from list

* Update some test fixtures and models

* Update sln

* update rust submodule

* Update sln

* Revert Uint256 extensions tests

* Use persistance for kvm state

* Refactor

* Jk documentation (#1203)

* Merge documentation fork into main repo (#1192)

* Update

* Add more instructions

* Add config poa node

* Update README.md

* Update README.md

* Update README.md

* Update Security.md

* Update Readme

* Add Contributor

* Update

* Update

* update

* Update

* Update

* Add website link

* Add documentation

* Refactor delta height watcher

* Add Install Nightly instructions

Additional doculmentation on how to install and enable nightly mode for rust

* Update pipeline

* Comment out test that is not used

* Remove unused test

* Change PoaTestNode Registrations

Co-authored-by: nshcore <nshcore@protonmail.com>
Co-authored-by: Sudhir Tibrewal <s.tibrewal@reply.eu>
Co-authored-by: Tomasz Kajetan Stanczak <tkstanczak@users.noreply.github.com>
Co-authored-by: fran <fran.sl@atlascity.io>
Co-authored-by: Joseph Kearney <46780513+kearneyjj1@users.noreply.github.com>
Co-authored-by: Joseph Kearney <kearneyjj@outlook.com>
@kearneyjj1
Document update (#1207)
2983a18 
* Update instructions on running a node

* Update TOC
Check if delta/candidate/fav came from POA node in more places. (#1213)
bc35b5a 
* Check if delta was from POA node in more places

* Check if delta was from POA node in more places
@tkstanczak @kearneyjj1 @franssl
Update nethermind upstream unit tests (#1211)
6fcc76d 
* 3.1 LTS + submodule fixing

* adding new projects from neth

* upgrade packages

* updating namespaces

* tests 16.5.0

* test adapter versions updated

* downgraded tests to 16.4.0

* Converting from XUnit to NUnit

* Fix Update more tests more tests

* Fix Update more tests more tests

* Fix Update more tests more tests

* Fix more tests

* Add changes to DB

Branch now working

* edit imports

* Fix more unit tests

* Fix more unit tests

* Fix more unit tests

* Fix more unit tests

* Fix more unit tests

* Fix more unit tests

* Fix more unit tests

* Fix more unit tests

* getting tests runner

* fixed KVM errors in test

* Update Hashing project

* Fix more tests

* Fix more tests

* Update pipeline dotnet core sdk version

* Fix more tests

* Fix pipeline test

* Increase prox state cycle sync

* Increase prox state cycle sync

* Refactor tests

* Test pipeline

* Test pipeline

* Skip poa concensus

Co-authored-by: Tomasz Kajetan Stanczak <tkstanczak@users.noreply.github.com>
Co-authored-by: Joseph Kearney <kearneyjj@outlook.com>
Co-authored-by: fran <fran.sl@atlascity.io>
Substitute peer repo for CandidateDeltaObserver and FavouriteDeltaObs…
1145ac7 
…erver tests (#1214)
Update file system api tests to use nunit setup instead of constructor (
36f16df 
#1220)
Fix sync issue with DeltaHashProvider (#1221)
6af496c 
* Fix sync issue

* Fix edge case if genisis is already in delta index service
Fix mempool items not removed incorrect hash, remove timestamp from t…
066c660 
…ransaction. (#1222)

* Fix sync issue

* Fix edge case if genisis is already in delta index service

* Remove timestamp from transaction and fix removing transaction from mempool + transaction hash

* Update protocol

* Add poa consensus test

* Comment out ignore

* Update protocol submodule

* Remove poa concensus test ignore attribute
Fix get balance bug on reset (#1224)
8839d7d 
* Dont use inmem

* Add native rocks

* Add rocks to core lib

* Oops use native
@dependabot
Bump PeterO.Cbor from 3.1.0 to 4.0.0 in /src/Catalyst.Core.Modules.Dfs (
41b419d 
#1197)

Bumps [PeterO.Cbor](https://github.com/peteroupc/CBOR) from 3.1.0 to 4.0.0.
- [Release notes](https://github.com/peteroupc/CBOR/releases)
- [Changelog](https://github.com/peteroupc/CBOR/blob/master/History.md)
- [Commits](peteroupc/CBOR@v3.1.0...v4.0.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alex <alex.white@atlascity.io>
@tkstanczak
updating neth reference (#1228)
6f59283 
* updating neth reference

* build fixes
@tkstanczak @franssl
Fixed disposal of containers creating rocksdb (#1233)
b32d8d6 
Co-authored-by: franssl <46971650+franssl@users.noreply.github.com>
@franssl @tkstanczak
Fix test suite (#1231)
ac94c7f 
* remove duplicate import

* add missing library

* test for linux

* remove pipeline step add project reference

* Refactor to move POATestNode to TestUtils

* add snappy for linux

* add snappy for mac

* add underscore to library link

* Remove redundant Dispose method

* Refactor to remove test project dependancy on DFS.Tests

* fixed disposal of containers creating rocksdb

Co-authored-by: Tomasz Kajetan Stanczak <tkstanczak@users.noreply.github.com>
@franssl
Fix test filtering (#1235)
8cc0c54
Merge develop
25ed546
Update azure pipelines
069714f
@Xela101 Xela101 changed the base branch from develop to master May 4, 2020 15:36
@Xela101 Xela101 marked this pull request as ready for review May 4, 2020 15:37
@Xela101 Xela101 added the Pull Request 🕵️ Used for pull requests. label May 4, 2020
@sudhirtibrewal sudhirtibrewal merged commit 5ededca into master May 4, 2020
@sudhirtibrewal sudhirtibrewal deleted the merge-dev-into-master branch May 4, 2020 16:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@franssl franssl Awaiting requested review from franssl

@stxphxn stxphxn Awaiting requested review from stxphxn

@sudhirtibrewal sudhirtibrewal Awaiting requested review from sudhirtibrewal

Assignees

No one assigned

Labels

Pull Request 🕵️ Used for pull requests.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@Xela101 @sudhirtibrewal @nshCore @franssl @Scooletz @tkstanczak @kearneyjj1