Merge pull request #459 from hirosystems/beta

merge beta into develop
hirosystems · Mar 5, 2025 · 8e4502b · 8e4502b
2 parents 16e8838 + 21e62a1
commit 8e4502b
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,39 @@
+## [3.0.0-beta.11](https://github.com/hirosystems/ordhook/compare/v3.0.0-beta.10...v3.0.0-beta.11) (2025-02-25)
+
+
+### Bug Fixes
+
+* **brc20:** historical token balance ([#444](https://github.com/hirosystems/ordhook/issues/444)) ([41438ac](https://github.com/hirosystems/ordhook/commit/41438aca962ba7f2c4add4df87740fdb6df6de00))
+* display unbound inscription satpoints as all zeros with unbound sequence as offset ([#445](https://github.com/hirosystems/ordhook/issues/445)) ([6815878](https://github.com/hirosystems/ordhook/commit/68158786f06c0a4ad6f56509eaa96012986f7790))
+
+## [3.0.0-beta.10](https://github.com/hirosystems/ordhook/compare/v3.0.0-beta.9...v3.0.0-beta.10) (2025-02-18)
+
+
+### Bug Fixes
+
+* **api:** multiple parent display ([703f98f](https://github.com/hirosystems/ordhook/commit/703f98f77f9797db3e4f4f0e3e14fbdb7c5275f8))
+
+## [3.0.0-beta.9](https://github.com/hirosystems/ordhook/compare/v3.0.0-beta.8...v3.0.0-beta.9) (2025-02-18)
+
+
+### Features
+
+* **api:** add parent_refs field to inscription responses ([#436](https://github.com/hirosystems/ordhook/issues/436)) ([5630644](https://github.com/hirosystems/ordhook/commit/563064413bcc2168f96cb87af4fd6ab51ed36e73))
+
+
+### Bug Fixes
+
+* **api:** show delegate inscription id correctly ([#439](https://github.com/hirosystems/ordhook/issues/439)) ([d4ee264](https://github.com/hirosystems/ordhook/commit/d4ee264ad0bec2749299b60e985927ba87d6f40e))
+* calculate charms correctly when inscription is unbound ([#440](https://github.com/hirosystems/ordhook/issues/440)) ([acfda83](https://github.com/hirosystems/ordhook/commit/acfda83757e5c06977ecf43ca396b7fcd780d71b))
+
+## [3.0.0-beta.8](https://github.com/hirosystems/ordhook/compare/v3.0.0-beta.7...v3.0.0-beta.8) (2025-02-18)
+
+
+### Features
+
+* **api:** return inscription charms in responses ([#435](https://github.com/hirosystems/ordhook/issues/435)) ([a7073da](https://github.com/hirosystems/ordhook/commit/a7073da0b4bb0c61d57284c48c65f73b0491a909))
+* index inscription charms ([#433](https://github.com/hirosystems/ordhook/issues/433)) ([4291eab](https://github.com/hirosystems/ordhook/commit/4291eabba7110ca5d4684f4801e234621e64d96b))
+
 ## [3.0.0-beta.7](https://github.com/hirosystems/ordhook/compare/v3.0.0-beta.6...v3.0.0-beta.7) (2025-02-16)
 
 

diff --git a/api/ordinals/src/pg/pg-store.ts b/api/ordinals/src/pg/pg-store.ts
@@ -172,7 +172,7 @@ export class PgStore extends BasePgStore {
             i.curse_type,
             i.ordinal_number AS sat_ordinal,
             (
-              SELECT ip.parent_inscription_id
+              SELECT STRING_AGG(ip.parent_inscription_id, ',')
               FROM inscription_parents AS ip
               WHERE ip.inscription_id = i.inscription_id
             ) AS parent_refs,

diff --git a/api/ordinals/tests/api/inscriptions.test.ts b/api/ordinals/tests/api/inscriptions.test.ts
@@ -225,7 +225,7 @@ describe('/inscriptions', () => {
       expect(response2.json()).toStrictEqual(expected);
     });
 
-    test('shows inscription with parent', async () => {
+    test('shows inscription with parents', async () => {
       await inscriptionReveal(db.sql, {
         inscription_id: '9f4a9b73b0713c5da01c0a47f97c6c001af9028d6bdd9e264dfacbc4e6790201i0',
         ordinal_number: '257418248345364',
@@ -296,13 +296,18 @@ describe('/inscriptions', () => {
         inscription_id: 'f351d86c6e6cae3c64e297e7463095732f216875bcc1f3c03f950a492bb25421i0',
         parent_inscription_id: '9f4a9b73b0713c5da01c0a47f97c6c001af9028d6bdd9e264dfacbc4e6790201i0',
       });
+      await insertTestInscriptionParent(db.sql, {
+        inscription_id: 'f351d86c6e6cae3c64e297e7463095732f216875bcc1f3c03f950a492bb25421i0',
+        parent_inscription_id: '001eec2c3fb12441057722b099ae22f4d67602e2e7add0bd018132c0b128cde3i0',
+      });
       const response = await fastify.inject({
         method: 'GET',
         url: '/ordinals/v1/inscriptions/f351d86c6e6cae3c64e297e7463095732f216875bcc1f3c03f950a492bb25421i0',
       });
       expect(response.statusCode).toBe(200);
       expect(response.json().parent_refs).toStrictEqual([
         '9f4a9b73b0713c5da01c0a47f97c6c001af9028d6bdd9e264dfacbc4e6790201i0',
+        '001eec2c3fb12441057722b099ae22f4d67602e2e7add0bd018132c0b128cde3i0',
       ]);
     });