@mysten-incubation/hashi 0.0.2 → 0.1.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @mysten-incubation/hashi
 
+## 0.1.0
+
+### Minor Changes
+
+- 75fcdca: Fix btcTxid display values to strip the 0x prefix. Add GraphQL-based discovery of pending deposits to transaction history — confirmed requests still read from the on-chain user_requests index; in-flight deposits are discovered via DepositRequestedEvent queries and deduplicated. Bump GET_OBJECTS_BATCH to 500.
+
 ## 0.0.2
 
 ### Patch Changes

package/dist/client.d.mts

@@ -36,7 +36,8 @@ declare class HashiClient {
     hashiObjectId,
     packageId,
     bitcoinNetwork,
-    btcRpcUrl
+    btcRpcUrl,
+    graphqlUrl
   }: {
     client: ClientWithCoreApi;
     network: SuiNetwork;
@@ -44,6 +45,7 @@ declare class HashiClient {
     packageId?: string;
     bitcoinNetwork?: BitcoinNetwork;
     btcRpcUrl?: string;
+    graphqlUrl?: string;
   });
   /**
    * Generates a unique Bitcoin P2TR deposit address for a Sui address.
@@ -344,14 +346,9 @@ declare class HashiClient {
     withdrawalFees: (sender?: string) => Promise<WithdrawalFees>;
     /**
      * Fetch the unified transaction history (deposits + withdrawals) for
-     * a Sui address. Reads from `BitcoinState.user_requests` — a Table
-     * that maps each user address to a Bag of request IDs — then batch-
-     * fetches the request objects and dispatches by Move type.
-     *
-     * Deposit items include `btcTxid` / `btcVout` extracted from the
-     * UTXO stored on the `DepositRequest`. Withdrawal items include the
-     * BTC txid from the linked `WithdrawalTransaction` once the committee
-     * has committed one.
+     * a Sui address. Confirmed requests come from the on-chain
+     * `user_requests` index; in-flight deposits are discovered via
+     * GraphQL `DepositRequestedEvent` queries (indexed by sender).
      */
     transactionHistory: (suiAddress: string) => Promise<TransactionHistoryItem[]>;
   };

package/dist/client.mjs

@@ -21,8 +21,17 @@ import { Transaction, coinWithBalance } from "@mysten/sui/transactions";
 const OBJECT_BAG_ADDRESS_TYPE = "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_object_field::Wrapper<address>";
 /** Max value of an unsigned 32-bit integer; vout is a u32 on the Bitcoin side. */
 const U32_MAX = 4294967295;
-/** Max objects per `getObjects` call — Sui transports typically cap at 50. */
-const GET_OBJECTS_BATCH = 50;
+/** Max objects per `getObjects` call. */
+const GET_OBJECTS_BATCH = 500;
+const GRAPHQL_URLS = {
+	devnet: "https://fullnode.devnet.sui.io:443/graphql",
+	testnet: "https://fullnode.testnet.sui.io:443/graphql",
+	mainnet: "https://fullnode.mainnet.sui.io:443/graphql",
+	localnet: "http://127.0.0.1:9000/graphql"
+};
+function defaultGraphqlUrl(network) {
+	return GRAPHQL_URLS[network] ?? GRAPHQL_URLS["mainnet"];
+}
 /**
 * Recognize the per-object errors that mean "the object (or dynamic field)
 * genuinely does not exist" — the only Error shape that `findUsedUtxos` is
@@ -80,11 +89,12 @@ var HashiClient = class {
 	#packageId;
 	#bitcoinNetwork;
 	#btcRpcUrl;
-	constructor({ client, network, hashiObjectId, packageId, bitcoinNetwork, btcRpcUrl }) {
+	#graphqlUrl;
+	constructor({ client, network, hashiObjectId, packageId, bitcoinNetwork, btcRpcUrl, graphqlUrl }) {
 		this.tx = {
 			deposit: (params) => {
 				const tx = new Transaction();
-				const internalTxid = reverseTxidBytes(params.txid);
+				const internalTxid = `0x${reverseTxidBytes(params.txid)}`;
 				for (const { vout, amountSats } of params.utxos) {
 					const utxoId$1 = tx.add(utxoId({
 						package: this.#packageId,
@@ -205,7 +215,7 @@ var HashiClient = class {
 				const fieldIds = [];
 				for (const u of utxos) {
 					const keyBcs = UtxoId.serialize({
-						txid: reverseTxidBytes(u.txid),
+						txid: `0x${reverseTxidBytes(u.txid)}`,
 						vout: u.vout
 					}).toBytes();
 					fieldIds.push(deriveDynamicFieldID(activePoolId, typeTag, keyBcs), deriveDynamicFieldID(spentPoolId, typeTag, keyBcs));
@@ -384,13 +394,29 @@ var HashiClient = class {
 			},
 			transactionHistory: async (suiAddress) => {
 				const btcState = await this.#fetchBitcoinState();
+				const confirmedIds = /* @__PURE__ */ new Set();
+				const items = [];
 				const userBagId = await this.#fetchUserRequestsBagId(btcState.user_requests.id, suiAddress);
