@arkiv-network/sdk 0.7.0-dev.1 → 0.8.0-advanced.2

package/dist/index.cjs

@@ -1,13 +1,22 @@
-const require_chains = require('./chains-BifaY04V.cjs');
-const require_queryBuilder = require('./queryBuilder-J37buGCi.cjs');
-const require_consts = require('./consts-CxT1-RXU.cjs');
-const require_entity = require('./entity-BhSXaB23.cjs');
-require('./types-a8gm_IaQ.cjs');
-const require_payload = require('./payload-D8YLKcJj.cjs');
+const require_chains = require('./chains-BYRTTipa.cjs');
+const require_expiry = require('./expiry-BELY2Kpw.cjs');
+const require_advanced = require('./advanced-fPImL6lW.cjs');
+const require_attributes = require('./attributes-Df9IsCVs.cjs');
+const require_key = require('./key-WKhXnXuU.cjs');
+const require_errors = require('./errors-BVbjKVMN.cjs');
+const require_flags = require('./flags-kr276q6i.cjs');
+const require_logger = require('./logger-Cr15lPAQ.cjs');
+require('./attr-DlmErkvR.cjs');
+const require_entity = require('./entity-B00Li04j.cjs');
+const require_queryBuilder = require('./queryBuilder-DbUMEZln.cjs');
+require('./entity-B7G8q_Eo.cjs');
+require('./types-NRqymi6S.cjs');
+const require_payload = require('./payload-KC14SDlN.cjs');
 let viem = require("viem");
+let viem_actions = require("viem/actions");
 
 //#region src/actions/public/getBlockTiming.ts
