jl777
|
9cc3658cda
|
Merge branch 'FSM' into jl777
|
2019-04-18 01:40:04 -11:00 |
|
jl777
|
4096d8edf2
|
Merge pull request #1437 from Mixa84/FSM
Adding validation for importgateway CC
|
2019-04-18 01:39:15 -11:00 |
|
Mihailo Milenkovic
|
9499ddf88f
|
Fix
|
2019-04-18 14:25:51 +02:00 |
|
Mihailo Milenkovic
|
0acaa3517f
|
Adding validation for importgateway CC (#22)
|
2019-04-18 14:23:12 +02:00 |
|
jl777
|
b874e3e488
|
Merge branch 'FSM' into jl777
|
2019-04-17 03:06:06 -11:00 |
|
jl777
|
f5b1645de9
|
Merge pull request #1436 from radix42/FSM
add checked block zmq notification type to send verified blocks
|
2019-04-17 03:05:44 -11:00 |
|
jl777
|
cb0043115d
|
Merge branch 'FSM' into FSM
|
2019-04-17 03:05:14 -11:00 |
|
Jane Mercer
|
222c0b226a
|
add checked block zmq nofitication type to publish verified blocks
|
2019-04-17 06:54:21 -07:00 |
|
jl777
|
eeb6241689
|
Merge branch 'FSM' into jl777
|
2019-04-17 02:36:43 -11:00 |
|
jl777
|
3523faadae
|
Merge pull request #1428 from jl777/jl777
Jl777
|
2019-04-16 21:34:18 -11:00 |
|
jl777
|
834e5e5080
|
Merge branch 'FSM' into jl777
|
2019-04-16 21:33:43 -11:00 |
|
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
|
fbda848712
|
Merge branch 'FSM' into jl777
|
2019-04-16 20:48:15 -11:00 |
|
jl777
|
6a1575895d
|
Merge branch 'FSM' into jl777
|
2019-04-16 20:45:46 -11: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
|
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
|
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
|
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 |
|