blackjok3r
|
b7772e39d5
|
Merge branch 'dev' of https://github.com/jl777/komodo into jl777-dev
x
|
2019-04-20 22:52:18 +08:00 |
|
jl777
|
c8fe029487
|
Merge pull request #1438 from KomodoPlatform/dev
[add] KOIN
|
2019-04-18 17:51:08 -11:00 |
|
ca333
|
13458b4040
|
[add] KOIN
|
2019-04-18 23:15:48 +02:00 |
|
ca333
|
b2da18bc38
|
Merge pull request #153 from jl777/dev
sync dev
|
2019-04-18 23:07:26 +02:00 |
|
jl777
|
c6a58be7f2
|
Merge pull request #1426 from jl777/jl777
fixin staking wallet issue
|
2019-04-15 18:26:39 -11:00 |
|
jl777
|
d341e1670c
|
Merge pull request #1425 from blackjok3rtt/jl777
wallet code fix
|
2019-04-15 18:23:49 -11:00 |
|
blackjok3r
|
0bb8c5be22
|
fix wallet code. Force daemon close and reccomend zapwallettxns for non staking chains.
|
2019-04-16 13:14:04 +08:00 |
|
blackjok3rtt
|
4049f9f6be
|
Merge pull request #63 from jl777/jl777
Jl777
|
2019-04-16 11:52:45 +08:00 |
|
jl777
|
189355399a
|
Merge pull request #1423 from jl777/FSM
FSM
|
2019-04-15 04:04:07 -11:00 |
|
jl777
|
5ee99e866a
|
Merge branch 'FSM' into jl777
|
2019-04-15 04:03:17 -11:00 |
|
jl777
|
9b76745f12
|
Merge pull request #1422 from jl777/jl777
Jl777
|
2019-04-15 04:03:12 -11:00 |
|
jl777
|
4219408809
|
Merge pull request #1421 from blackjok3rtt/jl777
fix wallet crash
|
2019-04-15 03:52:30 -11:00 |
|
jl777
|
74125f9cf3
|
Merge pull request #1420 from Mixa84/FSM
Fix looking for wrong type marker in Oracles CC
|
2019-04-15 03:14:12 -11:00 |
|
Mihailo Milenkovic
|
f087f49c4d
|
Fix looking for wrong type marker in Oracles CC
|
2019-04-15 16:00:03 +02:00 |
|
blackjok3r
|
2e727de8ee
|
fix wallet crash
|
2019-04-15 19:58:13 +08:00 |
|
jl777
|
c07f43dd6e
|
Merge branch 'beta' into dev
|
2019-04-14 18:20:25 -11:00 |
|
jl777
|
201f1e86c0
|
Merge pull request #1418 from jl777/FSM
FSM
|
2019-04-14 18:20:02 -11:00 |
|
jl777
|
25c603c717
|
Merge branch 'dev' into FSM
|
2019-04-14 18:19:18 -11:00 |
|
jl777
|
65b6cf85bc
|
Merge pull request #1413 from jl777/jl777
automatically rejoin a prices chain after being stranded
fix OUR staking
|
2019-04-14 18:18:46 -11:00 |
|
jl777
|
a667d6a596
|
Merge branch 'FSM' into jl777
|
2019-04-14 18:17:12 -11:00 |
|
jl777
|
31eb126876
|
Merge pull request #1417 from blackjok3rtt/jl777
revert miner change
|
2019-04-14 18:16:47 -11:00 |
|
blackjok3rtt
|
0666dc7cd8
|
Merge pull request #62 from jl777/dev
Dev
|
2019-04-15 13:07:42 +08:00 |
|
blackjok3rtt
|
47e290017f
|
Merge pull request #61 from blackjok3rtt/jl777
Jl777
|
2019-04-15 13:06:25 +08:00 |
|
blackjok3r
|
c9f395f241
|
revert miner change. Causes crash when staking.
|
2019-04-15 12:08:58 +08:00 |
|
blackjok3rtt
|
741f5b7d58
|
Merge pull request #60 from jl777/jl777
Jl777
|
2019-04-15 12:02:19 +08:00 |
|
jl777
|
35c7165a02
|
Merge pull request #1416 from phm87/patch-1
init.cpp : Help message for -whitelistaddress=
|
2019-04-14 06:48:45 -11:00 |
|
phm87
|
35ad4a6bc3
|
init.cpp : move help message -whitelistaddress=
Move the help message of -whitelistaddress= to the section related to "Wallet options:"
|
2019-04-14 19:24:29 +02:00 |
|
phm87
|
f7e94b113e
|
init.cpp : Help message for -whitelistaddress=
Few days ago, on discord, blackjok3r said that he hopes that somebody will add a help message for -whitelistaddress=
|
2019-04-14 18:29:28 +02:00 |
|
jl777
|
2b16669e64
|
Merge pull request #1415 from jl777/kolo
VOTE2019
|
2019-04-14 05:09:35 -11:00 |
|
Mihail Fedorov
|
4f3253fdc9
|
VOTE2019
|
2019-04-14 18:56:10 +03:00 |
|
Mihail Fedorov
|
914da1ba80
|
Merge remote-tracking branch 'origin/dev' into kolo
|
2019-04-14 18:48:25 +03:00 |
|
jl777
|
edfaea0c64
|
Revert to exit
|
2019-04-14 02:45:06 -11:00 |
|
jl777
|
9d208da4b6
|
void StartShutdown()
|
2019-04-14 02:17:58 -11:00 |
|
jl777
|
aec1884070
|
StartShutdown(); instead of exit()
|
2019-04-14 02:16:03 -11:00 |
|
jl777
|
a0136724b0
|
Merge pull request #1414 from blackjok3rtt/jl777
try wallet fix
|
2019-04-13 20:56:53 -11:00 |
|
blackjok3r
|
7c56d03474
|
try wallet fix
|
2019-04-14 15:51:26 +08:00 |
|
jl777
|
1ca7ee28e0
|
-)
|
2019-04-13 20:49:31 -11:00 |
|
jl777
|
8c27ef7372
|
Coin supply changes to include funds
|
2019-04-13 20:41:40 -11:00 |
|
jl777
|
9d0a39dbd7
|
coinsupply inflation calc
|
2019-04-13 19:19:00 -11:00 |
|
jl777
|
bceb29eb2b
|
New refs
|
2019-04-12 21:55:55 -11:00 |
|
jl777
|
a05149ce8e
|
Test
|
2019-04-12 09:13:30 -11:00 |
|
jl777
|
45f8c77b79
|
Handle prices directory there, but missing file
|
2019-04-12 09:10:47 -11:00 |
|
jl777
|
456ccc2564
|
Shutdown if can't open prices
|
2019-04-12 09:07:22 -11:00 |
|
jl777
|
0c3582c06a
|
Fix names
|
2019-04-12 09:03:08 -11:00 |
|
jl777
|
149ce304f6
|
pricefname.string().c_str(), createflag
|
2019-04-12 09:00:06 -11:00 |
|
jl777
|
f3056d4829
|
+print
|
2019-04-12 08:56:44 -11:00 |
|
jl777
|
d0fd337b25
|
Revert
|
2019-04-12 08:44:54 -11:00 |
|
jl777
|
325e914ce8
|
Test
|
2019-04-12 08:38:43 -11:00 |
|
jl777
|
26dddaac89
|
Skip timestamp for now
|
2019-04-12 08:31:44 -11:00 |
|
jl777
|
7d487d3ea3
|
Test
|
2019-04-12 08:28:56 -11:00 |
|