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

Conversation

dimxy
Copy link
Owner

@dimxy dimxy commented Sep 9, 2020

No description provided.

ca333 and others added 30 commits March 2, 2020 10:55
@ca333
Merge pull request jl777#278 from KomodoPlatform/dev
78e78f0 
sync beta
@ca333
Merge pull request jl777#293 from KomodoPlatform/beta
a570d7a 
0.5.3
@ca333
fix dead openssl download path
a9679e1
@ca333
add VOTE2020
b498aa2
@ca333
add ac_public param
b099cf6
@kolobus
assetchains file fix
b8e6272
@kolobus
assetchains file fix
4507757
@kolobus
VOTE and STBL added
f2c1fee
@kolobus
VOTE and STBL added
605dd49
@ca333
Merge pull request jl777#331 from kolobus/beta
ebe91e1 
VOTE2020 and STBL added
@ca333
Merge pull request jl777#332 from kolobus/master
30333c3 
STBL added
@travinkeith
Update year of copyright
d261319 
Update 2019 to 2020.
@ca333
Merge branch 'dev' into patch-1
a5e46cc
@ca333
bump KMD version
b15bfff
@ca333
remove time adjustment
7836f2b
@ca333
remove time adjustment
ade38f6
@ca333
Merge pull request jl777#351 from KomodoPlatform/rewrite_addtimedata
64bf8e4 
remove time adjustment
@smk762
remove WLC
fd39435 
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
Remove HUSH3
ec01dfe 
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
Delete wlc
bca1d41
@smk762
Delete wlc
50f4e83
@smk762
Update assetchains.old
d15309c
@ca333
Merge pull request jl777#352 from smk762/patch-7
44233d2 
remove WLC
@ca333
Merge pull request jl777#353 from smk762/patch-8
945936c 
Remove HUSH3
@ca333
feat: dpow season 4
eded49c
@ca333 @DeckerSU
Update src/komodo_defs.h
391dcb6 
provided by Decker - @kolobus provided key is wrong

Co-authored-by: DeckerSU <support@decker.su>
@ca333
update S4 hardfork height
b0a96af
@ca333
update pbca26 pubkey
3179865
@ca333
update starfleet pubkey
a8e545d
@ca333
Merge pull request jl777#354 from KomodoPlatform/s4
845862c 
feat: dpow season 4
jl777 and others added 26 commits June 13, 2020 18:16
@jl777
Revert
7631f34
@jl777
More reverts
2e86703
@jl777
Sync miner.cpp
05c7464
@jl777
net.h
c86bd5a
@jl777
build.sh
28947fa
@jl777
Fix
c815fa1
@ca333
update funcs.mk
91d000e 
KomodoPlatform#368 (review)
DeckerSU/KomodoOcean@85d2fa6
bitcoin/bitcoin@89bee1b
@ca333
Merge pull request jl777#368 from crackfoo/patch-4
3bb5331 
Update funcs.mk
@gcharang
updates assetchains.json to mirror dPoW repo
19c27f2
@gcharang
updates the assetchains.old file to mirror the dPoW repo
b37b004
@gcharang
removes cli files of etomic and kv
30cfb89
@ca333
Merge pull request jl777#371 from gcharang/dev
e159b4e 
Updates assetchain files to mirror dPoW repo
@ca333
resolve conflict net.h
d2d2ac3
@ca333
resolve conflict miner.cpp
2ba9366
@jl777
Merge pull request jl777#1850 from ca333/patch-13
2b2df5d 
resolve conflict net.h
@ca333
resolve conflict komodod_ci.yml
fba0c71
@ca333
resolve conflict pytest_util.py
a99809d
@ca333
resolve conflict conftest.py
5529641
@jl777
Merge pull request jl777#1851 from ca333/patch-13
ac4498c 
resolve conflicts
@ca333
Merge branch 'dev' into dev
54fd345
@ca333
revert conflict resolution merge from jl777:dev
7fddf74
@ca333
bump version
5000f2a
@gcharang
updates the assetchains.old file to add "$1" at the end of all the ch…
40878ca 
…ain parameters
@DeckerSU
refactor: remove unused header var in GetBlockProof
987f1b7
@ca333
Merge pull request jl777#375 from gcharang/dev
9ac57b9 
updates the assetchains.old file to add "$1" at the end of all the ch…
@ca333
Merge pull request jl777#376 from DeckerSU/patch-getblockproof
465f5e3 
refactor: remove unused header var in GetBlockProof
@dimxy dimxy merged this pull request into research Sep 9, 2020
@dimxy dimxy deleted the komodoplatform-dev branch September 24, 2021 10:07
dimxy pushed a commit that referenced this pull request Jul 4, 2022
@NutellaLicka
Merge pull request #43 from Alrighttt/tokel-season6
381bcec 
dpow season 6 activation
dimxy pushed a commit that referenced this pull request Sep 26, 2024
@Aklix
Merge pull request #43 from marmarachain/development
fa68f04 
adding last development changes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.