@x1id/resolve 0.10.0 → 0.11.0

package/dist/index.d.ts

@@ -41,6 +41,7 @@ export * from "./integrator.js";
 export * from "./voucher.js";
 export * from "./agent.js";
 export * from "./register.js";
+export * from "./lease.js";
 export * from "./accounts.js";
 export * from "./x402.js";
 export * from "./recordWrite.js";

package/dist/index.js

@@ -41,6 +41,7 @@ export * from "./integrator.js";
 export * from "./voucher.js";
 export * from "./agent.js";
 export * from "./register.js";
+export * from "./lease.js";
 // Was previously imported here for internal use only, never re-exported —
 // promoted to public API 2026-09-22 because a second real package (mcp/)
 // now needs `parseHandleAccount`/`RpcFn` directly rather than duplicating

package/dist/lease.d.ts

@@ -0,0 +1,92 @@
+/**
+ * Lease-to-own instructions (#8150, #8320) — the SIBLING of `register` for term
+ * leases, not a replacement: the permanent one-time `register` path
+ * (register.ts) is untouched and stays the default.
+ *
+ * - `register_leased` — claim an unregistered `["handle", name]` under a lease,
+ *   paying the first installment now.
+ * - `renew_lease` — pay more toward a leased handle. PERMISSIONLESS: the payer
+ *   need not be the owner (anyone may keep or pay off someone else's lease,
+ *   ENS-registrar-style).
+ * - `reclaim_expired_lease` — take over a leased handle whose grace period has
+ *   ENDED, under a FRESH lease; the reclaimer becomes `owner`. Also
+ *   permissionless. The program enforces `now >= expires_at + grace`.
+ *
+ * Hand-rolled like the rest of this package — no Anchor client, no
+ * `@solana/web3.js`. PDAs are NOT derived here (see delegate.ts) — derive
+ * `["config"]` / `["handle", name]` with your runtime's `findProgramAddress`,
+ * and read `Config.treasury` with {@link fetchConfigTreasury} (register.ts).
+ *
+ * `payment` is in lamports — the amount accepted toward the lease now. The
+ * on-chain `lease_seconds_purchased` / `lease_accept_payment` logic converts it
+ * to lease-time, capped at the permanent price (offering the full permanent
+ * price up front settles the handle permanently in one instruction, writing
+ * `expires_at = 0`). This builder does not compute that split; simulate or
+ * mirror it client-side if you need to preview before signing.
+ */
+import type { AddressLike, BuiltInstruction } from "./delegate.js";
+import type { HandleTypeValue } from "./voucher.js";
+/** `sha256("global:register_leased")[0..8]`. */
+export declare const REGISTER_LEASED_DISCRIMINATOR: Uint8Array;
+/** `sha256("global:renew_lease")[0..8]`. */
+export declare const RENEW_LEASE_DISCRIMINATOR: Uint8Array;
+/** `sha256("global:reclaim_expired_lease")[0..8]`. */
+export declare const RECLAIM_EXPIRED_LEASE_DISCRIMINATOR: Uint8Array;
+export interface RegisterLeasedParams {
+    /** The registry program id. */
+    readonly programId: AddressLike;
+    /** Pays the first lease installment + the `Handle` account's rent. Signer. */
+    readonly payer: AddressLike;
+    /** The handle's owner. Need not sign — may be registered on another's behalf. */
+    readonly owner: AddressLike;
+    /** The `["config"]` PDA. */
+    readonly config: AddressLike;
+    /** `Config.treasury` — read it fresh via {@link fetchConfigTreasury}. */
+    readonly treasury: AddressLike;
+    /** The `["handle", name]` PDA being claimed — must not already exist. */
+    readonly handle: AddressLike;
+    /** Canonical form (`parseName(...).canonical`), 1..=32 bytes. */
+    readonly name: string;
+    readonly handleType: HandleTypeValue;
+    /** First lease payment, in lamports. `>= permanentPrice` settles it outright. */
+    readonly payment: bigint;
+}
+/** Build `register_leased`. Data: `disc ‖ borsh(name) ‖ handleType(u8) ‖ payment(u64 LE)`. */
+export declare function buildRegisterLeasedIx(p: RegisterLeasedParams): BuiltInstruction;
+export interface RenewLeaseParams {
+    /** The registry program id. */
+    readonly programId: AddressLike;
+    /** Pays toward the lease. Signer. PERMISSIONLESS — need NOT be the owner. */
+    readonly payer: AddressLike;
+    /** The `["config"]` PDA (read-only on this path). */
+    readonly config: AddressLike;
+    /** `Config.treasury` — the program address-constrains it to this, so it can't
+     *  be substituted; read it fresh via {@link fetchConfigTreasury}. */
+    readonly treasury: AddressLike;
+    /** The leased `["handle", name]` PDA being paid toward. */
+    readonly handle: AddressLike;
+    /** Lamports to accept toward the lease (capped at the permanent price on-chain). */
+    readonly payment: bigint;
+}
+/** Build `renew_lease`. Data: `disc ‖ payment(u64 LE)`. */
+export declare function buildRenewLeaseIx(p: RenewLeaseParams): BuiltInstruction;
+export interface ReclaimExpiredLeaseParams {
+    /** The registry program id. */
+    readonly programId: AddressLike;
+    /** Pays the fresh lease's first installment; becomes the new owner. Signer.
+     *  PERMISSIONLESS — anyone may reclaim a grace-ended leased handle. */
+    readonly payer: AddressLike;
+    /** The new owner (typically the same as `payer`). Need not sign. */
+    readonly owner: AddressLike;
+    /** The `["config"]` PDA. */
+    readonly config: AddressLike;
+    /** `Config.treasury` — address-constrained on-chain; {@link fetchConfigTreasury}. */
+    readonly treasury: AddressLike;
+    /** The leased `["handle", name]` PDA being reclaimed — its grace must have ended. */
+    readonly handle: AddressLike;
+    readonly handleType: HandleTypeValue;
+    /** The fresh lease's first payment, in lamports. */
+    readonly payment: bigint;
+}
+/** Build `reclaim_expired_lease`. Data: `disc ‖ handleType(u8) ‖ payment(u64 LE)`. */
+export declare function buildReclaimExpiredLeaseIx(p: ReclaimExpiredLeaseParams): BuiltInstruction;

