2618 Commits

Author	SHA1	Message	Date
Jude Nelson	00137eb4a0	Merge branch 'master' into fix/neon-fixes-20200507	2020-05-07 15:11:16 -04:00
Jude Nelson	91344632e3	do a blocking-send to the relayer from the p2p thread if the network result contains blocks, microblocks, or transactions. also, restore poll interval to 5s, but throttle up to 10ms if there are available blocks to process (so the relayer keeps getting woken up)	2020-05-07 15:10:22 -04:00
Jude Nelson	6deb610c26	increase burnchain timeout to 300	2020-05-07 15:10:02 -04:00
Ludo Galabru	4ede6297a8	Merge pull request #1545 from blockstack/fix/retry_count ... Event dispatcher - get rid of the retry count	2020-05-07 14:51:28 -04:00
Ludo Galabru	cd506f664f	Get rid of the retry count	2020-05-07 14:25:14 -04:00
Ludo Galabru	1e3766aa0f	Get rid of the retry count	2020-05-07 14:20:57 -04:00
Aaron Blankstein	808abdedaa	track epoch size in microblock builder	2020-05-07 09:08:47 -05:00
Aaron Blankstein	227ed69b79	merge changes	2020-05-07 08:07:35 -05:00
Aaron Blankstein	f7b911fc32	Merge branch 'master' into feat/neon-microblocks	2020-05-06 16:36:16 -05:00
Aaron Blankstein	9891fcd3a0	Merge branch 'master' into fix/1540	2020-05-06 16:00:59 -05:00
Ludo Galabru	9b8720dde7	Merge branch 'master' into fix/utxo	2020-05-06 13:50:18 -04:00
Ludo Galabru	8119591a92	Fix cargo package name	2020-05-05 22:10:27 -04:00
Ludo Galabru	57d3bcfbfb	Merge branch 'master' into feature/bitcoin-neon-controller	2020-05-05 15:38:33 -04:00
Ludo Galabru	878f09f9ad	Merge branch 'master' into feature/bitcoin-neon-controller	2020-05-05 11:42:48 -04:00
Ludo Galabru	577b321a4d	Merge branch 'master' into feature/bitcoin-neon-controller	2020-05-04 16:14:15 -04:00
Ludo Galabru	06b14c5ad1	Strip prometheus changes that got lost	2020-05-01 17:51:03 -04:00
Ludo Galabru	494720fea6	Fix build warning	2020-05-01 17:41:03 -04:00
Ludo Galabru	7a45b32ccb	Port burnchain-neon-controller	2020-05-01 17:05:57 -04:00