@secondlayer/sdk 6.0.0 → 6.1.0

package/dist/index.js

@@ -25,6 +25,19 @@ class VersionConflictError extends ApiError {
 
 // src/base.ts
 var DEFAULT_BASE_URL = "https://api.secondlayer.tools";
+function buildQuery(params) {
+  const search = new URLSearchParams;
+  for (const [name, value] of Object.entries(params)) {
+    if (value === undefined || value === null)
+      continue;
+    const serialized = Array.isArray(value) ? value.join(",") : String(value);
+    if (serialized.length === 0)
+      continue;
+    search.set(name, serialized);
+  }
+  const query = search.toString();
+  return query ? `?${query}` : "";
+}
 
 class BaseClient {
   baseUrl;
@@ -312,11 +325,6 @@ class Subgraphs extends BaseClient {
   }
 }
 // src/index-api/client.ts
-function appendSearchParam(params, name, value) {
-  if (value === undefined || value === null)
-    return;
-  params.set(name, String(value));
-}
 function firstWalkFromHeight(params) {
   if (params.fromHeight !== undefined)
     return params.fromHeight;
@@ -346,31 +354,29 @@ class Index extends BaseClient {
     walk: (params = {}) => this.walkContractCalls(params)
   };
   async listFtTransfers(params = {}) {
-    const searchParams = new URLSearchParams;
-    appendSearchParam(searchParams, "cursor", params.cursor);
-    appendSearchParam(searchParams, "from_cursor", params.fromCursor);
-    appendSearchParam(searchParams, "limit", params.limit);
-    appendSearchParam(searchParams, "contract_id", params.contractId);
-    appendSearchParam(searchParams, "sender", params.sender);
-    appendSearchParam(searchParams, "recipient", params.recipient);
-    appendSearchParam(searchParams, "from_height", params.fromHeight);
-    appendSearchParam(searchParams, "to_height", params.toHeight);
-    const query = searchParams.toString();
-    return this.request("GET", `/v1/index/ft-transfers${query ? `?${query}` : ""}`);
+    return this.request("GET", `/v1/index/ft-transfers${buildQuery({
+      cursor: params.cursor,
+      from_cursor: params.fromCursor,
+      limit: params.limit,
+      contract_id: params.contractId,
+      sender: params.sender,
+      recipient: params.recipient,
+      from_height: params.fromHeight,
+      to_height: params.toHeight
+    })}`);
   }
   async listNftTransfers(params = {}) {
-    const searchParams = new URLSearchParams;
-    appendSearchParam(searchParams, "cursor", params.cursor);
-    appendSearchParam(searchParams, "from_cursor", params.fromCursor);
-    appendSearchParam(searchParams, "limit", params.limit);
-    appendSearchParam(searchParams, "contract_id", params.contractId);
-    appendSearchParam(searchParams, "asset_identifier", params.assetIdentifier);
-    appendSearchParam(searchParams, "sender", params.sender);
-    appendSearchParam(searchParams, "recipient", params.recipient);
-    appendSearchParam(searchParams, "from_height", params.fromHeight);
-    appendSearchParam(searchParams, "to_height", params.toHeight);
-    const query = searchParams.toString();
-    return this.request("GET", `/v1/index/nft-transfers${query ? `?${query}` : ""}`);
+    return this.request("GET", `/v1/index/nft-transfers${buildQuery({
+      cursor: params.cursor,
+      from_cursor: params.fromCursor,
+      limit: params.limit,
+      contract_id: params.contractId,
+      asset_identifier: params.assetIdentifier,
+      sender: params.sender,
+      recipient: params.recipient,
+      from_height: params.fromHeight,
+      to_height: params.toHeight
+    })}`);
   }
   async* walkFtTransfers(params = {}) {
     const batchSize = params.batchSize ?? 200;
@@ -423,18 +429,18 @@ class Index extends BaseClient {
     }
   }
   async listEvents(params) {
-    const searchParams = new URLSearchParams;
-    appendSearchParam(searchParams, "event_type", params.eventType);
-    appendSearchParam(searchParams, "cursor", params.cursor);
-    appendSearchParam(searchParams, "from_cursor", params.fromCursor);
-    appendSearchParam(searchParams, "limit", params.limit);
-    appendSearchParam(searchParams, "contract_id", params.contractId);
-    appendSearchParam(searchParams, "asset_identifier", params.assetIdentifier);
-    appendSearchParam(searchParams, "sender", params.sender);
-    appendSearchParam(searchParams, "recipient", params.recipient);
-    appendSearchParam(searchParams, "from_height", params.fromHeight);
-    appendSearchParam(searchParams, "to_height", params.toHeight);
-    return this.request("GET", `/v1/index/events?${searchParams.toString()}`);
+    return this.request("GET", `/v1/index/events${buildQuery({
+      event_type: params.eventType,
+      cursor: params.cursor,
+      from_cursor: params.fromCursor,
+      limit: params.limit,
+      contract_id: params.contractId,
+      asset_identifier: params.assetIdentifier,
+      sender: params.sender,
+      recipient: params.recipient,
+      from_height: params.fromHeight,
+      to_height: params.toHeight
+    })}`);
   }
   async* walkEvents(params) {
     const batchSize = params.batchSize ?? 200;
@@ -462,17 +468,16 @@ class Index extends BaseClient {
     }
   }
   async listContractCalls(params = {}) {
-    const searchParams = new URLSearchParams;
-    appendSearchParam(searchParams, "cursor", params.cursor);
-    appendSearchParam(searchParams, "from_cursor", params.fromCursor);
-    appendSearchParam(searchParams, "limit", params.limit);
-    appendSearchParam(searchParams, "contract_id", params.contractId);
-    appendSearchParam(searchParams, "function_name", params.functionName);
-    appendSearchParam(searchParams, "sender", params.sender);
-    appendSearchParam(searchParams, "from_height", params.fromHeight);
-    appendSearchParam(searchParams, "to_height", params.toHeight);
-    const query = searchParams.toString();
-    return this.request("GET", `/v1/index/contract-calls${query ? `?${query}` : ""}`);
+    return this.request("GET", `/v1/index/contract-calls${buildQuery({
+      cursor: params.cursor,
+      from_cursor: params.fromCursor,
+      limit: params.limit,
+      contract_id: params.contractId,
+      function_name: params.functionName,
+      sender: params.sender,
+      from_height: params.fromHeight,
+      to_height: params.toHeight
+    })}`);
   }
   async* walkContractCalls(params = {}) {
     const batchSize = params.batchSize ?? 200;
@@ -504,7 +509,74 @@ class Index extends BaseClient {
 // src/streams/client.ts
 import { ed25519 } from "@secondlayer/shared";
 
+// src/streams/errors.ts
+class AuthError extends Error {
+  status = 401;
+  constructor(message = "API key invalid or expired.") {
+    super(message);
+    this.name = "AuthError";
+  }
+}
+
+class RateLimitError extends Error {
+  retryAfter;
+  status = 429;
+  constructor(message = "Rate limited. Try again later.", retryAfter) {
+    super(message);
+    this.retryAfter = retryAfter;
+    this.name = "RateLimitError";
+  }
+}
+
+class ValidationError extends Error {
+  status;
+  body;
+  constructor(message, status, body) {
+    super(message);
+    this.status = status;
+    this.body = body;
+    this.name = "ValidationError";
+  }
+}
+
+class StreamsServerError extends Error {
+  status;
+  body;
+  constructor(message, status, body) {
+    super(message);
+    this.status = status;
+    this.body = body;
+    this.name = "StreamsServerError";
+  }
+}
+
+class StreamsSignatureError extends Error {
+  constructor(message = "Streams response signature verification failed.") {
+    super(message);
+    this.name = "StreamsSignatureError";
+  }
+}
+
+// src/streams/cursor.ts
+var Cursor = {
+  atHeight(height) {
+    return `${height}:0`;
+  },
+  parse(cursor) {
+    const parts = cursor.split(":");
+    const blockHeight = Number(parts[0]);
+    const eventIndex = Number(parts[1]);
+    if (parts.length !== 2 || !Number.isInteger(blockHeight) || !Number.isInteger(eventIndex)) {
+      throw new ValidationError(`Invalid stream cursor "${cursor}"; expected "<block>:<index>" (e.g. "951475:3").`, 400);
+    }
+    return { blockHeight, eventIndex };
+  }
+};
+
 // src/streams/consumer.ts
+function reorgKey(reorg) {
+  return `${reorg.detected_at}|${reorg.fork_point_height}|${reorg.new_canonical_tip}`;
+}
 async function defaultSleep(ms, signal) {
   if (signal?.aborted)
     return;
@@ -521,10 +593,12 @@ async function defaultSleep(ms, signal) {
 async function consumeStreamsEvents(opts) {
   const sleep = opts.sleep ?? defaultSleep;
   const mode = opts.mode ?? "tail";
+  const finalizedOnly = opts.finalizedOnly ?? false;
   const emptyBackoffMs = opts.emptyBackoffMs ?? 500;
   const maxPages = opts.maxPages ?? Number.POSITIVE_INFINITY;
   const maxEmptyPolls = opts.maxEmptyPolls ?? Number.POSITIVE_INFINITY;
   let cursor = opts.fromCursor ?? null;
+  const handledReorgs = new Set;
   let pages = 0;
   let emptyPolls = 0;
   while (pages < maxPages && emptyPolls < maxEmptyPolls && !opts.signal?.aborted) {
@@ -539,14 +613,32 @@ async function consumeStreamsEvents(opts) {
       assetIdentifier: opts.assetIdentifier
     });
     pages++;
-    const returnedCursor = await opts.onBatch(envelope.events, envelope);
-    const nextCursor = returnedCursor ?? envelope.next_cursor;
+    if (!finalizedOnly && opts.onReorg) {
+      const fresh = envelope.reorgs.filter((reorg) => !handledReorgs.has(reorgKey(reorg))).sort((a, b) => a.fork_point_height - b.fork_point_height);
+      if (fresh.length > 0) {
+        const forkPoint = Math.min(...fresh.map((reorg) => reorg.fork_point_height));
+        const rewind = Cursor.atHeight(forkPoint);
+        for (const reorg of fresh) {
+          await opts.onReorg(reorg, { cursor: rewind });
+          handledReorgs.add(reorgKey(reorg));
+        }
+        cursor = rewind;
+        emptyPolls = 0;
+        continue;
+      }
+    }
+    const emitted = finalizedOnly ? envelope.events.filter((event) => event.finalized) : envelope.events;
+    const checkpoint = finalizedOnly ? emitted.at(-1)?.cursor ?? cursor : envelope.next_cursor;
+    const returnedCursor = await opts.onBatch(emitted, envelope, {
+      cursor: checkpoint
+    });
+    const nextCursor = returnedCursor ?? checkpoint;
     if (nextCursor && nextCursor !== cursor) {
       cursor = nextCursor;
       emptyPolls = 0;
       continue;
     }
-    if (envelope.events.length === 0) {
+    if (emitted.length === 0) {
       emptyPolls++;
       if (mode === "bounded") {
         return { cursor, pages, emptyPolls };
@@ -602,56 +694,6 @@ async function* streamStreamsEvents(opts) {
 
 // src/streams/dumps.ts
 import { createHash } from "node:crypto";
-
-// src/streams/errors.ts
-class AuthError extends Error {
-  status = 401;
-  constructor(message = "API key invalid or expired.") {
-    super(message);
-    this.name = "AuthError";
-  }
-}
-
-class RateLimitError extends Error {
-  retryAfter;
-  status = 429;
-  constructor(message = "Rate limited. Try again later.", retryAfter) {
-    super(message);
-    this.retryAfter = retryAfter;
-    this.name = "RateLimitError";
-  }
-}
-
-class ValidationError extends Error {
-  status;
-  body;
-  constructor(message, status, body) {
-    super(message);
-    this.status = status;
-    this.body = body;
-    this.name = "ValidationError";
-  }
-}
-
-class StreamsServerError extends Error {
-  status;
-  body;
-  constructor(message, status, body) {
-    super(message);
-    this.status = status;
-    this.body = body;
-    this.name = "StreamsServerError";
-  }
-}
-
-class StreamsSignatureError extends Error {
-  constructor(message = "Streams response signature verification failed.") {
-    super(message);
-    this.name = "StreamsSignatureError";
-  }
-}
-
-// src/streams/dumps.ts
 function createStreamsDumps(opts) {
   const baseUrl = opts.baseUrl?.replace(/\/+$/, "");
   function requireBaseUrl() {
@@ -690,8 +732,12 @@ function createStreamsDumps(opts) {
 function cursorTuple(cursor) {
   if (!cursor)
     return [-1, -1];
-  const [block, index] = cursor.split(":");
-  return [Number(block), Number(index)];
+  const parts = cursor.split(":");
+  const [block, index] = parts.map(Number);
+  if (parts.length !== 2 || !Number.isInteger(block) || !Number.isInteger(index)) {
+    throw new ValidationError(`Invalid stream cursor "${cursor}"; expected "<block>:<index>" (e.g. "951475:3").`, 400);
+  }
+  return [block, index];
 }
 function maxCursor(a, b) {
   const [ah, ai] = cursorTuple(a);
@@ -702,18 +748,6 @@ var DEFAULT_STREAMS_BASE_URL = "https://api.secondlayer.tools";
 function normalizeBaseUrl(baseUrl) {
   return baseUrl.replace(/\/+$/, "");
 }
-function appendSearchParam2(params, name, value) {
-  if (value === undefined || value === null)
-    return;
-  params.set(name, String(value));
-}
-function appendListParam(params, name, value) {
-  if (value === undefined || value === null)
-    return;
-  const joined = Array.isArray(value) ? value.join(",") : value;
-  if (joined.length > 0)
-    params.set(name, joined);
-}
 async function responseBody(response) {
   const text = await response.text();
   if (text.length === 0)
@@ -835,23 +869,18 @@ function createStreamsClient(options) {
     });
   };
   async function listEvents(params = {}) {
-    const searchParams = new URLSearchParams;
-    appendSearchParam2(searchParams, "cursor", params.cursor);
-    appendSearchParam2(searchParams, "from_height", params.fromHeight);
-    appendSearchParam2(searchParams, "to_height", params.toHeight);
-    appendSearchParam2(searchParams, "limit", params.limit);
-    appendListParam(searchParams, "contract_id", params.contractId);
-    appendListParam(searchParams, "sender", params.sender);
-    appendListParam(searchParams, "recipient", params.recipient);
-    appendSearchParam2(searchParams, "asset_identifier", params.assetIdentifier);
-    if (params.types?.length) {
-      searchParams.set("types", params.types.join(","));
-    }
-    if (params.notTypes?.length) {
-      searchParams.set("not_types", params.notTypes.join(","));
-    }
-    const query = searchParams.toString();
-    return request(`/v1/streams/events${query ? `?${query}` : ""}`);
+    return request(`/v1/streams/events${buildQuery({
+      cursor: params.cursor,
+      from_height: params.fromHeight,
+      to_height: params.toHeight,
+      limit: params.limit,
+      contract_id: params.contractId,
+      sender: params.sender,
+      recipient: params.recipient,
+      asset_identifier: params.assetIdentifier,
+      types: params.types,
+      not_types: params.notTypes
+    })}`);
   }
   return {
     events: {
@@ -863,6 +892,7 @@ function createStreamsClient(options) {
         return consumeStreamsEvents({
           fromCursor: params.fromCursor,
           mode: params.mode,
+          finalizedOnly: params.finalizedOnly,
           types: params.types,
           notTypes: params.notTypes,
           contractId: params.contractId,
@@ -872,6 +902,7 @@ function createStreamsClient(options) {
           batchSize: params.batchSize ?? 100,
           fetchEvents,
           onBatch: params.onBatch,
+          onReorg: params.onReorg,
           emptyBackoffMs: params.emptyBackoffMs,
           maxPages: params.maxPages,
           maxEmptyPolls: params.maxEmptyPolls,
@@ -926,11 +957,10 @@ function createStreamsClient(options) {
     },
     reorgs: {
       list(params) {
-        const searchParams = new URLSearchParams;
-        appendSearchParam2(searchParams, "since", params.since);
-        appendSearchParam2(searchParams, "limit", params.limit);
-        const query = searchParams.toString();
-        return request(`/v1/streams/reorgs${query ? `?${query}` : ""}`);
+        return request(`/v1/streams/reorgs${buildQuery({
+          since: params.since,
+          limit: params.limit
+        })}`);
       }
     },
     dumps,
@@ -1012,127 +1042,8 @@ function getSubgraph(def, options = {}) {
   }
   return new Subgraphs(options).typed(def);
 }
-// src/streams/ft-transfer.ts
-function requireString(payload, field) {
-  const value = payload[field];
-  if (typeof value !== "string" || value.length === 0) {
-    throw new Error(`ft_transfer payload missing ${field}`);
-  }
-  return value;
-}
-function parseAssetIdentifier(assetIdentifier) {
-  const [contractId, tokenName] = assetIdentifier.split("::");
-  if (!contractId) {
-    throw new Error("ft_transfer payload has malformed asset_identifier");
-  }
-  return {
-    contract_id: contractId,
-    token_name: tokenName && tokenName.length > 0 ? tokenName : null
-  };
-}
-function isFtTransfer(event) {
-  return event.event_type === "ft_transfer";
-}
-function decodeFtTransfer(event) {
-  if (!isFtTransfer(event)) {
-    throw new Error(`Expected ft_transfer event, got ${event.event_type}`);
-  }
-  const payload = event.payload;
-  const assetIdentifier = requireString(payload, "asset_identifier");
-  const sender = requireString(payload, "sender");
-  const recipient = requireString(payload, "recipient");
-  const amount = requireString(payload, "amount");
-  if (!/^(0|[1-9]\d*)$/.test(amount)) {
-    throw new Error("ft_transfer payload has malformed amount");
-  }
-  const { contract_id, token_name } = parseAssetIdentifier(assetIdentifier);
-  return {
-    cursor: event.cursor,
-    block_height: event.block_height,
-    tx_id: event.tx_id,
-    tx_index: event.tx_index,
-    event_index: event.event_index,
-    event_type: event.event_type,
-    decoded_payload: {
-      asset_identifier: assetIdentifier,
-      contract_id: event.contract_id ?? contract_id,
-      token_name,
-      sender,
-      recipient,
-      amount
-    },
-    source_cursor: event.cursor
-  };
-}
-// src/streams/nft-transfer.ts
-function requireString2(payload, field) {
-  const value = payload[field];
-  if (typeof value !== "string" || value.length === 0) {
-    throw new Error(`nft_transfer payload missing ${field}`);
-  }
-  return value;
-}
-function requireHexValue(payload) {
-  const rawValue = payload.raw_value;
-  if (typeof rawValue === "string") {
-    if (!/^0x[0-9a-fA-F]*$/.test(rawValue)) {
-      throw new Error("nft_transfer payload has malformed value");
-    }
-    return rawValue;
-  }
-  const value = payload.value;
-  const hex = typeof value === "string" ? value : value && typeof value === "object" && typeof value.hex === "string" ? value.hex : null;
-  if (!hex) {
-    throw new Error("nft_transfer payload missing value");
-  }
-  if (!/^0x[0-9a-fA-F]*$/.test(hex)) {
-    throw new Error("nft_transfer payload has malformed value");
-  }
-  return hex;
-}
-function parseAssetIdentifier2(assetIdentifier) {
-  const [contractId, tokenName] = assetIdentifier.split("::");
-  if (!contractId) {
-    throw new Error("nft_transfer payload has malformed asset_identifier");
-  }
-  return {
-    contract_id: contractId,
-    token_name: tokenName && tokenName.length > 0 ? tokenName : null
-  };
-}
-function isNftTransfer(event) {
-  return event.event_type === "nft_transfer";
-}
-function decodeNftTransfer(event) {
-  if (!isNftTransfer(event)) {
-    throw new Error(`Expected nft_transfer event, got ${event.event_type}`);
-  }
-  const payload = event.payload;
-  const assetIdentifier = requireString2(payload, "asset_identifier");
-  const sender = requireString2(payload, "sender");
-  const recipient = requireString2(payload, "recipient");
-  const value = requireHexValue(payload);
-  const { contract_id, token_name } = parseAssetIdentifier2(assetIdentifier);
-  return {
-    cursor: event.cursor,
-    block_height: event.block_height,
-    tx_id: event.tx_id,
-    tx_index: event.tx_index,
-    event_index: event.event_index,
-    event_type: event.event_type,
-    decoded_payload: {
-      asset_identifier: assetIdentifier,
-      contract_id: event.contract_id ?? contract_id,
-      token_name,
-      sender,
-      recipient,
-      value
-    },
-    source_cursor: event.cursor
-  };
-}
 // src/streams/_payload.ts
-function requireString3(payload, field, eventType) {
+function requireString(payload, field, eventType) {
   const value = payload[field];
   if (typeof value !== "string" || value.length === 0) {
     throw new Error(`${eventType} payload missing ${field}`);
@@ -1143,7 +1054,7 @@ function optionalString(value) {
   return typeof value === "string" && value.length > 0 ? value : null;
 }
 function requireAmountField(payload, field, eventType) {
-  const amount = requireString3(payload, field, eventType);
+  const amount = requireString(payload, field, eventType);
   if (!/^(0|[1-9]\d*)$/.test(amount)) {
     throw new Error(`${eventType} payload has malformed ${field}`);
   }
@@ -1152,7 +1063,7 @@ function requireAmountField(payload, field, eventType) {
 function requireAmount(payload, eventType) {
   return requireAmountField(payload, "amount", eventType);
 }
-function parseAssetIdentifier3(assetIdentifier, eventType) {
+function parseAssetIdentifier(assetIdentifier, eventType) {
   const [contractId, tokenName] = assetIdentifier.split("::");
   if (!contractId) {
     throw new Error(`${eventType} payload has malformed asset_identifier`);
@@ -1162,7 +1073,7 @@ function parseAssetIdentifier3(assetIdentifier, eventType) {
     token_name: tokenName && tokenName.length > 0 ? tokenName : null
   };
 }
-function requireHexValue2(payload, eventType) {
+function requireHexValue(payload, eventType) {
   const rawValue = payload.raw_value;
   if (typeof rawValue === "string") {
     if (!/^0x[0-9a-fA-F]*$/.test(rawValue)) {
@@ -1193,6 +1104,52 @@ function decodedRow(event, eventType, decoded_payload) {
   };
 }
 
+// src/streams/ft-transfer.ts
+function isFtTransfer(event) {
+  return event.event_type === "ft_transfer";
+}
+function decodeFtTransfer(event) {
+  if (!isFtTransfer(event)) {
+    throw new Error(`Expected ft_transfer event, got ${event.event_type}`);
+  }
+  const payload = event.payload;
+  const assetIdentifier = requireString(payload, "asset_identifier", "ft_transfer");
+  const sender = requireString(payload, "sender", "ft_transfer");
+  const recipient = requireString(payload, "recipient", "ft_transfer");
+  const amount = requireAmount(payload, "ft_transfer");
+  const { contract_id, token_name } = parseAssetIdentifier(assetIdentifier, "ft_transfer");
+  return decodedRow(event, "ft_transfer", {
+    asset_identifier: assetIdentifier,
+    contract_id: event.contract_id ?? contract_id,
+    token_name,
+    sender,
+    recipient,
+    amount
+  });
+}
+// src/streams/nft-transfer.ts
+function isNftTransfer(event) {
+  return event.event_type === "nft_transfer";
+}
+function decodeNftTransfer(event) {
+  if (!isNftTransfer(event)) {
+    throw new Error(`Expected nft_transfer event, got ${event.event_type}`);
+  }
+  const payload = event.payload;
+  const assetIdentifier = requireString(payload, "asset_identifier", "nft_transfer");
+  const sender = requireString(payload, "sender", "nft_transfer");
+  const recipient = requireString(payload, "recipient", "nft_transfer");
+  const value = requireHexValue(payload, "nft_transfer");
+  const { contract_id, token_name } = parseAssetIdentifier(assetIdentifier, "nft_transfer");
+  return decodedRow(event, "nft_transfer", {
+    asset_identifier: assetIdentifier,
+    contract_id: event.contract_id ?? contract_id,
+    token_name,
+    sender,
+    recipient,
+    value
+  });
+}
 // src/streams/stx-events.ts
 function isStxTransfer(event) {
   return event.event_type === "stx_transfer";
@@ -1203,8 +1160,8 @@ function decodeStxTransfer(event) {
   }
   const payload = event.payload;
   return decodedRow(event, "stx_transfer", {
-    sender: requireString3(payload, "sender", "stx_transfer"),
-    recipient: requireString3(payload, "recipient", "stx_transfer"),
+    sender: requireString(payload, "sender", "stx_transfer"),
+    recipient: requireString(payload, "recipient", "stx_transfer"),
     amount: requireAmount(payload, "stx_transfer"),
     memo: optionalString(payload.memo)
   });
@@ -1218,7 +1175,7 @@ function decodeStxMint(event) {
   }
   const payload = event.payload;
   return decodedRow(event, "stx_mint", {
-    recipient: requireString3(payload, "recipient", "stx_mint"),
+    recipient: requireString(payload, "recipient", "stx_mint"),
     amount: requireAmount(payload, "stx_mint")
   });
 }
@@ -1231,7 +1188,7 @@ function decodeStxBurn(event) {
   }
   const payload = event.payload;
   return decodedRow(event, "stx_burn", {
-    sender: requireString3(payload, "sender", "stx_burn"),
+    sender: requireString(payload, "sender", "stx_burn"),
     amount: requireAmount(payload, "stx_burn")
   });
 }
@@ -1244,15 +1201,15 @@ function decodeStxLock(event) {
   }
   const payload = event.payload;
   return decodedRow(event, "stx_lock", {
-    sender: requireString3(payload, "locked_address", "stx_lock"),
+    sender: requireString(payload, "locked_address", "stx_lock"),
     amount: requireAmountField(payload, "locked_amount", "stx_lock"),
     payload: { unlock_height: optionalString(payload.unlock_height) }
   });
 }
 // src/streams/token-mint-burn.ts
 function assetFields(event, eventType) {
-  const assetIdentifier = requireString3(event.payload, "asset_identifier", eventType);
-  const { contract_id, token_name } = parseAssetIdentifier3(assetIdentifier, eventType);
+  const assetIdentifier = requireString(event.payload, "asset_identifier", eventType);
+  const { contract_id, token_name } = parseAssetIdentifier(assetIdentifier, eventType);
   return {
     asset_identifier: assetIdentifier,
     contract_id: event.contract_id ?? contract_id,
@@ -1268,7 +1225,7 @@ function decodeFtMint(event) {
   }
   return decodedRow(event, "ft_mint", {
     ...assetFields(event, "ft_mint"),
-    recipient: requireString3(event.payload, "recipient", "ft_mint"),
+    recipient: requireString(event.payload, "recipient", "ft_mint"),
     amount: requireAmount(event.payload, "ft_mint")
   });
 }
@@ -1281,7 +1238,7 @@ function decodeFtBurn(event) {
   }
   return decodedRow(event, "ft_burn", {
     ...assetFields(event, "ft_burn"),
-    sender: requireString3(event.payload, "sender", "ft_burn"),
+    sender: requireString(event.payload, "sender", "ft_burn"),
     amount: requireAmount(event.payload, "ft_burn")
   });
 }
@@ -1294,8 +1251,8 @@ function decodeNftMint(event) {
   }
   return decodedRow(event, "nft_mint", {
     ...assetFields(event, "nft_mint"),
-    recipient: requireString3(event.payload, "recipient", "nft_mint"),
-    value: requireHexValue2(event.payload, "nft_mint")
+    recipient: requireString(event.payload, "recipient", "nft_mint"),
+    value: requireHexValue(event.payload, "nft_mint")
   });
 }
 function isNftBurn(event) {
@@ -1307,8 +1264,8 @@ function decodeNftBurn(event) {
   }
   return decodedRow(event, "nft_burn", {
     ...assetFields(event, "nft_burn"),
-    sender: requireString3(event.payload, "sender", "nft_burn"),
-    value: requireHexValue2(event.payload, "nft_burn")
+    sender: requireString(event.payload, "sender", "nft_burn"),
+    value: requireHexValue(event.payload, "nft_burn")
   });
 }
 // src/clarity.ts
@@ -1379,11 +1336,6 @@ var STREAMS_EVENT_TYPES = [
   "print"
 ];
 // src/datasets/client.ts
-function appendParam(params, name, value) {
-  if (value === undefined || value === null)
-    return;
-  params.set(name, String(value));
-}
 var PARAM_KEYS = {
   fromBlock: "from_block",
   toBlock: "to_block",
@@ -1424,7 +1376,7 @@ class Datasets extends BaseClient {
     if (!d) {
       throw new Error(`unknown cursor dataset "${slug}" (use one of: ${Object.keys(CURSOR_SLUGS).join(", ")})`);
     }
-    const env = await this.get(d.path, this.buildParams(params));
+    const env = await this.get(d.path, this.paramsToQuery(params));
     return {
       rows: env[d.rowKey] ?? [],
       next_cursor: env.next_cursor ?? null,
@@ -1441,40 +1393,37 @@ class Datasets extends BaseClient {
   bnsNamespaceEvents = this.cursorDataset("bns/namespace-events", "events");
   bnsMarketplaceEvents = this.cursorDataset("bns/marketplace-events", "events");
   bnsNames(params = {}) {
-    const sp = new URLSearchParams;
-    appendParam(sp, "namespace", params.namespace);
-    appendParam(sp, "owner", params.owner);
-    appendParam(sp, "limit", params.limit);
-    appendParam(sp, "offset", params.offset);
-    return this.get("bns/names", sp);
+    return this.get("bns/names", buildQuery({
+      namespace: params.namespace,
+      owner: params.owner,
+      limit: params.limit,
+      offset: params.offset
+    }));
   }
   bnsNamespaces() {
-    return this.get("bns/namespaces", new URLSearchParams);
+    return this.get("bns/namespaces", "");
   }
   bnsResolve(fqn) {
-    const sp = new URLSearchParams;
-    sp.set("fqn", fqn);
-    return this.get("bns/resolve", sp);
+    return this.get("bns/resolve", buildQuery({ fqn }));
   }
   networkHealth() {
-    return this.get("network-health/summary", new URLSearchParams);
+    return this.get("network-health/summary", "");
   }
-  get(path, sp) {
-    const qs = sp.toString();
-    return this.request("GET", `/v1/datasets/${path}${qs ? `?${qs}` : ""}`);
+  get(path, query) {
+    return this.request("GET", `/v1/datasets/${path}${query}`);
   }
-  buildParams(params) {
-    const sp = new URLSearchParams;
+  paramsToQuery(params) {
+    const mapped = {};
     for (const [k, v] of Object.entries(params)) {
       if (v === undefined || v === null || k === "batchSize" || k === "signal")
         continue;
-      appendParam(sp, PARAM_KEYS[k] ?? k, v);
+      mapped[PARAM_KEYS[k] ?? k] = v;
     }
-    return sp;
+    return buildQuery(mapped);
   }
   cursorDataset(path, rowKey) {
     const list = async (params = {}) => {
-      const envelope = await this.get(path, this.buildParams(params));
+      const envelope = await this.get(path, this.paramsToQuery(params));
       return {
         rows: envelope[rowKey] ?? [],
         next_cursor: envelope.next_cursor ?? null,
@@ -1586,10 +1535,11 @@ export {
   RateLimitError,
   Index,
   Datasets,
+  Cursor,
   CURSOR_SLUGS,
   AuthError,
   ApiError
 };
 
-//# debugId=4712778CA4B6FFB664756E2164756E21
+//# debugId=DF9925BCF7B82FB964756E2164756E21
 //# sourceMappingURL=index.js.map