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

Komodoplatform dev #43

Merged
merged 97 commits into from
Sep 9, 2020
Merged

Komodoplatform dev #43

merged 97 commits into from
Sep 9, 2020

Commits on Mar 2, 2020

  1. Merge pull request jl777#278 from KomodoPlatform/dev 

    sync beta
    @ca333
    ca333 authored Mar 2, 2020
    Configuration menu
    Copy the full SHA
    78e78f0 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2020

  1. Merge pull request jl777#293 from KomodoPlatform/beta 

    0.5.3
    @ca333
    ca333 authored Mar 4, 2020
    Configuration menu
    Copy the full SHA
    a570d7a View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2020

  1. fix dead openssl download path

    @ca333
    ca333 authored Apr 5, 2020
    Configuration menu
    Copy the full SHA
    a9679e1 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2020

  1. add VOTE2020

    @ca333
    ca333 authored Apr 14, 2020
    Configuration menu
    Copy the full SHA
    b498aa2 View commit details
    Browse the repository at this point in the history

  2. add ac_public param

    @ca333
    ca333 authored Apr 14, 2020
    Configuration menu
    Copy the full SHA
    b099cf6 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2020

  1. assetchains file fix

    @kolobus
    kolobus committed Apr 23, 2020
    Configuration menu
    Copy the full SHA
    b8e6272 View commit details
    Browse the repository at this point in the history

  2. assetchains file fix

    @kolobus
    kolobus committed Apr 23, 2020
    Configuration menu
    Copy the full SHA
    4507757 View commit details
    Browse the repository at this point in the history

  3. VOTE and STBL added

    @kolobus
    kolobus committed Apr 23, 2020
    Configuration menu
    Copy the full SHA
    f2c1fee View commit details
    Browse the repository at this point in the history

  4. VOTE and STBL added

    @kolobus
    kolobus committed Apr 23, 2020
    Configuration menu
    Copy the full SHA
    605dd49 View commit details
    Browse the repository at this point in the history

  5. Merge pull request jl777#331 from kolobus/beta 

    VOTE2020 and STBL added
    @ca333
    ca333 authored Apr 23, 2020
    Configuration menu
    Copy the full SHA
    ebe91e1 View commit details
    Browse the repository at this point in the history

  6. Merge pull request jl777#332 from kolobus/master 

    STBL added
    @ca333
    ca333 authored Apr 23, 2020
    Configuration menu
    Copy the full SHA
    30333c3 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2020

  1. Update year of copyright 

    Update 2019 to 2020.
    @travinkeith
    travinkeith authored Apr 26, 2020
    Configuration menu
    Copy the full SHA
    d261319 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' into patch-1

    @ca333
    ca333 authored Apr 26, 2020
    Configuration menu
    Copy the full SHA
    a5e46cc View commit details
    Browse the repository at this point in the history

Commits on May 11, 2020

  1. bump KMD version

    @ca333
    ca333 committed May 11, 2020
    Configuration menu
    Copy the full SHA
    b15bfff View commit details
    Browse the repository at this point in the history

  2. remove time adjustment

    @ca333
    ca333 committed May 11, 2020
    Configuration menu
    Copy the full SHA
    7836f2b View commit details
    Browse the repository at this point in the history

  3. remove time adjustment

    @ca333
    ca333 committed May 11, 2020
    Configuration menu
    Copy the full SHA
    ade38f6 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2020

  1. Merge pull request jl777#351 from KomodoPlatform/rewrite_addtimedata 

    remove time adjustment
    @ca333
    ca333 authored May 12, 2020
    Configuration menu
    Copy the full SHA
    64bf8e4 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2020

  1. remove WLC 

    WLC is no longer notarised (was replaced by WLC21)
VRSC might also be candidate for removal, as it is no longer launched as an assetchain
    @smk762
    smk762 authored May 13, 2020
    Configuration menu
    Copy the full SHA
    fd39435 View commit details
    Browse the repository at this point in the history

  2. Remove HUSH3 

    Assuming this script is primarily for NN main server use - HUSH3 is launched on the 3rd party server.
