1831 Commits

Author SHA1 Message Date
Ludovic Galabru
ec507d7c59 Filling the blanks 2020-09-13 23:54:18 -04:00
Ludovic Galabru
43e86cca73 Merge branch 'feat/pox-stacks-lockup-change-requests' into feat/pox-recipient-sets+pox-stacks-lockup
# Conflicts:
#	sip/sip-007-stacking-consensus.md
#	testnet/stacks-node/src/neon_node.rs
2020-09-10 23:10:55 -04:00
Pascal
de74417309 fix secp256k1 upgrade 2020-09-09 21:16:24 -07:00
Ludovic Galabru
4377ea7f8b Fix integration test 2020-09-09 10:10:03 -04:00
Pascal
80f70742d4 remove older, unused secp256k1 crate 2020-09-08 23:49:16 -07:00
Pascal
38d33bb5f5 update secp256k1 to latest version - 0.17.2 2020-09-08 23:49:16 -07:00
Pascal
53cf631279 Merge pull request #1848 from psq/feat/key-1615
Implement #1615 by allowing key reuse
2020-09-08 23:46:25 -07:00
Aaron Blankstein
21e9272d3a Merge branch 'next' into fix/1825-marf-tx+next 2020-09-04 16:22:37 -05:00
Aaron Blankstein
c75e657d90 integrate changes into stacks-node 2020-09-03 15:22:05 -05:00
Pascal
fc34ac06bb check registered key used is the same for all blocks 2020-09-02 22:05:11 -07:00
Ludo Galabru
2400fd1ab7 Fix integration test 2020-09-03 00:52:23 -04:00
Ludo Galabru
330426baf0 Fix typo 2020-09-02 16:37:56 -04:00
Ludo Galabru
f8dc3d8f55 Revisit balance storage 2020-09-02 16:30:22 -04:00
Aaron Blankstein
4a6a38a308 address first set of comments 2020-09-02 15:06:41 -05:00
Aaron Blankstein
9df5d305a4 Merge branch 'next' into feat/pox-recipient-sets 2020-09-02 14:41:05 -05:00
Pascal
d60fe4e9ed cleanup comment 2020-09-02 00:43:02 -07:00
Pascal
573647ce0b mocknet, adjust integration tests 2020-09-02 00:40:13 -07:00
Aaron Blankstein
203356db9e Merge pull request #1820 from psq/fix/stj-92
fix for clarity-transaction-js-92
2020-09-01 16:04:43 -05:00
Pascal
1a068a8e5a implement #1615 by allowing key reuse, and only registering a key once in the node 2020-09-01 01:13:22 -07:00
Pascal
973884341d check trait compliance 2020-08-28 02:10:18 -07:00
Jude Nelson
27381d64b1 fix failing tests 2020-08-26 20:57:05 -04:00
Ludo Galabru
221661cd7b Avoid no-named indexed access syntax, fix warning 2020-08-26 18:07:13 -04:00
Ludo Galabru
0e689e1e90 Add krypton to supported modes 2020-08-26 16:58:46 -04:00
Jude Nelson
ab6fb5d4ce Merge branch 'next' into feat/pox-stacks-lockup 2020-08-26 15:10:39 -04:00
Jude Nelson
43c3b38913 API sync -- PoxStateDB --> BurnStateDB 2020-08-26 15:07:32 -04:00
Ludo Galabru
67023d84e7 Merge branch 'next' into feat/xenon-compatibility
# Conflicts:
#	testnet/stacks-node/src/main.rs
#	testnet/stacks-node/src/run_loop/neon.rs
2020-08-26 15:01:26 -04:00
Ludo Galabru
7dceb6aa46 Fix test 2020-08-26 13:53:09 -04:00
Ludo Galabru
2dabe9b578 Handle Krypton compatibility 2020-08-26 11:50:22 -04:00
Pascal
09cfc48a8c fix remaining burn_hash->consensus_hash missed by the rebase 2020-08-24 20:38:22 -07:00
Pascal
859d7e26b6 revert suggested fix, add failing test 2020-08-24 20:16:43 -07:00
Aaron Blankstein
9364080fee Merge branch 'next' into feat/pox-recipient-sets 2020-08-24 14:43:25 -05:00
Aaron Blankstein
b50ab846aa implement picking recipient set in neon_node 2020-08-24 14:33:27 -05:00
Ludo Galabru
3e9b430b8d Merge branch 'next' into feat/clarity-strings 2020-08-23 22:59:57 -04:00
Ludo Galabru
1189bd3021 Fix integration test 2020-08-19 14:13:43 -04:00
Ludo Galabru
932acb8f86 Required adjustments for xenon 2020-08-19 13:51:17 -04:00
Ludo Galabru
b168a9df92 Merge branch 'next' into feat/clarity-strings
# Conflicts:
#	testnet/stacks-node/src/tests/bitcoin_regtest.rs
#	testnet/stacks-node/src/tests/mod.rs
2020-08-18 09:15:28 -04:00
Aaron Blankstein
b9f6a716fe correct comments of parent_consensus_hash 2020-08-12 11:24:49 -05:00
Jude Nelson
c9cea61b82 Merge branch 'next' into feat/pox-stacks-lockup 2020-08-11 21:15:55 -04:00
Aaron Blankstein
9a38e87aac Merge pull request #1787 from blockstack/feat/chain-view-integration
Chains Coordinator Integration
2020-08-11 09:20:54 -05:00
Aaron Blankstein
2f9467106b update some rustdoc comments, better cleanup of bitcoin regtest controller after coordinator stops 2020-08-07 08:54:51 -05:00
Aaron Blankstein
d1a5c03ea3 goodbye singletons 2020-08-06 22:32:29 -05:00
Aaron Blankstein
09a44c010e mark process_blocks_at_tip cfg(test), fix comment typo 2020-08-06 14:27:40 -05:00
Ludo Galabru
1ec1af406f Fix integration test 2020-08-06 14:35:41 -04:00
Jude Nelson
f160e09972 fix build 2020-08-05 17:34:57 -04:00
Jude Nelson
3be5479901 remove unused var 2020-08-05 16:03:20 -04:00
Aaron Blankstein
98edb3cd93 remove blocks_processed from net_relay receipts responses, rename bitcoin_controller.resync() 2020-08-05 14:19:14 -05:00
Aaron Blankstein
a0edc182f3 pass Burnchain object into run() method 2020-08-05 13:41:09 -05:00
Aaron Blankstein
71116e1c2c make coord channel singleton more conventional, factor it away from the coordinator impl 2020-08-05 13:21:20 -05:00
Jude Nelson
c890a686c4 pull through the PoxStateDB to the right places 2020-08-05 14:20:56 -04:00
Jude Nelson
a2cd2029ec Merge branch 'next' into feat/pox-stacks-lockup 2020-08-05 03:04:56 -04:00