2060 Commits

Author SHA1 Message Date
Aaron Blankstein
e0de91f269 Merge remote-tracking branch 'origin/master' into merge/master-develop 2023-03-21 10:45:02 -05:00
Aaron Blankstein
ac35cde2c3 fix: incorporate unlocks in mempool admitter, #3623 2023-03-20 10:21:31 -05:00
Aaron Blankstein
f6a48d02bf fix: reduce chain-liveness poll frequency 2023-03-14 13:45:38 -05:00
CharlieC3
753aa1a224 chore: update default seed nodes and example config files 2023-03-14 10:11:20 -04:00
Igor Sylvester
a9f35ce799 Merge branch 'develop' into feat/3595 2023-03-07 12:14:42 -06:00
Jude Nelson
58cc729d75 fix: always_use_affirmation_maps defaults to false 2023-03-03 21:13:04 -05:00
Jude Nelson
969ffb4317 chore: fix compiler warnings 2023-03-01 13:12:55 -05:00
Jude Nelson
e1de15b25f chore: test booting up and mining with a custom wallet name 2023-03-01 13:12:44 -05:00
Jude Nelson
89e0bcaf5e feat: use config.burnchain.wallet_name instead of "" when we're actually dealing with wallet names 2023-03-01 13:12:26 -05:00
Aaron Blankstein
cb9f8dca0f docs: add more rustdocs 2023-02-28 17:48:54 -06:00
Stjepan Golemac
9800e7e8a6 fix: Resolve conflicts and the remaining two errors 2023-02-24 09:28:39 +01:00
Aaron Blankstein
04514c4ee4 Merge branch 'develop' into feat/atlas-tolerance-3082 2023-02-22 13:40:33 -06:00
Jude Nelson
ae050a24da Merge branch 'develop' into feat/mocknet-next 2023-02-15 18:00:23 +00:00
Jude Nelson
6ac6ae6c60 fix: transfer_stx, not TransferStx 2023-02-14 22:23:33 -05:00
Jude Nelson
fa63a49c11 Merge branch 'develop' into feat/atlas-tolerance-3082 2023-02-14 16:36:01 +00:00
Yuanhai He
91c8a4a655 Merge branch 'develop' into feat/mocknet-next 2023-02-10 22:02:42 +08:00
Aaron Blankstein
97ee5f6b33 cleanup warns 2023-02-08 11:49:48 -06:00
Aaron Blankstein
f823c3fe87 Merge and fix conflicts from remote-tracking branch 'origin/develop' into feat/atlas-tolerance-3082 2023-02-08 11:40:33 -06:00
bestmike007
0174151f6c chore: transition to epoch 2.05 before 2.1
Signed-off-by: bestmike007 <i@bestmike007.com>
2023-02-08 03:03:49 +00:00
bestmike007
64f1567daa chore: update mocknet config to disable public ip address discovery
Signed-off-by: bestmike007 <i@bestmike007.com>
2023-02-08 03:03:42 +00:00
bestmike007
e9b8ba533a feat: support stacks 2.1 in mocknet controller
Signed-off-by: bestmike007 <i@bestmike007.com>
2023-02-08 03:03:33 +00:00
Jude Nelson
7e01c57942 Merge branch 'develop' into rft_vec_to_sli 2023-02-07 16:10:42 +00:00
Pavitthra Pandurangan
2b9565fef6 cleanup 2023-02-02 17:25:44 -05:00
Pavitthra Pandurangan
487747abb2 added specific json serialization function 2023-02-02 17:16:18 -05:00
Jude Nelson
32d8a83ae7 Merge branch 'develop' into rft_vec_to_sli 2023-02-02 19:01:17 +00:00
Jude Nelson
8cdf09d17e Merge branch 'develop' into btc-tx-more-info 2023-02-02 17:13:29 +00:00
Don Park
d5f393f939 Merge branch 'develop' into feat/cur_block_pox_contract-2 2023-02-01 15:10:01 -08:00
Don Park
fffaf8f3bf update transition_removes_pox_sunset to accept pox-2 at v1_unlock_height+1 2023-02-01 15:08:53 -08:00
Don Park
7a360d5488 remove test_v1_pox_default_contract 2023-02-01 15:02:51 -08:00
Don Park
164549767e use neon_integrations::get_pox_info 2023-02-01 14:26:04 -08:00
Pavitthra Pandurangan
f36473a444 added docs, serialization functions, tests, and json formatting for btc ops is readable 2023-02-01 17:03:11 -05:00
Pavitthra Pandurangan
3d2b3e56b2 wip - add example of stx op to md file 2023-02-01 17:03:04 -05:00
Pavitthra Pandurangan
06cad4adbb changed parameter name 2023-02-01 17:02:49 -05:00
Pavitthra Pandurangan
57436f0dcb added burnchain_op field to transaction event payload + test 2023-02-01 17:02:15 -05:00
Jude Nelson
9e3b34a2a0 Merge branch 'develop' into feat/test-v1-unlock-height 2023-02-01 14:11:15 -05:00
Jude Nelson
df038a11f8 fix: add test for what happens if there's a gap in Stacks blocks 2023-02-01 14:08:15 -05:00
Jude Nelson
913c45c135 fix: uncomment and finish the integration test that confirms that we can begin pox-2 at the end of a reward cycle and unlock pox-1 at the start of the next, and that stacking proceeds through the v1 unlock reward cycle 2023-01-31 17:41:25 -05:00
Jude Nelson
494a0046eb fix: it's safe to instantiate pox-2 at the end of a prepare phase 2023-01-31 17:41:12 -05:00
Jude Nelson
ae0af594c0 Merge branch 'develop' into feat/cur_block_pox_contract-2 2023-01-31 21:06:28 +00:00
Jude Nelson
c61e08f303 Merge branch 'develop' into trait-arg-check 2023-01-31 21:05:23 +00:00
Don Park
7e4d6faf31 test pox_contract value for pox-2 after v1_unlock_height 2023-01-31 12:46:56 -08:00
Asim Mehmood
6376726be3 refactor: make cloning caller responsibility 2023-01-30 16:15:16 +05:00
Asim Mehmood
f850916760 fix: stacks/common 2023-01-27 19:05:44 +05:00
Brice Dobry
be86fa7f86 chore: add comments and clean up code 2023-01-25 17:46:06 -05:00
Brice Dobry
2d7c8a4355 Merge branch 'develop' into trait-arg-check 2023-01-25 15:58:04 -05:00
Aaron Blankstein
31d79ad122 test: add assertions to epoch_21::trait_invocation_cross_epoch 2023-01-24 16:06:19 -06:00
Aaron Blankstein
9fae1cfa20 test: add integration test work-in-progress 2023-01-24 15:50:17 -06:00
Jude Nelson
cd27b1ce72 Merge branch 'develop' into fix/3520 2023-01-24 14:12:25 -05:00
Jude Nelson
fb9a08f6ab chore: API sync to chain liveness thread 2023-01-24 10:32:21 -05:00
Jude Nelson
003b0878d7 chore: expose bitcoin indexer to p2p thread 2023-01-24 10:32:10 -05:00