Skip to content

Commit b013afc

Browse files
authored
Merge pull request #1258 from hirosystems/chore/merge-master
merge master into develop
2 parents 67845e4 + ff25ae0 commit b013afc

17 files changed

+431
-58
lines changed

CHANGELOG.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,38 @@
1+
## [4.1.1](https://github.com/hirosystems/stacks-blockchain-api/compare/v4.1.0...v4.1.1) (2022-08-03)
2+
3+
4+
### Bug Fixes
5+
6+
* include `index_block_hash` in `/block` ([#1253](https://github.com/hirosystems/stacks-blockchain-api/issues/1253)) ([8cd7606](https://github.com/hirosystems/stacks-blockchain-api/commit/8cd7606797bf1b744441d68b3db834fd11c25bfa))
7+
8+
# [4.1.0](https://github.com/hirosystems/stacks-blockchain-api/compare/v4.0.4...v4.1.0) (2022-07-07)
9+
10+
11+
### Features
12+
13+
* add cache control to `/extended/v1/tx/:tx_id` ([#1229](https://github.com/hirosystems/stacks-blockchain-api/issues/1229)) ([8d5ca2c](https://github.com/hirosystems/stacks-blockchain-api/commit/8d5ca2cce558f7f849fe3837930f66943c0738a7))
14+
15+
## [4.0.4](https://github.com/hirosystems/stacks-blockchain-api/compare/v4.0.3...v4.0.4) (2022-06-23)
16+
17+
18+
### Bug Fixes
19+
20+
* arm64-alpine image, bump stacks-encoding-native-js [#1217](https://github.com/hirosystems/stacks-blockchain-api/issues/1217) ([#1220](https://github.com/hirosystems/stacks-blockchain-api/issues/1220)) ([d49f007](https://github.com/hirosystems/stacks-blockchain-api/commit/d49f007b6e099cf9bc2ba0a98798e9c431af09c7))
21+
22+
## [4.0.3](https://github.com/hirosystems/stacks-blockchain-api/compare/v4.0.2...v4.0.3) (2022-06-21)
23+
24+
25+
### Bug Fixes
26+
27+
* add value indices on nft_custody views ([#1207](https://github.com/hirosystems/stacks-blockchain-api/issues/1207)) ([aac13c6](https://github.com/hirosystems/stacks-blockchain-api/commit/aac13c613044ae053e63d39a12a0e320e0104c86))
28+
29+
## [4.0.2](https://github.com/hirosystems/stacks-blockchain-api/compare/v4.0.1...v4.0.2) (2022-06-21)
30+
31+
32+
### Bug Fixes
33+
34+
* mobx build dependencies ([#1215](https://github.com/hirosystems/stacks-blockchain-api/issues/1215)) ([6e1eceb](https://github.com/hirosystems/stacks-blockchain-api/commit/6e1eceb843d28699d9d825212cf89d12cf37413f))
35+
136
## [4.0.1](https://github.com/hirosystems/stacks-blockchain-api/compare/v4.0.0...v4.0.1) (2022-06-01)
237

338

docs/entities/blocks/block.example.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"canonical": true,
33
"height": 3275,
44
"hash": "0xe77ba8cf6bb7c0e4f64adc83356289ed467d31a22354907b4bb814590058430f",
5+
"index_block_hash": "0x918697ef63f9d8bdf844c3312b299e72a231cde542f3173f7755bb8c1cdaf3a7",
56
"parent_block_hash": "0x75ab21ef25cbff2caa14c27d830ed7886a4d1522e1b6f9e5dc3b59ccf73ed49f",
67
"burn_block_time": 1594233639,
78
"burn_block_time_iso": "2020-08-27T16:41:26.000Z",

docs/entities/blocks/block.schema.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"canonical",
88
"height",
99
"hash",
10+
"index_block_hash",
1011
"parent_block_hash",
1112
"txs",
1213
"burn_block_time",
@@ -38,6 +39,10 @@
3839
"type": "string",
3940
"description": "Hash representing the block"
4041
},
42+
"index_block_hash": {
43+
"type": "string",
44+
"description": "The only hash that can uniquely identify an anchored block or an unconfirmed state trie"
45+
},
4146
"parent_block_hash": {
4247
"type": "string",
4348
"description": "Hash of the parent block"

docs/generated.d.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1132,6 +1132,10 @@ export interface Block {
11321132
* Hash representing the block
11331133
*/
11341134
hash: string;
1135+
/**
1136+
* The only hash that can uniquely identify an anchored block or an unconfirmed state trie
1137+
*/
1138+
index_block_hash: string;
11351139
/**
11361140
* Hash of the parent block
11371141
*/

0 commit comments

Comments
 (0)