package/dist/lease.js

@@ -0,0 +1,117 @@
+/**
+ * Lease-to-own instructions (#8150, #8320) — the SIBLING of `register` for term
+ * leases, not a replacement: the permanent one-time `register` path
+ * (register.ts) is untouched and stays the default.
+ *
+ * - `register_leased` — claim an unregistered `["handle", name]` under a lease,
+ *   paying the first installment now.
+ * - `renew_lease` — pay more toward a leased handle. PERMISSIONLESS: the payer
+ *   need not be the owner (anyone may keep or pay off someone else's lease,
+ *   ENS-registrar-style).
+ * - `reclaim_expired_lease` — take over a leased handle whose grace period has
+ *   ENDED, under a FRESH lease; the reclaimer becomes `owner`. Also
+ *   permissionless. The program enforces `now >= expires_at + grace`.
+ *
+ * Hand-rolled like the rest of this package — no Anchor client, no
+ * `@solana/web3.js`. PDAs are NOT derived here (see delegate.ts) — derive
+ * `["config"]` / `["handle", name]` with your runtime's `findProgramAddress`,
+ * and read `Config.treasury` with {@link fetchConfigTreasury} (register.ts).
+ *
+ * `payment` is in lamports — the amount accepted toward the lease now. The
+ * on-chain `lease_seconds_purchased` / `lease_accept_payment` logic converts it
+ * to lease-time, capped at the permanent price (offering the full permanent
+ * price up front settles the handle permanently in one instruction, writing
+ * `expires_at = 0`). This builder does not compute that split; simulate or
+ * mirror it client-side if you need to preview before signing.
+ */
+import { encodeBase58, decodeBase58_32 } from "./base58.js";
+/** `sha256("global:register_leased")[0..8]`. */
+export const REGISTER_LEASED_DISCRIMINATOR = Uint8Array.from([83, 192, 142, 193, 191, 53, 8, 15]);
+/** `sha256("global:renew_lease")[0..8]`. */
+export const RENEW_LEASE_DISCRIMINATOR = Uint8Array.from([11, 121, 141, 53, 216, 217, 123, 139]);
+/** `sha256("global:reclaim_expired_lease")[0..8]`. */
+export const RECLAIM_EXPIRED_LEASE_DISCRIMINATOR = Uint8Array.from([66, 80, 245, 8, 1, 21, 161, 110]);
+const SYSTEM_PROGRAM = "11111111111111111111111111111111";
+function toBytes32(v, what) {
+    if (typeof v === "string") {
+        const b = decodeBase58_32(v);
+        if (!b)
+            throw new Error(`${what} is not a valid base58 address`);
+        return b;
+    }
+    if (v.length !== 32)
+        throw new Error(`${what} must be exactly 32 bytes`);
+    return v;
+}
+function toBase58(v, what) {
+    return encodeBase58(toBytes32(v, what));
+}
+function assertHandleType(t) {
+    if (!Number.isInteger(t) || t < 0 || t > 3) {
+        throw new Error("handleType must be 0 (Human), 1 (Merchant), 2 (Org) or 3 (Agent)");
+    }
+}
+function encodeName(name) {
+    const b = new TextEncoder().encode(name);
+    if (b.length < 1 || b.length > 32)
+        throw new Error("name must be 1..=32 bytes (UTF-8)");
+    return b;
+}
+function u64le(n) {
+    if (n < 0n)
+        throw new Error("payment must be a non-negative u64 (lamports)");
+    const b = new Uint8Array(8);
+    new DataView(b.buffer).setBigUint64(0, n, true);
+    return b;
+}
+/** Build `register_leased`. Data: `disc ‖ borsh(name) ‖ handleType(u8) ‖ payment(u64 LE)`. */
+export function buildRegisterLeasedIx(p) {
+    assertHandleType(p.handleType);
+    const nb = encodeName(p.name);
+    const data = new Uint8Array(8 + 4 + nb.length + 1 + 8);
+    data.set(REGISTER_LEASED_DISCRIMINATOR, 0);
+    new DataView(data.buffer).setUint32(8, nb.length, true);
+    data.set(nb, 12);
+    data[12 + nb.length] = p.handleType;
+    data.set(u64le(p.payment), 12 + nb.length + 1);
+    const keys = [
+        { pubkey: toBase58(p.payer, "payer"), isSigner: true, isWritable: true },
+        { pubkey: toBase58(p.owner, "owner"), isSigner: false, isWritable: false },
+        { pubkey: toBase58(p.config, "config"), isSigner: false, isWritable: true },
+        { pubkey: toBase58(p.treasury, "treasury"), isSigner: false, isWritable: true },
+        { pubkey: toBase58(p.handle, "handle"), isSigner: false, isWritable: true },
+        { pubkey: SYSTEM_PROGRAM, isSigner: false, isWritable: false },
+    ];
+    return { programId: toBase58(p.programId, "programId"), keys, data };
+}
+/** Build `renew_lease`. Data: `disc ‖ payment(u64 LE)`. */
+export function buildRenewLeaseIx(p) {
+    const data = new Uint8Array(8 + 8);
+    data.set(RENEW_LEASE_DISCRIMINATOR, 0);
+    data.set(u64le(p.payment), 8);
+    const keys = [
+        { pubkey: toBase58(p.payer, "payer"), isSigner: true, isWritable: true },
+        { pubkey: toBase58(p.config, "config"), isSigner: false, isWritable: false },
+        { pubkey: toBase58(p.treasury, "treasury"), isSigner: false, isWritable: true },
+        { pubkey: toBase58(p.handle, "handle"), isSigner: false, isWritable: true },
+        { pubkey: SYSTEM_PROGRAM, isSigner: false, isWritable: false },
+    ];
+    return { programId: toBase58(p.programId, "programId"), keys, data };
+}
+/** Build `reclaim_expired_lease`. Data: `disc ‖ handleType(u8) ‖ payment(u64 LE)`. */
+export function buildReclaimExpiredLeaseIx(p) {
+    assertHandleType(p.handleType);
+    const data = new Uint8Array(8 + 1 + 8);
+    data.set(RECLAIM_EXPIRED_LEASE_DISCRIMINATOR, 0);
+    data[8] = p.handleType;
+    data.set(u64le(p.payment), 9);
+    const keys = [
+        { pubkey: toBase58(p.payer, "payer"), isSigner: true, isWritable: true },
+        { pubkey: toBase58(p.owner, "owner"), isSigner: false, isWritable: false },
+        { pubkey: toBase58(p.config, "config"), isSigner: false, isWritable: true },
+        { pubkey: toBase58(p.treasury, "treasury"), isSigner: false, isWritable: true },
+        { pubkey: toBase58(p.handle, "handle"), isSigner: false, isWritable: true },
+        { pubkey: SYSTEM_PROGRAM, isSigner: false, isWritable: false },
+    ];
+    return { programId: toBase58(p.programId, "programId"), keys, data };
+}

