Commit Graph
27024 Commits
Author SHA1 Message Date
DeckerSU 03794dc208 first approach to get HTTPS in libcurl work
1. libcurl.mk now changed to build against static openssl from deps.
2. but, it won't work with openssl 1.1.1a, bcz of SSL: couldn't create a context: error:00000000:lib(0):func(0):reason(0)	,
so, in test i decided to upgrade openssl to 1.1.1b.
3. original openssl.mk was with many disabled features, i enable all of them,
of course it's don't needed and we need to leave only SSL/TLS things enabled
in OpenSSL build.
4. probably i broke something in Windows and MacOS build.

This commit is only first approach to continue work.
2019-04-19 21:57:10 +03:00
jl777 b797e4421a Merge branch 'FSM' into jl777 2019-04-19 07:25:53 -11:00
jl777 ad480a67dd Merge pull request #1442 from dimxy/token-migration
Token crosschain migration support in fungible chain cluster
2019-04-19 07:25:35 -11:00
dimxy fa9ca8b430 removed test invalid return 2019-04-19 23:07:12 +05:00
jl777 df6d17c73d Merge branch 'FSM' into jl777 2019-04-19 05:49:06 -11:00
jl777 a3380794dd Merge pull request #1441 from Mixa84/FSM
Add -earlytxid param and check -ac_end,-ac_supply and -ac_perc. (#23)
2019-04-19 05:48:55 -11:00
Mihailo Milenkovic b4175592e8 Add -earlytxid param and check -ac_end,-ac_supply and -ac_perc. (#23) 2019-04-19 18:41:58 +02:00
dimxy e2fc84faac defined missing rpc createburntx 2019-04-19 19:28:48 +05:00
dimxy c3e7b1c799 corr ret true for prev tx 2019-04-19 19:16:16 +05:00
dimxy 19c4977056 test invalid on 2019-04-19 15:55:34 +05:00
dimxy 59a02a874e corr selfimport param 2019-04-19 15:27:42 +05:00
dimxy 53a7f69501 rebased onto latest FSM with gateways import 2019-04-19 15:17:47 +05:00
dimxy f9eaf192b4 burn tx isEof check added 2019-04-19 14:41:49 +05:00
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 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
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