Would it be worth creating `third_party` and `third_party.json` here for use on the second server, or would that be better placed in the dPoW repo?
    @smk762
    smk762 authored May 13, 2020
    Configuration menu
    Copy the full SHA
    ec01dfe View commit details
    Browse the repository at this point in the history

  3. Delete wlc

    @smk762
    smk762 authored May 13, 2020
    Configuration menu
    Copy the full SHA
    bca1d41 View commit details
    Browse the repository at this point in the history

  4. Delete wlc

    @smk762
    smk762 authored May 13, 2020
    Configuration menu
    Copy the full SHA
    50f4e83 View commit details
    Browse the repository at this point in the history

  5. Update assetchains.old

    @smk762
    smk762 authored May 13, 2020
    Configuration menu
    Copy the full SHA
    d15309c View commit details
    Browse the repository at this point in the history

Commits on May 14, 2020

  1. Merge pull request jl777#352 from smk762/patch-7 

    remove WLC
    @ca333
    ca333 authored May 14, 2020
    Configuration menu
    Copy the full SHA
    44233d2 View commit details
    Browse the repository at this point in the history

  2. Merge pull request jl777#353 from smk762/patch-8 

    Remove HUSH3
    @ca333
    ca333 authored May 14, 2020
    Configuration menu
    Copy the full SHA
    945936c View commit details
    Browse the repository at this point in the history

Commits on May 17, 2020

  1. feat: dpow season 4

    @ca333
    ca333 committed May 17, 2020
    Configuration menu
    Copy the full SHA
    eded49c View commit details
    Browse the repository at this point in the history

Commits on May 18, 2020

  1. Update src/komodo_defs.h 

    provided by Decker - @kolobus provided key is wrong

Co-authored-by: DeckerSU <support@decker.su>
    @ca333 @DeckerSU
    ca333 and DeckerSU authored May 18, 2020
    Configuration menu
    Copy the full SHA
    391dcb6 View commit details
    Browse the repository at this point in the history

  2. update S4 hardfork height

    @ca333
    ca333 authored May 18, 2020
    Configuration menu
    Copy the full SHA
    b0a96af View commit details
    Browse the repository at this point in the history

  3. update pbca26 pubkey

    @ca333
    ca333 authored May 18, 2020
    Configuration menu
    Copy the full SHA
    3179865 View commit details
    Browse the repository at this point in the history

  4. update starfleet pubkey

    @ca333
    ca333 authored May 18, 2020
    Configuration menu
    Copy the full SHA
    a8e545d View commit details
    Browse the repository at this point in the history

  5. Merge pull request jl777#354 from KomodoPlatform/s4 

    feat: dpow season 4
    @ca333
    ca333 authored May 18, 2020
    Configuration menu
    Copy the full SHA
    845862c View commit details
    Browse the repository at this point in the history

  6. Merge branch 'beta' into dev

    @ca333
    ca333 authored May 18, 2020
    Configuration menu
    Copy the full SHA
    5a8f567 View commit details
    Browse the repository at this point in the history

  7. Merge pull request jl777#337 from travinkeith/patch-1 

    Minor - Update year of copyright
    @ca333
    ca333 authored May 18, 2020
    Configuration menu
    Copy the full SHA
    b00ad77 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2020

  1. synced ci_cd files with research state

    @tonymorony
    tonymorony committed May 19, 2020
    Configuration menu
    Copy the full SHA
    718adca View commit details
    Browse the repository at this point in the history

  2. build scripts for ci_cd

    @tonymorony
    tonymorony committed May 19, 2020
    Configuration menu
    Copy the full SHA
    5523a55 View commit details
    Browse the repository at this point in the history

  3. revert updating of non ci_cd related build scripts

    @tonymorony
    tonymorony committed May 19, 2020
    Configuration menu
    Copy the full SHA
    6d57d4c View commit details
    Browse the repository at this point in the history

  4. use CC tests for dev CC code base

    @tonymorony
    tonymorony committed May 19, 2020
    Configuration menu
    Copy the full SHA
    74453e8 View commit details
    Browse the repository at this point in the history

  5. Merge pull request jl777#355 from KomodoPlatform/ci_cd_sync 

    sync ci_cd files with research state
    @tonymorony
    tonymorony authored May 19, 2020
    Configuration menu
    Copy the full SHA
    1101102 View commit details
    Browse the repository at this point in the history

  6. Merge pull request jl777#315 from KomodoPlatform/dev 

    sync beta
    @ca333
    ca333 authored May 19, 2020
    Configuration menu
    Copy the full SHA
    1d02800 View commit details
    Browse the repository at this point in the history

  7. bump version - major update 

    cc: @tonymorony
    @ca333
    ca333 authored May 19, 2020
    Configuration menu
    Copy the full SHA
    e68462b View commit details
    Browse the repository at this point in the history

  8. Merge pull request jl777#356 from KomodoPlatform/dev 

    bump version - major update
    @ca333
    ca333 authored May 19, 2020
    Configuration menu
    Copy the full SHA
    c340cdd View commit details
    Browse the repository at this point in the history