-const logger$8 = require_queryBuilder.getLogger("actions:public:get-block-timing");
+const logger$8 = require_logger.getLogger("actions:public:get-block-timing");
 async function getBlockTiming(client) {
 	const blockTiming = await client.request({
 		method: "arkiv_getBlockTiming",
@@ -23,33 +32,26 @@ async function getBlockTiming(client) {
 
 //#endregion
 //#region src/actions/public/getEntity.ts
-async function getEntity(client, key) {
-	let bytes;
-	try {
-		bytes = (0, viem.hexToBytes)(key);
-	} catch {
-		throw new Error(`Invalid key format: ${key}. Key must be a valid hex string.`);
-	}
-	if (bytes.length !== 32) throw new Error(`Invalid key length: ${bytes.length} bytes. Key must be 32 bytes (64 hex characters) long.`);
-	const hexKey = (0, viem.bytesToHex)(bytes);
-	const result = await client.request({
-		method: "arkiv_query",
-		params: [`$key = ${hexKey}`, { includeData: {
-			key: true,
-			attributes: true,
-			payload: true,
-			contentType: true,
-			expiration: true,
-			owner: true,
-			creator: true,
-			createdAtBlock: true,
-			lastModifiedAtBlock: true,
-			transactionIndexInBlock: true,
-			operationIndexInTransaction: true
-		} }]
+/**
+* Reads one entity by key, with every field selected.
+*
+* Returns a {@link FullEntity} rather than an {@link Entity}: the selection is fixed at `"*"`, so
+* every field is populated and none of them needs a `?` at the call site. The bare `Entity` type
+* has every field optional because a `select()` result carries only what it asked for.
+*
+* @throws {InvalidValueError} If the key is not 32 bytes.
+* @throws {NoEntityFoundError} If no live entity has that key — it never existed, or it was
+* deleted or has expired.
+*/
+async function getEntity(client, entityKey) {
+	const { entities } = await require_queryBuilder.runQuery(client, {
+		query: require_queryBuilder.eq("$key", require_attributes.key(entityKey)).toString(),
+		select: require_queryBuilder.toRpcSelect("*"),
+		limit: 1
 	});
-	if (!result.data.length) throw new require_queryBuilder.NoEntityFoundError();
-	return await require_queryBuilder.entityFromRpcResult(result.data[0]);
+	const entity = entities[0];
+	if (entity === void 0) throw new require_logger.NoEntityFoundError(entityKey);
+	return entity;
 }
 
 //#endregion
@@ -62,355 +64,294 @@ async function getEntityCount(client) {
 }
 
 //#endregion
-//#region src/actions/public/query.ts
-async function query(client, query$1, queryOptions) {
-	const rpcQueryOptions = {
-		includeData: {
-			key: true,
-			payload: queryOptions?.includeData?.payload ?? true,
-			attributes: queryOptions?.includeData?.attributes ?? false,
-			contentType: queryOptions?.includeData?.metadata ?? false,
-			expiration: queryOptions?.includeData?.metadata ?? false,
-			owner: queryOptions?.includeData?.metadata ?? false,
-			creator: queryOptions?.includeData?.metadata ?? false,
-			createdAtBlock: queryOptions?.includeData?.metadata ?? false,
-			lastModifiedAtBlock: queryOptions?.includeData?.metadata ?? false,
-			transactionIndexInBlock: queryOptions?.includeData?.metadata ?? false,
-			operationIndexInTransaction: queryOptions?.includeData?.metadata ?? false
-		},
-		...queryOptions?.atBlock !== void 0 && { atBlock: (0, viem.numberToHex)(queryOptions.atBlock) },
-		...queryOptions?.orderBy && { orderBy: queryOptions?.orderBy.map((order) => ({
-			name: order.name,
-			type: order.type,
-			desc: order.desc === "desc"
-		})) },
-		...queryOptions?.resultsPerPage !== void 0 && { resultsPerPage: (0, viem.numberToHex)(queryOptions.resultsPerPage) },
-		...queryOptions?.cursor !== void 0 && { cursor: queryOptions?.cursor }
-	};
-	const result = await client.request({
-		method: "arkiv_query",
-		params: [query$1, rpcQueryOptions]
+//#region src/actions/public/getEntityNonce.ts
+const logger$7 = require_logger.getLogger("actions:public:get-entity-nonce");
+/**
+* Reads an owner's entity-minting nonce — how many entities that account has created.
+*
+* This is not the account's transaction nonce. The engine keeps a separate counter per creator and
+* mixes it into every key it mints, which is what makes two identical creates from one account land
+* on different keys.
+*
+* @param owner - The account whose nonce to read.
+* @returns The number of entities `owner` has created so far, which is the nonce its next create
+* will use.
+*/
+async function getEntityNonce(client, owner) {
+	const nonce = await (0, viem_actions.readContract)(client, {
+		address: require_expiry.ARKIV_ADDRESS,
+		abi: require_advanced.ENTITY_NONCE_ABI,
+		functionName: "entityNonce",
+		args: [owner]
 	});
-	return {
-		entities: await Promise.all(result.data.map((entity) => require_queryBuilder.entityFromRpcResult(entity))),
-		cursor: result.cursor,
-		blockNumber: BigInt(result.blockNumber)
-	};
+	logger$7("entity nonce of %s is %s", owner, nonce);
+	return nonce;
 }
 
 //#endregion
-//#region src/utils/arkivTransactions.ts
-const logger$7 = require_queryBuilder.getLogger("utils:arkiv-transactions");
-const MIME_REGEX = /^[a-z][a-z0-9!#$&\-^_]*\/[a-z0-9][a-z0-9!#$&\-^_.+]*$/;
-function validateContentType(contentType) {
-	if (!MIME_REGEX.test(contentType)) throw new require_queryBuilder.InvalidContentTypeError(contentType);
-}
-const ENTITY_EXECUTE_ABI = (0, viem.parseAbi)(["function execute((uint8 operationType, bytes32 entityKey, bytes payload, (bytes32[4] data) contentType, (bytes32 name, uint8 valueType, bytes32[4] value)[] attributes, uint32 expiresIn, address newOwner)[] ops) external"]);
-const ENTITY_OPERATION_EVENT_ABI = (0, viem.parseAbi)(["event EntityOperation(bytes32 indexed entityKey, uint8 indexed operationType, address indexed owner, uint32 expiresAt, bytes32 entityHash)"]);
-const ENTITY_ERRORS_ABI = (0, viem.parseAbi)([
-	"error EmptyBatch()",
-	"error AttributesNotSorted()",
-	"error InvalidValueType(bytes32 name, uint8 valueType)",
-	"error InvalidOpType(uint8 operationType)",
-	"error ExpiryInPast(uint32 expiresAt, uint32 currentBlock)",
-	"error TooManyAttributes(uint256 count, uint256 maxCount)",
-	"error EntityNotFound(bytes32 entityKey)",
-	"error NotOwner(bytes32 entityKey, address caller, address owner)",
-	"error EntityExpired(bytes32 entityKey, uint32 expiresAt)",
-	"error ExpiryNotExtended(bytes32 entityKey, uint32 newExpiresAt, uint32 currentExpiresAt)",
-	"error TransferToZeroAddress(bytes32 entityKey)",
-	"error TransferToSelf(bytes32 entityKey)",
-	"error EntityNotExpired(bytes32 entityKey, uint32 expiresAt)",
-	"error Ident32Empty()",
-	"error Ident32TooLong(uint256 length)",
-	"error Ident32InvalidByte(uint256 position, bytes1 value)",
-	"error MimeEmpty()",
-	"error MimeTooLong(uint256 length, uint256 maxLength)",
-	"error MimeInvalidByte(uint256 position, bytes1 value)",
-	"error MimeIncomplete()"
-]);
-const EXECUTE_ABI = [...ENTITY_EXECUTE_ABI, ...ENTITY_ERRORS_ABI];
-const ENTITY_NONCE_ABI = (0, viem.parseAbi)(["function nonces(address owner) view returns (uint32)"]);
-const ZERO_ADDRESS = "0x0000000000000000000000000000000000000000";
-const ZERO_32 = `0x${"00".repeat(32)}`;
-const EMPTY_BYTES128 = [
-	ZERO_32,
-	ZERO_32,
-	ZERO_32,
-	ZERO_32
-];
-function encodeBytes128(data) {
-	const padded = new Uint8Array(128);
-	padded.set(data.slice(0, 128));
-	return [
-		(0, viem.toHex)(padded.slice(0, 32)),
-		(0, viem.toHex)(padded.slice(32, 64)),
-		(0, viem.toHex)(padded.slice(64, 96)),
-		(0, viem.toHex)(padded.slice(96, 128))
-	];
-}
-function encodeMime128(contentType) {
-	return { data: contentType ? encodeBytes128((0, viem.stringToBytes)(contentType)) : EMPTY_BYTES128 };
+//#region src/actions/public/predictEntityKeys.ts
+/**
+* Works out the keys an account's next creates will be given, before sending them.
+*
+* A key is `keccak256(chainId ++ registry ++ owner ++ nonce ++ salt)`. Everything but the nonce is
+* known to the caller, and the nonce is read here — so a batch can reference a key it is about to
+* mint, storing it as a `key` attribute on a sibling entity created in the same transaction.
+*
+* Each key arrives paired with its salt, and the create must be given that salt: a create left to
+* pick its own salt picks a random one, which mints a different key.
+*
+* The prediction is valid only while nothing else from this owner is in flight. Every create that
+* lands first takes the nonce with it and moves these keys. For a key you can rely on
+* unconditionally, read it back from the create instead — `createEntity` and `mutateEntities`
+* report the keys the engine actually minted.
+*
+* @param parameters - Owner, and either a count or the salts. {@link PredictEntityKeysParameters}
+* @returns One `{ key, salt }` pair per create, in batch order. {@link PredictEntityKeysReturnType}
+*
+* @example A batch whose second entity points at its first.
+* import { key } from "@arkiv-network/sdk/attr"
+*
+* const [parent, child] = await client.predictEntityKeys({ owner: account.address, count: 2 })
+* await wallet.mutateEntities({
+*   creates: [
+*     { payload, contentType, expires, salt: parent.salt },
+*     {
+*       payload,
+*       contentType,
+*       expires,
+*       salt: child.salt,
+*       attributes: { parent: key(parent.key) },
+*     },
+*   ],
+* })
+*/
+async function predictEntityKeys(client, { owner, count, salts }) {
+	const resolvedSalts = resolveSalts(count, salts);
+	const chainId = client.chain?.id ?? await (0, viem_actions.getChainId)(client);
+	const nonce = await getEntityNonce(client, owner);
+	return resolvedSalts.map((salt, index) => ({
+		key: require_key.predictEntityKey({
+			owner,
+			nonce: nonce + BigInt(index),
+			salt,
+			chainId
+		}),
+		salt
+	}));
 }
-function encodeAttribute(attr) {
-	require_queryBuilder.validateAttribute(attr);
-	const name = (0, viem.toHex)(attr.key, { size: 32 });
-	if (typeof attr.value === "string") {
-		if (require_queryBuilder.isEntityKey(attr.value)) return {
-			name,
-			valueType: require_queryBuilder.RpcAttributeValueType.EntityKey,
-			value: [
-				(0, viem.toHex)((0, viem.toBytes)(attr.value), { size: 32 }),
-				ZERO_32,
-				ZERO_32,
-				ZERO_32
-			]
-		};
-		return {
-			name,
-			valueType: require_queryBuilder.RpcAttributeValueType.String,
-			value: encodeBytes128((0, viem.stringToBytes)(attr.value))
-		};
+/** The salts to derive from: the ones given, or `count` fresh random ones. */
+function resolveSalts(count, salts) {
+	if (salts !== void 0) {
+		if (salts.length === 0) throw new Error("predictEntityKeys: `salts` is empty — there is nothing to predict");
+		return salts.map(require_key.validateSalt);
 	}
-	return {
-		name,
-		valueType: require_queryBuilder.RpcAttributeValueType.Uint,
-		value: [
-			(0, viem.toHex)(BigInt(attr.value), { size: 32 }),
-			ZERO_32,
-			ZERO_32,
-			ZERO_32
-		]
-	};
-}
-function encodeAttributes(attrs) {
-	const encoded = attrs.map((attr) => ({
-		key: attr.key,
-		...encodeAttribute(attr)
-	})).sort((a, b) => a.name < b.name ? -1 : a.name > b.name ? 1 : 0);
-	for (let i = 1; i < encoded.length; i++) if (encoded[i].name === encoded[i - 1].name) throw new require_queryBuilder.DuplicateAttributeError(encoded[i].key);
-	return encoded.map(({ key: _,...attr }) => attr);
-}
-function toBTL(expiresIn) {
-	require_queryBuilder.validateExpiresIn(expiresIn);
-	return Math.ceil(expiresIn / require_consts.BLOCK_TIME);
+	if (count === void 0) throw new Error("predictEntityKeys: pass either `count` or `salts`");
+	if (!Number.isInteger(count) || count <= 0) throw new Error(`predictEntityKeys: \`count\` must be a positive whole number, got ${count}`);
+	return Array.from({ length: count }, () => require_key.randomSalt());
 }
-function deriveEntityKey(chainId, owner, nonce) {
-	return (0, viem.keccak256)((0, viem.encodePacked)([
-		"uint256",
-		"address",
-		"address",
-		"uint32"
-	], [
-		BigInt(chainId),
-		require_consts.ARKIV_ADDRESS,
-		owner,
-		Number(nonce)
-	]));
-}
-async function sendArkivTransaction(client, ops, txParams) {
-	if (!client.account) throw new Error("Account required");
-	if (!client.chain) throw new Error("Chain required");
-	const walletClient = client;
-	const { creates, updates, deletes, extensions, ownershipChanges } = ops;
-	const owner = client.account.address;
-	const ownerNonce = creates?.length ? BigInt(await walletClient.readContract({
-		address: require_consts.ARKIV_ADDRESS,
-		abi: ENTITY_NONCE_ABI,
-		functionName: "nonces",
-		args: [owner]
-	})) : 0n;
-	const createdEntityKeys = (creates ?? []).map((_, i) => deriveEntityKey(client.chain.id, owner, ownerNonce + BigInt(i)));
-	for (const item of creates ?? []) validateContentType(item.contentType);
-	for (const item of updates ?? []) validateContentType(item.contentType);
-	const operations = [
-		...(creates ?? []).map((item, i) => ({
-			operationType: require_entity.EntityOperationType.Create,
-			entityKey: createdEntityKeys[i],
-			payload: (0, viem.toHex)(item.payload),
-			contentType: encodeMime128(item.contentType),
-			attributes: encodeAttributes(item.attributes),
-			expiresIn: toBTL(item.expiresIn),
-			newOwner: ZERO_ADDRESS
-		})),
-		...(updates ?? []).map((item) => ({
-			operationType: require_entity.EntityOperationType.Update,
-			entityKey: item.entityKey,
-			payload: (0, viem.toHex)(item.payload),
-			contentType: encodeMime128(item.contentType),
-			attributes: encodeAttributes(item.attributes),
-			expiresIn: 0,
-			newOwner: ZERO_ADDRESS
-		})),
-		...(deletes ?? []).map((item) => ({
-			operationType: require_entity.EntityOperationType.Delete,
-			entityKey: item.entityKey,
-			payload: "0x",
-			contentType: encodeMime128(""),
-			attributes: [],
-			expiresIn: 0,
-			newOwner: ZERO_ADDRESS
-		})),
-		...(extensions ?? []).map((item) => ({
-			operationType: require_entity.EntityOperationType.Extend,
-			entityKey: item.entityKey,
-			payload: "0x",
-			contentType: encodeMime128(""),
-			attributes: [],
-			expiresIn: toBTL(item.expiresIn),
-			newOwner: ZERO_ADDRESS
-		})),
-		...(ownershipChanges ?? []).map((item) => ({
-			operationType: require_entity.EntityOperationType.Transfer,
-			entityKey: item.entityKey,
-			payload: "0x",
-			contentType: encodeMime128(""),
-			attributes: [],
-			expiresIn: 0,
-			newOwner: item.newOwner
-		}))
-	];
-	logger$7("Sending execute with %d operations %s", operations.length, JSON.stringify(operations));
-	try {
-		const txHash = await walletClient.writeContract({
-			address: require_consts.ARKIV_ADDRESS,
-			abi: EXECUTE_ABI,
-			functionName: "execute",
-			args: [operations],
-			account: client.account,
-			chain: client.chain,
-			...txParams
-		});
-		const receipt = await walletClient.waitForTransactionReceipt({ hash: txHash });
-		logger$7("Tx receipt %o", receipt);
-		if (receipt.status === "reverted") {
-			try {
-				await walletClient.simulateContract({
-					address: require_consts.ARKIV_ADDRESS,
-					abi: EXECUTE_ABI,
-					functionName: "execute",
-					args: [operations],
-					account: client.account,
-					chain: client.chain
-				});
-			} catch (err) {
-				const error = err;
-				const reason = error.shortMessage ?? error.cause?.details ?? "No reason provided by backend.";
-				throw new require_queryBuilder.EntityMutationError(`Transaction ${receipt.transactionHash} reverted. Reason: ${reason}`);
-			}
-			throw new require_queryBuilder.EntityMutationError(`Transaction ${receipt.transactionHash} reverted. No reason provided by backend.`);
-		}
-		return {
-			receipt,
-			createdEntityKeys
-		};
-	} catch (error) {
-		let message = "Transaction failed";
-		if (error instanceof viem.TransactionExecutionError) message += `: ${error.details}`;
-		else if (error instanceof viem.ContractFunctionExecutionError) {
-			logger$7("Contract function execution error data:", error.shortMessage);
-			if (error.cause instanceof viem.ContractFunctionRevertedError) message += `: ${error.cause.message}`;
-			else message += ": Execution error without revert data";
-		} else if (error instanceof require_queryBuilder.EntityMutationError) throw error;
-		throw new require_queryBuilder.EntityMutationError(message);
-	}
+
+//#endregion
+//#region src/actions/public/query.ts
+/**
+* Runs a single query and returns one page, with no builder in between.
+*
+* Takes either an {@link Expression} or a raw query string. The string form is an escape hatch for
+* a query built elsewhere — it goes to the node exactly as written, with none of the name, type or
+* operator checks the expression combinators apply.
+*
+* @throws {QueryError} If the node rejects the query.
+*/
+function query(client, query$1, options = {}) {
+	return require_queryBuilder.runQuery(client, {
+		query: query$1.toString(),
+		select: require_queryBuilder.toRpcSelect(options.select),
+		limit: options.limit,
+		cursor: options.cursor,
+		atBlock: options.atBlock
+	});
 }
 
 //#endregion
-//#region src/actions/public/subscribeEntityEvents.ts
-const logger$6 = require_queryBuilder.getLogger("actions:public:subscribe-entity-events");
-const arkivABI = ENTITY_OPERATION_EVENT_ABI;
-async function subscribeEntityEvents(client, { onError, onEntityCreated, onEntityUpdated, onEntityDeleted, onEntityExpired, onEntityExpiresInExtended, onEntityOwnerChanged }, pollingInterval, fromBlock) {
-	return client.watchEvent({
-		pollingInterval: pollingInterval ?? 1e3,
-		fromBlock,
-		events: arkivABI,
+//#region src/actions/public/watchEntityEvents.ts
+const logger$6 = require_logger.getLogger("actions:public:watch-entity-events");
+/**
+* How often to poll, when the caller does not say.
+*
+* Half a block: fast enough that an event is never a whole block stale, slow enough not to hammer
+* the node. viem's own default is derived from a 12-second Ethereum block and is far too slow here.
+*/
+const DEFAULT_POLLING_INTERVAL = require_expiry.BLOCK_TIME * 1e3 / 2;
+/**
+* Watches entity events, calling the handlers you pass as they arrive.
+*
+* Every event here is decoded from a log the Arkiv operation address emitted, and carries the
+* block, transaction and log index it came from — so consuming them in order replays exactly what
+* the engine did.
+*
+* @param parameters - Handlers and options. {@link WatchEntityEventsParameters}
+* @returns A function that stops the watcher.
+*
+*
+* @example
+* import { createPublicClient } from "@arkiv-network/sdk"
+* import { cheesecake } from "@arkiv-network/sdk/chains"
+* import { http } from "viem"
+*
+* const client = createPublicClient({ chain: cheesecake, transport: http() })
+*
+* const unwatch = client.watchEntityEvents({
+*   onEntityCreated: ({ entityKey, owner, expiresAt }) =>
+*     console.log("created", entityKey, "by", owner, "until block", expiresAt),
+*   onEntityDeleted: ({ entityKey }) => console.log("deleted", entityKey),
+*   onError: (error) => console.error(error),
+* })
+*
+* unwatch()
+*/
+function watchEntityEvents(client, parameters) {
+	const { onEntityCreated, onEntityPatched, onExpiryExtended, onOwnershipTransferred, onEntityDeleted, onEvent, onError, fromBlock, pollingInterval = DEFAULT_POLLING_INTERVAL } = parameters;
+	const publicClient = client;
+	const reportError = onError ?? logToConsole;
+	function emit(event) {
+		deliver(onEvent, event);
+		switch (event.type) {
+			case "EntityCreated":
+				deliver(onEntityCreated, event);
+				break;
+			case "EntityPatched":
+				deliver(onEntityPatched, event);
+				break;
+			case "ExpiryExtended":
+				deliver(onExpiryExtended, event);
+				break;
+			case "OwnershipTransferred":
+				deliver(onOwnershipTransferred, event);
+				break;
+			case "EntityDeleted":
+				deliver(onEntityDeleted, event);
+				break;
+		}
+	}
+	/**
+	* Runs one handler, keeping its failure to itself.
+	*
+	* A handler that throws is the consumer's problem, not the watcher's: letting it escape would
+	* reject the poll, drop the rest of the batch, and take down every other handler with it.
+	*/
+	function deliver(handler, event) {
+		if (handler === void 0) return;
+		try {
+			handler(event);
+		} catch (error) {
+			reportError(asError(error));
+		}
+	}
+	return publicClient.watchEvent({
+		address: require_expiry.ARKIV_ADDRESS,
+		events: require_key.ENTITY_EVENTS_ABI,
+		pollingInterval,
+		...fromBlock !== void 0 && { fromBlock },
 		onLogs: (logs) => {
-			logger$6("logs from subscribeEntityEvents %o", logs);
+			logger$6("logs %o", logs);
 			for (const log of logs) {
-				const event = (0, viem.decodeEventLog)({
-					abi: arkivABI,
-					topics: log.topics,
-					data: log.data
-				});
-				logger$6("event from subscribeEntityEvents %o", event);
-				if (event.eventName !== "EntityOperation") continue;
-				const entityKey = event.args.entityKey;
-				const owner = event.args.owner;
-				const expiresAt = event.args.expiresAt;
-				const entityHash = event.args.entityHash;
-				switch (Number(event.args.operationType)) {
-					case require_entity.EntityOperationType.Create:
-						onEntityCreated?.({
-							entityKey,
-							owner,
-							expiresAt,
-							entityHash
-						});
-						break;
-					case require_entity.EntityOperationType.Update:
-						onEntityUpdated?.({
-							entityKey,
-							owner,
-							expiresAt,
-							entityHash
-						});
-						break;
-					case require_entity.EntityOperationType.Extend:
-						onEntityExpiresInExtended?.({
-							entityKey,
-							owner,
-							expiresAt,
-							entityHash
-						});
-						break;
-					case require_entity.EntityOperationType.Transfer:
-						onEntityOwnerChanged?.({
-							entityKey,
-							owner,
-							entityHash
-						});
-						break;
-					case require_entity.EntityOperationType.Delete:
-						onEntityDeleted?.({
-							entityKey,
-							owner
-						});
-						break;
-					default:
-						onEntityExpired?.({
-							entityKey,
-							owner
-						});
-						break;
+				if (log.blockNumber === null || log.transactionHash === null || log.logIndex === null) continue;
+				const context = {
+					blockNumber: log.blockNumber,
+					transactionHash: log.transactionHash,
+					logIndex: log.logIndex
+				};
+				let event;
+				try {
+					event = toEntityEvent(log.topics, log.data, context);
+				} catch (error) {
+					reportError(asError(error));
+					continue;
 				}
+				emit(event);
 			}
 		},
-		onError: (error) => {
-			console.error("error from subscribeEntityEvents", error);
-			onError?.(error);
-		}
+		onError: (error) => reportError(error)
 	});
 }
+/** The fallback when no `onError` was given — see {@link WatchEntityEventsParameters.onError}. */
+function logToConsole(error) {
+	console.error("watchEntityEvents error", error);
+}
+/** Handlers take an `Error`, and a `throw` can be anything. */
+function asError(error) {
+	return error instanceof Error ? error : new Error(String(error));
+}
+/**
+* Decodes one log into the {@link EntityEvent} it carries.
+*
+* @throws If the log does not decode against {@link ENTITY_EVENTS_ABI}.
+*/
+function toEntityEvent(topics, data, context) {
+	const decoded = (0, viem.decodeEventLog)({
+		abi: require_key.ENTITY_EVENTS_ABI,
+		topics,
+		data
+	});
+	switch (decoded.eventName) {
+		case "EntityCreated": return {
+			type: "EntityCreated",
+			...context,
+			...decoded.args,
+			creationFlags: require_flags.decodeCreationFlags(decoded.args.creationFlags)
+		};
+		case "EntityPatched": return {
+			type: "EntityPatched",
+			...context,
+			...decoded.args
+		};
+		case "ExpiryExtended": return {
+			type: "ExpiryExtended",
+			...context,
+			...decoded.args
+		};
+		case "OwnershipTransferred": return {
+			type: "OwnershipTransferred",
+			...context,
+			...decoded.args
+		};
+		case "EntityDeleted": return {
+			type: "EntityDeleted",
+			...context,
+			...decoded.args
+		};
+	}
+}
+
+//#endregion
+//#region src/clients/decorators/arkivAdvanced.ts
+function publicAdvancedActions(client) {
+	return {
+		pingTransaction: (txHash) => require_advanced.pingTransaction(client, txHash),
+		getMutationResult: (txHash) => require_advanced.getMutationResult(client, txHash),
+		decodeMutationResult: (receipt) => require_advanced.decodeMutationResult(receipt)
+	};
+}
+function walletAdvancedActions(client) {
+	return {
+		...publicAdvancedActions(client),
+		buildMutation: (data, options) => require_advanced.buildMutation(client, data, options),
+		sendMutation: (data, options) => require_advanced.sendMutation(client, data, options)
+	};
+}
 
 //#endregion
 //#region src/clients/decorators/arkivPublic.ts
 function publicArkivActions(client) {
 	return {
-		getEntity: (key) => getEntity(client, key),
+		getEntity: (key$1) => getEntity(client, key$1),
 		query: (rawQuery, queryOptions) => query(client, rawQuery, queryOptions),
-		buildQuery: () => new require_queryBuilder.QueryBuilder(client),
 		select: (selection) => new require_queryBuilder.SelectQueryBuilder(client, selection),
 		getBlockTiming: () => getBlockTiming(client),
 		getEntityCount: () => getEntityCount(client),
-		subscribeEntityEvents: ({ onError, onEntityCreated, onEntityUpdated, onEntityDeleted, onEntityExpired, onEntityExpiresInExtended }, pollingInterval, fromBlock) => subscribeEntityEvents(client, {
-			onError,
-			onEntityCreated,
-			onEntityUpdated,
-			onEntityDeleted,
-			onEntityExpired,
-			onEntityExpiresInExtended
-		}, pollingInterval, fromBlock)
+		getEntityNonce: (owner) => getEntityNonce(client, owner),
+		predictEntityKeys: (parameters) => predictEntityKeys(client, parameters),
+		watchEntityEvents: (parameters) => watchEntityEvents(client, parameters),
+		advanced: publicAdvancedActions(client)
 	};
 }
 
@@ -421,35 +362,36 @@ function publicArkivActions(client) {
 *
 * - Docs: https://docs.arkiv.network/ts-sdk/clients/public
 *
-* A Public Client is an interface to "public" [Ethereum JSON-RPC API](https://ethereum.org/en/developers/docs/apis/json-rpc/), [Arkiv JSON-RPC API](https://docs.arkiv.network/json-rpc/), and [Braga JSON-RPC API](https://braga.holesky.arkiv.network/rpc) methods such as retrieving block numbers, transactions, reading from smart contracts, etc through [Public Actions](/docs/actions/public/introduction).
+* A Public Client is an interface to "public" [Ethereum JSON-RPC API](https://ethereum.org/en/developers/docs/apis/json-rpc/), [Arkiv JSON-RPC API](https://docs.arkiv.network/json-rpc/), and [Cheesecake JSON-RPC API](https://rpc.cheesecake.db-chain.devnet.gobas.me) methods such as retrieving block numbers, transactions, reading from smart contracts, etc through [Public Actions](/docs/actions/public/introduction).
 *
 * @param parameters - Configuration object for the public client (chain, transport, etc.)
 * @returns A Arkiv Public Client. {@link PublicArkivClient}
 *
 * @example
-* import { createPublicClient, http } from 'arkiv'
-* import { braga } from 'arkiv/chains'
+* import { createPublicClient } from "@arkiv-network/sdk"
+* import { cheesecake } from "@arkiv-network/sdk/chains"
+* import { http } from "viem"
 *
 * const client = createPublicClient({
-*   chain: braga,
+*   chain: cheesecake,
 *   transport: http(),
 * })
 */
 function createPublicClient(parameters) {
-	const { key = "public", name = "Public Client" } = parameters;
+	const { key: key$1 = "public", name = "Public Client" } = parameters;
 	return (0, viem.createClient)({
 		...parameters,
-		key,
+		key: key$1,
 		name
 	}).extend(viem.publicActions).extend(publicArkivActions);
 }
 
 //#endregion
 //#region src/actions/wallet/changeOwnership.ts
-const logger$5 = require_queryBuilder.getLogger("actions:wallet:change-ownership");
+const logger$5 = require_logger.getLogger("actions:wallet:change-ownership");
 async function changeOwnership(client, data, txParams) {
 	logger$5("changeOwnership %o", data);
-	const { receipt } = await sendArkivTransaction(client, { ownershipChanges: [data] }, txParams);
+	const { receipt } = await require_advanced.sendArkivTransaction(client, { ownershipChanges: [data] }, txParams);
 	logger$5("Receipt from changeOwnership %o", receipt);
 	return {
 		txHash: receipt.transactionHash,
@@ -459,23 +401,27 @@ async function changeOwnership(client, data, txParams) {
 
 //#endregion
 //#region src/actions/wallet/createEntity.ts
-const logger$4 = require_queryBuilder.getLogger("actions:wallet:create-entity");
+const logger$4 = require_logger.getLogger("actions:wallet:create-entity");
 async function createEntity(client, data, txParams) {
 	logger$4("createEntity %o", data);
-	const { receipt, createdEntityKeys } = await sendArkivTransaction(client, { creates: [data] }, txParams);
+	const { receipt, createdEntityKeys, createdExpiries } = await require_advanced.sendArkivTransaction(client, { creates: [data] }, txParams);
 	logger$4("Receipt from createEntity %o", receipt);
+	const [entityKey] = createdEntityKeys;
+	const [expiresAt] = createdExpiries;
+	if (entityKey === void 0 || expiresAt === void 0) throw new require_logger.EntityMutationError(`Transaction ${receipt.transactionHash} succeeded, but the receipt did not carry the expected entity key or expiry.`);
 	return {
 		txHash: receipt.transactionHash,
-		entityKey: createdEntityKeys[0]
+		entityKey,
+		expiresAt
 	};
 }
 
 //#endregion
 //#region src/actions/wallet/deleteEntity.ts
-const logger$3 = require_queryBuilder.getLogger("actions:wallet:delete-entity");
+const logger$3 = require_logger.getLogger("actions:wallet:delete-entity");
 async function deleteEntity(client, data, txParams) {
 	logger$3("deleteEntity %o", data);
-	const { receipt } = await sendArkivTransaction(client, { deletes: [data] }, txParams);
+	const { receipt } = await require_advanced.sendArkivTransaction(client, { deletes: [data] }, txParams);
 	logger$3("Receipt from deleteEntity %o", receipt);
 	return {
 		txHash: receipt.transactionHash,
@@ -485,28 +431,30 @@ async function deleteEntity(client, data, txParams) {
 
 //#endregion
 //#region src/actions/wallet/extendEntity.ts
-const logger$2 = require_queryBuilder.getLogger("actions:wallet:extend-entity");
+const logger$2 = require_logger.getLogger("actions:wallet:extend-entity");
 async function extendEntity(client, data, txParams) {
 	logger$2("extendEntity %o", data);
-	const { receipt } = await sendArkivTransaction(client, { extensions: [data] }, txParams);
+	const { receipt, extendedExpiries } = await require_advanced.sendArkivTransaction(client, { extensions: [data] }, txParams);
 	logger$2("Receipt from extendEntity %o", receipt);
+	const [expiresAt] = extendedExpiries;
+	if (expiresAt === void 0) throw new require_logger.EntityMutationError(`Transaction ${receipt.transactionHash} succeeded, but the receipt did not carry the expected entity expiry.`);
 	return {
 		txHash: receipt.transactionHash,
-		entityKey: data.entityKey
+		entityKey: data.entityKey,
+		expiresAt
 	};
 }
 
 //#endregion
 //#region src/actions/wallet/mutateEntities.ts
-const logger$1 = require_queryBuilder.getLogger("actions:wallet:mutate-entities");
+const logger$1 = require_logger.getLogger("actions:wallet:mutate-entities");
 async function mutateEntities(client, data, txParams) {
-	if (!data.creates && !data.updates && !data.deletes && !data.extensions) throw new Error("No operations to perform");
-	const { receipt, createdEntityKeys } = await sendArkivTransaction(client, data, txParams);
+	const { receipt, createdEntityKeys } = await require_advanced.sendArkivTransaction(client, data, txParams);
 	logger$1("Receipt from mutateEntities %o", receipt);
 	return {
 		txHash: receipt.transactionHash,
 		createdEntities: createdEntityKeys,
-		updatedEntities: (data.updates ?? []).map((u) => u.entityKey),
+		patchedEntities: (data.patches ?? []).map((p) => p.entityKey),
 		deletedEntities: (data.deletes ?? []).map((d) => d.entityKey),
 		extendedEntities: (data.extensions ?? []).map((e) => e.entityKey),
 		ownershipChanges: (data.ownershipChanges ?? []).map((o) => o.entityKey)
@@ -514,12 +462,12 @@ async function mutateEntities(client, data, txParams) {
 }
 
 //#endregion
-//#region src/actions/wallet/updateEntity.ts
-const logger = require_queryBuilder.getLogger("actions:wallet:update-entity");
-async function updateEntity(client, data, txParams) {
-	logger("updateEntity %o", data);
-	const { receipt } = await sendArkivTransaction(client, { updates: [data] }, txParams);
-	logger("Receipt from updateEntity %o", receipt);
+//#region src/actions/wallet/patchEntity.ts
+const logger = require_logger.getLogger("actions:wallet:patch-entity");
+async function patchEntity(client, data, txParams) {
+	logger("patchEntity %o", data);
+	const { receipt } = await require_advanced.sendArkivTransaction(client, { patches: [data] }, txParams);
+	logger("Receipt from patchEntity %o", receipt);
 	return {
 		txHash: receipt.transactionHash,
 		entityKey: data.entityKey
@@ -531,47 +479,54 @@ async function updateEntity(client, data, txParams) {
 function walletArkivActions(client) {
 	return {
 		createEntity: (data, txParams) => createEntity(client, data, txParams),
-		updateEntity: (data, txParams) => updateEntity(client, data, txParams),
+		patchEntity: (data, txParams) => patchEntity(client, data, txParams),
 		deleteEntity: (data, txParams) => deleteEntity(client, data, txParams),
 		extendEntity: (data, txParams) => extendEntity(client, data, txParams),
 		changeOwnership: (data, txParams) => changeOwnership(client, data, txParams),
-		mutateEntities: (data, txParams) => mutateEntities(client, data, txParams)
+		mutateEntities: (data, txParams) => mutateEntities(client, data, txParams),
+		advanced: walletAdvancedActions(client)
 	};
 }
 
 //#endregion
 //#region src/clients/createWalletClient.ts
 /**
-* Creates a Public Client with a given [Transport](https://viem.sh/docs/clients/intro) configured for a [Chain](https://viem.sh/docs/clients/chains).
+* Creates a Wallet Client with a given [Transport](https://viem.sh/docs/clients/intro) configured
+* for a [Chain](https://viem.sh/docs/clients/chains) and an account.
 *
-* - Docs: https://docs.arkiv.network/ts-sdk/clients/public
+* - Docs: https://docs.arkiv.network/ts-sdk/clients/wallet
 *
-* A Public Client is an interface to "public" [Ethereum JSON-RPC API](https://ethereum.org/en/developers/docs/apis/json-rpc/), [Arkiv JSON-RPC API](https://docs.arkiv.network/json-rpc/), and [Braga JSON-RPC API](https://braga.holesky.arkiv.network/rpc) methods such as retrieving block numbers, transactions, reading from smart contracts, etc through [Public Actions](/docs/actions/public/introduction).
+* A Wallet Client signs and sends transactions, so it carries an `account` and exposes everything
+* that mutates state — `createEntity`, `patchEntity`, `deleteEntity`, `extendEntity`,
+* `changeOwnership` and `mutateEntities` — on top of the read actions a Public Client has.
 *
 * @param parameters - Configuration object for the wallet client (chain, transport, account, etc.)
 * @returns A Arkiv Wallet Client. {@link WalletArkivClient}
 *
 * @example
-* import { createPublicClient, http } from 'arkiv'
-* import { braga } from 'arkiv/chains'
+* import { createWalletClient } from "@arkiv-network/sdk"
+* import { cheesecake } from "@arkiv-network/sdk/chains"
+* import { http } from "viem"
+* import { privateKeyToAccount } from "viem/accounts"
 *
-* const client = createPublicClient({
-*   chain: braga,
+* const client = createWalletClient({
+*   chain: cheesecake,
 *   transport: http(),
+*   account: privateKeyToAccount("0x..."),
 * })
 */
 function createWalletClient(parameters) {
-	const { key = "wallet", name = "Wallet Client" } = parameters;
+	const { key: key$1 = "wallet", name = "Wallet Client" } = parameters;
 	return (0, viem.createClient)({
 		...parameters,
-		key,
+		key: key$1,
 		name
 	}).extend(viem.publicActions).extend(viem.walletActions).extend(walletArkivActions);
 }
 
 //#endregion
 //#region src/utils/chains.ts
-const chainMap = new Map(Object.entries(require_chains.chains_exports).map(([key, value]) => [key.toLowerCase(), value]));
+const chainMap = new Map(Object.entries(require_chains.chains_exports).map(([key$1, value]) => [key$1.toLowerCase(), value]));
 /**
 * Get a chain from its name
 * @param name - The name of the chain, case insensitive
@@ -585,18 +540,69 @@ function chainFromName(name) {
 }
 
 //#endregion
-exports.DuplicateAttributeError = require_queryBuilder.DuplicateAttributeError;
-exports.EntityMutationError = require_queryBuilder.EntityMutationError;
-exports.EntityOperationType = require_entity.EntityOperationType;
-exports.InvalidAttributeError = require_queryBuilder.InvalidAttributeError;
-exports.InvalidAttributeKeyError = require_queryBuilder.InvalidAttributeKeyError;
-exports.InvalidContentTypeError = require_queryBuilder.InvalidContentTypeError;
-exports.InvalidExpirationError = require_queryBuilder.InvalidExpirationError;
-exports.NoCursorOrLimitError = require_queryBuilder.NoCursorOrLimitError;
-exports.NoEntityFoundError = require_queryBuilder.NoEntityFoundError;
-exports.NoMoreResultsError = require_queryBuilder.NoMoreResultsError;
+exports.ConflictingMutationError = require_attributes.ConflictingMutationError;
+exports.DECIMAL_SCALE = require_attributes.DECIMAL_SCALE;
+exports.DECIMAL_UNIT = require_attributes.DECIMAL_UNIT;
+exports.ENTITY_EVENTS_ABI = require_key.ENTITY_EVENTS_ABI;
+exports.EmptyPatchError = require_logger.EmptyPatchError;
+exports.Entity = require_entity.Entity;
+exports.EntityMutationError = require_logger.EntityMutationError;
+exports.ExpirationTime = require_payload.ExpirationTime;
+exports.I32_MAX = require_attributes.I32_MAX;
+exports.I32_MIN = require_attributes.I32_MIN;
+exports.InvalidAttributeNameError = require_attributes.InvalidAttributeNameError;
+exports.InvalidContentTypeError = require_logger.InvalidContentTypeError;
+exports.InvalidCreationFlagsError = require_errors.InvalidCreationFlagsError;
+exports.InvalidExpiryError = require_errors.InvalidExpiryError;
+exports.InvalidSaltError = require_errors.InvalidSaltError;
+exports.InvalidValueError = require_attributes.InvalidValueError;
+exports.MAX_ATTRIBUTES = require_attributes.MAX_ATTRIBUTES;
+exports.MAX_EXPIRES_AT = require_expiry.MAX_EXPIRES_AT;
+exports.MAX_NAME_BYTES = require_attributes.MAX_NAME_BYTES;
+exports.MAX_PAYLOAD_BYTES = require_attributes.MAX_PAYLOAD_BYTES;
+exports.MAX_SALT = require_key.MAX_SALT;
+exports.MAX_STRING_BYTES = require_attributes.MAX_STRING_BYTES;
+exports.MissingValueError = require_attributes.MissingValueError;
+exports.NoEntityFoundError = require_logger.NoEntityFoundError;
+exports.NoMoreResultsError = require_logger.NoMoreResultsError;
+exports.NoRandomSourceError = require_errors.NoRandomSourceError;
+exports.OperationType = require_expiry.OperationType;
+exports.TooManyAttributesError = require_attributes.TooManyAttributesError;
+exports.U256_MAX = require_attributes.U256_MAX;
+exports.U64_MAX = require_attributes.U64_MAX;
+exports.UnknownAttributeTypeError = require_attributes.UnknownAttributeTypeError;
+exports.UntypedValueError = require_attributes.UntypedValueError;
+exports.addr = require_attributes.addr;
+exports.bool = require_attributes.bool;
+exports.buildEntityOperations = require_advanced.buildEntityOperations;
+exports.buildMutation = require_advanced.buildMutation;
+exports.bytes32 = require_attributes.bytes32;
 exports.chainFromName = chainFromName;
+exports.collectMutationEvents = require_advanced.collectMutationEvents;
 exports.createPublicClient = createPublicClient;
 exports.createWalletClient = createWalletClient;
+exports.dec = require_attributes.dec;
+exports.decFromUnits = require_attributes.decFromUnits;
+exports.decUnits = require_attributes.decUnits;
+exports.decodeCreationFlags = require_flags.decodeCreationFlags;
+exports.decodeMutationResult = require_advanced.decodeMutationResult;
+exports.encodeCreationFlags = require_flags.encodeCreationFlags;
+exports.getMutationResult = require_advanced.getMutationResult;
+exports.i32 = require_attributes.i32;
+exports.isArkivValue = require_attributes.isArkivValue;
+exports.isValidAttributeName = require_attributes.isValidAttributeName;
 exports.jsonToPayload = require_payload.jsonToPayload;
-exports.stringToPayload = require_payload.stringToPayload;
+exports.key = require_attributes.key;
+exports.mutationNeedsBlockNumber = require_advanced.mutationNeedsBlockNumber;
+exports.pingTransaction = require_advanced.pingTransaction;
+exports.predictEntityKey = require_key.predictEntityKey;
+exports.randomSalt = require_key.randomSalt;
+exports.resolveExpiry = require_expiry.resolveExpiry;
+exports.sendMutation = require_advanced.sendMutation;
+exports.str = require_attributes.str;
+exports.stringToPayload = require_payload.stringToPayload;
+exports.toBlocks = require_expiry.toBlocks;
+exports.toValue = require_attributes.toValue;
+exports.u256 = require_attributes.u256;
+exports.u64 = require_attributes.u64;
+exports.validateAttributeName = require_attributes.validateAttributeName;