-				if (userBagId === null) return [];
-				const requestIds = await this.#listAllDynamicFieldAddressKeys(userBagId);
-				if (requestIds.length === 0) return [];
-				const objects = await this.#batchGetObjects(requestIds, { content: true });
-				const { items, withdrawalTxnLookups } = this.#classifyRequestObjects(objects);
-				await this.#populateWithdrawalBtcTxids(items, withdrawalTxnLookups);
+				if (userBagId !== null) {
+					const requestIds = await this.#listAllDynamicFieldAddressKeys(userBagId);
+					if (requestIds.length > 0) {
+						const objects = await this.#batchGetObjects(requestIds, { content: true });
+						const classified = this.#classifyRequestObjects(objects);
+						items.push(...classified.items);
+						await this.#populateWithdrawalBtcTxids(items, classified.withdrawalTxnLookups);
+						for (const id of requestIds) confirmedIds.add(id);
+					}
+				}
+				try {
+					const depositEventType = `${this.#packageId}::deposit::DepositRequestedEvent`;
+					const pendingIds = (await this.#queryEventRequestIds(suiAddress, depositEventType)).filter((id) => !confirmedIds.has(id));
+					if (pendingIds.length > 0) {
+						const objects = await this.#batchGetObjects(pendingIds, { content: true });
+						const classified = this.#classifyRequestObjects(objects);
+						items.push(...classified.items);
+					}
+				} catch {}
+				items.sort((a, b) => Number(b.timestampMs - a.timestampMs));
 				return items;
 			}
 		};
