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

Upstream merges #2

Merged
merged 27 commits into from
Mar 25, 2019
Merged

Upstream merges #2

merged 27 commits into from
Mar 25, 2019

Commits on Mar 4, 2019

  1. CI publish to aws (#10446)

    * move publish aws from gitlab.yml to gitlab scripts
    
    * gitlab.yml cleaning
    move publish AWS to gitlab scripts
    remove dependencies from android build
    General-Beck authored Mar 4, 2019
    Configuration menu
    Copy the full SHA
    1bd4564 View commit details
    Browse the repository at this point in the history
  2. Implement parity_versionInfo & parity_setChain on LC; fix parity_setC…

    …hain (#10312)
    
    * Light client: implement parity_versionInfo RPC
    
    * Light client: implement set_exit_handler & parity_setChain RPC
    
    * parity_setChain RPC: return an error if failed (instead of `true`)
    
    * Implement eth_subscribe('syncing') RPC for full node & light node
    
    * Fix indentation
    
    * Revert commit: Implement eth_subscribe('syncing')
    
    * Revert change to Cr callback function
    axelchalon authored and niklasad1 committed Mar 4, 2019
    Configuration menu
    Copy the full SHA
    7014642 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2019

  1. CI aws git checkout (#10451)

    * Updating the CI system with the publication of releases and binary files on github
    
    Signed-off-by: Denis S. Soldatov aka General-Beck <general.beck@gmail.com>
    
    * move publish aws from gitlab.yml to gitlab scripts
    
    Signed-off-by: Denis S. Soldatov aka General-Beck <general.beck@gmail.com>
    
    * gitlab.yml cleaning
    move publish AWS to gitlab scripts
    remove dependencies from android build
    
    Signed-off-by: Denis S. Soldatov aka General-Beck <general.beck@gmail.com>
    
    * Revert "Updating the CI system with the publication of releases and binary files on github"
    
    This reverts commit da87e06.
    
    * remove no-git for aws
    
    * microfix
    
    * no need in no_git then
    General-Beck authored and TriplEight committed Mar 5, 2019
    Configuration menu
    Copy the full SHA
    3e1d731 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2019

  1. perf(ethcore): micro-opt (#10405)

    Mostly fixes that changes `eagerly eval` to `lazy eval`
    niklasad1 authored and debris committed Mar 6, 2019
    Configuration menu
    Copy the full SHA
    91933d8 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2019

  1. Revert "CI aws git checkout (#10451)" (#10456)

    * Revert "CI aws git checkout (#10451)"
    
    This reverts commit 3e1d731.
    
    * Update .gitlab-ci.yml
    
    revert aws script with small fixes
    
    * Delete publish-aws.sh
    General-Beck authored Mar 7, 2019
    Configuration menu
    Copy the full SHA
    742a600 View commit details
    Browse the repository at this point in the history
  2. docs: update changelogs for 2.2.{8,9,10,11}, 2.3.{1,2,3,4,5}, and 2.4…

    ….0 (#10389)
    
    * docs: move changelog 2-3 to docs/
    
    * docs: fix changelog 2-3 path
    
    * docs: add changelogs for 2.2.{8,9,10,11}
    
    * docs: add changelogs for 2.3.{1,2,3,4}
    
    * Update CHANGELOG.md
    
    * Update CHANGELOG-2.3.md
    
    * Update CHANGELOG.md
    
    * Update CHANGELOG.md
    5chdn authored and soc1c committed Mar 7, 2019
    Configuration menu
    Copy the full SHA
    ab27848 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2019

  1. Configuration menu
    Copy the full SHA
    23d977e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4320c9b View commit details
    Browse the repository at this point in the history
  3. Tests parallelized (#10452)

    * tests splitted, phase 1
    
    * typo
    
    * fix wrong launch commands
    
    * typos
    
    * rearrangements
    
    * use `nproc` function for threads
    
    * use nproc for threads
    
    * let theads be auto, build-andriod no more in regular run
    
    * split val chain and cargo check
    
    * renamed some files
    
    * wrong phase
    
    * check rust files before test jobs
    
    * lint error
    
    * rust files modivied var
    
    * test except changes
    
    * add rust_changes except
    
    * lint error
    
    * fixes
    
    * .gitlab-ci.yml can't be excluded
    
    * pipeline shouldn't start
    
    * pipeline must go
    
    * pipeline must go 2
    
    * pipeline must go 3
    
    * pipeline must go 4
    
    * pipeline must go 5
    
    * pipeline must go 6
    
    * pipeline must go 7
    
    * pipeline must not go 1
    
    * pipeline must go 8
    
    * avoid skippng tests yet, reintroducing them after the caching
    
    * test theory
    
    * parallelized cargo check with combusting helicopters
    
    * less uploads
    
    * alias for cargo checks
    
    * nice template
    TriplEight authored Mar 11, 2019
    Configuration menu
    Copy the full SHA
    82a148a View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2019

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

Commits on Mar 13, 2019

  1. simplify parity machine (#10469)

    * simplify ethcore machine by removing redundant traits
    
    * further ethereum machine simplifications
    
    * removed obsolete todo
    debris authored Mar 13, 2019
    Configuration menu
    Copy the full SHA
    a16bad4 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2019

  1. further simplify machine (#10472)

    * removed AuxiliaryRequest from Machin trait
    
    * removed AncestryAction from Machine trait
    
    * removed AuxiliaryData from Machine trait
    
    * removed LocalizedMachine trait
    debris authored and sorpaas committed Mar 14, 2019
    Configuration menu
    Copy the full SHA
    c9db8ea View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f875175 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d83143d View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2019

  1. simplify block module and usage (#10479)

    * removed trait IsBlock and simplify block usage
    
    * removed redundant ClosedBlock::hash function
    debris authored and ascjones committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    a574df3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fb46165 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2019

  1. Сaching through docker volume (#10477)

    * _old codebase_ before docker update
    
    * before docker update, testing runnr
    
    * docker update, testing the caching
    
    * distributed job cargo homes
    
    * distributed job cargo homes 2
    
    * distributed job cargo homes 3
    
    * dockerfile with gitlab checkout, audit uses template
    
    * dockerfile gets repo in volume
    
    * change builds_dir
    
    * trying docker cache for repo
    
    * repo cached automatically
    
    * after script is not concatenated
    
    * check sccache non-cacheable reasons nature
    
    * watch cache
    
    * log sccache
    
    * log sccache 2
    
    * debug log sccache
    
    * fix debug log sccache
    
    * fix debug log sccache 2
    
    * debug log cache 3
    
    * debug log cache 3
    
    * trace log all sccache
    
    * test wo cargo cache
    
    * test w removed cargo cache
    
    * report non-cacheable reasons, cargo cache is back and empty
    
    * report non-cacheable reasons, cargo cache is back and empty 2
    
    * report non-cacheable reasons, cargo cache is back and empty 3
    
    * wrap into after_script
    
    * restore CI tags
    
    `qa` -> `linux-docker`
    
    * return to main runners, this will fail until config on runners And Dockerfile won't be updated
    
    * typo fix CI lint
    
    * return to docker tag
    TriplEight authored and General-Beck committed Mar 19, 2019
    Configuration menu
    Copy the full SHA
    a8ee3c9 View commit details
    Browse the repository at this point in the history
  2. fix win&mac build (#10486)

    add CARGO_HOME:                      "${CI_PROJECT_DIR}/.cargo"
    General-Beck authored and TriplEight committed Mar 19, 2019
    Configuration menu
    Copy the full SHA
    effead9 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    78a5346 View commit details
    Browse the repository at this point in the history
  4. fix(extract timestamp_checked_add as lib) (#10383)

    * fix(extract `timestamp_checked_add` as lib)
    
    * fix(whisper types): remove unused `EmptyTopics`
    
    * fix(time-lib): feature-flag to use time-lib or std
    
    This commit adds conditional compilation checks that falls back to `our time-lib` when
    `time_checked_add` is not available in the standard library
    
    Note, `time_checked_add` covers both `checked_add` and `checked_sub`
    
    * fix(grumble): use cfg_attr to define rustc feature
    niklasad1 authored and soc1c committed Mar 19, 2019
    Configuration menu
    Copy the full SHA
    037fd1b View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2019

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

Commits on Mar 21, 2019

  1. whisper/cli: add p2p port and ip parameters (#10057)

    * whisper/cli: add p2p port and ip parameters
    
    This is so that those params don't change randomly and are in sync with the URL that
    is displayed.
    
    * feedback: Result instead of panic
    
    Co-Authored-By: gballet <gballet@gmail.com>
    
    * feedback: Map error in port conversion
    
    Co-Authored-By: gballet <gballet@gmail.com>
    
    * whisper/cli: User can specify enode private key
    
    So that the enode doesn't change at every run.
    
    * whipser/cli: finish integrating review feedback.
    
    * Accomodate error API change
    
    * Update rustc-hex version in whisper/cli/Cargo.toml
    
    Co-Authored-By: gballet <gballet@gmail.com>
    
    * Update README with new whisper cli options
    
    * Fix typo in error message
    
    Co-Authored-By: gballet <gballet@gmail.com>
    
    * Fix Cargo.lock and build issue after lib version upgrade
    
    * Fix another typo
    
    Co-Authored-By: gballet <gballet@gmail.com>
    gballet authored and ordian committed Mar 21, 2019
    Configuration menu
    Copy the full SHA
    b700ff3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    375a8da View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2019

  1. Configuration menu
    Copy the full SHA
    f2c34f7 View commit details
    Browse the repository at this point in the history
  2. fix(rpc): fix a bunch of clippy lints (#10493)

    * fix(rpc): fix a bunch of clippy lints
    
    * fix(rpc clippy): remove unused ignored lints
    
    * fix(clippy): fix all redundant_field_names
    
    This commit fixes all uses of `redundant_field_names` and removes the ignored lint `redundant_field_names`
    
    * fix(brain unwrap): replace with expect
    niklasad1 authored and HCastano committed Mar 22, 2019
    Configuration menu
    Copy the full SHA
    17042e9 View commit details
    Browse the repository at this point in the history
  3. docs: add changelogs for 2.3.{6,7,8} and 2.4.{1,2,3} (#10494)

    * docs: add changelogs for 2.3.{6,7} and 2.4.{1,2}
    
    * docs: add changelogs for 2.4.3 beta and 2.3.8 stable
    
    * Update docs/CHANGELOG-2.3.md
    
    Co-Authored-By: soc1c <47772477+soc1c@users.noreply.github.com>
    
    * Update docs/CHANGELOG-2.3.md
    
    Co-Authored-By: soc1c <47772477+soc1c@users.noreply.github.com>
    
    * docs: remove empty lines
    soc1c authored and niklasad1 committed Mar 22, 2019
    Configuration menu
    Copy the full SHA
    023e511 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2019

  1. Add a more realistic Batch test (#10511)

    * Remove unrealistic tests
    
    * Add test that more closely resembles real usage
    HCastano authored Mar 25, 2019
    Configuration menu
    Copy the full SHA
    6cf3ba7 View commit details
    Browse the repository at this point in the history