Aaron Blankstein
2117fe7a9d
test: use wait_for_microblocks rather than a wait_ms
2021-06-16 12:23:11 -05:00
Aaron Blankstein
16a20520f9
chore: remove infinite loop in microblock_integration test
2021-06-16 09:39:23 -05:00
Aaron Blankstein
d8b1c977aa
chore: try to speed up some integration tests
2021-06-15 16:01:12 -05:00
Aaron Blankstein
f14d11eb02
Merge pull request #2709 from blockstack/chore/remove-tini
...
Chore: remove tini dependency
2021-06-15 11:49:23 -05:00
Jude Nelson
3db274c4e6
Merge branch 'develop' into chore/remove-tini
2021-06-15 15:30:11 +00:00
Gregory Coppola
b86576c89f
Merge pull request #2676 from blockstack/fix/string-docs
...
[docs] Add some string-ascii and string-utf8 types to the docs
2021-06-14 18:53:27 -05:00
Aaron Blankstein
d7ea4772d2
Merge branch 'develop' into chore/remove-tini
2021-06-14 17:19:38 -05:00
Greg Coppola
105cf37db3
Removed a trailing space character.
2021-06-14 16:23:52 -05:00
pavitthrap
5929f3f823
Merge branch 'develop' into fix/string-docs
2021-06-14 16:59:32 -04:00
pavitthrap
9ca70dca36
Merge pull request #2653 from blockstack/fix/microblocks-miner-emit
...
fix: emit microblocks mined by the node itself, add microblock hashes
2021-06-14 16:59:12 -04:00
Pavitthra Pandurangan
1efb4a9e3b
Removed a TODO, the question it relates to is now in issue #2712
2021-06-14 14:53:15 -04:00
Aaron Blankstein
c2ade99373
Merge branch 'develop' into fix/microblocks-miner-emit
2021-06-14 13:09:46 -05:00
Aaron Blankstein
a1ca772ab0
Merge branch 'develop' into chore/remove-tini
2021-06-14 13:07:14 -05:00
Aaron Blankstein
cc0ba62319
Merge pull request #2694 from blockstack/fix/2644-rbf-check
...
Fix : #2644 reorder UTXO staleness and RBF-limit check
2021-06-14 13:05:21 -05:00
Greg Coppola
ab21f2a2cd
Reverting files to the 'develop' branch versions
2021-06-14 11:53:50 -05:00
Greg Coppola
1030b75364
Trying to rever CHANGELOG.md
2021-06-14 11:52:50 -05:00
Greg Coppola
662fca91fb
removed some files that aren't in 'develop'
2021-06-14 11:48:42 -05:00
Greg Coppola
66ba215d67
Merge branch 'fix/string-docs' of github.com:blockstack/stacks-blockchain into fix/string-docs
2021-06-14 11:46:54 -05:00
Greg Coppola
f24da4b8c5
Fixed some typos
2021-06-14 11:46:36 -05:00
Greg Coppola
4984611c1e
Fixed a vm:docs test case
2021-06-14 11:38:54 -05:00
Aaron Blankstein
b076b8c95b
chore: remove tini dependency
2021-06-14 11:02:51 -05:00
Jude Nelson
865d9568e5
Merge branch 'develop' into fix/2644-rbf-check
2021-06-14 15:13:25 +00:00
Jude Nelson
836ea7037b
Merge branch 'develop' into fix/string-docs
2021-06-14 15:12:57 +00:00
Aaron Blankstein
270a697a74
Merge pull request #2592 from blockstack/feat/clar-coverage
...
Add lcov compatible coverage reporting to clarity-cli
2021-06-14 09:45:22 -05:00
Pavitthra Pandurangan
f60f0c84e4
Added new-microblocks event to event dispatcher docs
2021-06-09 17:23:56 -04:00
Aaron Blankstein
d0ca6abd20
Merge branch 'develop' into feat/clar-coverage
2021-06-09 15:22:00 -05:00
Greg Coppola
f490959d78
Addressing comments by @pavitthrap
2021-06-08 17:21:06 -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
Greg Coppola
296cd72400
Re-worked the types and signatures
...
Various changes to the focus functions were made for clarity and consistency.
2021-06-07 13:19:10 -05:00
Greg Coppola
f1a254601d
Fixed one more signature
...
This changes a signature that antedates this PR to be
more consistent.
2021-06-07 12:23:15 -05:00
Greg Coppola
96e9e754bc
Fixed some signatures
...
Some signatures were inconsistent with the input/output types.
2021-06-07 12:19:38 -05:00
Greg Coppola
6a81b0dfad
Ran 'cargo fmt'
2021-06-07 12:14:33 -05:00
Greg Coppola
5063aaf1ad
Use a virtual type 'sequence' to condense complicated disjoined types
...
Instead of having long lists of disjoined types, e.g.,
buff|(list A)|string-ascii|string-utf8
We now condense these to being a 'virtual' type called 'sequence',
which doesn't actually exist in the Clarity type hierarchy,
but is used in the docs, and which is explained in each description
in which it is used.
2021-06-07 12:11:29 -05:00
Greg Coppola
3f6e90ab5c
Addressed failing tests
2021-06-04 13:16:55 -05:00
Greg Coppola
9913e4a3ac
Addressed comments.
2021-06-04 12:52:46 -05:00
Greg Coppola
8527928830
running format
2021-06-04 12:15:20 -05:00
Aaron Blankstein
c40a15f79a
Merge pull request #2647 from blockstack/feat/miner-control
...
Private local testnet support
2021-06-04 11:35:02 -05:00
Aaron Blankstein
b923c0c816
Merge branch 'develop' into feat/miner-control
2021-06-04 10:36:42 -05:00
Reed Rosenbluth
30530b6a97
feat: make eval_all function public ( #2689 )
2021-06-04 10:19:35 -04: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
Aaron Blankstein
23530c9389
Merge remote-tracking branch 'origin/develop' into feat/clar-coverage
2021-06-03 09:25:11 -05:00
Aaron Blankstein
0326386bbc
Merge branch 'develop' into feat/clar-coverage
2021-06-03 09:24:01 -05:00
Greg Coppola
afdd1bbbd3
added concat example
2021-06-02 17:32:26 -05:00
Greg Coppola
e3636e8459
added all the different examples
2021-06-02 17:29:47 -05:00
Greg Coppola
2d8bb96b6e
added some additional examples
2021-06-02 17:17:17 -05:00
Greg Coppola
990f577098
Merge branch 'master' into fix/string-docs
2021-06-02 16:08:50 -05:00
Ludo Galabru
85f07f1aa7
Merge pull request #2665 from blockstack/develop
...
Release 2.0.11.1.0
2021-06-02 16:31:12 -04:00
Ludo Galabru
ddc0a29a06
Merge pull request #2688 from blockstack/feat/update-develop
...
Update develop with latest master
2021-06-02 13:58:18 -04:00
