Commit Graph

28440 Commits

Author SHA1 Message Date
dimxy
a11333e766 importproof proc read bad id 2019-04-19 14:41:48 +05:00
dimxy
d87f6a158a rawtransaction corr importproof type 2019-04-19 14:41:47 +05:00
dimxy
4add699cbb token migration moved to FSM 2019-04-19 14:41:46 +05:00
jl777
da37292af7 Merge branch 'FSM' into jl777 2019-04-18 22:25:37 -11:00
jl777
34b615de35 Merge pull request #1440 from Mixa84/FSM
Fix oracleslist on SetCCtxids
2019-04-18 22:24:59 -11:00
Mihailo Milenkovic
62b4c709ca Fix oracleslist on SetCCtxids 2019-04-19 11:23:35 +02:00
jl777
a209aaeeb7 if ( (json= send_curl(url,(char *)"bnbprice")) != 0 ) 2019-04-18 22:02:26 -11:00
jl777
9129c28d90 Test 2019-04-18 22:01:07 -11:00
jl777
b4ad109167 send_curl 2019-04-18 21:59:31 -11:00
jl777
fe3386f6a7 Merge pull request #1439 from jl777/dev
Dev
2019-04-18 21:19:15 -11: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
0140f176a6 Return error in else case 2019-04-18 07:16:48 -11:00
jl777
b533bc95d5 if ( (json= get_urljson(url)) != 0 ) 2019-04-18 03:55:58 -11:00
jl777
cbf2d438eb if ( (json= send_curl(url,(char *)"iex")) != 0 ) // 2019-04-18 03:53:04 -11:00
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
blackjok3r
25bf471ddd add notary pay stuff without breaking blockindex. 2019-04-17 18:36:00 +08:00
blackjok3r
ab7558ab9d inital commit for notarypay 0BR 2019-04-17 17:42:24 +08:00
blackjok3rtt
9f1c4f88e9 Merge pull request #68 from jl777/jl777
Jl777
2019-04-17 17:38:24 +08: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