Skip to content
This repository has been archived by the owner on Feb 26, 2024. It is now read-only.

fix: ensure timestamp, block number, and parentHash are correct #443

Merged
merged 7 commits into from
Jul 15, 2019
Merged

fix: ensure timestamp, block number, and parentHash are correct #443

merged 7 commits into from
Jul 15, 2019

Commits on Jul 3, 2019

  1. when creating a block via creatBlock, allow for copying the parent block

    @davidmurdoch
    davidmurdoch committed Jul 3, 2019
    Configuration menu
    Copy the full SHA
    dcddeac View commit details
    Browse the repository at this point in the history

  2. make sure forking will never exceed our inital fork block number

    @davidmurdoch
    davidmurdoch committed Jul 3, 2019
    Configuration menu
    Copy the full SHA
    35f718f View commit details
    Browse the repository at this point in the history

  3. Add and update tests

    @davidmurdoch
    davidmurdoch committed Jul 3, 2019
    Configuration menu
    Copy the full SHA
    a2c3427 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2019

  1. Allow emulateParent to be optional, without the bug.

    @davidmurdoch
    davidmurdoch committed Jul 15, 2019
    Configuration menu
    Copy the full SHA
    d528ea9 View commit details
    Browse the repository at this point in the history

  2. let's admit it, that was just too much whitesapce here.

    @davidmurdoch
    davidmurdoch committed Jul 15, 2019
    Configuration menu
    Copy the full SHA
    af7bc39 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into fix/call-timestamp-and-block

    @davidmurdoch
    davidmurdoch authored Jul 15, 2019
    Configuration menu
    Copy the full SHA
    852278d View commit details
    Browse the repository at this point in the history

  4. Fix a messy merge

    @davidmurdoch
    davidmurdoch committed Jul 15, 2019
    Configuration menu
    Copy the full SHA
    82acc5f View commit details
    Browse the repository at this point in the history