@@ -417,6 +443,7 @@ var HashiClient = class {
 		this.#packageId = resolvedPackageId;
 		this.#bitcoinNetwork = bitcoinNetwork ?? config?.bitcoinNetwork ?? "testnet";
 		this.#btcRpcUrl = btcRpcUrl;
+		this.#graphqlUrl = graphqlUrl ?? defaultGraphqlUrl(network);
 	}
 	/**
 	* Generates a unique Bitcoin P2TR deposit address for a Sui address.
@@ -683,26 +710,8 @@ var HashiClient = class {
 		return BitcoinState.parse(new Uint8Array(dynamicField.value.bcs));
 	}
 	/**
-	* Batch-fetches objects in chunks of `GET_OBJECTS_BATCH`, concatenating
-	* the results. Each element is either an object or an `Error` (for
-	* missing / deleted objects).
-	*/
-	async #batchGetObjects(objectIds, include) {
-		const results = [];
-		for (let i = 0; i < objectIds.length; i += GET_OBJECTS_BATCH) {
-			const batch = objectIds.slice(i, i + GET_OBJECTS_BATCH);
-			const { objects } = await this.#client.core.getObjects({
-				objectIds: batch,
-				include
-			});
-			results.push(...objects);
-		}
-		return results;
-	}
-	/**
 	* Resolve the Bag id holding a user's request IDs from `user_requests`,
-	* or `null` if the user has never had a request (no Table entry yet —
-	* `getDynamicField` rejects rather than returning a sentinel).
+	* or `null` if the user has never had a request.
 	*/
 	async #fetchUserRequestsBagId(tableId, suiAddress) {
 		try {
@@ -720,8 +729,7 @@ var HashiClient = class {
 	}
 	/**
 	* Enumerate every `address`-keyed dynamic field on `parentId`, paginating
-	* through `listDynamicFields` until exhausted. Decodes each `name.bcs` as
-	* a Sui address.
+	* through `listDynamicFields` until exhausted.
 	*/
 	async #listAllDynamicFieldAddressKeys(parentId) {
 		const keys = [];
@@ -737,6 +745,58 @@ var HashiClient = class {
 		return keys;
 	}
 	/**
+	* Batch-fetches objects in chunks of `GET_OBJECTS_BATCH`, concatenating
+	* the results. Each element is either an object or an `Error` (for
+	* missing / deleted objects).
+	*/
+	async #batchGetObjects(objectIds, include) {
+		const results = [];
+		for (let i = 0; i < objectIds.length; i += GET_OBJECTS_BATCH) {
+			const batch = objectIds.slice(i, i + GET_OBJECTS_BATCH);
+			const { objects } = await this.#client.core.getObjects({
+				objectIds: batch,
+				include
+			});
+			results.push(...objects);
+		}
+		return results;
+	}
+	/**
+	* Query the Sui GraphQL endpoint for events of a given type emitted by
+	* a sender. Returns the `request_id` from each event's JSON payload,
+	* paginating through all results.
+	*/
+	async #queryEventRequestIds(sender, eventType) {
+		const ids = [];
+		let cursor = null;
+		let hasMore = true;
+		while (hasMore) {
+			const query = `{
+                events(
+                    filter: { sender: "${sender}", type: "${eventType}" }
+                    first: 50${cursor ? `, after: "${cursor}"` : ""}
+                ) {
+                    nodes { contents { json } }
+                    pageInfo { hasNextPage endCursor }
+                }
+            }`;
+			const res = await fetch(this.#graphqlUrl, {
+				method: "POST",
+				headers: { "Content-Type": "application/json" },
+				body: JSON.stringify({ query })
+			});
+			if (!res.ok) throw new Error(`GraphQL request failed: ${res.status}`);
+			const body = await res.json();
+			if (body.errors?.length) throw new Error(`GraphQL error: ${body.errors[0].message}`);
+			const events = body.data?.events;
+			if (!events) break;
+			for (const node of events.nodes) ids.push(node.contents.json.request_id);
+			hasMore = events.pageInfo.hasNextPage;
+			cursor = events.pageInfo.endCursor ?? null;
+		}
+		return ids;
+	}
+	/**
 	* Classify a batch of request objects into deposit / withdrawal history
 	* items. Errors in the batch are skipped (the request object may have
 	* been deleted between the bag enumeration and the fetch). Returns the

package/dist/types.d.mts

@@ -18,6 +18,8 @@ interface HashiClientOptions<Name = "HashiClient"> {
   bitcoinNetwork?: BitcoinNetwork;
   /** Optional Bitcoin Core JSON-RPC URL for UTXO lookups and confirmation checks. */
   btcRpcUrl?: string;
+  /** Override the Sui GraphQL endpoint URL (defaults to `https://fullnode.{network}.sui.io:443/graphql`). */
+  graphqlUrl?: string;
 }
 /**
  * Frozen snapshot of every governance-controlled protocol parameter, returned

package/dist/util.mjs

@@ -29,7 +29,7 @@ function assertHex32(value, fieldName) {
 function reverseTxidBytes(txid) {
 	assertHex32(txid, "txid");
 	const hex = txid.slice(2);
-	let reversed = "0x";
+	let reversed = "";
 	for (let i = hex.length - 2; i >= 0; i -= 2) reversed += hex.slice(i, i + 2);
 	return reversed;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mysten-incubation/hashi",
-  "version": "0.0.2",
+  "version": "0.1.0",
   "description": "TypeScript SDK for the Hashi Sui Move smart contracts",
   "license": "Apache-2.0",
   "author": "Mysten Labs <build@mystenlabs.com>",