project-cpu-mcp 0.8.1 → 0.9.0

package/dist/services/reveal-revert.utils.js

@@ -1,17 +1,28 @@
+import { decodeKnownRevert } from './revert-decode.utils.js';
 import { CellRevertName } from './types.js';
 import { CELL_ABI } from '../contracts/cell.abi.js';
 import { withAdapterPhrase } from '../randomness/adapter-revert.utils.js';
-import { decodeRevert } from '../wallet/revert.utils.js';
 const CELL_REVERT_NAMES = Object.values(CellRevertName);
-function toCellRevertName(name) {
-    return CELL_REVERT_NAMES.find((known) => known === name) ?? null;
-}
 function messageFor(name, args, tokenId) {
     switch (name) {
-        case CellRevertName.INSUFFICIENT_REVEAL_FEE:
-            return (`The reveal fee moved between the quote and the send: the cell asks the randomness source for ` +
-                `its fee inside the request, and this transaction carried less than it quoted. The quote ` +
-                `follows the gas price, so quote again and retry.`);
+        case CellRevertName.INSUFFICIENT_REVEAL_PAYMENT:
+            return (`The reveal price moved between the quote and the send: cell ${tokenId} required ` +
+                `${String(args[0] ?? 'more')} wei and this transaction carried ${String(args[1] ?? 'less')}. ` +
+                `Nothing was spent — reveal cell ${tokenId} again and it prices the reveal afresh.`);
+        case CellRevertName.REVEAL_PAYMENT_NOT_CONFIGURED:
+            return (`This deployment has put no price on a reveal yet — neither the ETH leg nor the $CPU leg — so ` +
+                `no cell can be revealed on it. Nothing was spent and cell ${tokenId} is untouched.`);
+        case CellRevertName.REVEAL_HOOK_NOT_CONFIGURED:
+            return (`This deployment has nowhere to send a reveal's ETH contribution, so it refuses every reveal. ` +
+                `Nothing was spent and cell ${tokenId} is untouched.`);
+        case CellRevertName.HOOK_DELIVERY_FAILED:
+            return (`The reveal's ETH contribution could not be delivered, so the whole request was undone: ` +
+                `nothing was spent and cell ${tokenId} is untouched. This is a fault of the deployment, not ` +
+                `of your wallet — retry later.`);
+        case CellRevertName.REFUND_FAILED:
+            return (`The reveal carried more ETH than it cost and the change could not be returned, so the whole ` +
+                `request was undone: nothing was spent and cell ${tokenId} is untouched. A wallet that ` +
+                `refuses a plain ETH transfer cannot reveal.`);
         case CellRevertName.REVEAL_NOT_CONFIGURED:
             return (`This deployment has no reveal draw configured, so no cell can be revealed on it yet. Nothing ` +
                 `was spent and cell ${tokenId} is untouched.`);
@@ -44,25 +55,21 @@ function messageFor(name, args, tokenId) {
     }
 }
 export function isRevealAlreadyPending(error) {
-    const decoded = decodeRevert(error, CELL_ABI);
-    return decoded !== null && toCellRevertName(decoded.name) === CellRevertName.REVEAL_ALREADY_PENDING;
+    const decoded = decodeKnownRevert(error, CELL_ABI, CELL_REVERT_NAMES);
+    return decoded !== null && decoded.name === CellRevertName.REVEAL_ALREADY_PENDING;
 }
 export function withRevealInFlightPhrase(error, tokenId) {
-    const decoded = decodeRevert(error, CELL_ABI);
-    if (decoded === null || toCellRevertName(decoded.name) !== CellRevertName.REVEAL_IN_FLIGHT) {
+    const decoded = decodeKnownRevert(error, CELL_ABI, CELL_REVERT_NAMES);
+    if (decoded === null || decoded.name !== CellRevertName.REVEAL_IN_FLIGHT) {
         return error;
     }
     return new Error(messageFor(CellRevertName.REVEAL_IN_FLIGHT, decoded.args, tokenId), { cause: error });
 }
 export function withRevealRequestPhrase(error, tokenId) {
-    const decoded = decodeRevert(error, CELL_ABI);
+    const decoded = decodeKnownRevert(error, CELL_ABI, CELL_REVERT_NAMES);
     if (decoded === null) {
         return withAdapterPhrase(error);
     }
-    const name = toCellRevertName(decoded.name);
-    if (name === null) {
-        return withAdapterPhrase(error);
-    }
-    return new Error(messageFor(name, decoded.args, tokenId), { cause: error });
+    return new Error(messageFor(decoded.name, decoded.args, tokenId), { cause: error });
 }
 //# sourceMappingURL=reveal-revert.utils.js.map

package/dist/services/reveal-revert.utils.js.map

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

package/dist/services/reveal.service.d.ts

@@ -27,7 +27,14 @@ export declare class RevealService {
     private pendingWithoutSettleableRequest;
     private pendingAtRetiredSource;
     private pendingButUnlisted;
-    private settleReRevealCost;
+    /**
+     * Every reveal is paid for, first one included, and only the Cell knows the price: the chain config
+     * carries the two gameplay legs but not the live randomness fee, so a value rebuilt from it underpays.
+     * Either leg may be zero — a zero burn needs no approval, and a zero contribution is not a free reveal.
+     */
+    private fundReveal;
+    private prepareRevealRequest;
+    private sendRevealRequest;
     private pollFulfillment;
 }
 //# sourceMappingURL=reveal.service.d.ts.map

package/dist/services/reveal.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reveal.service.d.ts","sourceRoot":"","sources":["../../src/services/reveal.service.ts"],"names":[],"mappings":"AAWA,OAAO,EAQH,KAAK,YAAY,EACjB,KAAK,oBAAoB,EAI5B,MAAM,YAAY,CAAC;AAqBpB,qBAAa,aAAa;IACtB,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,UAAU,CAAc;IACzC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAkB;IAC5C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA6B;IACxD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoB;IAC3C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAmB;IAC7C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;gBAErB,OAAO,EAAE,oBAAoB;IAYnC,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;YA4DtC,uBAAuB;YAgDvB,8BAA8B;YA0D9B,iBAAiB;YAsBjB,aAAa;YA0Db,eAAe;YAmDf,YAAY;IAmB1B,OAAO,CAAC,YAAY;YAQN,YAAY;YAeZ,SAAS;YAQT,QAAQ;IAyBtB,OAAO,CAAC,OAAO;YAiBD,UAAU;IAmBxB,OAAO,CAAC,UAAU;YAoBJ,+BAA+B;IAU7C,OAAO,CAAC,sBAAsB;IAqC9B,OAAO,CAAC,kBAAkB;YA6BZ,kBAAkB;YAkBlB,eAAe;CAYhC"}
+{"version":3,"file":"reveal.service.d.ts","sourceRoot":"","sources":["../../src/services/reveal.service.ts"],"names":[],"mappings":"AAUA,OAAO,EAUH,KAAK,YAAY,EACjB,KAAK,oBAAoB,EAI5B,MAAM,YAAY,CAAC;AAqBpB,qBAAa,aAAa;IACtB,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,UAAU,CAAc;IACzC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAkB;IAC5C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA6B;IACxD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoB;IAC3C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAmB;IAC7C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;gBAErB,OAAO,EAAE,oBAAoB;IAYnC,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;YA4DtC,uBAAuB;YAiCvB,8BAA8B;YA4C9B,iBAAiB;YAsBjB,aAAa;YA0Db,eAAe;YAmDf,YAAY;IAmB1B,OAAO,CAAC,YAAY;YAQN,YAAY;YAeZ,SAAS;YAQT,QAAQ;IAyBtB,OAAO,CAAC,OAAO;YAiBD,UAAU;IAmBxB,OAAO,CAAC,UAAU;YAoBJ,+BAA+B;IAU7C,OAAO,CAAC,sBAAsB;IAqC9B,OAAO,CAAC,kBAAkB;IA6B1B;;;;OAIG;YACW,UAAU;YAgBV,oBAAoB;YAmBpB,iBAAiB;YAKjB,eAAe;CAYhC"}

package/dist/services/reveal.service.js

@@ -1,7 +1,7 @@
-import { isAddress, parseEther } from 'viem';
+import { isAddress } from 'viem';
 import { isRevealAlreadyPending } from './reveal-revert.utils.js';
-import { REVEAL_FEE_BUFFER_BPS, REVEAL_POLL_INTERVAL_MS, REVEAL_POLL_TIMEOUT_MS, REVEAL_PRIME_ATTEMPTS, REVEAL_PRIME_INTERVAL_MS, } from './reveal.constants.js';
-import { revealDepositsOf, revealRequestedOf } from './reveal.utils.js';
+import { REVEAL_POLL_INTERVAL_MS, REVEAL_POLL_TIMEOUT_MS, REVEAL_PRIME_ATTEMPTS, REVEAL_PRIME_INTERVAL_MS, } from './reveal.constants.js';
+import { bufferedRevealValue, revealDepositsOf, revealRequestedOf } from './reveal.utils.js';
 import { RevealSettlementKind, } from './types.js';
 import { RandomnessKind } from '../api/types.js';
 import { sameAddress } from '../randomness/request.utils.js';
@@ -9,7 +9,7 @@ import { planBeaconWait } from '../randomness/round.utils.js';
 import { AdapterRequestState, BeaconRoundOutcome, } from '../randomness/types.js';
 import { sleep } from '../utils/async.utils.js';
 import { errorMessage } from '../utils/error.utils.js';
-import { cpuFromWei } from '../utils/format.utils.js';
+import { cpuFromWei, ethFromWei } from '../utils/format.utils.js';
 export class RevealService {
     wallet;
     appConfig;
@@ -81,21 +81,9 @@ export class RevealService {
         }
     }
     async revealThroughPushSource(input) {
-        const { randomness, config, cell, tokenId, genesis, previousRevealCount } = input;
-        const { approveTxHash, reRevealCostWei } = await this.settleReRevealCost(config, cell, genesis);
-        const fee = await randomness.quoteFee();
-        const value = fee + (fee * REVEAL_FEE_BUFFER_BPS) / 10000n;
-        this.logger.info('requesting on-chain reveal', {
-            tokenId,
-            cell,
-            genesis,
-            source: randomness.source,
-            feeWei: fee.toString(),
-            valueWei: value.toString(),
-            network: config.network,
-        });
-        const txHash = await this.cellClient.requestReveal({ cell, tokenId: BigInt(tokenId), value });
-        const confirmed = await this.contracts.confirm(txHash, 'Reveal request');
+        const { randomness, cell, tokenId, genesis, previousRevealCount } = input;
+        const { approveTxHash, quote, value } = await this.prepareRevealRequest(input);
+        const confirmed = await this.sendRevealRequest(cell, tokenId, value);
         const fulfilled = await this.pollFulfillment(tokenId, previousRevealCount);
         this.logger.info('reveal request confirmed', {
             tokenId,
@@ -114,34 +102,22 @@ export class RevealService {
             deposits: null,
             status: confirmed.status,
             blockNumber: confirmed.blockNumber,
-            fee: cpuFromWei(fee.toString()),
-            reRevealCost: cpuFromWei(reRevealCostWei.toString()),
+            ethPaid: ethFromWei(quote.totalRequiredWei.toString()),
+            cpuBurn: cpuFromWei(quote.cpuBurnWei.toString()),
             approveTxHash,
             fulfilled,
             note: null,
         };
     }
     async revealThroughSelfServiceSource(input) {
-        const { randomness, config, cell, tokenId, genesis } = input;
+        const { randomness, cell, tokenId } = input;
         if (input.pending) {
             return this.settleOpenRequest(input, null);
         }
-        const { approveTxHash, reRevealCostWei } = await this.settleReRevealCost(config, cell, genesis);
-        const fee = await randomness.quoteRequestFee();
-        const value = fee + (fee * REVEAL_FEE_BUFFER_BPS) / 10000n;
-        this.logger.info('requesting on-chain reveal', {
-            tokenId,
-            cell,
-            genesis,
-            source: randomness.source,
-            feeWei: fee.toString(),
-            valueWei: value.toString(),
-            network: config.network,
-        });
+        const { approveTxHash, quote, value } = await this.prepareRevealRequest(input);
         let confirmed;
         try {
-            const txHash = await this.cellClient.requestReveal({ cell, tokenId: BigInt(tokenId), value });
-            confirmed = await this.contracts.confirm(txHash, 'Reveal request');
+            confirmed = await this.sendRevealRequest(cell, tokenId, value);
         }
         catch (error) {
             if (!isRevealAlreadyPending(error)) {
@@ -166,8 +142,8 @@ export class RevealService {
             source: requested?.source ?? randomness.source,
             requestTxHash: confirmed.txHash,
             approveTxHash,
-            feeWei: fee,
-            reRevealCostWei,
+            paidWei: quote.totalRequiredWei,
+            cpuBurnWei: quote.cpuBurnWei,
             status: confirmed.status,
             blockNumber: confirmed.blockNumber,
         });
@@ -187,8 +163,8 @@ export class RevealService {
             source: open.source,
             requestTxHash: null,
             approveTxHash,
-            feeWei: 0n,
-            reRevealCostWei: 0n,
+            paidWei: 0n,
+            cpuBurnWei: 0n,
             status: null,
             blockNumber: null,
         });
@@ -351,7 +327,7 @@ export class RevealService {
             deposits: null,
             fulfilled: false,
             note: `${reason} The reveal request stays open: call reveal on cell ${input.tokenId} again to settle ` +
-                `it — that charges no new fee — or read the draw with get_cell ${input.tokenId} once anyone ` +
+                `it — that pays for no second reveal — or read the draw with get_cell ${input.tokenId} once anyone ` +
                 `settles it.`,
         };
     }
@@ -365,8 +341,8 @@ export class RevealService {
             round: round === null ? null : round.toString(),
             status: ctx.status,
             blockNumber: ctx.blockNumber,
-            fee: cpuFromWei(ctx.feeWei.toString()),
-            reRevealCost: cpuFromWei(ctx.reRevealCostWei.toString()),
+            ethPaid: ethFromWei(ctx.paidWei.toString()),
+            cpuBurn: cpuFromWei(ctx.cpuBurnWei.toString()),
             approveTxHash: ctx.approveTxHash,
         };
     }
@@ -388,8 +364,8 @@ export class RevealService {
             source: retired.source,
             requestTxHash: null,
             approveTxHash,
-            feeWei: 0n,
-            reRevealCostWei: 0n,
+            paidWei: 0n,
+            cpuBurnWei: 0n,
             status: null,
             blockNumber: null,
         };
@@ -401,7 +377,7 @@ export class RevealService {
             note: `Cell ${input.tokenId} carries reveal request ${retired.requestId}, opened at randomness source ` +
                 `${retired.source}, while the chain config now reveals through ${input.randomness.source}. A cell ` +
                 `takes its draw only from the source its own request names, so nothing you can send closes this ` +
-                `one: this call requested nothing and paid no reveal fee, calling reveal again will not clear the ` +
+                `one: this call requested nothing and paid nothing, calling reveal again will not clear the ` +
                 `cell, and fulfill_reveal refuses a request of a retired source. The cell stays locked on this ` +
                 `open request until an admin of the contracts clears it on-chain — that admin cleanup is the only ` +
                 `way out.`,
@@ -423,28 +399,53 @@ export class RevealService {
             deposits: null,
             status: null,
             blockNumber: null,
-            fee: '0',
-            reRevealCost: '0',
+            ethPaid: '0',
+            cpuBurn: '0',
             approveTxHash,
             fulfilled: false,
             note: `Cell ${input.tokenId} already carries a reveal request, so this call requested nothing and ` +
-                `paid no reveal fee, but the game API does not list that request yet, so this call cannot tell ` +
+                `paid nothing, but the game API does not list that request yet, so this call cannot tell ` +
                 `which request to settle. Two ways out: call reveal on cell ${input.tokenId} again in a few ` +
                 `seconds and it settles the request once the API lists it; or leave it — anyone holding the ` +
                 `beacon signature can settle it — and read the draw with get_cell ${input.tokenId} once it lands.`,
         };
     }
-    async settleReRevealCost(config, cell, genesis) {
-        if (genesis) {
-            return { approveTxHash: null, reRevealCostWei: 0n };
+    /**
+     * Every reveal is paid for, first one included, and only the Cell knows the price: the chain config
+     * carries the two gameplay legs but not the live randomness fee, so a value rebuilt from it underpays.
+     * Either leg may be zero — a zero burn needs no approval, and a zero contribution is not a free reveal.
+     */
+    async fundReveal(config, cell) {
+        const quote = await this.cellClient.quoteReveal(cell);
+        if (quote.cpuBurnWei === 0n) {
+            return { approveTxHash: null, quote };
         }
         const cpuToken = config.contracts.cpuToken;
         if (!isAddress(cpuToken, { strict: false })) {
-            throw new Error(`$CPU token is not configured for network ${config.network}; cannot pay for re-reveal.`);
+            throw new Error(`$CPU token is not configured for network ${config.network}; cannot pay for a reveal.`);
         }
-        const reRevealCostWei = parseEther(config.reveal.reRevealCost);
-        const approveTxHash = reRevealCostWei > 0n ? await this.allowance.ensureAllowance(cpuToken, cell, reRevealCostWei) : null;
-        return { approveTxHash, reRevealCostWei };
+        const approveTxHash = await this.allowance.ensureAllowance(cpuToken, cell, quote.cpuBurnWei);
+        return { approveTxHash, quote };
+    }
+    async prepareRevealRequest(input) {
+        const { randomness, config, cell, tokenId, genesis } = input;
+        const { approveTxHash, quote } = await this.fundReveal(config, cell);
+        const value = bufferedRevealValue(quote.totalRequiredWei);
+        this.logger.info('requesting on-chain reveal', {
+            tokenId,
+            cell,
+            genesis,
+            source: randomness.source,
+            quotedWei: quote.totalRequiredWei.toString(),
+            valueWei: value.toString(),
+            cpuBurnWei: quote.cpuBurnWei.toString(),
+            network: config.network,
+        });
+        return { approveTxHash, quote, value };
+    }
+    async sendRevealRequest(cell, tokenId, value) {
+        const txHash = await this.cellClient.requestReveal({ cell, tokenId: BigInt(tokenId), value });
+        return this.contracts.confirm(txHash, 'Reveal request');
     }
     async pollFulfillment(tokenId, previousRevealCount) {
         const deadline = Date.now() + REVEAL_POLL_TIMEOUT_MS;

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

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

package/dist/services/reveal.utils.d.ts

@@ -5,6 +5,14 @@ export interface RevealRequestedView {
     requestId: bigint;
     source: Address;
 }
+/**
+ * The ETH a reveal transaction carries: the quoted total plus headroom. The randomness leg of the quote is
+ * read in an `eth_call`, where it can price lower than the send is charged, so a transaction carrying the
+ * quote exactly can still underpay. The headroom goes on the total for that reason — a share of the fee leg
+ * alone would be zero exactly when it is needed. The excess is refunded inside the same transaction, so
+ * the reveal still costs the quoted total.
+ */
+export declare function bufferedRevealValue(totalRequiredWei: bigint): bigint;
 export declare function revealRequestedOf(logs: Array<Log>, cell: Address, tokenId: string): RevealRequestedView | null;
 export declare function revealDepositsOf(logs: Array<Log>, cell: Address, requestId: bigint, resources: ResourceNames): Array<RevealDepositView> | null;
 //# sourceMappingURL=reveal.utils.d.ts.map

package/dist/services/reveal.utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reveal.utils.d.ts","sourceRoot":"","sources":["../../src/services/reveal.utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,MAAM,CAAC;AAE9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAGpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAE9D,MAAM,WAAW,mBAAmB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC;CACnB;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,mBAAmB,GAAG,IAAI,CAM9G;AAED,wBAAgB,gBAAgB,CAC5B,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,EAChB,IAAI,EAAE,OAAO,EACb,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,aAAa,GACzB,KAAK,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAsBjC"}
+{"version":3,"file":"reveal.utils.d.ts","sourceRoot":"","sources":["../../src/services/reveal.utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,MAAM,CAAC;AAG9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAIpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAE9D,MAAM,WAAW,mBAAmB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC;CACnB;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,gBAAgB,EAAE,MAAM,GAAG,MAAM,CAEpE;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,mBAAmB,GAAG,IAAI,CAM9G;AAED,wBAAgB,gBAAgB,CAC5B,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,EAChB,IAAI,EAAE,OAAO,EACb,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,aAAa,GACzB,KAAK,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAsBjC"}

package/dist/services/reveal.utils.js

@@ -1,6 +1,18 @@
 import { parseEventLogs } from 'viem';
+import { REVEAL_FEE_BUFFER_BPS } from './reveal.constants.js';
+import { BPS_DENOMINATOR } from '../config/constants.js';
 import { CELL_ABI } from '../contracts/cell.abi.js';
 import { sameAddress, sameTokenId } from '../randomness/request.utils.js';
+/**
+ * The ETH a reveal transaction carries: the quoted total plus headroom. The randomness leg of the quote is
+ * read in an `eth_call`, where it can price lower than the send is charged, so a transaction carrying the
+ * quote exactly can still underpay. The headroom goes on the total for that reason — a share of the fee leg
+ * alone would be zero exactly when it is needed. The excess is refunded inside the same transaction, so
+ * the reveal still costs the quoted total.
+ */
+export function bufferedRevealValue(totalRequiredWei) {
+    return totalRequiredWei + (totalRequiredWei * REVEAL_FEE_BUFFER_BPS) / BPS_DENOMINATOR;
+}
 export function revealRequestedOf(logs, cell, tokenId) {
     const events = parseEventLogs({ abi: CELL_ABI, eventName: 'RevealRequested', logs });
     const event = events.find((candidate) => sameAddress(candidate.address, cell) && sameTokenId(candidate.args.tokenId.toString(), tokenId));

package/dist/services/reveal.utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"reveal.utils.js","sourceRoot":"","sources":["../../src/services/reveal.utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAA0B,MAAM,MAAM,CAAC;AAG9D,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAQ1E,MAAM,UAAU,iBAAiB,CAAC,IAAgB,EAAE,IAAa,EAAE,OAAe;IAC9E,MAAM,MAAM,GAAG,cAAc,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,SAAS,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC;IACrF,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CACrB,CAAC,SAAS,EAAE,EAAE,CAAC,WAAW,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC,CACjH,CAAC;IACF,OAAO,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;AACvG,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC5B,IAAgB,EAChB,IAAa,EACb,SAAiB,EACjB,SAAwB;IAExB,MAAM,MAAM,GAAG,cAAc,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,SAAS,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC;IACrF,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CACrB,CAAC,SAAS,EAAE,EAAE,CAAC,WAAW,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,SAAS,KAAK,SAAS,CAChG,CAAC;IACF,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACtB,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,MAAM,KAAK,GAA6B,EAAE,CAAC;IAC3C,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,IAAI,EAAE,EAAE;QAC9C,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QAC9C,IAAI,UAAU,KAAK,CAAC,IAAI,MAAM,KAAK,EAAE,EAAE,CAAC;YACpC,OAAO;QACX,CAAC;QACD,KAAK,CAAC,IAAI,CAAC;YACP,UAAU;YACV,YAAY,EAAE,SAAS,CAAC,UAAU,CAAC,IAAI,IAAI;YAC3C,MAAM,EAAE,MAAM,CAAC,QAAQ,EAAE;YACzB,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC;SAC5C,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IACH,OAAO,KAAK,CAAC;AACjB,CAAC"}
+{"version":3,"file":"reveal.utils.js","sourceRoot":"","sources":["../../src/services/reveal.utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAA0B,MAAM,MAAM,CAAC;AAE9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAQ1E;;;;;;GAMG;AACH,MAAM,UAAU,mBAAmB,CAAC,gBAAwB;IACxD,OAAO,gBAAgB,GAAG,CAAC,gBAAgB,GAAG,qBAAqB,CAAC,GAAG,eAAe,CAAC;AAC3F,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,IAAgB,EAAE,IAAa,EAAE,OAAe;IAC9E,MAAM,MAAM,GAAG,cAAc,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,SAAS,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC;IACrF,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CACrB,CAAC,SAAS,EAAE,EAAE,CAAC,WAAW,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC,CACjH,CAAC;IACF,OAAO,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;AACvG,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC5B,IAAgB,EAChB,IAAa,EACb,SAAiB,EACjB,SAAwB;IAExB,MAAM,MAAM,GAAG,cAAc,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,SAAS,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC;IACrF,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CACrB,CAAC,SAAS,EAAE,EAAE,CAAC,WAAW,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,SAAS,KAAK,SAAS,CAChG,CAAC;IACF,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACtB,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,MAAM,KAAK,GAA6B,EAAE,CAAC;IAC3C,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,IAAI,EAAE,EAAE;QAC9C,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QAC9C,IAAI,UAAU,KAAK,CAAC,IAAI,MAAM,KAAK,EAAE,EAAE,CAAC;YACpC,OAAO;QACX,CAAC;QACD,KAAK,CAAC,IAAI,CAAC;YACP,UAAU;YACV,YAAY,EAAE,SAAS,CAAC,UAAU,CAAC,IAAI,IAAI;YAC3C,MAAM,EAAE,MAAM,CAAC,QAAQ,EAAE;YACzB,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC;SAC5C,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IACH,OAAO,KAAK,CAAC;AACjB,CAAC"}

package/dist/services/revert-decode.utils.d.ts

@@ -0,0 +1,7 @@
+import type { Abi } from 'viem';
+export interface KnownRevert<T extends string> {
+    name: T;
+    args: ReadonlyArray<unknown>;
+}
+export declare function decodeKnownRevert<T extends string>(error: unknown, abi: Abi, names: ReadonlyArray<T>): KnownRevert<T> | null;
+//# sourceMappingURL=revert-decode.utils.d.ts.map

package/dist/services/revert-decode.utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"revert-decode.utils.d.ts","sourceRoot":"","sources":["../../src/services/revert-decode.utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAIhC,MAAM,WAAW,WAAW,CAAC,CAAC,SAAS,MAAM;IACzC,IAAI,EAAE,CAAC,CAAC;IACR,IAAI,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;CAChC;AAED,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,MAAM,EAC9C,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,GACxB,WAAW,CAAC,CAAC,CAAC,GAAG,IAAI,CAUvB"}

package/dist/services/revert-decode.utils.js

@@ -0,0 +1,13 @@
+import { decodeRevert } from '../wallet/revert.utils.js';
+export function decodeKnownRevert(error, abi, names) {
+    const decoded = decodeRevert(error, abi);
+    if (decoded === null) {
+        return null;
+    }
+    const name = names.find((known) => known === decoded.name) ?? null;
+    if (name === null) {
+        return null;
+    }
+    return { name, args: decoded.args };
+}
+//# sourceMappingURL=revert-decode.utils.js.map

package/dist/services/revert-decode.utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"revert-decode.utils.js","sourceRoot":"","sources":["../../src/services/revert-decode.utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAOzD,MAAM,UAAU,iBAAiB,CAC7B,KAAc,EACd,GAAQ,EACR,KAAuB;IAEvB,MAAM,OAAO,GAAG,YAAY,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACzC,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC;IACnE,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;QAChB,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;AACxC,CAAC"}

package/dist/services/types.d.ts

@@ -1,6 +1,6 @@
 import type { Address, Hash, Log } from 'viem';
 import type { ApiClient } from '../api/client.js';
-import type { BuildingType, BuildingView, CraftRecipeId, CraftStackView, IRevealRequestsReader, LotAvailability, LotSort, OpenRevealRequestView, RandomnessDescriptor, RecipeView, RevealCostView, StorageConfigView, SyndicateSort, TransportRoutingView } from '../api/types.js';
+import type { BuildingType, BuildingView, CraftRecipeId, CraftStackView, IRevealRequestsReader, LotAvailability, LotSort, OpenRevealRequestView, RandomnessDescriptor, RecipeView, RevealPaymentView, StorageConfigView, SyndicateSort, TransportRoutingView } from '../api/types.js';
 import type { Network } from '../config/types.js';
 import type { CellCoord } from '../geometry/types.js';
 import type { ILogger } from '../logger/types.js';
@@ -88,8 +88,11 @@ export interface AppConfig {
     recipes: Array<RecipeView>;
     /** Per-building catalog — on-chain id, kind, costs, and mine/craft bindings. */
     buildings: Array<CatalogBuildingView>;
-    /** First-reveal-free + re-reveal cost params. */
-    reveal: RevealCostView;
+    /**
+     * The two gameplay legs every reveal is charged; `null` when the game API serves no reveal payment at
+     * all. Never the total to send — a reveal is always funded from `ICellClient.quoteReveal`.
+     */
+    reveal: RevealPaymentView | null;
     transport: TransportRoutingView;
     /** Trade fee params, normalized to the MCP's percent surface. */
     trade: TradeConfigView;
@@ -125,6 +128,18 @@ export interface RequestRevealParams {
     tokenId: bigint;
     value: bigint;
 }
+/**
+ * What one reveal costs right now, read from the Cell itself and the only source a reveal is funded from:
+ * `totalRequiredWei` is the whole ETH the reveal is charged and `cpuBurnWei` the exact burn to approve. The
+ * transaction carries headroom over the total (see `bufferedRevealValue`); the burn is approved as quoted.
+ * Any leg may be zero.
+ */
+export interface RevealQuote {
+    ethContributionWei: bigint;
+    randomnessFeeWei: bigint;
+    totalRequiredWei: bigint;
+    cpuBurnWei: bigint;
+}
 export interface PlaceParams {
     cell: Address;
     tokenId: bigint;
@@ -162,6 +177,7 @@ export interface CellViewResult {
 }
 export interface ICellClient {
     readCellView(cell: Address, tokenId: bigint): Promise<CellViewResult>;
+    quoteReveal(cell: Address): Promise<RevealQuote>;
     requestReveal(params: RequestRevealParams): Promise<Hash>;
     place(params: PlaceParams): Promise<Hash>;
     demolish(params: DemolishParams): Promise<Hash>;
@@ -182,7 +198,11 @@ export interface RevealServiceOptions {
     logger: ILogger;
 }
 export declare enum CellRevertName {
-    INSUFFICIENT_REVEAL_FEE = "InsufficientRevealFee",
+    INSUFFICIENT_REVEAL_PAYMENT = "InsufficientRevealPayment",
+    REVEAL_PAYMENT_NOT_CONFIGURED = "RevealPaymentNotConfigured",
+    REVEAL_HOOK_NOT_CONFIGURED = "RevealHookNotConfigured",
+    HOOK_DELIVERY_FAILED = "HookDeliveryFailed",
+    REFUND_FAILED = "RefundFailed",
     REVEAL_NOT_CONFIGURED = "RevealNotConfigured",
     REVEAL_CELL_OCCUPIED = "RevealCellOccupied",
     REVEAL_PROCESS_ACTIVE = "RevealProcessActive",
@@ -191,6 +211,18 @@ export declare enum CellRevertName {
     DEPOSITS_NOT_EXHAUSTED = "DepositsNotExhausted",
     REVEAL_REQUEST_ID_IN_USE = "RevealRequestIdInUse"
 }
+export declare enum UpgradeRevertName {
+    NOT_REVEALED = "NotRevealed",
+    PROCESS_ACTIVE = "ProcessActive",
+    DEMOLISH_IN_PROGRESS = "DemolishInProgress",
+    BUILDING_NOT_ENABLED = "BuildingNotEnabled",
+    NOT_A_BASE_BUILDING = "NotABaseBuilding",
+    INVALID_UPGRADE = "InvalidUpgrade",
+    BUILDING_NOT_READY = "BuildingNotReady",
+    STORAGE_EXCEEDS_CAP = "StorageExceedsCap",
+    INSUFFICIENT_LIQUID = "InsufficientLiquid",
+    NOT_CELL_OWNER = "NotCellOwner"
+}
 export interface PushRevealInput {
     randomness: PushRandomness;
     config: AppConfig;
@@ -209,13 +241,19 @@ export interface SelfServiceRevealInput {
     pending: boolean;
     owner: Address;
 }
+export interface FundedRevealRequest {
+    approveTxHash: Hash | null;
+    quote: RevealQuote;
+    value: bigint;
+}
 export interface RevealRequestContext {
     requestId: bigint | null;
     source: Address;
     requestTxHash: Hash | null;
     approveTxHash: Hash | null;
-    feeWei: bigint;
-    reRevealCostWei: bigint;
+    /** The whole ETH the reveal cost, as the Cell quoted it; the transaction carries headroom above it. */
+    paidWei: bigint;
+    cpuBurnWei: bigint;
     status: TxStatus | null;
     blockNumber: string | null;
 }
@@ -252,9 +290,15 @@ export interface RevealResult {
     deposits: Array<RevealDepositView> | null;
     status: TxStatus | null;
     blockNumber: string | null;
-    fee: string;
-    /** Re-reveal cost in $CPU (decimal); "0" for a first reveal. */
-    reRevealCost: string;
+    /**
+     * The whole ETH this reveal cost (decimal), as the cell quoted it — the liquidity contribution and the
+     * randomness fee together, not the fee alone; "0" when the call sent no request of its own. The
+     * transaction carries headroom above it and the excess comes back in the same transaction, so this is
+     * what the wallet is left down by.
+     */
+    ethPaid: string;
+    /** $CPU burned by this reveal (decimal); "0" when the call sent no request of its own. */
+    cpuBurn: string;
     approveTxHash: Hash | null;
     fulfilled: boolean;
     note: string | null;
@@ -333,6 +377,24 @@ export interface BuildPlacement {
     /** Build cost in $CPU (decimal). */
     buildCost: string;
 }
+export interface UpgradeInput {
+    tokenId: string;
+    targetBuildingType: string;
+}
+export interface UpgradeResult {
+    tokenId: string;
+    fromBuildingType: string;
+    toBuildingType: string;
+    buildCost: string;
+    buildInputs: Array<CraftStackView>;
+    noop: boolean;
+    upgrading: boolean;
+    finishAt: number | null;
+    approveTxHash: Hash | null;
+    txHash: Hash | null;
+    status: TxStatus | null;
+    blockNumber: string | null;
+}
 export interface DemolishInput {
     tokenId: string;
 }