jl777
|
a67b6e918a
|
Merge pull request #1435 from blackjok3rtt/FSM
Few small changes from LABS.
|
2019-04-16 21:33:04 -11:00 |
|
blackjok3r
|
1c4c00ff8b
|
add ac_founders and ac_perc to getblocksubsidy
|
2019-04-17 16:16:59 +08:00 |
|
blackjok3r
|
2692d48f0c
|
clean up some notary pay stuff. Put current LABS notaries in ERA1 ready for reset.
|
2019-04-17 16:16:10 +08:00 |
|
jl777
|
3652d41e97
|
Merge pull request #1434 from blackjok3rtt/FSM
Port of MoMoM changes from LABS.
|
2019-04-16 20:45:29 -11:00 |
|
blackjok3r
|
cf02649727
|
Change MoMoMData RPC to use a 5 block KMD delay. Change MoMoM hash to use a range of 7 MoM hash. Add offset to migrate_completeimporttransaction.
|
2019-04-17 15:27:31 +08:00 |
|
jl777
|
d89a3ad6b7
|
Merge pull request #1433 from blackjok3rtt/FSM
Add optional height pram to importprivkey
|
2019-04-16 20:12:21 -11:00 |
|
blackjok3r
|
78162cf103
|
Add height param to importprivkey
|
2019-04-17 15:00:47 +08:00 |
|
blackjok3rtt
|
f2666b3293
|
Merge pull request #67 from jl777/FSM
Fsm
|
2019-04-17 14:36:14 +08: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 |
|
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 |
|
jl777
|
06157628eb
|
Atol
|
2019-04-12 08:21:55 -11:00 |
|
jl777
|
e6eddb7a70
|
-print
|
2019-04-12 08:17:28 -11:00 |
|
jl777
|
eb2b06ba62
|
+print
|
2019-04-12 08:14:32 -11:00 |
|
jl777
|
d1af8415a8
|
Pricing
|
2019-04-12 08:08:48 -11:00 |
|
jl777
|
e4330edc0a
|
c_Str
|
2019-04-12 07:57:20 -11:00 |
|
jl777
|
77afae4f25
|
Support stock prices
|
2019-04-12 07:51:28 -11:00 |
|