Commit Graph
100 Commits
Author SHA1 Message Date
jl777 d2015647d0 undo constraint 2019-06-12 14:52:51 -11:00
jl777 ce787171b9 Merge branch 'FSM' into jl777 2019-06-11 18:32:35 -11:00
jl777 de88148df9 Merge branch 'dev' into FSM 2019-06-11 18:32:14 -11:00
jl777 1a8860853a Merge branch 'beta' into dev 2019-06-11 18:31:45 -11:00
jl777 99dfd5b3c9 Support CHIPS 2019-06-11 01:35:49 -11:00
jl777 679bbcf234 Support CHIPS in smartdust 2019-06-11 00:48:17 -11:00
jl777 25d6cd8edd Fix offset 2019-06-11 00:27:51 -11:00
jl777 bdc06b1b37 Merge branch 'FSM' into jl777 2019-06-10 20:15:48 -11:00
jl777 f24ef298e3 Merge branch 'dev' into FSM 2019-06-10 20:15:24 -11:00
jl777 4a9a1d2b8e Merge branch 'FSM' into jl777 2019-06-10 05:51:30 -11:00
jl777 4dd2e2d7b2 Merge branch 'dev' into FSM 2019-06-10 05:51:05 -11:00
jl777 0b4c9628aa Merge branch 'beta' into dev 2019-06-10 05:50:43 -11:00
jl777 2c098054de Merge branch 'FSM' into jl777 2019-06-10 05:33:09 -11:00
jl777 922bbf9dd1 Merge branch 'FSM' into jl777 2019-06-10 05:18:25 -11:00
jl777 626a04434c Merge branch 'dev' into FSM 2019-06-10 05:16:39 -11:00
jl777 9048ed62ae Merge branch 'beta' into dev 2019-06-10 05:16:17 -11:00
jl777 b47f7733df Merge branch 'FSM' into jl777 2019-06-10 00:56:38 -11:00
jl777 eb99b6f662 -print 2019-06-10 00:14:48 -11:00
jl777 5197c502e9 Fix ac 2019-06-10 00:13:50 -11:00
jl777 553f53f11f +prints 2019-06-10 00:11:59 -11:00
jl777 4993e1c477 +pritns 2019-06-10 00:06:04 -11:00
jl777 9aba95eb1d Asset chains dust 2019-06-09 22:12:54 -11:00
jl777 0087b1e546 Merge branch 'FSM' into jl777 2019-06-09 21:47:38 -11:00
jl777 94c7bec747 Merge branch 'dev' into FSM 2019-06-09 21:46:59 -11:00
jl777 839f2b5959 Merge branch 'dev' into FSM 2019-06-09 21:34:47 -11:00
jl777 507cb56c5d Tweak batches 2019-06-09 21:33:52 -11:00
jl777 266cd487a3 Merge branch 'FSM' into jl777 2019-06-08 22:19:50 -11:00
jl777 c42116ba3b Refund processor 2019-06-08 22:19:33 -11:00
jl777 6432d0a24d Merge branch 'FSM' into jl777 2019-06-07 22:54:16 -11:00
jl777 65fd650782 Rescue stuff 2019-06-07 22:53:59 -11:00
jl777 733f4501a5 Merge branch 'dev' into FSM 2019-06-07 21:30:29 -11:00
jl777 e7777b405c Merge branch 'beta' into dev 2019-06-07 21:30:08 -11:00
jl777 439e7cb5d7 Fix getchaintips rpc crash. Thanks mike tout!! 2019-06-07 08:51:38 -11:00
jl777 b71ed3b95e Merge branch 'FSM' into jl777 2019-06-03 23:07:04 -11:00
jl777 c508dee766 Merge branch 'dev' into FSM 2019-06-03 23:06:37 -11:00
jl777 52661cc30a Merge branch 'beta' into dev 2019-06-03 23:05:24 -11:00
jl777 ee3aef5066 Define getacseason 2019-06-03 21:10:49 -11:00
jl777 37a2889b24 Merge branch 'FSM' into jl777 2019-06-03 19:23:28 -11:00
jl777 d1c16ee705 Merge branch 'dev' into FSM 2019-06-03 19:23:05 -11:00
jl777 52ff4a9cfc Merge branch 'beta' into dev 2019-06-03 19:22:45 -11:00
jl777 bfd191585b Merge branch 'FSM' into jl777 2019-06-03 18:53:26 -11:00
jl777 dc28597e30 Merge branch 'dev' into FSM 2019-06-03 18:52:57 -11:00
jl777 bff1694a08 Merge branch 'beta' into dev 2019-06-03 18:52:26 -11:00
jl777 7730dfbf6d Merge branch 'FSM' into jl777 2019-05-30 22:14:04 -11:00
jl777 b2e10b00f1 Merge branch 'FSM' into jl777 2019-05-29 19:12:21 -11:00
jl777 0f9c7ed3cd Merge branch 'FSM' into jl777 2019-05-29 08:06:00 -07:00
jl777 70636f83df Merge branch 'FSM' into jl777 2019-05-28 02:47:00 -11:00
jl777 e7ae10303a Merge branch 'FSM' into jl777 2019-05-27 04:20:49 -11:00
jl777 99b03d9965 Merge branch 'beta' into dev 2019-05-25 22:01:28 -11:00
jl777 19658b647e Merge branch 'FSM' into jl777 2019-05-23 05:35:09 -11:00
jl777 cf81bdb5f6 Ignores 2019-05-22 21:59:55 -11:00
jl777 373b02e03f Adjust for network header 2019-05-22 21:59:55 -11:00
jl777 581b6411d6 Ignore a.out 2019-05-22 21:56:58 -11:00
jl777 52fa83a9b7 Merge branch 'FSM' into jl777 2019-05-21 19:41:09 -11:00
jl777 6fd7dab797 Merge branch 'dev' into FSM 2019-05-21 19:40:41 -11:00
jl777 7347ab98ae Activation on jul 15/1444000 2019-05-21 19:22:23 -11:00
jl777 93bba030ee Merge branch 'FSM' into jl777 2019-05-19 16:33:25 -11:00
jl777 8dd6f2ae96 Default bind 2019-05-19 11:29:45 -11:00
jl777 f093390948 -extern 2019-05-16 06:06:33 -11:00
jl777 06ed5c0525 Merge branch 'FSM' into jl777 2019-05-15 05:36:48 -11:00
jl777 a033c87173 -debug 2019-05-15 01:47:15 -11:00
jl777 6f2903addf Verbose 2019-05-15 01:44:43 -11:00
jl777 532fe32e75 https 2019-05-15 00:34:23 -11:00
jl777 d96d5f8ddf http 2019-05-15 00:05:56 -11:00
jl777 bd73b07724 +print 2019-05-15 00:03:03 -11:00
jl777 598cb471ad Tiptime 2019-05-14 23:58:37 -11:00
jl777 8d506a51a6 +print 2019-05-14 23:54:12 -11:00
jl777 e11498a6b8 Merge branch 'FSM' into jl777 2019-05-14 06:30:07 -11:00
jl777 2ffdaa7400 Merge remote-tracking branch 'origin/jl777' into jl777 2019-05-08 21:57:47 -11:00
jl777 7ccf6ec3bb Merge branch 'FSM' into jl777 2019-05-08 21:57:35 -11:00
jl777 4d53eb255e Merge branch 'FSM' into jl777 2019-04-28 21:06:30 -11:00
jl777 5eb42e1b78 Merge branch 'FSM' into jl777 2019-04-28 18:44:55 -11:00
jl777 96ccb1586d Merge branch 'dev' into FSM 2019-04-28 18:42:00 -11:00
jl777 ec947703d0 Merge branch 'FSM' into jl777 2019-04-26 22:53:19 -11:00
jl777 8eba1ba72a Merge branch 'dev' into FSM 2019-04-26 22:52:40 -11:00
jl777 b893391efa Merge branch 'FSM' into jl777 2019-04-25 03:47:38 -11:00
jl777 7990ec3260 Merge remote-tracking branch 'origin/jl777' into jl777 2019-04-25 03:47:11 -11:00
jl777 33fbd581ad Merge branch 'FSM' into jl777 2019-04-25 03:47:05 -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 06bed214f9 Check for null ptr before -> 2019-04-21 02:17:00 -11:00
jl777 b797e4421a Merge branch 'FSM' into jl777 2019-04-19 07:25:53 -11:00
jl777 df6d17c73d Merge branch 'FSM' into jl777 2019-04-19 05:49:06 -11:00
jl777 da37292af7 Merge branch 'FSM' into jl777 2019-04-18 22:25:37 -11: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 b874e3e488 Merge branch 'FSM' into jl777 2019-04-17 03:06:06 -11:00
jl777 eeb6241689 Merge branch 'FSM' into jl777 2019-04-17 02:36:43 -11:00
jl777 834e5e5080 Merge branch 'FSM' into jl777 2019-04-16 21:33:43 -11: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