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.

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

Merge with upstream (geth 1.8.8) #392

Closed
wants to merge 25 commits into from
Closed

Merge with upstream (geth 1.8.8) #392

wants to merge 25 commits into from

Commits on May 31, 2018

  1. Merge attempt

    @Szkered
    Szkered committed May 31, 2018
    Configuration menu
    Copy the full SHA
    4b44bea View commit details
    Browse the repository at this point in the history

  2. debug merge attempt

    @Szkered
    Szkered committed May 31, 2018
    Configuration menu
    Copy the full SHA
    622e98a View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2018

  1. debug tests

    @Szkered
    Szkered committed Jun 1, 2018
    Configuration menu
    Copy the full SHA
    a67eccb View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2018

  1. Feature/fix_some_tests (Consensys#387) 

    * same fix as ethereum/go-ethereum#15783
* Fix insufficient balance for transfer
* change chainId of QuorumTestChainConfig
    @tsuzukit
    tsuzukit authored and Zekun Shi committed Jun 14, 2018
    Configuration menu
    Copy the full SHA
    9249ab3 View commit details
    Browse the repository at this point in the history

  2. validate input before calling evm

    @jpmsam
    jpmsam authored and Zekun Shi committed Jun 14, 2018
    Configuration menu
    Copy the full SHA
    be8f2f8 View commit details
    Browse the repository at this point in the history

  3. Merge pull request Consensys#399 from jpmorganchase/private_state 

    validate input before calling evm
    @jpmsam
    jpmsam authored and Zekun Shi committed Jun 14, 2018
    Configuration menu
    Copy the full SHA
    cfa9c96 View commit details
    Browse the repository at this point in the history

  4. quorum-maker master link

    @fixanoid
    fixanoid authored and Zekun Shi committed Jun 14, 2018
    Configuration menu
    Copy the full SHA
    be5f906 View commit details
    Browse the repository at this point in the history

  5. Fixes eth.hashrate panic Consensys#393 (Consensys#409)

    @jpmsam
    jpmsam authored and Zekun Shi committed Jun 14, 2018
    Configuration menu
    Copy the full SHA
    4bfaedf View commit details
    Browse the repository at this point in the history

  6. update raft fix to 1.8.8

    Zekun Shi authored and Zekun Shi committed Jun 14, 2018
    Configuration menu
    Copy the full SHA
    f9541a4 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2018

  1. fix raft block creating issue; 

    issue was that miner was subscribing to chainheadevent
    @Szkered
    Szkered committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    30a2c8c View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2018

  1. fix istanbul consensus

    @Szkered
    Szkered committed Jun 29, 2018
    Configuration menu
    Copy the full SHA
    39ca953 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2018

  1. bind: fix bind_test.go update code and abi of some contracts that failed

    @amalrajmani
    amalrajmani committed Jul 13, 2018
    Configuration menu
    Copy the full SHA
    b40cc3b View commit details
    Browse the repository at this point in the history

  2. Let constellation have longer to start up 

    Add more gas for test
Set Quorum to be true
Update expected block hash in test
    @prd-fox
    prd-fox committed Jul 13, 2018
    Configuration menu
    Copy the full SHA
    cdede06 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2018

  1. Update files to keep in line with vanilla geth, adding back in the 

    pieces needed for Quorum.
    @prd-fox
    prd-fox committed Jul 15, 2018
    Configuration menu
    Copy the full SHA
    71e5e86 View commit details
    Browse the repository at this point in the history

  2. Add Constellation build files

    @prd-fox
    prd-fox committed Jul 15, 2018
    Configuration menu
    Copy the full SHA
    0c3bace View commit details
    Browse the repository at this point in the history

  3. Only keep pieces of Travis file that are needed

    @prd-fox
    prd-fox committed Jul 15, 2018
    Configuration menu
    Copy the full SHA
    799c40e View commit details
    Browse the repository at this point in the history

  4. Only keep pieces of Travis file that are needed

    @prd-fox
    prd-fox committed Jul 15, 2018
    Configuration menu
    Copy the full SHA
    df1a6eb View commit details
    Browse the repository at this point in the history

  5. Use sudo to install constellation

    @prd-fox
    prd-fox committed Jul 15, 2018
    Configuration menu
    Copy the full SHA
    55cfe9e View commit details
    Browse the repository at this point in the history

  6. Use sudo to install constellation

    @prd-fox
    prd-fox committed Jul 15, 2018
    Configuration menu
    Copy the full SHA
    4c662bc View commit details
    Browse the repository at this point in the history

  7. Make test scripts executable

    @prd-fox
    prd-fox committed Jul 15, 2018
    Configuration menu
    Copy the full SHA
    d0be6b2 View commit details
    Browse the repository at this point in the history

  8. Give Constellation time to start

    @prd-fox
    prd-fox committed Jul 15, 2018
    Configuration menu
    Copy the full SHA
    f25cdca View commit details
    Browse the repository at this point in the history

  9. Update gas table to make use of the dual state db

    @prd-fox
    prd-fox committed Jul 15, 2018
    Configuration menu
    Copy the full SHA
    8470793 View commit details
    Browse the repository at this point in the history

  10. Fix issue using correct state db

    @prd-fox
    prd-fox committed Jul 15, 2018
    Configuration menu
    Copy the full SHA
    29257ca View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2018

  1. Merge pull request #1 from prd-fox/feature/quorum-test-fixes 

    Test fixes
    @vsmk98
    vsmk98 authored Jul 16, 2018
    Configuration menu
    Copy the full SHA
    f62f4c8 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2018

  1. Merge pull request #1 from vsmk98/merge-188 

    Merging local changes
    @vsmk98
    vsmk98 authored Jul 27, 2018
    Configuration menu
    Copy the full SHA
    de23c5a View commit details
    Browse the repository at this point in the history