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.

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

Develop blocks2 #62

Merged
merged 36 commits into from
Sep 2, 2020
Merged

Develop blocks2 #62

merged 36 commits into from
Sep 2, 2020

Conversation

2a5A1Ghu1
Copy link
Member

No description provided.

2a5A1Ghu1 and others added 30 commits February 13, 2019 00:30
* Added all of the code for the update

* Fix URL Path

* Fixed default directory path

* Change masternode declarations to karmanode

* change to ohmcoin

* Create .gitignore

* Update .gitignore

* Update .gitignore

* karmanodefy

* Update proposallist.cpp

* Missing class

* Docs Masternode to karmanode

* Change mn(masternode) to kn(karmanode)

* Update doc and comment collateral

* More doc updates

* Fixed Karmanode references in proposal related files.

* Ckarmanode -> CKarmanode

* Karmanodefy Budget System

* Porotocol and Version Bump

* Protocol Enforcement

* Fix typo

* Spork fixes
* Added all of the code for the update

* Fix URL Path

* Fixed default directory path

* Change masternode declarations to karmanode

* change to ohmcoin

* Create .gitignore

* Update .gitignore

* Update .gitignore

* karmanodefy

* Update proposallist.cpp

* Missing class

* Docs Masternode to karmanode

* Change mn(masternode) to kn(karmanode)

* Update doc and comment collateral

* More doc updates

* Fixed Karmanode references in proposal related files.

* Ckarmanode -> CKarmanode

* Karmanodefy Budget System

* Porotocol and Version Bump

* Protocol Enforcement

* Fix typo

* Spork fixes
This will need to be built against different brew formulas that will be provided on release... This is also a temporary solution once fixes are made for building against updated dependencies.
Limits amount of txs loaded
removed arrant paranthesis
Revert "Changed for loop copies to references, and added stake logging"
Andrew LaChasse and others added 6 commits August 10, 2020 12:04
* Version 3.0.0.1 dev (#53)

* Version 3.0.0.1 dev
- Increase time between blocks at block 2977924 or when network has reached 95% upgrade threshold
- Change block time to 4 minutes
- Set  block reward to 6 on activation of new time
- Adjust new block enforce policy to 24 hour span

* fix flag check for; add fIgnoreLegacyBlocks

* move variable out of if statement, fix compile.

* Improve2 (#54)

* WIP: upgrade network upgrade features; testnet fixes..

* add this back for now..

* add missed file, optional.h

* more imports

* adjust imports for consensus.h

* correction

* fix moar missing imports

* add missing vars and fixes

* missing header declare

* changes..

* update makefile

* need this here too..

* fixed compile

* further fixed.

Co-authored-by: Jon <squid@sqdmc.net>

* Zerocoin is not active; Actually use new block version parameter..

* Don't do this, zerocoin not active..

* remove or fix zerocoin at some later point.

* zerocoin is off.

* Adjust new block version update to use protocol version
Prepare for removal of zercoin; refactoring..
Implement sporks to enforce new version lock ins.

* fix compile issues

* get height for tip

* get consensus params

* add missing spork info

* Version 3.0.2.0

Co-authored-by: Crypto Pliskin <13294167+2a5A1Ghu1@users.noreply.github.com>

* Fixes Wallet Lock Issue (#55)

* Fix block height condition

* Combine Spork 24 into 23

Co-authored-by: squidicuz <squid@sqdmc.net>
@2a5A1Ghu1 2a5A1Ghu1 merged commit d46fa3d into Test-Master Sep 2, 2020
@2a5A1Ghu1 2a5A1Ghu1 deleted the develop-blocks2 branch September 2, 2020 13:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants