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

Candidate for 4.0.13 #1383

Merged
merged 28 commits into from
Jul 19, 2021
Merged

Candidate for 4.0.13 #1383

merged 28 commits into from
Jul 19, 2021

Commits on May 25, 2021

  1. backpressure-miners

    @pragmaxim
    pragmaxim committed May 25, 2021
    Configuration menu
    Copy the full SHA
    754ccb2 View commit details
    Browse the repository at this point in the history

  2. self-adjustable prepareCandidate retry period

    @pragmaxim
    pragmaxim committed May 25, 2021
    Configuration menu
    Copy the full SHA
    c4444af View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2021

  1. Merge branch 'v4.0.12' of github.com:ergoplatform/ergo into backpress… 

    …ure-miners-to-avoid-failing
    @kushti
    kushti committed Jun 1, 2021
    Configuration menu
    Copy the full SHA
    a308e9e View commit details
    Browse the repository at this point in the history

  2. commenting ErgoMiner

    @pragmaxim
    pragmaxim committed Jun 1, 2021
    Configuration menu
    Copy the full SHA
    12fd519 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2021

  1. 4.0.13 set

    @kushti
    kushti committed Jun 3, 2021
    Configuration menu
    Copy the full SHA
    b8e9250 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'v4.0.13' of github.com:ergoplatform/ergo into backpress… 

    …ure-miners-to-avoid-failing
    @kushti
    kushti committed Jun 3, 2021
    Configuration menu
    Copy the full SHA
    14af02f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'backpressure-miners-to-avoid-failing' of github.com:erg… 

    …oplatform/ergo into backpressure-miners-to-avoid-failing
    @kushti
    kushti committed Jun 3, 2021
    Configuration menu
    Copy the full SHA
    2d1471f View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1364 from ergoplatform/backpressure-miners-to-avo… 

    …id-failing

backpressure miners
    @kushti
    kushti committed Jun 3, 2021
    Configuration menu
    Copy the full SHA
    12e9772 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into v4.0.13

    @kushti
    kushti committed Jun 3, 2021
    Configuration menu
    Copy the full SHA
    ae42ba5 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2021

  1. scaladoc fix

    @kushti
    kushti committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    c783580 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'v4.0.13' of github.com:ergoplatform/ergo into v4.0.13

    @kushti
    kushti committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    5251a78 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2021

  1. avoiding silent wallet failure

    @pragmaxim
    pragmaxim committed Jun 15, 2021
    Configuration menu
    Copy the full SHA
    9b2fdd3 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2021

  1. fix-api: set correct types in yaml

    @aslesarenko
    aslesarenko committed Jun 22, 2021
    Configuration menu
    Copy the full SHA
    b39552b View commit details
    Browse the repository at this point in the history

  2. fix-api: scriptProcessor made lazy

    @aslesarenko
    aslesarenko committed Jun 22, 2021
    Configuration menu
    Copy the full SHA
    d7aff73 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2021

  1. Wait for concurrent thread completion in concurrent applyModifier() a… 

    …nd proofsForTransactions() test
    @knizhnik
    knizhnik committed Jun 23, 2021
    Configuration menu
    Copy the full SHA
    203d963 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'v4.0.13' of github.com:ergoplatform/ergo into fix-api

    @kushti
    kushti committed Jun 23, 2021
    Configuration menu
    Copy the full SHA
    2c12339 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1393 from ergoplatform/fix-api 

    Fixes for Appkit
    @kushti
    kushti committed Jun 23, 2021
    Configuration menu
    Copy the full SHA
    12f1d96 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2021

  1. fixing ErgoMiner scaladoc

    @pragmaxim
    pragmaxim committed Jun 30, 2021
    Configuration menu
    Copy the full SHA
    49197ee View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2021

  1. Merge pull request #1395 from ergoplatform/fix_concurrent_modification 

    Wait for concurrent thread completion in concurrent modification test
    @kushti
    kushti committed Jul 11, 2021
    Configuration menu
    Copy the full SHA
    37d2b42 View commit details
    Browse the repository at this point in the history

  2. minor code improvements

    @kushti
    kushti committed Jul 11, 2021
    Configuration menu
    Copy the full SHA
    a5e7426 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2021

  1. loop fix for double-spending transactions

    @kushti
    kushti committed Jul 12, 2021
    Configuration menu
    Copy the full SHA
    52ed239 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2021

  1. Merge pull request #1406 from ergoplatform/assembly-improvs 

    Block assembly fix
    @kushti
    kushti committed Jul 13, 2021
    Configuration menu
    Copy the full SHA
    61db9de View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1391 from ergoplatform/avoiding-silent-wallet-fai… 

    …lure

avoiding silent wallet failure
    @kushti
    kushti committed Jul 13, 2021
    Configuration menu
    Copy the full SHA
    d1e2851 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2021

  1. scaladoc fix for validation settings

    @kushti
    kushti committed Jul 18, 2021
    Configuration menu
    Copy the full SHA
    0a6fd12 View commit details
    Browse the repository at this point in the history

  2. changing comment on pubKey presence

    @kushti
    kushti committed Jul 18, 2021
    Configuration menu
    Copy the full SHA
    f9d542c View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2021

  1. actions

    @kushti
    kushti committed Jul 19, 2021
    Configuration menu
    Copy the full SHA
    c160c01 View commit details
    Browse the repository at this point in the history

  2. .github

    @kushti
    kushti committed Jul 19, 2021
    Configuration menu
    Copy the full SHA
    beb0ae7 View commit details
    Browse the repository at this point in the history

  3. yml fixes

    @kushti
    kushti committed Jul 19, 2021
    Configuration menu
    Copy the full SHA
    ced8f34 View commit details
    Browse the repository at this point in the history