Skip to content
This repository has been archived by the owner on Aug 16, 2021. It is now read-only.

[FS] Sidechains coming in with history #3287

Merged
merged 237 commits into from
Mar 1, 2019
Merged

[FS] Sidechains coming in with history #3287

merged 237 commits into from
Mar 1, 2019

Conversation

codingupastorm
Copy link
Collaborator

Changed the PR to come from a branch inside this repo so we can continue PR process whilst developing sidechains.

This will be blocked until the FN release.

Remember when merging this eventually to use the 'merge with history' option :)

Carlton Pringle added 30 commits April 4, 2018 14:57
Imported from Changeset 124
Imported from Changeset 135
Imported from Changeset 136
Imported from Changeset 137
Imported from Changeset 140
Imported from Changeset 146
Imported from Changeset 147
Imported from Changeset 150
Imported from Changeset 154
Imported from Changeset 156
Imported from Changeset 157
Imported from Changeset 159
Imported from Changeset 161
Imported from Changeset 163
Imported from Changeset 165
Imported from Changeset 166
Imported from Changeset 167
Imported from Changeset 168
Imported from Changeset 169
Imported from Changeset 170
Imported from Changeset 171
Imported from Changeset 173
codingupastorm and others added 25 commits December 21, 2018 00:21
The IsFederationActive call takes 961 ms (almost a full second). 

This PR adds a cache of parameters / result values.
…d 60s timeout (#340)

* Revert "Add caching to MaturedBlocksProvider (#334)"

This reverts commit 4ffdacb.

* exception logging

* Reduce batch size

* make sure we don't trigger timeout

* improved tests by not asserting logs

* fixes per review
* Moved coinbase text out of the CreateGenesis method

* removed some unused variables

* Brought the name and cointicker of the networks inline with the definition of the networks

* Brought some more network data for Main inline

* Upgrade # of coins to 100M

* Create new genesis block for Main
* Add Api endpoint to show federation history

* Clean up warning and associated code style

* Remove newline

* Remove space

* Use StringBuilder
* nuget package only exists for net451

* no need for Test SDK on this exe project
This removes the WithdrawalHistoryProvider class.
The MainChain_To_SideChain test is being a bit sporadic for me, but it has been passing.
* moved fed controller tests file

* init test

* Moved BuildErrorResponse to base class

* Added 3 tests

* 3 more tests
* Revert "tests for FederationWalletController (#357)"

This reverts commit 18e6bc8.

* reintroduced tests
* Create .gitattributes

* Fix CR problem?
@dangershony
Copy link
Contributor

Please wait before committing this, i'd like to bump build version before and after this goes in.

* Move transaction building out to own class.

* Add Guard, only for consistency

* Add to DI.
@bokobza bokobza merged commit d859b3b into master Mar 1, 2019
@codingupastorm codingupastorm deleted the sidechains-history branch March 4, 2019 00:11
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.