Commit Graph

28226 Commits

Author SHA1 Message Date
jl777
e8771704e0 Merge pull request #1448 from letolabs/stdoutspam
Reduce unnecessary warnings to STDOUT
2019-04-21 04:49:21 -11:00
Jonathan "Duke" Leto
74b2563334 Reduce unnecessary warnings to STDOUT 2019-04-21 07:58:05 -07:00
jl777
25cd593f95 Merge pull request #1447 from jl777/jl777
Jl777
2019-04-21 02:42:37 -11:00
jl777
4889ceebb6 Merge branch 'FSM' into jl777 2019-04-21 02:42:10 -11:00
jl777
0b66a88ba2 int32_t komodo_blockheight(uint256 hash); 2019-04-21 02:40:49 -11:00
jl777
70015ce70d int32_t komodo_blockheight(uint256 hash); 2019-04-21 02:37:51 -11:00
jl777
124156f956 int32_t komodo_blockheight(uint256 hash); 2019-04-21 02:36:46 -11:00
jl777
f79d72fb94 Include file 2019-04-21 02:34:31 -11:00
jl777
564da3c982 Change mapblockindex[] into function calls with guards 2019-04-21 02:33:31 -11:00
jl777
6058c87f3f Merge pull request #1446 from jl777/jl777
Jl777
2019-04-21 02:18:19 -11:00
jl777
06bed214f9 Check for null ptr before -> 2019-04-21 02:17:00 -11:00
jl777
db2cf15b85 Merge pull request #1445 from blackjok3rtt/jl777
fix two bugs for Alright
2019-04-20 18:49:08 -11:00
blackjok3r
d16cdf5538 Add -testmode command line arg 2019-04-21 13:05:39 +08:00
blackjok3r
82e6cd0f93 fix two bugs for Alright 2019-04-21 11:48:16 +08:00
blackjok3r
7e173d3c49 Merge branch 'jl777-dev' into dev
x
2019-04-20 22:52:39 +08:00
blackjok3r
b7772e39d5 Merge branch 'dev' of https://github.com/jl777/komodo into jl777-dev
x
2019-04-20 22:52:18 +08:00
jl777
ce876219e7 Merge pull request #1443 from blackjok3rtt/jl777
add last of paymentsCC valdiation
2019-04-20 00:32:19 -11:00
blackjok3r
fea2b66581 add validation for OP_RETURN to payments CC. Enable ccvoutopret for payments fund. 2019-04-20 19:29:16 +08:00
blackjok3rtt
a44390244c Merge pull request #101 from KMDLabs/mastertest
Mastertest
2019-04-20 13:15:24 +08:00
blackjok3rtt
9900063ced Merge pull request #100 from blackjok3rtt/newLABS
New labs
2019-04-20 13:12:23 +08:00
blackjok3rtt
d12fb49e80 Merge pull request #70 from jl777/jl777
Jl777
2019-04-20 11:13:56 +08:00
blackjok3rtt
e36ef072c9 Merge pull request #69 from jl777/jl777
Merge token back down
2019-04-20 10:02:14 +08:00
DeckerSU
2f19aeaa4a + debug (ssl and curl version printout) 2019-04-19 22:01:54 +03:00
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
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