Commits on May 20, 2020

  1. Merge pull request jl777#357 from KomodoPlatform/beta 

    Komodo 0.6.0 "Draconic Serpent"
    @ca333
    ca333 authored May 20, 2020
    Configuration menu
    Copy the full SHA
    1e1c631 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2020

  1. bump deprecation height

    @ca333
    ca333 committed May 21, 2020
    Configuration menu
    Copy the full SHA
    80b7a94 View commit details
    Browse the repository at this point in the history

  2. add todo

    @ca333
    ca333 committed May 21, 2020
    Configuration menu
    Copy the full SHA
    c227519 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' of https://github.com/komodoplatform/komodo into dev

    @ca333
    ca333 committed May 21, 2020
    Configuration menu
    Copy the full SHA
    7af1817 View commit details
    Browse the repository at this point in the history

  4. Merge pull request jl777#358 from KomodoPlatform/dev 

    bump deprecation height
    @ca333
    ca333 authored May 21, 2020
    Configuration menu
    Copy the full SHA
    e7e8145 View commit details
    Browse the repository at this point in the history

  5. Merge pull request jl777#359 from KomodoPlatform/beta 

    bump deprecation height
    @ca333
    ca333 authored May 21, 2020
    Configuration menu
    Copy the full SHA
    b998ca1 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2020

  1. disable throw_if_sync

    @ca333
    ca333 committed May 22, 2020
    Configuration menu
    Copy the full SHA
    4db5591 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2020

  1. MESH - CC Activation

    @himu007
    himu007 authored May 26, 2020
    Configuration menu
    Copy the full SHA
    b1ce090 View commit details
    Browse the repository at this point in the history

  2. MESH - CC Activation

    @himu007
    himu007 authored May 26, 2020
    Configuration menu
    Copy the full SHA
    48afc55 View commit details
    Browse the repository at this point in the history

  3. Merge pull request jl777#361 from himu007/dev 

    MESH - CC Activation at height 320000
    @ca333
    ca333 authored May 26, 2020
    Configuration menu
    Copy the full SHA
    6ad6bc2 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2020

  1. minor spelling fix

    @smk762
    smk762 authored Jun 3, 2020
    Configuration menu
    Copy the full SHA
    79daaa1 View commit details
    Browse the repository at this point in the history

  2. Merge pull request jl777#363 from smk762/patch-9 

    minor spelling fix
    @ca333
    ca333 authored Jun 3, 2020
    Configuration menu
    Copy the full SHA
    42a2cb6 View commit details
    Browse the repository at this point in the history

  3. fix windows build guide

    @DeckerSU
    DeckerSU committed Jun 3, 2020
    Configuration menu
    Copy the full SHA
    d8ecf0c View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2020

  1. Merge pull request jl777#365 from DeckerSU/patch-winbuild-guide 

    fix windows build guide
    @ca333
    ca333 authored Jun 4, 2020
    Configuration menu
    Copy the full SHA
    650dca8 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2020

  1. + CountBits in crypto/common.h 

    Return the smallest number n such that (x >> n) == 0 (or 64 if the highest bit in x is set)
    @DeckerSU
    DeckerSU committed Jun 7, 2020
    Configuration menu
    Copy the full SHA
    eb31d6c View commit details
    Browse the repository at this point in the history

  2. Add asmap utility which queries a mapping 

    The scripts for creating a compact IP->ASN mapping are here:
https://github.com/sipa/asmap

