Commit Graph
27901 Commits
Author SHA1 Message Date
dimxy 5a688c226d corr vobj 2019-05-23 19:34:35 +05:00
dimxy 4d72ae985a added totals to PriceGetOrderbook 2019-05-23 19:34:34 +05:00
jl777 12a3d56205 Merge branch 'master' into beta 2019-05-22 22:05:20 -11:00
jl777 cf81bdb5f6 Ignores 2019-05-22 21:59:55 -11:00
jl777 373b02e03f Adjust for network header 2019-05-22 21:59:55 -11:00
jl777 581b6411d6 Ignore a.out 2019-05-22 21:56:58 -11:00
blackjok3r 563a08be81 undo 2019-05-23 13:55:01 +08:00
jl777 52fa83a9b7 Merge branch 'FSM' into jl777 2019-05-21 19:41:09 -11:00
jl777 6fd7dab797 Merge branch 'dev' into FSM 2019-05-21 19:40:41 -11:00
jl777 128ee4edaa Merge pull request #1495 from jl777/jl777
Jl777
2019-05-21 19:39:42 -11:00
jl777 7347ab98ae Activation on jul 15/1444000 2019-05-21 19:22:23 -11:00
gtmatcha 6d45a1d6ee update pub 2019-05-22 12:13:32 +09:00
smk762 f7e5eb44f2 updated addr and pubkey 2019-05-21 18:28:01 +08:00
jl777 5225f98fc3 Merge pull request #1494 from blackjok3rtt/jl777
KMD hardfork code and bug fixes.
2019-05-20 19:33:16 -11:00
blackjok3r 16cfae41eb Merge branch 'beta' into jl777 2019-05-21 14:19:22 +08:00
blackjok3rtt ae126e9cf6 Merge pull request #87 from jl777/beta
Beta
2019-05-21 14:03:54 +08:00
blackjok3r 26a7bbdf39 revert labs build changes 2019-05-21 13:57:13 +08:00
blackjok3rtt 278bfad27e Merge pull request #86 from KMDLabs/master
staker fixes
2019-05-21 13:55:36 +08:00
blackjok3r 1f7f5aace0 disable tokens funcID for now. 2019-05-21 13:23:13 +08:00
gcharang f983882c8b Update pubkey 2019-05-21 10:23:23 +05:30
blackjok3rtt 5e44b0a965 Merge pull request #85 from jl777/jl777
Jl777
2019-05-21 11:27:29 +08:00
blackjok3rtt f9620e3ac0 Merge pull request #117 from blackjok3rtt/jl777
fix PIRATE
2019-05-21 11:10:03 +08:00
blackjok3r d5eea5669e fix PIRATE 2019-05-20 22:18:55 +08:00
jl777 e08b8de209 Merge pull request #1493 from MyHush/zsync3
Wait to look at KOMODO_INSYNC until we hold cs_main lock
2019-05-20 03:01:49 -11:00
Jonathan "Duke" Leto 406d6e60a2 Wait to look at KOMODO_INSYNC until we hold cs_main lock, to prevent a datarace when using chainActive 2019-05-20 06:49:22 -07:00
jl777 fbda899304 Merge pull request #1492 from jl777/dev
Dev
2019-05-19 23:31:14 -11:00
jl777 c41090127f Merge pull request #1491 from chainmakers/dev
add K64
2019-05-19 23:29:28 -11:00
jl777 08743db95e Merge pull request #1490 from chainmakers/beta
add K64
2019-05-19 23:29:05 -11:00
Jorian 6c065384d1 add K64 2019-05-20 12:10:57 +02:00
Jorian 9841866380 add K64 2019-05-20 12:05:48 +02:00
jl777 93bba030ee Merge branch 'FSM' into jl777 2019-05-19 16:33:25 -11:00
jl777 1ea6df970b Merge pull request #1489 from Alrighttt/FSM
change oraclessamples output to obj
2019-05-19 16:33:11 -11:00
jl777 8dd6f2ae96 Default bind 2019-05-19 11:29:45 -11:00
Alrighttt 5c77b99a66 remove print, remove unused obj 2019-05-19 23:10:20 +02:00
Alrighttt c39133405e change oraclessamples to obj 2019-05-19 23:04:18 +02:00
Alrighttt e3eb2de3ee Merge pull request #1 from jl777/FSM
Fsm
2019-05-19 22:22:31 +02:00
blackjok3rtt 4bf7e2ac91 Merge pull request #114 from blackjok3rtt/jl777
try fix
2019-05-19 00:51:30 +08:00
blackjok3r e90ac44dde try fix 2019-05-19 00:48:24 +08:00
blackjok3rtt 8800fd4c60 Merge pull request #113 from blackjok3rtt/jl777
fix erase expired tx on wallet load
2019-05-19 00:22:25 +08:00
blackjok3r d4aac39f75 fix erase expired tx on wallet load 2019-05-19 00:21:36 +08:00
blackjok3rtt add8b29e32 Merge pull request #112 from blackjok3rtt/jl777
fix erase expired tx on wallet load
2019-05-19 00:17:40 +08:00
blackjok3r c0bc4dc7f8 fix erase expired tx on wallet load 2019-05-19 00:16:31 +08:00
blackjok3rtt 60d582482f Merge pull request #111 from blackjok3rtt/jl777
KMD seasons change test / bug fix
2019-05-18 23:50:41 +08:00
blackjok3r 02a3f08894 fix staking wallet fix. 2019-05-18 23:38:49 +08:00
blackjok3r 1583446b47 change notary pubkey activation code. 2019-05-18 22:53:16 +08:00
jl777 8eb4baf3ff Merge pull request #1488 from himu007/patch-2
Update README.md
2019-05-17 06:30:46 -11:00
SHossain 1970e04175 Update README.md 2019-05-17 17:33:43 +01:00
blackjok3r c1df6fc05a fix 2019-05-17 12:04:33 +08:00
blackjok3r 027f9a58f1 revert build things for start.sh 2019-05-17 10:30:56 +08:00
blackjok3rtt 1b1cb6ef5f Merge pull request #110 from blackjok3rtt/jl777
merge paymentsCC updates down. staker bug fixes
2019-05-17 10:14:37 +08:00