fix: support multiple BNS name events in the same transaction (#1337)

* fix: multiple name transfers in same block

* fix: support multiple name events in same tx

Author: rafaelcr

src/datastore/common.ts

@@ -517,11 +517,12 @@ export interface DbBnsName {
   expire_block: number;
   grace_period?: number;
   renewal_deadline?: number;
-  resolver?: string | undefined;
+  resolver?: string;
   zonefile: string;
   zonefile_hash: string;
   tx_id: string;
   tx_index: number;
+  event_index?: number;
   status?: string;
   canonical: boolean;
 }
@@ -1106,6 +1107,7 @@ export interface BnsNameInsertValues {
   namespace_id: string;
   tx_index: number;
   tx_id: PgBytea;
+  event_index: number | null;
   status: string | null;
   canonical: boolean;
   index_block_hash: PgBytea;

src/datastore/pg-store.ts

@@ -3127,7 +3127,7 @@ export class PgStore {
         WHERE namespace_id = ${namespace}
         AND registered_at <= ${maxBlockHeight}
         AND canonical = true AND microblock_canonical = true
-        ORDER BY name, registered_at DESC, microblock_sequence DESC, tx_index DESC
+        ORDER BY name, registered_at DESC, microblock_sequence DESC, tx_index DESC, event_index DESC
         LIMIT 100
         OFFSET ${offset}
       `;
@@ -3187,7 +3187,10 @@ export class PgStore {
           AND n.registered_at <= ${maxBlockHeight}
           AND n.canonical = true
           AND n.microblock_canonical = true
-        ORDER BY n.registered_at DESC, n.microblock_sequence DESC, n.tx_index DESC
+        ORDER BY n.registered_at DESC,
+          n.microblock_sequence DESC,
+          n.tx_index DESC,
+          n.event_index DESC
         LIMIT 1
       `;
       if (nameZonefile.length === 0) {
@@ -3455,7 +3458,7 @@ export class PgStore {
         FROM names
         WHERE canonical = true AND microblock_canonical = true
         AND registered_at <= ${maxBlockHeight}
-        ORDER BY name, registered_at DESC, microblock_sequence DESC, tx_index DESC
+        ORDER BY name, registered_at DESC, microblock_sequence DESC, tx_index DESC, event_index DESC
         LIMIT 100
         OFFSET ${offset}
       `;

src/datastore/pg-write-store.ts

@@ -1404,12 +1404,25 @@ export class PgWriteStore extends PgStore {
       namespace_id,
       tx_id,
       tx_index,
+      event_index,
       status,
       canonical,
     } = bnsName;
-    // Try to figure out the name's expiration block based on its namespace's lifetime. However, if
-    // the name was only transferred, keep the expiration from the last register/renewal we had.
+    // Try to figure out the name's expiration block based on its namespace's lifetime.
     let expireBlock = expire_block;
+    const namespaceLifetime = await sql<{ lifetime: number }[]>`
+      SELECT lifetime
+      FROM namespaces
+      WHERE namespace_id = ${namespace_id}
+      AND canonical = true AND microblock_canonical = true
+      ORDER BY namespace_id, ready_block DESC, microblock_sequence DESC, tx_index DESC
+      LIMIT 1
+    `;
+    if (namespaceLifetime.length > 0) {
+      expireBlock = registered_at + namespaceLifetime[0].lifetime;
+    }
+    // If the name was transferred, keep the expiration from the last register/renewal we had (if
+    // any).
     if (status === 'name-transfer') {
       const prevExpiration = await sql<{ expire_block: number }[]>`
         SELECT expire_block
@@ -1422,18 +1435,6 @@ export class PgWriteStore extends PgStore {
       if (prevExpiration.length > 0) {
         expireBlock = prevExpiration[0].expire_block;
       }
-    } else {
-      const namespaceLifetime = await sql<{ lifetime: number }[]>`
-        SELECT lifetime
-        FROM namespaces
-        WHERE namespace_id = ${namespace_id}
-        AND canonical = true AND microblock_canonical = true
-        ORDER BY namespace_id, ready_block DESC, microblock_sequence DESC, tx_index DESC
-        LIMIT 1
-      `;
-      if (namespaceLifetime.length > 0) {
-        expireBlock = registered_at + namespaceLifetime[0].lifetime;
-      }
     }
     // If we didn't receive a zonefile, keep the last valid one.
     let finalZonefile = zonefile;
@@ -1476,6 +1477,7 @@ export class PgWriteStore extends PgStore {
       namespace_id: namespace_id,
       tx_index: tx_index,
       tx_id: tx_id,
+      event_index: event_index ?? null,
       status: status ?? null,
       canonical: canonical,
       index_block_hash: blockData.index_block_hash,
@@ -1486,14 +1488,15 @@ export class PgWriteStore extends PgStore {
     };
     await sql`
       INSERT INTO names ${sql(nameValues)}
-      ON CONFLICT ON CONSTRAINT unique_name_tx_id_index_block_hash_microblock_hash DO
+      ON CONFLICT ON CONSTRAINT unique_name_tx_id_index_block_hash_microblock_hash_event_index DO
         UPDATE SET
           address = EXCLUDED.address,
           registered_at = EXCLUDED.registered_at,
           expire_block = EXCLUDED.expire_block,
           zonefile_hash = EXCLUDED.zonefile_hash,
           namespace_id = EXCLUDED.namespace_id,
           tx_index = EXCLUDED.tx_index,
+          event_index = EXCLUDED.event_index,
           status = EXCLUDED.status,
           canonical = EXCLUDED.canonical,
           parent_index_block_hash = EXCLUDED.parent_index_block_hash,

src/event-stream/bns/bns-helpers.ts

@@ -1,5 +1,5 @@
 import { BufferCV, ChainID, ClarityType, hexToCV, StringAsciiCV } from '@stacks/transactions';
-import { hexToBuffer, hexToUtf8String } from '../../helpers';
+import { bnsNameCV, hexToBuffer, hexToUtf8String } from '../../helpers';
 import {
   CoreNodeEvent,
   CoreNodeEventType,
@@ -281,6 +281,7 @@ export function parseNameRenewalWithNoZonefileHashFromContractCall(
       zonefile: '',
       tx_id: tx.parsed_tx.tx_id,
       tx_index: tx.core_tx.tx_index,
+      event_index: undefined,
       status: 'name-renewal',
       canonical: true,
     };
@@ -290,7 +291,7 @@ export function parseNameRenewalWithNoZonefileHashFromContractCall(
 export function parseNameFromContractEvent(
   event: SmartContractEvent,
   tx: CoreNodeParsedTxMessage,
-  txEvents: CoreNodeEvent[],
+  allEvents: CoreNodeEvent[],
   blockHeight: number,
   chainId: ChainID
 ): DbBnsName | undefined {
@@ -303,24 +304,27 @@ export function parseNameFromContractEvent(
   } catch (error) {
     return;
   }
-  let name_address = attachment.attachment.metadata.tx_sender.address;
+  const fullName = `${attachment.attachment.metadata.name}.${attachment.attachment.metadata.namespace}`;
+  let ownerAddress = attachment.attachment.metadata.tx_sender.address;
   // Is this a `name-transfer`? If so, look for the new owner in an `nft_transfer` event bundled in
   // the same transaction.
   if (attachment.attachment.metadata.op === 'name-transfer') {
-    for (const txEvent of txEvents) {
+    for (const eventItem of allEvents) {
       if (
-        txEvent.type === CoreNodeEventType.NftTransferEvent &&
-        txEvent.nft_transfer_event.asset_identifier === `${getBnsContractID(chainId)}::names`
+        eventItem.txid === event.txid &&
+        eventItem.type === CoreNodeEventType.NftTransferEvent &&
+        eventItem.nft_transfer_event.asset_identifier === `${getBnsContractID(chainId)}::names` &&
+        eventItem.nft_transfer_event.raw_value === bnsNameCV(fullName)
       ) {
-        name_address = txEvent.nft_transfer_event.recipient;
+        ownerAddress = eventItem.nft_transfer_event.recipient;
         break;
       }
     }
   }
   const name: DbBnsName = {
-    name: `${attachment.attachment.metadata.name}.${attachment.attachment.metadata.namespace}`,
+    name: fullName,
     namespace_id: attachment.attachment.metadata.namespace,
-    address: name_address,
+    address: ownerAddress,
     // expire_block will be calculated upon DB insert based on the namespace's lifetime.
     expire_block: 0,
     registered_at: blockHeight,
@@ -329,6 +333,7 @@ export function parseNameFromContractEvent(
     zonefile: '',
     tx_id: event.txid,
     tx_index: tx.core_tx.tx_index,
+    event_index: event.event_index,
     status: attachment.attachment.metadata.op,
     canonical: true,
   };

src/migrations/1608030374842_names.ts

@@ -52,6 +52,7 @@ export async function up(pgm: MigrationBuilder): Promise<void> {
       type: 'smallint',
       notNull: true,
     },
+    event_index: 'integer',
     status: {
       type: 'string',
       notNull: false
@@ -89,10 +90,11 @@ export async function up(pgm: MigrationBuilder): Promise<void> {
     { name: 'registered_at', sort: 'DESC' },
     { name: 'microblock_sequence', sort: 'DESC' },
     { name: 'tx_index', sort: 'DESC' },
+    { name: 'event_index', sort: 'DESC' }
   ]);
   pgm.addConstraint(
     'names',
-    'unique_name_tx_id_index_block_hash_microblock_hash',
-    'UNIQUE(name, tx_id, index_block_hash, microblock_hash)'
+    'unique_name_tx_id_index_block_hash_microblock_hash_event_index',
+    'UNIQUE(name, tx_id, index_block_hash, microblock_hash, event_index)'
   );
 }