bitcoin/bitcoin@8feb4e4
    @DeckerSU
    DeckerSU committed Jun 7, 2020
    Configuration menu
    Copy the full SHA
    377c9c5 View commit details
    Browse the repository at this point in the history

  3. p2p: supplying and using asmap to improve IP bucketing in addrman 

    first approach to porting bitcoin/bitcoin#16702 into old v0.13 codebase.
    @DeckerSU
    DeckerSU committed Jun 7, 2020
    Configuration menu
    Copy the full SHA
    5550e12 View commit details
    Browse the repository at this point in the history

  4. Return mapped AS in RPC call getpeerinfo and in GUI

    @DeckerSU
    DeckerSU committed Jun 7, 2020
    Configuration menu
    Copy the full SHA
    4544c1f View commit details
    Browse the repository at this point in the history

  5. Addrman Google Tests 

    Note: these are standart tests, which is not include asmap features.
    @DeckerSU
    DeckerSU committed Jun 7, 2020
    Configuration menu
    Copy the full SHA
    67cb0ca View commit details
    Browse the repository at this point in the history

  6. add legacy and asmap addrman tests

    @DeckerSU
    DeckerSU committed Jun 7, 2020
    Configuration menu
    Copy the full SHA
    421795c View commit details
    Browse the repository at this point in the history

  7. when clearing addrman clear mapInfo and mapAddr 

    bitcoin/bitcoin@b86a420
    @DeckerSU
    DeckerSU committed Jun 7, 2020
    Configuration menu
    Copy the full SHA
    d5d1249 View commit details
    Browse the repository at this point in the history

  8. add addrman serialization test

    @DeckerSU
    DeckerSU committed Jun 7, 2020
    Configuration menu
    Copy the full SHA
    f4cb8b9 View commit details
    Browse the repository at this point in the history

  9. addrman: Add missing lock in Clear() (CAddrMan) 

    bitcoin/bitcoin#11585
    @DeckerSU
    DeckerSU committed Jun 7, 2020
    Configuration menu
    Copy the full SHA
    7d411ae View commit details
    Browse the repository at this point in the history

  10. add fsbridge namespace (using by addrman in DecodeAsmap)

    @DeckerSU
    DeckerSU committed Jun 7, 2020
    Configuration menu
    Copy the full SHA
    49cdd67 View commit details
    Browse the repository at this point in the history

  11. fix copyStats call (asmap)

    @DeckerSU
    DeckerSU committed Jun 7, 2020
    Configuration menu
    Copy the full SHA
    cc1ca6e View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2020

  1. remove inactive coins

    @himu007
    himu007 committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    e05f1c7 View commit details
    Browse the repository at this point in the history

  2. remove SEC

    @himu007
    himu007 committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    7971f32 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2020

  1. Merge pull request jl777#366 from DeckerSU/patch-asmap 

    p2p: supplying and using asmap to improve IP bucketing in addrman
    @ca333
    ca333 authored Jun 10, 2020
    Configuration menu
    Copy the full SHA
    d9749eb View commit details
    Browse the repository at this point in the history

  2. Merge pull request jl777#367 from himu007/s4 

    remove "inactive" coins
    @ca333
    ca333 authored Jun 10, 2020
    Configuration menu
    Copy the full SHA
    97e3b9f View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2020

  1. Update funcs.mk 

    fixes compile ownership issues on linux

Cheers
http://zpool.ca
    @crackfoo
    crackfoo authored Jun 12, 2020
    Configuration menu
    Copy the full SHA
    49397ba View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2020

  1. Tmp renames

    @jl777
    jl777 committed Jun 14, 2020
    Configuration menu
    Copy the full SHA
    567103d View commit details
    Browse the repository at this point in the history

  2. Revert

    @jl777
    jl777 committed Jun 14, 2020
    Configuration menu
    Copy the full SHA
    7631f34 View commit details
    Browse the repository at this point in the history

  3. More reverts

    @jl777
    jl777 committed Jun 14, 2020
    Configuration menu
    Copy the full SHA
    2e86703 View commit details
    Browse the repository at this point in the history

  4. Sync miner.cpp

    @jl777
    jl777 committed Jun 14, 2020
    Configuration menu
    Copy the full SHA
    05c7464 View commit details
    Browse the repository at this point in the history

  5. net.h

    @jl777
    jl777 committed Jun 14, 2020
    Configuration menu
    Copy the full SHA
    c86bd5a View commit details
    Browse the repository at this point in the history

  6. build.sh

    @jl777
    jl777 committed Jun 14, 2020
    Configuration menu
    Copy the full SHA
    28947fa View commit details
    Browse the repository at this point in the history

  7. Fix

    @jl777
    jl777 committed Jun 14, 2020
    Configuration menu
    Copy the full SHA
    c815fa1 View commit details
    Browse the repository at this point in the history

  8. update funcs.mk 

    KomodoPlatform#368 (review)
