Commit Graph

19363 Commits

Author SHA1 Message Date
Jude Nelson
37c7e12c84 Merge branch 'develop' into feat/cur_block_pox_contract-2 2023-02-02 04:14:14 +00:00
Brice Dobry
ac77ccf3e3 Merge pull request #3536 from stacks-network/feat/abi-add-epoch
feat: add epoch to abi RPC endpoint
2023-02-01 21:04:16 -05: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
Brice Dobry
10a5c6c809 Merge branch 'develop' into feat/abi-add-epoch 2023-02-01 16:56:28 -05:00
Brice Dobry
0143cde633 fix: add epoch to expected output in tests 2023-02-01 16:55:29 -05:00
Jude Nelson
c169579571 Merge pull request #3549 from stacks-network/feat/test-v1-unlock-height
[testing] Add integration test to verify that v1 unlock height and epoch 2.1 work as expected
2023-02-01 21:48:10 +00:00
Jude Nelson
9e3b34a2a0 Merge branch 'develop' into feat/test-v1-unlock-height 2023-02-01 14:11:15 -05:00
Jude Nelson
bdeb2c040e fix: run new test in CI 2023-02-01 14:08:38 -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
Aaron Blankstein
b971cd42ea chore: fix test setup after merge 2023-02-01 13:04:24 -06:00
Jude Nelson
c95e4c2a1a Merge branch 'develop' into feat/abi-add-epoch 2023-02-01 02:21:17 +00:00
Jude Nelson
bb965af42d Merge pull request #3522 from stacks-network/trait-arg-check
Fix bug with handling 2.05 trait in 2.1
2023-02-01 02:20:49 +00:00
Jude Nelson
6c8845ea7f fix: add new test to CI 2023-01-31 18:15:35 -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
Jude Nelson
80e60b6353 Merge branch 'develop' into feat/abi-add-epoch 2023-01-31 21:05:07 +00:00
Jude Nelson
6df9c78d57 Merge pull request #3524 from stacks-network/fix/3520
Fix/3520
2023-01-31 21:04:45 +00:00
Don Park
7e4d6faf31 test pox_contract value for pox-2 after v1_unlock_height 2023-01-31 12:46:56 -08:00
Don Park
61e2a407ba report the pox_contract for the current block instead of the current reward cycle 2023-01-31 12:38:53 -08:00
Jude Nelson
09afa45ff1 Merge branch 'develop' into trait-arg-check 2023-01-31 18:47:13 +00:00
Jude Nelson
f50c77d0d8 Merge branch 'develop' into fix/3520 2023-01-31 18:46:24 +00:00
Aaron Blankstein
44ac57b4d1 Merge pull request #3543 from stacks-network/fix/3541-non-recursing-parse
2.1: Eliminate recursion in `parse_list` and `parse_tuple`
2023-01-31 12:28:26 -06:00
Jude Nelson
5e643c2d59 Merge pull request #3528 from stacks-network/fix/3527
Fix/3527
2023-01-31 17:34:48 +00:00
Aaron Blankstein
63eab619e6 refactor: add fallible peek_last_token() 2023-01-31 09:37:45 -06:00
Brice Dobry
70d72a9922 feat: canonicalize all types in ContractAnalysis
For future compatibility, canonicalize all types in the
`ContractAnalysis` structure, not just the outward facing ones.
2023-01-30 21:35:03 -05:00
Jude Nelson
6e132755f6 Merge branch 'fix/3520' into fix/3527 2023-01-30 17:48:30 -05:00
Jude Nelson
d88fab33bc Merge branch 'develop' into fix/3520 2023-01-30 17:48:19 -05:00
Jude Nelson
ea492102fa Merge branch 'fix/3520' into fix/3527 2023-01-30 17:47:16 -05:00
Jude Nelson
e2ef0e1691 fix: add test coverage for Uint256 increment() 2023-01-30 17:46:43 -05:00
Jude Nelson
9b0989bd94 fix: add test coverage for the case when there is a burnchain fork that includes the same block-commit tx 2023-01-30 17:46:22 -05:00
Aaron Blankstein
ee72c0f5b6 Merge branch 'fix/3541-non-recursing-parse' of github.com:blockstack/stacks-blockchain into fix/3541-non-recursing-parse 2023-01-30 16:33:13 -06:00
Aaron Blankstein
523e2d4ef4 ci: do not fail ci if codecov upload fails 2023-01-30 16:33:04 -06:00
Aaron Blankstein
2baa69340b chore: fix typo in rustdoc
Co-authored-by: Brice Dobry <brice@hiro.so>
2023-01-30 14:15:48 -06:00
Jude Nelson
e4611ea851 fix: delete unused constants 2023-01-30 14:56:55 -05:00
Jude Nelson
6c77464581 fix: burnchain operations are all keyed by (txid, burn_header_hash). Add test coverage to ensure that if there's a burnchain fork, we preserve both forks' burnchain ops 2023-01-30 14:56:13 -05:00
Aaron Blankstein
b7f5f50a2f chore: add more detail to comments 2023-01-30 12:52:12 -06:00
Aaron Blankstein
f16c48286a fix: #3541 by eliminating recursion in parse_list + parse_tuple 2023-01-30 12:37:56 -06:00
Brice Dobry
254990f613 feat: add epoch to abi RPC endpoint
It can be useful for clients to know during which epoch a contract was
published. This was a specific request from the Clarinet team.
2023-01-27 08:44:45 -05:00
Brice Dobry
b1343ea550 refactor: delete AnalysisDatabase::get_map_type
This method should not be used anywhere (and it is not), so let's delete
it!
2023-01-26 16:50:26 -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
857ab1c773 use unwraps in test 2023-01-25 14:53:13 -06:00
Brice Dobry
dcf783cf6e test: more testing of traits across epochs 2023-01-25 15:30:42 -05:00
Aaron Blankstein
4295c62e27 test: add another clarity_vm::test::contracts test for stored principals 2023-01-25 14:16:20 -06:00
pavitthrap
5ac386c048 Merge pull request #3523 from stacks-network/fix/remove-idea
fix: Remove `.idea` directory which was added by mistake, add to .gitignore
2023-01-25 14:47:42 -05:00