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

update to upstream #8

Merged
merged 2,926 commits into from
Aug 2, 2020
Merged

update to upstream #8

merged 2,926 commits into from
Aug 2, 2020

Conversation

phm87
Copy link
Owner

@phm87 phm87 commented Aug 2, 2020

No description provided.

ca333 and others added 30 commits March 3, 2020 09:48
@ca333
Merge pull request #291 from Milerius/DEX_task_milerius
bd7b2ec 
Dex task milerius
@ca333
Merge pull request #294 from KomodoPlatform/DEX_task_milerius
d0e5937 
sync DEX
@jl777
Use home dir
5218831
@Mixa84
Oracles validation fixes (#48)
e01f6ed
@jl777
Merge pull request jl777#1813 from Mixa84/FSM
0dd7712 
Oracles validation fixes (#48)
@Mixa84
Pegs modifications (#49)
e4b96f9
@ca333
Merge pull request #293 from KomodoPlatform/beta
a570d7a 
0.5.3
@jl777
Merge pull request jl777#1814 from Mixa84/FSM
21393e6 
Pegs modifications
@ca333
update subatomic makefile
050dd28
@ca333
exec subatomic makefile
8d4c83d
@Milerius
fix(subatomic): all snprintf call
9b03448
@ca333
Merge pull request #295 from Milerius/dex_fix_snprintf
b0d0db5 
fix(subatomic): all snprintf call
@ca333
Merge pull request #296 from KomodoPlatform/DEX_task_milerius
659bad0 
sync DEX
@ca333
Merge pull request #297 from jl777/jl777
26cba54 
sync DEX
@ca333
mv subatomic bin
5b209c5
@ca333
rm obsoleted makefile
77e3326
@jl777
Merge pull request jl777#1806 from KomodoPlatform/DEX
ebc9204 
refactor subatomic
@dimxy
added kogs cc eval code and initial src files
9458642
@ca333
add notarizer makefile
f1b9a74
@jl777
Merge pull request jl777#1816 from KomodoPlatform/DEX
4351586 
add notarizer makefile
@jl777
Merge pull request jl777#1815 from dimxy/kogs-eval
4d0a3b8 
Add kogs cc eval code and initial srcs
@ca333
update notarizer build
d7733f8
@jl777
Merge pull request jl777#1817 from KomodoPlatform/DEX
0e33404 
update notarizer build
@ca333
update betdapp sub_cli args
2c70511
@ca333
add betdapp makefile
ff8fbc0
@jl777
Merge pull request jl777#1818 from KomodoPlatform/DEX
bba7c88 
update betdapp
@ca333
rm template matching and pseudo opcodes
0fc66eb
@ca333
add ValidSize()
bc5cb3b
@ca333
add IsPushOnly(const_iterator)
abf64c1
@ca333
rm bare multisig outputs
852a65f
ca333 and others added 29 commits June 10, 2020 12:00
@ca333
Merge pull request #366 from DeckerSU/patch-asmap
d9749eb 
p2p: supplying and using asmap to improve IP bucketing in addrman
@ca333
Merge pull request #367 from himu007/s4
97e3b9f 
remove "inactive" coins
@crackfoo
Update funcs.mk
49397ba 
fixes compile ownership issues on linux

Cheers
http://zpool.ca
@jl777
Tmp renames
567103d
@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 
#368 (review)
DeckerSU/KomodoOcean@85d2fa6
bitcoin/bitcoin@89bee1b
@ca333
Merge pull request #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 #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
Merge pull request #370 from KomodoPlatform/dev
d98b51b 
sync beta
@ca333
bump version
5000f2a
@ca333
Merge pull request #374 from KomodoPlatform/dev
dd40e2d 
bump version
@ca333
Merge pull request #373 from KomodoPlatform/beta
666047b 
0.6.1
@phm87 phm87 merged commit cb83713 into phm87:patch-9 Aug 2, 2020
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.