Skip to content

Commit ee1c065

Browse files
zone117xzone117x
authored
Merge pull request #1990 from hirosystems/develop
Cut beta release
2 parents 1e96dc0 + f55483a commit ee1c065

15 files changed

+324
-144
lines changed

‎CHANGELOG.md

-64
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,3 @@
1-
## [7.11.0-beta.7](https://github.com/hirosystems/stacks-blockchain-api/compare/v7.11.0-beta.6...v7.11.0-beta.7) (2024-05-14)
2-
3-
4-
### Features
5-
6-
* add burn_block_height to Rosetta endpoints ([#1974](https://github.com/hirosystems/stacks-blockchain-api/issues/1974)) ([9648ac8](https://github.com/hirosystems/stacks-blockchain-api/commit/9648ac8a373229b384089339545e49e5164bc165))
7-
* add signer_address to pox signer endpoints ([#1975](https://github.com/hirosystems/stacks-blockchain-api/issues/1975)) ([7d3444b](https://github.com/hirosystems/stacks-blockchain-api/commit/7d3444b96541e8883aa7f858cf56dd457d50a2b0))
8-
9-
10-
### Bug Fixes
11-
12-
* pox4 properties missing in various endpoints ([#1977](https://github.com/hirosystems/stacks-blockchain-api/issues/1977)) ([521d771](https://github.com/hirosystems/stacks-blockchain-api/commit/521d7712409a9d9bffa3278ca44c21394167a085))
13-
* socket-io client must only use websocket transport ([#1976](https://github.com/hirosystems/stacks-blockchain-api/issues/1976)) ([85ea5af](https://github.com/hirosystems/stacks-blockchain-api/commit/85ea5afef4b3134b1481e5b001c1f45619ccdb62))
14-
15-
## [7.11.0-beta.6](https://github.com/hirosystems/stacks-blockchain-api/compare/v7.11.0-beta.5...v7.11.0-beta.6) (2024-05-03)
16-
17-
18-
### Features
19-
20-
* add burn_block_height to transactions ([#1969](https://github.com/hirosystems/stacks-blockchain-api/issues/1969)) ([3e2d524](https://github.com/hirosystems/stacks-blockchain-api/commit/3e2d524ca369b88a53fc4dfc2287aa3f0fb92e64))
21-
22-
## [7.11.0-beta.5](https://github.com/hirosystems/stacks-blockchain-api/compare/v7.11.0-beta.4...v7.11.0-beta.5) (2024-05-01)
23-
24-
25-
### Features
26-
27-
* add average stacks block time to burn block endpoints ([#1963](https://github.com/hirosystems/stacks-blockchain-api/issues/1963)) ([31c2eed](https://github.com/hirosystems/stacks-blockchain-api/commit/31c2eedfb5f778d5f0bf61bf3dd8effbf80511c4))
28-
* add total tx count to burn block endpoints ([#1965](https://github.com/hirosystems/stacks-blockchain-api/issues/1965)) ([d38b78a](https://github.com/hirosystems/stacks-blockchain-api/commit/d38b78a53e6dfa1774ba61a149a5931f29f64230))
29-
* average block times endpoint ([#1962](https://github.com/hirosystems/stacks-blockchain-api/issues/1962)) ([cd151aa](https://github.com/hirosystems/stacks-blockchain-api/commit/cd151aaa289c679fc20b82ee751e55776a8d6c42))
30-
31-
32-
### Bug Fixes
33-
34-
* issue with block_time receipt not being written to db ([#1961](https://github.com/hirosystems/stacks-blockchain-api/issues/1961)) ([74c06c6](https://github.com/hirosystems/stacks-blockchain-api/commit/74c06c68574ef38400c0d4e4b8e3378adb6fbbf2))
35-
36-
## [7.11.0-beta.4](https://github.com/hirosystems/stacks-blockchain-api/compare/v7.11.0-beta.3...v7.11.0-beta.4) (2024-04-23)
37-
38-
39-
### Bug Fixes
40-
41-
* inconsistent block transaction results in Rosetta response ([#1958](https://github.com/hirosystems/stacks-blockchain-api/issues/1958)) ([a5bec61](https://github.com/hirosystems/stacks-blockchain-api/commit/a5bec614ec99d0729e89200c56525cf062cdda23))
42-
43-
## [7.11.0-beta.3](https://github.com/hirosystems/stacks-blockchain-api/compare/v7.11.0-beta.2...v7.11.0-beta.3) (2024-04-19)
44-
45-
46-
### Bug Fixes
47-
48-
* rosetta account endpoint should assume chain tip if block not specified ([#1956](https://github.com/hirosystems/stacks-blockchain-api/issues/1956)) ([4bba526](https://github.com/hirosystems/stacks-blockchain-api/commit/4bba526327db0ae9cf778df69db0d7505e280ea3))
49-
50-
## [7.11.0-beta.2](https://github.com/hirosystems/stacks-blockchain-api/compare/v7.11.0-beta.1...v7.11.0-beta.2) (2024-04-16)
51-
52-
53-
### Features
54-
55-
* docker build for arm ([#1947](https://github.com/hirosystems/stacks-blockchain-api/issues/1947)) ([2c526fc](https://github.com/hirosystems/stacks-blockchain-api/commit/2c526fcf8ead66ff3055bbd77e37f663726503af))
56-
* support multiple STX faucet source accounts ([#1946](https://github.com/hirosystems/stacks-blockchain-api/issues/1946)) ([5d69c7c](https://github.com/hirosystems/stacks-blockchain-api/commit/5d69c7c1b5ccbd6020b436c379f0ae9b6f9982bb))
57-
58-
## [7.11.0-beta.1](https://github.com/hirosystems/stacks-blockchain-api/compare/v7.10.0...v7.11.0-beta.1) (2024-04-15)
59-
60-
61-
### Features
62-
63-
* support multiple STX faucet source accounts ([#1946](https://github.com/hirosystems/stacks-blockchain-api/issues/1946)) ([be5db0c](https://github.com/hirosystems/stacks-blockchain-api/commit/be5db0c5fadb0d0278e10b6de3586bbd7f5c85be))
64-
651
## [7.10.0](https://github.com/hirosystems/stacks-blockchain-api/compare/v7.9.1...v7.10.0) (2024-04-15)
662

673

‎docs/api/stacking/get-pox-cycle-signer-stackers.example.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
{
77
"pox_address": "15Z2sAvjgVDpcBh4vx9g2XKU8FVHYcXNaj",
88
"stacked_amount": "686251350000000000",
9-
"stacker_address": "STRYYQQ9M8KAF4NS7WNZQYY59X93XEKR31JP64CP"
9+
"stacker_address": "STRYYQQ9M8KAF4NS7WNZQYY59X93XEKR31JP64CP",
10+
"stacker_type": "solo"
1011
}
1112
]
1213
}

‎docs/api/stacking/get-pox-cycle-signers.example.json

+9-3
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,29 @@
99
"stacked_amount": "686251350000000000",
1010
"stacked_amount_percent": 50,
1111
"weight": 5,
12-
"weight_percent": 55.55555555555556
12+
"weight_percent": 55.55555555555556,
13+
"solo_stacker_count": 16,
14+
"pooled_stacker_count": 3615
1315
},
1416
{
1517
"signing_key": "0x029874497a7952483aa23890e9d0898696f33864d3df90939930a1f45421fe3b09",
1618
"signer_address": "STF9B75ADQAVXQHNEQ6KGHXTG7JP305J2GRWF3A2",
1719
"stacked_amount": "457500900000000000",
1820
"stacked_amount_percent": 33.333333333333336,
1921
"weight": 3,
20-
"weight_percent": 33.33333333333333
22+
"weight_percent": 33.33333333333333,
23+
"solo_stacker_count": 0,
24+
"pooled_stacker_count": 1456
2125
},
2226
{
2327
"signing_key": "0x02dcde79b38787b72d8e5e0af81cffa802f0a3c8452d6b46e08859165f49a72736",
2428
"signer_address": "ST18MDW2PDTBSCR1ACXYRJP2JX70FWNM6YY2VX4SS",
2529
"stacked_amount": "228750450000000000",
2630
"stacked_amount_percent": 16.666666666666668,
2731
"weight": 1,
28-
"weight_percent": 11.11111111111111
32+
"weight_percent": 11.11111111111111,
33+
"solo_stacker_count": 637,
34+
"pooled_stacker_count": 0
2935
}
3036
]
3137
}

‎docs/entities/stacking/signer.example.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,7 @@
44
"stacked_amount": "686251350000000000",
55
"stacked_amount_percent": 50,
66
"weight": 5,
7-
"weight_percent": 55.55555555555556
7+
"weight_percent": 55.55555555555556,
8+
"solo_stacker_count": 16,
9+
"pooled_stacker_count": 3615
810
}

‎docs/entities/stacking/signer.schema.json

+11-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
"weight",
99
"stacked_amount",
1010
"weight_percent",
11-
"stacked_amount_percent"
11+
"stacked_amount_percent",
12+
"solo_stacker_count",
13+
"pooled_stacker_count"
1214
],
1315
"properties": {
1416
"signing_key": {
@@ -29,6 +31,14 @@
2931
},
3032
"stacked_amount_percent": {
3133
"type": "number"
34+
},
35+
"solo_stacker_count": {
36+
"type": "integer",
37+
"description": "The number of solo stackers associated with this signer."
38+
},
39+
"pooled_stacker_count": {
40+
"type": "integer",
41+
"description": "The number of pooled stackers associated with this signer."
3242
}
3343
}
3444
}

‎docs/entities/stacking/stacker.example.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"pox_address": "15Z2sAvjgVDpcBh4vx9g2XKU8FVHYcXNaj",
33
"stacked_amount": "686251350000000000",
4-
"stacker_address": "STRYYQQ9M8KAF4NS7WNZQYY59X93XEKR31JP64CP"
4+
"stacker_address": "STRYYQQ9M8KAF4NS7WNZQYY59X93XEKR31JP64CP",
5+
"stacker_type": "solo"
56
}

‎docs/entities/stacking/stacker.schema.json

+6-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"required": [
66
"stacker_address",
77
"stacked_amount",
8-
"pox_address"
8+
"pox_address",
9+
"stacker_type"
910
],
1011
"properties": {
1112
"stacker_address": {
@@ -16,6 +17,10 @@
1617
},
1718
"pox_address": {
1819
"type": "string"
20+
},
21+
"stacker_type": {
22+
"type": "string",
23+
"enum": ["solo", "pooled"]
1924
}
2025
}
2126
}

‎docs/generated.d.ts

+9
Original file line numberDiff line numberDiff line change
@@ -3372,6 +3372,7 @@ export interface PoxStacker {
33723372
stacker_address: string;
33733373
stacked_amount: string;
33743374
pox_address: string;
3375+
stacker_type: "solo" | "pooled";
33753376
}
33763377
/**
33773378
* GET request that returns signers for a PoX cycle
@@ -3401,6 +3402,14 @@ export interface PoxSigner {
34013402
stacked_amount: string;
34023403
weight_percent: number;
34033404
stacked_amount_percent: number;
3405+
/**
3406+
* The number of solo stackers associated with this signer.
3407+
*/
3408+
solo_stacker_count: number;
3409+
/**
3410+
* The number of pooled stackers associated with this signer.
3411+
*/
3412+
pooled_stacker_count: number;
34043413
}
34053414
/**
34063415
* GET request that returns PoX cycles

‎src/api/routes/v2/helpers.ts

+3
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,8 @@ export function parseDbPoxSigner(signer: DbPoxCycleSigner, isMainnet: boolean):
188188
stacked_amount: signer.stacked_amount,
189189
weight_percent: signer.weight_percent,
190190
stacked_amount_percent: signer.stacked_amount_percent,
191+
pooled_stacker_count: signer.pooled_stacker_count,
192+
solo_stacker_count: signer.solo_stacker_count,
191193
};
192194
return result;
193195
}
@@ -197,6 +199,7 @@ export function parseDbPoxSignerStacker(stacker: DbPoxCycleSignerStacker): PoxSt
197199
stacker_address: stacker.stacker,
198200
stacked_amount: stacker.locked,
199201
pox_address: stacker.pox_addr,
202+
stacker_type: stacker.stacker_type,
200203
};
201204
// Special handling for pool operator stackers
202205
if (

‎src/datastore/common.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -1086,8 +1086,8 @@ export interface DbPoxCycleSigner {
10861086
stacked_amount: string;
10871087
weight_percent: number;
10881088
stacked_amount_percent: number;
1089-
// TODO: Figure this out
1090-
// total_stackers: number;
1089+
pooled_stacker_count: number;
1090+
solo_stacker_count: number;
10911091
}
10921092

10931093
export interface DbPoxCycleSignerStacker {
@@ -1096,6 +1096,7 @@ export interface DbPoxCycleSignerStacker {
10961096
pox_addr: string;
10971097
name: string;
10981098
amount_ustx: string;
1099+
stacker_type: 'solo' | 'pooled';
10991100
}
11001101

11011102
interface ReOrgEntities {

0 commit comments

Comments
 (0)