project-cpu-mcp 0.10.0 → 0.12.0

package/dist/services/auth.service.js

@@ -1,16 +1,12 @@
-import { generatePrivateKey, privateKeyToAccount } from 'viem/accounts';
 import { buildSiweMessage } from './siwe.utils.js';
-import { HttpStatus, } from '../api/types.js';
+import { HttpStatus } from '../api/types.js';
 import { isJwtExpired } from '../session/jwt.utils.js';
 import { SessionStatus } from '../session/types.js';
-import { WalletMode } from '../types.js';
-import { sleep } from '../utils/async.utils.js';
 export class AuthService {
     session;
     api;
     wallet;
     logger;
-    pendingAuth = null;
     constructor(options) {
         this.session = options.session;
         this.api = options.api;
@@ -26,25 +22,29 @@ export class AuthService {
             }
             this.logger.info('stored JWT missing or expired — re-running SIWE login');
         }
-        return this.login();
+        return this.login(this.wallet.get(), new AbortController().signal);
     }
     async reauthenticate() {
         this.logger.info('forcing SIWE re-login');
-        return this.login();
+        return this.login(this.wallet.get(), new AbortController().signal);
     }
     // ---- SIWE (EVM mode) ----
     async authenticateSiwe() {
-        return this.login();
+        return this.login(this.wallet.get(), new AbortController().signal);
     }
-    async login() {
-        const wallet = this.wallet.get();
+    async authenticateWithWallet(wallet, signal) {
+        return this.login(wallet, signal);
+    }
+    async login(wallet, signal) {
+        signal.throwIfAborted();
         const address = wallet.getAddress();
         const chainId = wallet.getChainId();
         this.logger.info('starting SIWE login', { address, chainId });
         const { data: nonce } = await this.api.request('/api/v1/auth/siwe/nonce', {
             method: 'POST',
             body: { address },
-        });
+        }, signal);
+        signal.throwIfAborted();
         const message = buildSiweMessage({
             address,
             chainId,
@@ -54,93 +54,36 @@ export class AuthService {
             expirationTime: nonce.expirationTime,
         });
         const signature = await wallet.signMessage(message);
+        signal.throwIfAborted();
         const { status, data: verified } = await this.api.request('/api/v1/auth/siwe/verify', {
             method: 'POST',
             body: { message, signature },
-        });
+        }, signal);
         if (status !== HttpStatus.Ok || !verified.accessToken) {
             throw new Error(`SIWE verification failed (status ${status})`);
         }
+        signal.throwIfAborted();
         this.persistToken(address, verified.accessToken);
         this.logger.info('SIWE login completed', { address });
         return verified.accessToken;
     }
     persistToken(address, jwt) {
-        if (this.session.getStatus() === SessionStatus.Active) {
+        const walletMode = this.session.getWalletMode();
+        const current = this.session.getStatus() === SessionStatus.Active ? this.session.getSession() : null;
+        if (current !== null &&
+            (current.walletMode === undefined || current.walletMode === walletMode) &&
+            (current.address === undefined || current.address.toLowerCase() === address.toLowerCase())) {
             this.session.setJwt(jwt);
             return;
         }
         const now = new Date().toISOString();
         this.session.setSession({
-            walletMode: WalletMode.EVM,
+            walletMode,
             address,
-            sessionPrivateKey: null,
             jwt,
-            sessionConfig: null,
             createdAt: now,
             updatedAt: now,
         });
     }
-    // ---- Device Authorization (AGW mode) ----
-    getPendingAuth() {
-        return this.pendingAuth;
-    }
-    async authenticateDevice() {
-        const sessionPrivateKey = generatePrivateKey();
-        const account = privateKeyToAccount(sessionPrivateKey);
-        const signerAddress = account.address;
-        this.logger.info('starting device auth', { signerAddress });
-        const { data: deviceAuth } = await this.api.request('/api/v1/auth/device/start', {
-            method: 'POST',
-            body: { signerAddress },
-        });
-        const verificationUrl = `${deviceAuth.verificationUri}?code=${deviceAuth.userCode}`;
-        const result = {
-            verificationUrl,
-            userCode: deviceAuth.userCode,
-        };
-        this.pendingAuth = result;
-        this.pollUntilComplete(deviceAuth.deviceCode, deviceAuth.interval, deviceAuth.expiresIn, sessionPrivateKey, signerAddress)
-            .catch((error) => {
-            this.logger.error('device auth polling failed', {
-                error,
-            });
-        })
-            .finally(() => {
-            this.pendingAuth = null;
-        });
-        this.logger.info('device auth started — user must open URL', { url: verificationUrl });
-        return result;
-    }
-    async pollUntilComplete(deviceCode, intervalS, expiresInS, sessionPrivateKey, signerAddress) {
-        const deadline = Date.now() + expiresInS * 1000;
-        while (Date.now() < deadline) {
-            await sleep(intervalS * 1000);
-            const { status, data } = await this.api.request('/api/v1/auth/device/token', {
-                method: 'POST',
-                body: { deviceCode },
-            });
-            if (status === HttpStatus.Accepted) {
-                this.logger.debug('device auth still pending');
-                continue;
-            }
-            if (status !== HttpStatus.Ok) {
-                throw new Error(`Device auth polling failed: ${status}`);
-            }
-            const now = new Date().toISOString();
-            this.session.setSession({
-                walletMode: WalletMode.AGW,
-                address: signerAddress,
-                sessionPrivateKey,
-                jwt: null,
-                sessionConfig: data.sessionConfig,
-                createdAt: now,
-                updatedAt: now,
-            });
-            this.logger.info('device auth completed', { address: signerAddress });
-            return;
-        }
-        throw new Error('Device authorization timed out. Please try again.');
-    }
 }
 //# sourceMappingURL=auth.service.js.map