package/dist/voucher.d.ts

@@ -128,3 +128,56 @@ export interface RefundVoucherParams {
 }
 /** Build `refund_voucher` — payer-signed, only valid at/after `expiresAt`. */
 export declare function buildRefundVoucherIx(p: RefundVoucherParams): BuiltInstruction;
+/** `sha256("global:claim_voucher_tokenized")[0..8]`. */
+export declare const CLAIM_VOUCHER_TOKENIZED_DISCRIMINATOR: Uint8Array;
+export interface ClaimVoucherTokenizedParams {
+    readonly programId: AddressLike;
+    /** Submits + signs; fronts the tx fee (reimbursed) + the handle rent. */
+    readonly claimer: AddressLike;
+    readonly config: AddressLike;
+    readonly treasury: AddressLike;
+    readonly voucher: AddressLike;
+    /** The original voucher payer — receives rent back when the voucher closes. */
+    readonly voucherPayer: AddressLike;
+    /** Who the pNFT + ownership go to: the bound recipient, or the claimer for an
+     *  open voucher. The mint's ATA + token record derive against THIS address. */
+    readonly owner: AddressLike;
+    /** The `["handle", name]` PDA. */
+    readonly handle: AddressLike;
+    readonly name: string;
+    /** `["nft_mint", handle]` PDA. */
+    readonly mint: AddressLike;
+    /** `owner`'s associated token account for `mint` (receives the frozen unit). */
+    readonly ownerTokenAccount: AddressLike;
+    /** Metaplex metadata PDA for `mint`. */
+    readonly metadata: AddressLike;
+    /** Metaplex master-edition PDA for `mint`. */
+    readonly masterEdition: AddressLike;
+    /** pNFT TokenRecord PDA for (`mint`, `ownerTokenAccount`). */
+    readonly tokenRecord: AddressLike;
+    /** The collection parent mint (`["collection_mint"]`). */
+    readonly collectionMint: AddressLike;
+    /** The collection parent metadata (writable — sized-collection bump). */
+    readonly collectionMetadata: AddressLike;
+    /** The collection parent master edition. */
+    readonly collectionMasterEdition: AddressLike;
+    /** The collection authority PDA. */
+    readonly collectionAuthority: AddressLike;
+    /** The integrator wallet — REQUIRED iff the voucher carries one; must equal
+     *  the voucher's `integrator`. Omit otherwise. */
+    readonly integrator?: AddressLike;
+}
+/**
+ * Build `claim_voucher_tokenized` (#8335) — the tokenized sibling of
+ * {@link buildClaimVoucherIx} and the DEFAULT path the live gift-claim flow
+ * uses: it registers the handle AND mints its tradeable capability pNFT in one
+ * instruction. The pNFT + ownership go to `owner` (the bound recipient, or the
+ * claimer for an open voucher), so `ownerTokenAccount` / `tokenRecord` derive
+ * against `owner`, not the claimer. Data: `disc ‖ borsh(name)` — the handle type
+ * comes from the voucher, not an argument.
+ *
+ * The register + 3 Metaplex CPIs exceed the 200k default compute budget —
+ * prepend a ComputeBudget `setComputeUnitLimit` instruction in the SAME
+ * transaction (the app uses ~400k) or the claim fails on-chain.
+ */
+export declare function buildClaimVoucherTokenizedIx(p: ClaimVoucherTokenizedParams): BuiltInstruction;

