1831 Commits

Author SHA1 Message Date
Aaron Blankstein
d8b1c977aa chore: try to speed up some integration tests 2021-06-15 16:01:12 -05:00
Aaron Blankstein
5167546ef9 Merge branch 'develop' into fix/2710-mocknet 2021-06-15 13:42:23 -05:00
pavitthrap
52c96dc945 Merge branch 'develop' into fix/2710-mocknet 2021-06-14 15:44:52 -04:00
Aaron Blankstein
c2ade99373 Merge branch 'develop' into fix/microblocks-miner-emit 2021-06-14 13:09:46 -05:00
Aaron Blankstein
06d7274354 fix: logic bug in mocknet/helium miner #2710 2021-06-14 12:04:31 -05:00
Jude Nelson
b104a74102 Merge branch 'next' into fix/1805 2021-06-14 01:52:11 -04:00
Jude Nelson
64e20a7438 refactor: sync neon integration tests with new burnchain API 2021-06-14 01:51:18 -04:00
Jude Nelson
186f1f7225 refactor: synchronize Bitcoin sync logic in the Stacks node with the new burnchain API 2021-06-14 01:51:01 -04:00
Aaron Blankstein
373ad8de13 Merge remote-tracking branch 'origin/next' into feat/2.1-pragma 2021-06-11 09:50:13 -05:00
Aaron Blankstein
43ee29709b Merge remote-tracking branch 'origin/next' into feat/stacks-2.1-initialization 2021-06-11 08:57:26 -05:00
Aaron Blankstein
ba9ed6e0c1 fix: #2644 reorder UTXO staleness and RBF-limit check 2021-06-08 11:20:19 -05:00
pavitthrap
9621e09e11 Merge branch 'develop' into fix/microblocks-miner-emit 2021-06-08 10:26:08 -04:00
Aaron Blankstein
10d8ee4676 chore: plumb changes into testnet/ 2021-06-04 12:21:31 -05:00
Aaron Blankstein
d6c6d6618c Merge branch 'develop' into feat/miner-control 2021-06-03 15:44:15 -05:00
pavitthrap
bfaa9da60c Merge branch 'develop' into fix/microblocks-miner-emit 2021-06-03 15:45:41 -04:00
Ludo Galabru
9fce0cc86f Merge branch 'master' into develop
# Conflicts:
#	testnet/stacks-node/conf/local-second-miner.toml
2021-06-02 09:39:48 -04:00
Pavitthra Pandurangan
665284981c Changed panic! to warn! statement 2021-06-01 16:40:06 -04:00
Charlie
08c4b9d61b Update configs (#2652)
* chore: update sample/example stacks-node configs and some docs

* chore: update configs

* docs: update README

* docs: update mainnet-follower-conf bitcoin properties
2021-05-27 11:56:42 -04:00
Jude Nelson
916d01aea9 fix: mine microblocks if there are no *recent* attachable blocks (i.e. less than 10 minutes present) 2021-05-26 13:58:41 -04:00
Aaron Blankstein
746ddfcd8a Merge branch 'develop' into feat/miner-control 2021-05-26 10:25:15 -05:00
Pavitthra Pandurangan
94361b37bc Switched using to using for all the burn block stats, handled getting burn block stats in the case that the parent_consensus_hash was the 2021-05-25 13:49:28 -04:00
Pavitthra Pandurangan
10f4fec4f2 Added burn block stats for new_microblock event; refactored variable names for burn block stats for the new_block event 2021-05-24 15:19:22 -04:00
pavitthrap
acd4a0dc4b Merge branch 'develop' into feat/prom-miners 2021-05-24 11:50:22 -04:00
Pavitthra Pandurangan
955cffc851 Merge branch 'fix/microblocks-miner-emit' of https://github.com/blockstack/stacks-blockchain into fix/microblocks-miner-emit 2021-05-21 17:54:15 -04:00
Pavitthra Pandurangan
bce80ca4f1 Added prev burn block stats to the new_block event 2021-05-21 17:53:33 -04:00
Matthew Little
7022cf929f fix: #2668 microblock data missing from event emitter while syncing 2021-05-21 22:06:42 +02:00
Pavitthra Pandurangan
7efa0fa833 Simplified logic for setting the global burnchain signer, moved all miner metric code into prometheus feature blocks 2021-05-20 18:23:01 -04:00
Pavitthra Pandurangan
0da6ba09f1 test: added test to ensure microblock hashes were properly added to the mb event 2021-05-19 19:12:42 -04:00
Pavitthra Pandurangan
67e116e5e2 Addressed feedback: dealt with out of bounds errors, removed style change in consensus crit code, use lazy_static instead of unsafe block 2021-05-19 16:56:29 -04:00
Ludo Galabru
119997119f Merge branch 'develop' into fix/mocknet-endpoint 2021-05-19 14:37:38 -04:00
Pavitthra Pandurangan
d4f713bac3 Feat: added mining-related prometheus stats 2021-05-19 13:53:13 -04:00
Matthew Little
a37debc96b feat: include microblock parent hash in /new_microblocks event paylaod 2021-05-19 17:54:11 +02:00
Ludo Galabru
bde0aebd28 Merge branch 'develop' into fix/2645 2021-05-19 11:06:42 -04:00
Ludo Galabru
6ee297b515 Merge branch 'develop' into fix/block-limit 2021-05-19 09:26:17 -04:00
Jude Nelson
3ccf5d5243 fix: simplify comparison logic 2021-05-18 15:52:04 -04:00
Jude Nelson
16cc445d42 fix: prioritize smallest UTXO first if there are two equally-recent UTXOs 2021-05-18 15:04:05 -04:00
Jude Nelson
11ac0dff1e feat: add a test for the fix to #2645 2021-05-18 14:56:55 -04:00
Jude Nelson
149c82b4e9 feat: use the most-recently-produced UTXO when building a transaction, as opposed to the highest-value. This addresses #2645 without requiring a UTXO consolidation on the miner's part. 2021-05-18 14:56:00 -04:00
Aaron Blankstein
97dff22b7f Merge branch 'develop' into feat/key-commands 2021-05-18 11:32:34 -05:00
Ludo Galabru
ddb1c1d05c Merge branch 'develop' into fix/block-limit 2021-05-18 12:29:44 -04:00
Aaron Blankstein
d6e195b04d Merge branch 'develop' into next 2021-05-18 09:41:52 -05:00
Ludo Galabru
9533c125b6 Merge branch 'develop' into fix/local-setup 2021-05-18 10:40:27 -04:00
Ludo Galabru
55a8f1e208 fix: block limit should not be configurable 2021-05-18 10:14:10 -04:00
Aaron Blankstein
33d3a2491a formatting help command 2021-05-18 08:34:29 -05:00
Aaron Blankstein
44e0997eeb feat: add key output commands to stacks-node 2021-05-18 08:31:16 -05:00
Pavitthra Pandurangan
466fe4344a Switched pox constants from optional to required 2021-05-17 17:11:13 -04:00
Matthew Little
5dd4172d75 feat: emit microblock header hash to event observer, required for micro-fork detection 2021-05-13 22:03:28 +02:00
Matthew Little
14c3ede3d2 fix: ensure microblocks mined by the node itself are emitted to the event observer 2021-05-13 20:26:16 +02:00
Reed Rosenbluth
2ceb461e0d style: rustfmt 2021-05-12 16:31:57 -04:00
Reed Rosenbluth
97e80beb6c refactor: codec module 2021-05-12 16:31:57 -04:00