@d9-network/ink 1.1.0 → 1.2.1

package/dist/index.mjs

@@ -1,3 +1,4 @@
+import { _ as isMessageCall, d as PSP22_SELECTORS, f as buildLabelMap, g as getSelectorForLabel, h as getLabelForSelector, m as getAllSelectors, p as buildSelectorMap, t as indexer_exports, v as isPSP22Call } from "./indexer-C-EZviUx.mjs";
 import { Binary } from "polkadot-api";
 import { fromHex } from "polkadot-api/utils";
 import { getInkDynamicBuilder, getInkLookup } from "@polkadot-api/ink-contracts";
@@ -5,7 +6,7 @@ import { ss58Decode } from "@polkadot-labs/hdkd-helpers";
 import { HexSink, Src } from "@subsquid/scale-codec";
 import { AccountId, Bytes as Bytes$1, Option, Struct, Tuple, Variant, Vector, _void, bool, i128, i16, i32, i64, i8, str, u128, u16, u32, u64, u8 } from "@polkadot-api/substrate-bindings";
 import { blake2b } from "@noble/hashes/blake2.js";
-import { AbortedError, AbortedError as AbortedError$1, ContractError, ContractError as ContractError$1, ContractExecutionError, D9_SS58_PREFIX, DecodeError, DecodeError as DecodeError$1, EncodeError, LangError, LangError as LangError$1, MetadataError, MetadataError as MetadataError$1, NetworkError, SignerError, TimeoutError, TimeoutError as TimeoutError$1, TransactionError, TransactionError as TransactionError$1, isContractError, isErrorType } from "@d9-network/spec";
+import { AbortedError, AbortedError as AbortedError$1, ContractError, ContractError as ContractError$1, ContractExecutionError, D9_SS58_PREFIX, DecodeError, DecodeError as DecodeError$1, EncodeError, LangError, LangError as LangError$1, MetadataError, MetadataError as MetadataError$1, NetworkError, SignerError, TimeoutError, TimeoutError as TimeoutError$1, TransactionError, TransactionError as TransactionError$1, isContractError, isErrorType, toD9Address } from "@d9-network/spec";
 import { catchError, filter, from, map, mergeMap, of, share } from "rxjs";
 
 //#region src/encode.ts