package/dist/voucher.js

@@ -183,3 +183,59 @@ export function buildRefundVoucherIx(p) {
         data,
     };
 }
+// ===================== claim_voucher_tokenized (gift NFTs, #8335) =====================
+/** `sha256("global:claim_voucher_tokenized")[0..8]`. */
+export const CLAIM_VOUCHER_TOKENIZED_DISCRIMINATOR = Uint8Array.from([131, 111, 174, 105, 154, 248, 191, 235]);
+// Fixed Metaplex / SPL program ids + sysvar in the pNFT-mint tail — hardcoded,
+// never derived (matches the app's mintNft.ts).
+const TOKEN_PROGRAM_ID = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA";
+const ASSOCIATED_TOKEN_PROGRAM_ID = "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL";
+const TOKEN_METADATA_PROGRAM = "metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s";
+const SYSVAR_INSTRUCTIONS = "Sysvar1nstructions1111111111111111111111111";
+/**
+ * Build `claim_voucher_tokenized` (#8335) — the tokenized sibling of
+ * {@link buildClaimVoucherIx} and the DEFAULT path the live gift-claim flow
+ * uses: it registers the handle AND mints its tradeable capability pNFT in one
+ * instruction. The pNFT + ownership go to `owner` (the bound recipient, or the
+ * claimer for an open voucher), so `ownerTokenAccount` / `tokenRecord` derive
+ * against `owner`, not the claimer. Data: `disc ‖ borsh(name)` — the handle type
+ * comes from the voucher, not an argument.
+ *
+ * The register + 3 Metaplex CPIs exceed the 200k default compute budget —
+ * prepend a ComputeBudget `setComputeUnitLimit` instruction in the SAME
+ * transaction (the app uses ~400k) or the claim fails on-chain.
+ */
+export function buildClaimVoucherTokenizedIx(p) {
+    const name = encString(p.name);
+    const data = new Uint8Array(8 + name.length);
+    data.set(CLAIM_VOUCHER_TOKENIZED_DISCRIMINATOR, 0);
+    data.set(name, 8);
+    const keys = [
+        { pubkey: toBase58(p.claimer, "claimer"), isSigner: true, isWritable: true },
+        { pubkey: toBase58(p.config, "config"), isSigner: false, isWritable: true },
+        { pubkey: toBase58(p.treasury, "treasury"), isSigner: false, isWritable: true },
+        { pubkey: toBase58(p.voucher, "voucher"), isSigner: false, isWritable: true },
+        { pubkey: toBase58(p.voucherPayer, "voucherPayer"), isSigner: false, isWritable: true },
+        { pubkey: toBase58(p.owner, "owner"), isSigner: false, isWritable: false },
+        { pubkey: toBase58(p.handle, "handle"), isSigner: false, isWritable: true },
+        // Metaplex pNFT tail — order + flags verbatim from mintNft.ts::tokenizedTailKeys.
+        { pubkey: toBase58(p.mint, "mint"), isSigner: false, isWritable: true },
+        { pubkey: toBase58(p.ownerTokenAccount, "ownerTokenAccount"), isSigner: false, isWritable: true },
+        { pubkey: toBase58(p.metadata, "metadata"), isSigner: false, isWritable: true },
+        { pubkey: toBase58(p.masterEdition, "masterEdition"), isSigner: false, isWritable: true },
+        { pubkey: toBase58(p.tokenRecord, "tokenRecord"), isSigner: false, isWritable: true },
+        { pubkey: toBase58(p.collectionMint, "collectionMint"), isSigner: false, isWritable: false },
+        { pubkey: toBase58(p.collectionMetadata, "collectionMetadata"), isSigner: false, isWritable: true },
+        { pubkey: toBase58(p.collectionMasterEdition, "collectionMasterEdition"), isSigner: false, isWritable: false },
+        { pubkey: toBase58(p.collectionAuthority, "collectionAuthority"), isSigner: false, isWritable: false },
+        { pubkey: TOKEN_METADATA_PROGRAM, isSigner: false, isWritable: false },
+        { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
+        { pubkey: ASSOCIATED_TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
+        { pubkey: SYSTEM_PROGRAM, isSigner: false, isWritable: false },
+        { pubkey: SYSVAR_INSTRUCTIONS, isSigner: false, isWritable: false },
+    ];
+    if (p.integrator !== undefined) {
+        keys.push({ pubkey: toBase58(p.integrator, "integrator"), isSigner: false, isWritable: true });
+    }
+    return { programId: toBase58(p.programId, "programId"), keys, data };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@x1id/resolve",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "description": "Resolve @handles and X1NS names on X1. Never silently picks between namespaces.",
   "type": "module",
   "main": "./dist/index.js",