DeckerSU/KomodoOcean@85d2fa6
bitcoin/bitcoin@89bee1b
    @ca333
    ca333 authored Jun 14, 2020
    Configuration menu
    Copy the full SHA
    91d000e View commit details
    Browse the repository at this point in the history

  9. Merge pull request jl777#368 from crackfoo/patch-4 

    Update funcs.mk
    @ca333
    ca333 authored Jun 14, 2020
    Configuration menu
    Copy the full SHA
    3bb5331 View commit details
    Browse the repository at this point in the history

  10. updates assetchains.json to mirror dPoW repo

    @gcharang
    gcharang committed Jun 14, 2020
    Configuration menu
    Copy the full SHA
    19c27f2 View commit details
    Browse the repository at this point in the history

  11. updates the assetchains.old file to mirror the dPoW repo

    @gcharang
    gcharang committed Jun 14, 2020
    Configuration menu
    Copy the full SHA
    b37b004 View commit details
    Browse the repository at this point in the history

  12. removes cli files of etomic and kv

    @gcharang
    gcharang committed Jun 14, 2020
    Configuration menu
    Copy the full SHA
    30cfb89 View commit details
    Browse the repository at this point in the history

  13. Merge pull request jl777#371 from gcharang/dev 

    Updates assetchain files to mirror dPoW repo
    @ca333
    ca333 authored Jun 14, 2020
    Configuration menu
    Copy the full SHA
    e159b4e View commit details
    Browse the repository at this point in the history

  14. resolve conflict net.h

    @ca333
    ca333 authored Jun 14, 2020
    Configuration menu
    Copy the full SHA
    d2d2ac3 View commit details
    Browse the repository at this point in the history

  15. resolve conflict miner.cpp

    @ca333
    ca333 authored Jun 14, 2020
    Configuration menu
    Copy the full SHA
    2ba9366 View commit details
    Browse the repository at this point in the history

  16. Merge pull request jl777#1850 from ca333/patch-13 

    resolve conflict net.h
    @jl777
    jl777 authored Jun 14, 2020
    Configuration menu
    Copy the full SHA
    2b2df5d View commit details
    Browse the repository at this point in the history

  17. resolve conflict komodod_ci.yml

    @ca333
    ca333 authored Jun 14, 2020
    Configuration menu
    Copy the full SHA
    fba0c71 View commit details
    Browse the repository at this point in the history

  18. resolve conflict pytest_util.py

    @ca333
    ca333 authored Jun 14, 2020
    Configuration menu
    Copy the full SHA
    a99809d View commit details
    Browse the repository at this point in the history

  19. resolve conflict conftest.py

    @ca333
    ca333 authored Jun 14, 2020
    Configuration menu
    Copy the full SHA
    5529641 View commit details
    Browse the repository at this point in the history

  20. Merge pull request jl777#1851 from ca333/patch-13 

    resolve conflicts
    @jl777
    jl777 authored Jun 14, 2020
    Configuration menu
    Copy the full SHA
    ac4498c View commit details
    Browse the repository at this point in the history

  21. Merge branch 'dev' into dev

    @ca333
    ca333 authored Jun 14, 2020
    Configuration menu
    Copy the full SHA
    54fd345 View commit details
    Browse the repository at this point in the history

  22. revert conflict resolution merge from jl777:dev

    @ca333
    ca333 committed Jun 14, 2020
    Configuration menu
    Copy the full SHA
    7fddf74 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2020

  1. bump version

    @ca333
    ca333 authored Jun 21, 2020
    Configuration menu
    Copy the full SHA
    5000f2a View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2020

  1. updates the assetchains.old file to add "$1" at the end of all the ch… 

    …ain parameters
    @gcharang
    gcharang committed Jun 30, 2020
    Configuration menu
    Copy the full SHA
    40878ca View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2020

  1. refactor: remove unused header var in GetBlockProof

    @DeckerSU
    DeckerSU committed Jul 1, 2020
    Configuration menu
    Copy the full SHA
    987f1b7 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2020

  1. Merge pull request jl777#375 from gcharang/dev 

    updates the assetchains.old file to add "$1" at the end of all the ch…
    @ca333
    ca333 authored Jul 2, 2020
    Configuration menu
    Copy the full SHA
    9ac57b9 View commit details
    Browse the repository at this point in the history

  2. Merge pull request jl777#376 from DeckerSU/patch-getblockproof 

    refactor: remove unused header var in GetBlockProof
    @ca333
    ca333 authored Jul 2, 2020
    Configuration menu
    Copy the full SHA
    465f5e3 View commit details
    Browse the repository at this point in the history