Merge branch 'master' into beta

Author: rafaelcr

CHANGELOG.md

@@ -1,6 +1,20 @@
-## [8.0.2-beta.1](https://github.com/hirosystems/stacks-blockchain-api/compare/v8.0.1...v8.0.2-beta.1) (2024-09-26)
+## [8.0.3](https://github.com/hirosystems/stacks-blockchain-api/compare/v8.0.2...v8.0.3) (2024-10-01)
+
+
+### Bug Fixes
+
+* query param `until_block` not working in several endpoints ([#2101](https://github.com/hirosystems/stacks-blockchain-api/issues/2101)) ([fce15d6](https://github.com/hirosystems/stacks-blockchain-api/commit/fce15d68377b6fe5fabeab65b34bd4e7a8d3bef6))
+
+## [8.0.2](https://github.com/hirosystems/stacks-blockchain-api/compare/v8.0.1...v8.0.2) (2024-09-27)
 
 
+### Bug Fixes
+
+* tests ([689ff18](https://github.com/hirosystems/stacks-blockchain-api/commit/689ff183dd0bdd1779f0220835123a0cc99e37c6))
+
+
+## [8.0.2-beta.1](https://github.com/hirosystems/stacks-blockchain-api/compare/v8.0.1...v8.0.2-beta.1) (2024-09-26)
+
 ### Bug Fixes
 
 * use current circulating STX tokens for `stx_supply` endpoint, year 2050 estimate in new field ([b3e08e7](https://github.com/hirosystems/stacks-blockchain-api/commit/b3e08e7872c4a6b5a076d8bbcc22eb388ecef5ab))

src/api/query-helpers.ts

@@ -41,10 +41,10 @@ export function parseUntilBlockQuery(
 ): undefined | number | string {
   if (!untilBlock) return;
   if (typeof untilBlock === 'string') {
-    if (unanchored !== undefined) {
+    if (unanchored) {
       // if mutually exclusive unachored is also specified, throw bad request error
       throw new InvalidRequestError(
-        `can't handle both 'unanchored' and 'until_block' in the same request`,
+        `can't handle both 'unanchored=true' and 'until_block' in the same request`,
         InvalidRequestErrorType.bad_request
       );
     }

src/tests/address-tests.ts

@@ -1570,6 +1570,12 @@ describe('address tests', () => {
     };
     expect(JSON.parse(fetchAddrBalance1.text)).toEqual(expectedResp1);
 
+    const fetchAddrBalance1AtBlock = await supertest(api.server).get(
+      `/extended/v1/address/${testAddr2}/balances?until_block=1`
+    );
+    expect(fetchAddrBalance1AtBlock.status).toBe(200);
+    expect(fetchAddrBalance1AtBlock.type).toBe('application/json');
+
     const fetchAddrBalance2 = await supertest(api.server).get(
       `/extended/v1/address/${testContractAddr}/balances`
     );
@@ -2608,16 +2614,6 @@ describe('address tests', () => {
       );
       expect(response.status).toBe(400);
     }
-
-    const addressEndpoints1 = ['/transactions', '/transactions_with_transfers', '/stx_inbound'];
-
-    /// check for mutually exclusive until_block adn height params
-    for (const path of addressEndpoints1) {
-      const response1 = await supertest(api.server).get(
-        `/extended/v1/address/STB44HYPYAT2BB2QE513NSP81HTMYWBJP02HPGK6${path}?until_block=5&height=0`
-      );
-      expect(response1.status).toBe(400);
-    }
   });
 
   test('/transactions materialized view separates anchored and unanchored counts correctly', async () => {

src/tests/other-tests.ts

@@ -141,11 +141,13 @@ describe('other tests', () => {
     expect(result1.status).toBe(200);
     expect(result1.type).toBe('application/json');
     const expectedResp1 = {
-      unlocked_percent: '12.93',
-      total_stx: '1818000000.000000',
-      unlocked_stx: microStxToStx(expectedTotalStx1),
-      block_height: dbBlock1.block_height,
+      unlocked_percent: '100.00',
+      total_stx: '235000000.000000',
+      total_stx_year_2050: '1818000000.000000',
+      unlocked_stx: '235000000.000000',
+      block_height: 1,
     };
+
     expect(JSON.parse(result1.text)).toEqual(expectedResp1);
 
     // ensure burned STX reduce the unlocked stx supply
@@ -166,9 +168,10 @@ describe('other tests', () => {
     expect(result2.status).toBe(200);
     expect(result2.type).toBe('application/json');
     const expectedResp2 = {
-      unlocked_percent: '12.38',
-      total_stx: '1818000000.000000',
+      unlocked_percent: '100.00',
+      total_stx: microStxToStx(expectedTotalStx2),
       unlocked_stx: microStxToStx(expectedTotalStx2),
+      total_stx_year_2050: '1818000000.000000',
       block_height: dbBlock1.block_height,
     };
     expect(JSON.parse(result2.text)).toEqual(expectedResp2);
@@ -197,8 +200,9 @@ describe('other tests', () => {
     expect(result3.status).toBe(200);
     expect(result3.type).toBe('application/json');
     const expectedResp3 = {
-      unlocked_percent: '13.20',
-      total_stx: '1818000000.000000',
+      unlocked_percent: '100.00',
+      total_stx: microStxToStx(expectedTotalStx3),
+      total_stx_year_2050: '1818000000.000000',
       unlocked_stx: microStxToStx(expectedTotalStx3),
       block_height: dbBlock1.block_height,
     };
@@ -207,7 +211,7 @@ describe('other tests', () => {
     const result4 = await supertest(api.server).get(`/extended/v1/stx_supply/total/plain`);
     expect(result4.status).toBe(200);
     expect(result4.type).toBe('text/plain');
-    expect(result4.text).toEqual('1818000000.000000');
+    expect(result4.text).toEqual('240000000.000000');
 
     const result5 = await supertest(api.server).get(`/extended/v1/stx_supply/circulating/plain`);
     expect(result5.status).toBe(200);
@@ -219,13 +223,17 @@ describe('other tests', () => {
     expect(result6.status).toBe(200);
     expect(result6.type).toBe('application/json');
     const expectedResp6 = {
-      unlockedPercent: '13.20',
-      totalStacks: '1818000000.000000',
-      totalStacksFormatted: '1,818,000,000.000000',
+      unlockedPercent: '100.00',
+      totalStacks: microStxToStx(expectedTotalStx3),
+      totalStacksFormatted: new Intl.NumberFormat('en', {
+        minimumFractionDigits: STACKS_DECIMAL_PLACES,
+      }).format(parseInt(microStxToStx(expectedTotalStx3))),
       unlockedSupply: microStxToStx(expectedTotalStx3),
       unlockedSupplyFormatted: new Intl.NumberFormat('en', {
         minimumFractionDigits: STACKS_DECIMAL_PLACES,
       }).format(parseInt(microStxToStx(expectedTotalStx3))),
+      totalStacksYear2050: '1818000000.000000',
+      totalStacksYear2050Formatted: '1,818,000,000.000000',
       blockHeight: dbBlock1.block_height.toString(),
     };
     expect(JSON.parse(result6.text)).toEqual(expectedResp6);