@@ -501,7 +502,7 @@ var ContractEventParser = class {
 	constructor(descriptor, contractAddress) {
 		if (!descriptor.metadata) throw new Error("Contract descriptor must include metadata");
 		this.metadata = descriptor.metadata;
-		this.contractAddress = contractAddress;
+		this.contractAddress = toD9Address(contractAddress);
 		this.eventDecoders = buildAllEventDecoders(this.metadata);
 		this.contractAddressBytes = ss58Decode(contractAddress)[0];
 		this.eventSignatures = /* @__PURE__ */ new Map();
@@ -527,7 +528,7 @@ var ContractEventParser = class {
 	parseEvent(chainEvent) {
 		const extracted = this.extractContractEmittedEvent(chainEvent);
 		if (!extracted) return null;
-		const { contract, data, topics, blockNumber, blockHash, eventIndex } = extracted;
+		const { contract, data, topics, blockNumber, blockHash, eventIndex, extrinsicIndex } = extracted;
 		if (!this.bytesEqual(contract, this.contractAddressBytes)) return null;
 		if (topics.length === 0) return null;
 		const signature = topics[0];
@@ -551,17 +552,19 @@ var ContractEventParser = class {
 		}
 		try {
 			const decodedData = decoder(data.slice(1));
+			const rawEvent = {
+				blockNumber,
+				blockHash,
+				eventIndex,
+				contractAddress: this.getContractAddress(),
+				data,
+				topics
+			};
+			if (extrinsicIndex !== void 0) rawEvent.extrinsicIndex = extrinsicIndex;
 			return {
 				type: eventLabel,
 				value: decodedData,
-				raw: {
-					blockNumber,
-					blockHash,
-					eventIndex,
-					contractAddress: this.getContractAddress(),
-					data,
-					topics
-				}
+				raw: rawEvent
 			};
 		} catch (error) {
 			console.warn(`Failed to decode event ${eventLabel}:`, error);
@@ -702,13 +705,16 @@ var ContractEventParser = class {
 		const blockNumber = typeof record.blockNumber === "number" ? record.blockNumber : 0;
 		const blockHash = typeof record.blockHash === "string" ? record.blockHash : "";
 		const eventIndex = typeof record.eventIndex === "number" ? record.eventIndex : 0;
+		let extrinsicIndex;
+		if (record.phase && typeof record.phase === "object" && record.phase.type === "ApplyExtrinsic" && typeof record.phase.value === "number") extrinsicIndex = record.phase.value;
 		return {
 			contract,
 			data,
 			topics,
 			blockNumber,
 			blockHash,
-			eventIndex
+			eventIndex,
+			extrinsicIndex
 		};
 	}
 	/**
@@ -875,7 +881,7 @@ function createNativeTransferStream(client, getEvents, watchAddress) {
 * @example
 * ```ts
 * import { createMessageBuilder } from '@d9-network/ink';
-* import { contracts } from '@polkadot-api/descriptors';
+* import { contracts } from '@d9-network/spec';
 *
 * const builder = createMessageBuilder(contracts.usdt);
 *
@@ -1333,7 +1339,7 @@ function createD9InkContract(descriptor, address, options) {
 * @example
 * ```ts
 * import { createD9InkSdk } from "@d9-network/ink";
-* import { contracts } from "@polkadot-api/descriptors";
+* import { contracts } from "@d9-network/spec";
 *
 * const sdk = createD9InkSdk(client);
 * const usdtContract = sdk.getContract(
@@ -1923,190 +1929,6 @@ function isCallType(call, label) {
 	return call.type === label;
 }
 
-//#endregion
-//#region src/selectors.ts
-/**
-* PSP22 standard selectors for quick reference
-*
-* These are derived from the PSP22 standard and are consistent across implementations.
-* Use these when you need to quickly check if call data matches a specific PSP22 method.
-*
-* @example
-* ```ts
-* import { PSP22_SELECTORS, extractSelectorHex } from "@d9-network/ink";
-*
-* const selectorHex = extractSelectorHex(callData);
-* if (selectorHex === PSP22_SELECTORS.transfer) {
-*   // This is a PSP22::transfer call
-* }
-* ```
-*/
-const PSP22_SELECTORS = {
-	totalSupply: "162df8c2",
-	balanceOf: "6568382f",
-	allowance: "4d47d921",
-	transfer: "db20f9f5",
-	transferFrom: "54b3c76e",
-	approve: "b20f1bbd",
-	increaseAllowance: "96d6b57a",
-	decreaseAllowance: "fecb57d5"
-};
-/**
-* Build a selector lookup map from contract metadata
-*
-* @param metadata - Contract metadata
-* @returns Map of selector hex (without 0x) -> SelectorInfo
-*
-* @example
-* ```ts
-* import { contracts } from "@d9-network/spec";
-* import { buildSelectorMap } from "@d9-network/ink";
-*
-* const selectors = buildSelectorMap(contracts.usdt.metadata);
-* const info = selectors.get("db20f9f5");
-* if (info) {
-*   console.log(info.label); // "PSP22::transfer"
-* }
-* ```
-*/
-function buildSelectorMap(metadata) {
-	const map$1 = /* @__PURE__ */ new Map();
-	const messages = metadata.spec.messages;
-	for (const message of messages) {
-		const selectorHex = message.selector.startsWith("0x") ? message.selector.slice(2).toLowerCase() : message.selector.toLowerCase();
-		const selector = hexToBytes(selectorHex);
-		map$1.set(selectorHex, {
-			label: message.label,
-			selector,
-			selectorHex,
-			mutates: message.mutates,
-			payable: message.payable
-		});
-	}
-	return map$1;
-}
-/**
-* Build a reverse lookup map (label -> selector info)
-*
-* @param metadata - Contract metadata
-* @returns Map of label -> SelectorInfo
-*
-* @example
-* ```ts
-* const labelMap = buildLabelMap(contracts.usdt.metadata);
-* const info = labelMap.get("PSP22::transfer");
-* console.log(info?.selectorHex); // "db20f9f5"
-* ```
-*/
-function buildLabelMap(metadata) {
-	const map$1 = /* @__PURE__ */ new Map();
-	const selectorMap = buildSelectorMap(metadata);
-	for (const info of selectorMap.values()) map$1.set(info.label, info);
-	return map$1;
-}
-/**
-* Get selector for a message label
-*
-* @param metadata - Contract metadata
-* @param label - Message label (e.g., "PSP22::transfer")
-* @returns Selector info or null if not found
-*
-* @example
-* ```ts
-* const info = getSelectorForLabel(contracts.usdt.metadata, "PSP22::transfer");
-* console.log(info?.selectorHex); // "db20f9f5"
-* ```
-*/
-function getSelectorForLabel(metadata, label) {
-	return buildLabelMap(metadata).get(label) ?? null;
-}
-/**
-* Get message label for a selector
-*
-* @param metadata - Contract metadata
-* @param selector - Selector as Uint8Array or hex string (with or without 0x)
-* @returns Selector info or null if not found
-*
-* @example
-* ```ts
-* const info = getLabelForSelector(contracts.usdt.metadata, "db20f9f5");
-* console.log(info?.label); // "PSP22::transfer"
-*
-* // Also works with Uint8Array
-* const info2 = getLabelForSelector(contracts.usdt.metadata, callData.slice(0, 4));
-* ```
-*/
-function getLabelForSelector(metadata, selector) {
-	const selectorHex = normalizeSelector(selector);
-	return buildSelectorMap(metadata).get(selectorHex) ?? null;
-}
-/**
-* Check if call data matches a specific message
-*
-* @param metadata - Contract metadata
-* @param callData - Call data bytes or hex string
-* @param label - Message label to check
-* @returns True if the call data selector matches the label
-*
-* @example
-* ```ts
-* if (isMessageCall(contracts.usdt.metadata, callData, "PSP22::transfer")) {
-*   // This is a transfer call
-* }
-* ```
-*/
-function isMessageCall(metadata, callData, label) {
-	const bytes = typeof callData === "string" ? hexToBytes(callData) : callData;
-	if (bytes.length < 4) return false;
-	const callSelectorHex = bytesToHex(bytes.slice(0, 4));
-	const info = getSelectorForLabel(metadata, label);
-	return info !== null && info.selectorHex === callSelectorHex;
-}
-/**
-* Check if call data matches a PSP22 method
-*
-* @param callData - Call data bytes or hex string
-* @param method - PSP22 method name (e.g., "transfer", "transferFrom")
-* @returns True if the call data selector matches the PSP22 method
-*
-* @example
-* ```ts
-* if (isPSP22Call(callData, "transfer")) {
-*   // This is a PSP22::transfer call
-* }
-* ```
-*/
-function isPSP22Call(callData, method) {
-	const bytes = typeof callData === "string" ? hexToBytes(callData) : callData;
-	if (bytes.length < 4) return false;
-	return bytesToHex(bytes.slice(0, 4)) === PSP22_SELECTORS[method];
-}
-/**
-* Get all selectors from contract metadata
-*
-* @param metadata - Contract metadata
-* @returns Array of SelectorInfo for all messages
-*/
-function getAllSelectors(metadata) {
-	const selectorMap = buildSelectorMap(metadata);
-	return Array.from(selectorMap.values());
-}
-function normalizeSelector(selector) {
-	if (selector instanceof Uint8Array) return bytesToHex(selector);
-	return selector.startsWith("0x") ? selector.slice(2).toLowerCase() : selector.toLowerCase();
-}
-function hexToBytes(hex) {
-	const clean = hex.startsWith("0x") ? hex.slice(2) : hex;
-	const bytes = new Uint8Array(clean.length / 2);
-	for (let i = 0; i < bytes.length; i++) bytes[i] = parseInt(clean.slice(i * 2, i * 2 + 2), 16);
-	return bytes;
-}
-function bytesToHex(bytes) {
-	let hex = "";
-	for (let i = 0; i < bytes.length; i++) hex += bytes[i].toString(16).padStart(2, "0");
-	return hex;
-}
-
 //#endregion
 //#region src/extrinsic-parser.ts
 /**
@@ -2168,6 +1990,10 @@ var ExtrinsicParser = class {
 		const call = this.callParser.parseCall(raw);
 		if (!call) return null;
 		if (this.options.messageLabels && this.options.messageLabels.length > 0 && !this.options.messageLabels.includes(call.type)) return null;
+		let signer = String(extrinsic.signer ?? "");
+		if (signer && signer.length >= 32) try {
+			signer = toD9Address(signer);
+		} catch {}
 		return {
 			call,
 			extrinsic: {
@@ -2175,7 +2001,7 @@ var ExtrinsicParser = class {
 				blockNumber: extrinsic.blockNumber ?? 0,
 				blockHash: extrinsic.blockHash ?? "",
 				index: extrinsic.index ?? 0,
-				signer: String(extrinsic.signer ?? "")
+				signer
 			},
 			contractAddress,
 			value
@@ -2259,10 +2085,11 @@ var ExtrinsicParser = class {
 	}
 	extractContractAddress(dest) {
 		if (!dest) return null;
-		if (typeof dest === "string") return dest;
-		if (typeof dest === "object" && "type" in dest && "value" in dest) return dest.value;
-		if (typeof dest === "object" && "Id" in dest) return dest.Id;
-		return null;
+		let address = null;
+		if (typeof dest === "string") address = dest;
+		else if (typeof dest === "object" && "type" in dest && "value" in dest) address = dest.value;
+		else if (typeof dest === "object" && "Id" in dest) address = dest.Id;
+		return address ? toD9Address(address) : null;
 	}
 	extractBytes(data) {
 		if (!data) return null;
@@ -2422,5 +2249,5 @@ function gasExceedsLimit(gas, limit) {
 }
 
 //#endregion
-export { AbortedError, ContractCallParser, ContractError, ContractEventParser, ContractExecutionError, DecodeError, EncodeError, ExtrinsicParser, InkCodecs, LangError, MetadataError, NetworkError, PSP22_SELECTORS, SignerError, TimeoutError, TransactionError, applyGasMargin, buildAllEventDecoders, buildAllMessageDecoders, buildEventDecoder, buildLabelMap, buildMessageDecoder, buildSelectorMap, compareGasWeight, createAsciiEventTopic, createCodecRegistry, createContractEventStream, createD9InkContract, createD9InkSdk, createExtrinsicParser, createMessageBuilder, createNativeTransferStream, createPSP22TransferStream, createTypedRpc, decodeContractCallResult, decodeInkValue, encodeCall, encodeContractCall, encodeContractCallWithLimits, estimateTransactionCost, extractContractEmittedData, formatGasInfo, gasExceedsLimit, getAllSelectors, getEventSignature, getLabelForSelector, getSelectorForLabel, isApplyExtrinsicPhase, isBalancesTransferEvent, isCallType, isContractCalledEvent, isContractEmittedEvent, isContractError, isErrorType, isEventType, isLangError, isMessageCall, isPSP22Call, unwrapInkResult };
+export { AbortedError, ContractCallParser, ContractError, ContractEventParser, ContractExecutionError, DecodeError, EncodeError, ExtrinsicParser, InkCodecs, LangError, MetadataError, NetworkError, PSP22_SELECTORS, SignerError, TimeoutError, TransactionError, applyGasMargin, buildAllEventDecoders, buildAllMessageDecoders, buildEventDecoder, buildLabelMap, buildMessageDecoder, buildSelectorMap, compareGasWeight, createAsciiEventTopic, createCodecRegistry, createContractEventStream, createD9InkContract, createD9InkSdk, createExtrinsicParser, createMessageBuilder, createNativeTransferStream, createPSP22TransferStream, createTypedRpc, decodeContractCallResult, decodeInkValue, encodeCall, encodeContractCall, encodeContractCallWithLimits, estimateTransactionCost, extractContractEmittedData, formatGasInfo, gasExceedsLimit, getAllSelectors, getEventSignature, getLabelForSelector, getSelectorForLabel, indexer_exports as indexer, isApplyExtrinsicPhase, isBalancesTransferEvent, isCallType, isContractCalledEvent, isContractEmittedEvent, isContractError, isErrorType, isEventType, isLangError, isMessageCall, isPSP22Call, unwrapInkResult };
 //# sourceMappingURL=index.mjs.map