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

Merge Block Changes #56

Merged
merged 4 commits into from
Sep 2, 2020
Merged

Merge Block Changes #56

merged 4 commits into from
Sep 2, 2020

Commits on Aug 16, 2020

  1. 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>
    squidicuzz and 2a5A1Ghu1 authored Aug 16, 2020
    Configuration menu
    Copy the full SHA
    414392c View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2020

  1. Configuration menu
    Copy the full SHA
    6f6bb4d View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2020

  1. Fix block height condition

    2a5A1Ghu1 authored Aug 19, 2020
    Configuration menu
    Copy the full SHA
    13633d3 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2020

  1. Combine Spork 24 into 23

    squidicuzz committed Sep 1, 2020
    Configuration menu
    Copy the full SHA
    6dcbd82 View commit details
    Browse the repository at this point in the history