package/dist/services/auth.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../src/services/auth.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../src/services/auth.service.ts"],"names":[],"mappings":"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"}

package/dist/services/cell.client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cell.client.d.ts","sourceRoot":"","sources":["../../src/services/cell.client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,KAAK,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,MAAM,CAAC;AAGnE,OAAO,KAAK,EACR,iBAAiB,EACjB,cAAc,EACd,WAAW,EACX,cAAc,EACd,WAAW,EACX,WAAW,EACX,mBAAmB,EACnB,WAAW,EACX,gBAAgB,EAChB,iBAAiB,EACjB,iBAAiB,EACpB,MAAM,YAAY,CAAC;AAMpB,qBAAa,UAAW,YAAW,WAAW;IAC1C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAkB;IAC5C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;gBAErB,OAAO,EAAE,iBAAiB;IAKhC,YAAY,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IASrE,WAAW,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC;IAiBhD,aAAa,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAoBzD,KAAK,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBzC,QAAQ,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAU/C,WAAW,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAerD,UAAU,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAenD,KAAK,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAUzC,WAAW,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;CAa9D"}
+{"version":3,"file":"cell.client.d.ts","sourceRoot":"","sources":["../../src/services/cell.client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,KAAK,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,MAAM,CAAC;AAGnE,OAAO,KAAK,EACR,iBAAiB,EACjB,cAAc,EACd,WAAW,EACX,cAAc,EACd,WAAW,EACX,WAAW,EACX,mBAAmB,EACnB,WAAW,EACX,gBAAgB,EAChB,iBAAiB,EACjB,iBAAiB,EACpB,MAAM,YAAY,CAAC;AAMpB,qBAAa,UAAW,YAAW,WAAW;IAC1C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAkB;IAC5C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;gBAErB,OAAO,EAAE,iBAAiB;IAKhC,YAAY,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IASrE,WAAW,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC;IA2BhD,aAAa,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAoBzD,KAAK,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBzC,QAAQ,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAU/C,WAAW,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAerD,UAAU,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAenD,KAAK,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAUzC,WAAW,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;CAa9D"}

package/dist/services/cell.client.js

@@ -1,5 +1,5 @@
 import { encodeFunctionData } from 'viem';
-import { withRevealInFlightPhrase, withRevealRequestPhrase } from './reveal-revert.utils.js';
+import { withRevealInFlightPhrase, withRevealQuotePhrase, withRevealRequestPhrase } from './reveal-revert.utils.js';
 import { CELL_ABI } from '../contracts/cell.abi.js';
 import { bufferedGasLimit } from '../wallet/gas.utils.js';
 export class CellClient {
@@ -18,18 +18,31 @@ export class CellClient {
         });
     }
     async quoteReveal(cell) {
-        const [ethContributionWei, randomnessFeeWei, totalRequiredWei, cpuBurnWei] = await this.contracts.read({
-            address: cell,
-            abi: CELL_ABI,
-            functionName: 'quoteReveal',
-            args: [],
-        });
+        let quote;
+        try {
+            quote = await this.contracts.read({
+                address: cell,
+                abi: CELL_ABI,
+                functionName: 'quoteReveal',
+                args: [],
+            });
+        }
+        catch (error) {
+            throw withRevealQuotePhrase(error);
+        }
+        const [poolContributionWei, randomnessFeeWei, ethBudgetWei, cpuBurnWei, metadataPublicationChargeWei] = quote;
         this.logger.info('quoted the reveal', {
             cell,
-            totalRequiredWei: totalRequiredWei.toString(),
+            ethBudgetWei: ethBudgetWei.toString(),
             cpuBurnWei: cpuBurnWei.toString(),
         });
-        return { ethContributionWei, randomnessFeeWei, totalRequiredWei, cpuBurnWei };
+        return {
+            poolContributionWei,
+            randomnessFeeWei,
+            ethBudgetWei,
+            cpuBurnWei,
+            metadataPublicationChargeWei,
+        };
     }
     async requestReveal(params) {
         const data = encodeFunctionData({

package/dist/services/cell.client.js.map

@@ -1 +1 @@
-{"version":3,"file":"cell.client.js","sourceRoot":"","sources":["../../src/services/cell.client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cell.client.js","sourceRoot":"","sources":["../../src/services/cell.client.ts"],"names":[],"mappings":"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"}

package/dist/services/lot-return.constants.d.ts

@@ -0,0 +1,3 @@
+export declare const LOT_RETURN_REVERT_NAMES: readonly ["FeeExceedsMax", "LotNotOpen", "LotNotEvicted", "NotSeller", "WrongHub", "NotDestOwner", "PathTooShort", "DegenerateWaypoint", "NotEligibleWaypoint", "HopOutOfRange", "NotWaypointOwner", "NotRevealed", "BelowMinAmount", "ZeroAmount"];
+export declare const LOT_RETURN_REVERT_REASONS: Readonly<Record<(typeof LOT_RETURN_REVERT_NAMES)[number], string>>;
+//# sourceMappingURL=lot-return.constants.d.ts.map

package/dist/services/lot-return.constants.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"lot-return.constants.d.ts","sourceRoot":"","sources":["../../src/services/lot-return.constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,uBAAuB,qPAe1B,CAAC;AAEX,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,uBAAuB,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAmBxG,CAAC"}

package/dist/services/lot-return.constants.js

@@ -0,0 +1,35 @@
+export const LOT_RETURN_REVERT_NAMES = [
+    'FeeExceedsMax',
+    'LotNotOpen',
+    'LotNotEvicted',
+    'NotSeller',
+    'WrongHub',
+    'NotDestOwner',
+    'PathTooShort',
+    'DegenerateWaypoint',
+    'NotEligibleWaypoint',
+    'HopOutOfRange',
+    'NotWaypointOwner',
+    'NotRevealed',
+    'BelowMinAmount',
+    'ZeroAmount',
+];
+export const LOT_RETURN_REVERT_REASONS = {
+    FeeExceedsMax: 'the whole route priced out above the ceiling that travelled with the call, so the chain refused it ' +
+        'and nothing was spent — quote the return again and send it straight away',
+    LotNotOpen: 'the lot is no longer open — re-read it, then return it through the branch its state calls for',
+    LotNotEvicted: 'the lot is not evicted — re-read it, then return it through the branch its state calls for',
+    NotSeller: 'the lot is not yours to return',
+    WrongHub: "the route must start at the lot's hub",
+    NotDestOwner: 'the last cell on the route must be one you own',
+    PathTooShort: 'the route needs at least the hub and your destination cell',
+    DegenerateWaypoint: 'the route visits the same cell twice',
+    NotEligibleWaypoint: 'a waypoint on the route is not eligible — a hub on the path cannot serve as a live node right now ' +
+        '(temporarily unroutable, not frozen)',
+    HopOutOfRange: "a hop on the route is longer than transport's reach",
+    NotWaypointOwner: 'a non-hub waypoint on the route is not owned by you',
+    NotRevealed: 'a cell on the route (or the hub) is not revealed yet',
+    BelowMinAmount: "the remainder is below transport's minimum shipment",
+    ZeroAmount: 'the lot has no units left to send home',
+};
+//# sourceMappingURL=lot-return.constants.js.map

package/dist/services/lot-return.constants.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"lot-return.constants.js","sourceRoot":"","sources":["../../src/services/lot-return.constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,uBAAuB,GAAG;IACnC,eAAe;IACf,YAAY;IACZ,eAAe;IACf,WAAW;IACX,UAAU;IACV,cAAc;IACd,cAAc;IACd,oBAAoB;IACpB,qBAAqB;IACrB,eAAe;IACf,kBAAkB;IAClB,aAAa;IACb,gBAAgB;IAChB,YAAY;CACN,CAAC;AAEX,MAAM,CAAC,MAAM,yBAAyB,GAAuE;IACzG,aAAa,EACT,qGAAqG;QACrG,0EAA0E;IAC9E,UAAU,EAAE,+FAA+F;IAC3G,aAAa,EAAE,4FAA4F;IAC3G,SAAS,EAAE,gCAAgC;IAC3C,QAAQ,EAAE,uCAAuC;IACjD,YAAY,EAAE,gDAAgD;IAC9D,YAAY,EAAE,4DAA4D;IAC1E,kBAAkB,EAAE,sCAAsC;IAC1D,mBAAmB,EACf,oGAAoG;QACpG,sCAAsC;IAC1C,aAAa,EAAE,qDAAqD;IACpE,gBAAgB,EAAE,qDAAqD;IACvE,WAAW,EAAE,sDAAsD;IACnE,cAAc,EAAE,qDAAqD;IACrE,UAAU,EAAE,wCAAwC;CACvD,CAAC"}

package/dist/services/lot-return.service.d.ts

@@ -0,0 +1,25 @@
+import type { ILotReturnService, LotReturnServiceOptions } from './lot-return.types.js';
+import { type LotReturnInput, type LotReturnQuote, type LotReturnQuoteInput, type LotReturnResult } from './types.js';
+/**
+ * One seller intent — send a lot's whole unsold remainder home — over the two contract branches that can
+ * carry it: `cancel` for an Open lot, `reclaim` for an Evicted one. Both are priced by `Trade.quoteReturn`
+ * and both carry the ceiling the seller passes in, never a figure this service picked for them: the route is
+ * re-priced on-chain to decide, and a fee that outgrew the seller's ceiling refuses before anything is spent.
+ */
+export declare class LotReturnService implements ILotReturnService {
+    private readonly wallet;
+    private readonly appConfig;
+    private readonly allowance;
+    private readonly contracts;
+    private readonly tradeClient;
+    private readonly mapReader;
+    private readonly logger;
+    constructor(options: LotReturnServiceOptions);
+    quoteReturn(input: LotReturnQuoteInput): Promise<LotReturnQuote>;
+    returnLot(input: LotReturnInput): Promise<LotReturnResult>;
+    private prepare;
+    private quoteOnChain;
+    private assessDestination;
+    private toQuoteView;
+}
+//# sourceMappingURL=lot-return.service.d.ts.map

package/dist/services/lot-return.service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"lot-return.service.d.ts","sourceRoot":"","sources":["../../src/services/lot-return.service.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAexF,OAAO,EAMH,KAAK,cAAc,EACnB,KAAK,cAAc,EACnB,KAAK,mBAAmB,EACxB,KAAK,eAAe,EAGvB,MAAM,YAAY,CAAC;AAqBpB;;;;;GAKG;AACH,qBAAa,gBAAiB,YAAW,iBAAiB;IACtD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiB;IACxC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAa;IACvC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAoB;IAC9C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAkB;IAC5C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAe;IAC3C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAmB;IAC7C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;gBAErB,OAAO,EAAE,uBAAuB;IAUtC,WAAW,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,cAAc,CAAC;IAOhE,SAAS,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,eAAe,CAAC;YAqElD,OAAO;YAuBP,YAAY;YASZ,iBAAiB;IAmB/B,OAAO,CAAC,WAAW;CAmBtB"}

package/dist/services/lot-return.service.js

@@ -0,0 +1,151 @@
+import { decodeDeliveryScheduled, settleTransitFees } from './delivery.helpers.js';
+import { assertFeeWithinCeiling, assertReturnRoute, assertReturnableLot, assertRouteStartsAtHub, assertWholeRemainder, decodeReturnedUnits, describeCapacityRefusal, describeLotReturnRevert, parseFeeCeilingWei, returnBranchOf, } from './lot-return.utils.js';
+import { preparePaidAction } from './paid-action.js';
+import { AppContract } from './paid-action.types.js';
+import { LotReturnBranch, } from './types.js';
+import { assessDestinationCapacity } from './warehouse.utils.js';
+import { toProjectionConfig } from '../map/reader.utils.js';
+import { configuredStorageCap, usesHubShelf } from '../map/storage.utils.js';
+import { cpuFromWei } from '../utils/format.utils.js';
+/**
+ * One seller intent — send a lot's whole unsold remainder home — over the two contract branches that can
+ * carry it: `cancel` for an Open lot, `reclaim` for an Evicted one. Both are priced by `Trade.quoteReturn`
+ * and both carry the ceiling the seller passes in, never a figure this service picked for them: the route is
+ * re-priced on-chain to decide, and a fee that outgrew the seller's ceiling refuses before anything is spent.
+ */
+export class LotReturnService {
+    wallet;
+    appConfig;
+    allowance;
+    contracts;
+    tradeClient;
+    mapReader;
+    logger;
+    constructor(options) {
+        this.wallet = options.wallet;
+        this.appConfig = options.appConfig;
+        this.allowance = options.allowance;
+        this.contracts = options.contracts;
+        this.tradeClient = options.tradeClient;
+        this.mapReader = options.mapReader;
+        this.logger = options.logger;
+    }
+    async quoteReturn(input) {
+        const prepared = await this.prepare(input);
+        const quote = await this.quoteOnChain(prepared);
+        const capacity = await this.assessDestination(prepared, quote.amount);
+        return this.toQuoteView(prepared, quote, capacity);
+    }
+    async returnLot(input) {
+        const maxFee = parseFeeCeilingWei(input.maxTransitFeeWei, input.lotId);
+        const prepared = await this.prepare(input);
+        const { action, trade, lot, state, lotId, returnTokenIds } = prepared;
+        const transport = action.requireContract(AppContract.Transport, 'cannot route goods');
+        const quote = await this.quoteOnChain(prepared);
+        assertWholeRemainder(quote.amount, lot.remaining, input.lotId);
+        assertFeeWithinCeiling(quote.transitFee, maxFee, input.lotId);
+        const capacity = await this.assessDestination(prepared, quote.amount);
+        if (!capacity.fits) {
+            throw new Error(describeCapacityRefusal(capacity, prepared.destinationTokenId, input.lotId));
+        }
+        const branch = returnBranchOf(state);
+        // The price decides whether an allowance is needed at all; the ceiling only decides how much it caps.
+        // Keying this on the ceiling would send an unbounded approve for a route that costs nothing.
+        const approveTxHash = quote.transitFee === 0n
+            ? null
+            : await this.allowance.ensureAllowance(action.requireContract(AppContract.CpuToken, 'cannot pay for transit'), transport, maxFee);
+        this.logger.info('returning lot', {
+            lotId: input.lotId,
+            branch,
+            maxFeeWei: maxFee.toString(),
+            quotedFeeWei: quote.transitFee.toString(),
+            amount: quote.amount.toString(),
+        });
+        let confirmed;
+        try {
+            const txHash = branch === LotReturnBranch.Reclaimed
+                ? await this.tradeClient.reclaim({ trade, lotId, returnTokenIds, maxFee })
+                : await this.tradeClient.cancel({ trade, lotId, returnTokenIds, maxFee });
+            confirmed = await this.contracts.confirm(txHash, `Return lot ${input.lotId}`);
+        }
+        catch (error) {
+            throw describeLotReturnRevert(error, branch);
+        }
+        const scheduled = decodeDeliveryScheduled(confirmed.logs, transport);
+        const transit = settleTransitFees(confirmed.logs, transport, quote.transitFee);
+        const returned = decodeReturnedUnits(confirmed.logs, trade, quote.amount, this.logger);
+        return {
+            lotId: input.lotId,
+            originalState: state,
+            branch,
+            hubTokenId: lot.hub.toString(),
+            resourceId: lot.resource,
+            returned: returned.toString(),
+            transitPaid: cpuFromWei(transit.transitPaid.toString()),
+            transitDiscount: cpuFromWei(transit.transitDiscount.toString()),
+            destinationTokenId: scheduled.targetId.toString(),
+            deliveryId: scheduled.deliveryId.toString(),
+            arrivalAt: Number(scheduled.arrivalAt),
+            approveTxHash,
+            txHash: confirmed.txHash,
+            status: confirmed.status,
+            blockNumber: confirmed.blockNumber,
+        };
+    }
+    async prepare(input) {
+        const action = await preparePaidAction({ appConfig: this.appConfig, wallet: this.wallet });
+        const trade = action.requireContract(AppContract.Trade, 'cannot return a lot');
+        assertReturnRoute(input.chain);
+        const seller = action.wallet.getAddress();
+        const lotId = BigInt(input.lotId);
+        const lot = await this.tradeClient.getLot({ trade, lotId });
+        const state = assertReturnableLot(lot, seller, input.lotId);
+        assertRouteStartsAtHub(input.chain, lot.hub, input.lotId);
+        return {
+            action,
+            trade,
+            lot,
+            state,
+            seller,
+            lotId,
+            returnTokenIds: input.chain.map((tokenId) => BigInt(tokenId)),
+            destinationTokenId: String(input.chain[input.chain.length - 1]),
+        };
+    }
+    async quoteOnChain(prepared) {
+        return this.tradeClient.quoteReturn({
+            trade: prepared.trade,
+            lotId: prepared.lotId,
+            returnTokenIds: prepared.returnTokenIds,
+            seller: prepared.seller,
+        });
+    }
+    async assessDestination(prepared, required) {
+        await this.mapReader.refresh();
+        const cell = await this.mapReader.readRevealCell(prepared.destinationTokenId);
+        if (cell === null) {
+            throw new Error(`Cell ${prepared.destinationTokenId} is not in the world map, so the room it has for the ` +
+                `remainder cannot be checked. Nothing was sent — retry shortly, or route the return to a ` +
+                `revealed cell of your own.`);
+        }
+        const projection = toProjectionConfig(prepared.action.config);
+        const emptyStorageCap = configuredStorageCap(prepared.lot.resource, usesHubShelf(cell.building, cell.ready, projection), projection);
+        return assessDestinationCapacity(cell, prepared.lot.resource, required, emptyStorageCap);
+    }
+    toQuoteView(prepared, quote, capacity) {
+        return {
+            lotId: prepared.lotId.toString(),
+            hubTokenId: prepared.lot.hub.toString(),
+            resourceId: prepared.lot.resource,
+            amount: quote.amount.toString(),
+            destinationTokenId: prepared.destinationTokenId,
+            maxTransitFee: cpuFromWei(quote.transitFee.toString()),
+            maxTransitFeeWei: quote.transitFee.toString(),
+            transitDiscount: cpuFromWei(quote.transitDiscount.toString()),
+            totalDistance: Number(quote.totalDistance),
+            arrivalAt: Number(quote.arrivalAt),
+            capacity,
+        };
+    }
+}
+//# sourceMappingURL=lot-return.service.js.map

package/dist/services/lot-return.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"lot-return.service.js","sourceRoot":"","sources":["../../src/services/lot-return.service.ts"],"names":[],"mappings":"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"}

package/dist/services/lot-return.types.d.ts

@@ -0,0 +1,19 @@
+import type { IAllowanceService, IAppConfig, ITradeClient, LotReturnInput, LotReturnQuote, LotReturnQuoteInput, LotReturnResult } from './types.js';
+import type { ILogger } from '../logger/types.js';
+import type { RevealCellReader } from '../map/types.js';
+import type { IContractClient, WalletProvider } from '../wallet/types.js';
+export interface LotReturnServiceOptions {
+    wallet: WalletProvider;
+    appConfig: IAppConfig;
+    allowance: IAllowanceService;
+    contracts: IContractClient;
+    tradeClient: ITradeClient;
+    mapReader: RevealCellReader;
+    logger: ILogger;
+}
+/** One player intent — send a lot's whole remainder home — quoted and then settled. */
+export interface ILotReturnService {
+    quoteReturn(input: LotReturnQuoteInput): Promise<LotReturnQuote>;
+    returnLot(input: LotReturnInput): Promise<LotReturnResult>;
+}
+//# sourceMappingURL=lot-return.types.d.ts.map

package/dist/services/lot-return.types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"lot-return.types.d.ts","sourceRoot":"","sources":["../../src/services/lot-return.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,iBAAiB,EACjB,UAAU,EACV,YAAY,EACZ,cAAc,EACd,cAAc,EACd,mBAAmB,EACnB,eAAe,EAClB,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAE1E,MAAM,WAAW,uBAAuB;IACpC,MAAM,EAAE,cAAc,CAAC;IACvB,SAAS,EAAE,UAAU,CAAC;IACtB,SAAS,EAAE,iBAAiB,CAAC;IAC7B,SAAS,EAAE,eAAe,CAAC;IAC3B,WAAW,EAAE,YAAY,CAAC;IAC1B,SAAS,EAAE,gBAAgB,CAAC;IAC5B,MAAM,EAAE,OAAO,CAAC;CACnB;AAED,uFAAuF;AACvF,MAAM,WAAW,iBAAiB;IAC9B,WAAW,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IACjE,SAAS,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;CAC9D"}

package/dist/services/lot-return.types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=lot-return.types.js.map

package/dist/services/lot-return.types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"lot-return.types.js","sourceRoot":"","sources":["../../src/services/lot-return.types.ts"],"names":[],"mappings":""}

package/dist/services/lot-return.utils.d.ts

@@ -0,0 +1,33 @@
+import { type Address, type Log } from 'viem';
+import { LotReturnBranch, type DestinationCapacityView, type OnChainLot } from './types.js';
+import { LotState } from '../api/types.js';
+import type { ILogger } from '../logger/types.js';
+export declare function assertReturnRoute(chain: Array<number>): void;
+/**
+ * The chain is the arbiter of what a lot is: the projection can lag an eviction or a sell-out by a block,
+ * and a return sent against a stale state is a spend that reverts.
+ */
+export declare function assertReturnableLot(lot: OnChainLot, seller: Address, lotId: string): LotState;
+export declare function assertRouteStartsAtHub(chain: Array<number>, hub: bigint, lotId: string): void;
+/** A lot return is all-or-nothing; a quote for anything but the current remainder is a partial return. */
+export declare function assertWholeRemainder(quoted: bigint, remaining: bigint, lotId: string): void;
+/** The ceiling travels as wei precisely so nothing rounds it; a figure that is not whole wei is not a ceiling. */
+export declare function parseFeeCeilingWei(maxTransitFeeWei: string, lotId: string): bigint;
+/**
+ * The client half of the fee promise. Only the source hub's rate is pinned on-chain, at the figure recorded
+ * when the lot was listed, so any later waypoint can raise its own between the quote and this call. The
+ * ceiling itself does travel with the transaction and caps the whole route total there, but that backstop
+ * only fires once gas is committed: refusing here — before the allowance, before the transaction — is what
+ * makes a stale ceiling cost a re-quote instead of a reverted spend.
+ */
+export declare function assertFeeWithinCeiling(quotedWei: bigint, ceilingWei: bigint, lotId: string): void;
+export declare function returnBranchOf(state: LotState): LotReturnBranch;
+export declare function describeCapacityRefusal(capacity: DestinationCapacityView, destinationTokenId: string, lotId: string): string;
+export declare function describeLotReturnRevert(error: unknown, branch: LotReturnBranch): unknown;
+/**
+ * Both branches close the lot with the same lifecycle event. When a receipt carries none — a contract that
+ * settles a reclaim silently — the quote the contract itself just priced is the only honest figure left, and
+ * refusing to answer would report a settled return as a failure.
+ */
+export declare function decodeReturnedUnits(logs: Array<Log>, trade: Address, quoted: bigint, logger: ILogger): bigint;
+//# sourceMappingURL=lot-return.utils.d.ts.map

package/dist/services/lot-return.utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"lot-return.utils.d.ts","sourceRoot":"","sources":["../../src/services/lot-return.utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwC,KAAK,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,MAAM,CAAC;AAKpF,OAAO,EAAE,eAAe,EAAE,KAAK,uBAAuB,EAAE,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AAC5F,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAG3C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAMlD,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,CAc5D;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,QAAQ,CAiB7F;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAQ7F;AAED,0GAA0G;AAC1G,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAQ3F;AAED,kHAAkH;AAClH,wBAAgB,kBAAkB,CAAC,gBAAgB,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAoBlF;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAWjG;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,QAAQ,GAAG,eAAe,CAE/D;AAED,wBAAgB,uBAAuB,CACnC,QAAQ,EAAE,uBAAuB,EACjC,kBAAkB,EAAE,MAAM,EAC1B,KAAK,EAAE,MAAM,GACd,MAAM,CAQR;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,eAAe,GAAG,OAAO,CAWxF;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,MAAM,CAU7G"}