Commit Graph

26969 Commits

Author SHA1 Message Date
jl777
0ba2e30b2d Merge remote-tracking branch 'origin/jl777' into jl777 2019-04-16 20:12:33 -11:00
jl777
1e4648e509 Merge branch 'FSM' into jl777 2019-04-16 20:12:27 -11:00
jl777
ec780ae3ba Merge pull request #1432 from blackjok3rtt/ac_nk
Add assetchains_nk
2019-04-16 19:09:54 -11:00
blackjok3r
18854e2af7 ac_nk params 2019-04-17 13:42:02 +08:00
blackjok3rtt
c2c425d855 Merge pull request #66 from jl777/jl777
Jl777
2019-04-17 10:38:18 +08:00
jl777
527f1ff90e Merge pull request #1429 from blackjok3rtt/CCparams_test
cccustom changed to use CCopret
2019-04-16 02:20:34 -11:00
blackjok3r
87ebcc3b2b revert createrawtransaction 2019-04-16 21:11:06 +08:00
blackjok3r
660c8dc26c fix has_opret function 2019-04-16 21:08:39 +08:00
blackjok3r
997f9ce5fc initial commit to use CCopt for custom CC 2019-04-16 20:59:15 +08:00
jl777
81aa1908d9 Deprecate prices_extract 2019-04-15 23:31:59 -11:00
jl777
094f72afb4 Smoothed 2019-04-15 23:27:20 -11:00
jl777
ece9e468bc #define PRICES_MAXDATAPOINTS 8 2019-04-15 23:14:50 -11:00
blackjok3rtt
7f89532c03 Merge pull request #64 from blackjok3rtt/jl777
fix wallet code. Force daemon close and reccomend zapwallettxns for n…
2019-04-16 16:08:41 +08: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
blackjok3r
c3a9d0fa0c test 2019-04-16 12:28:27 +08:00
blackjok3rtt
4049f9f6be Merge pull request #63 from jl777/jl777
Jl777
2019-04-16 11:52:45 +08: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
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
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