@xgamesfun/solana 0.28.2 → 0.28.3

package/README.md

@@ -77,7 +77,7 @@ codex plugin add xsolana@xgamesfun
 
 **claude.ai, ChatGPT or Claude Desktop:** add `https://xgames.fun/mcp` as a custom connector. Nothing to install.
 
-**Cursor, Cline, opencode or any MCP client:** run `npx -y --package=@xgamesfun/solana@0.28.2 xsolana mcp`.
+**Cursor, Cline, opencode or any MCP client:** run `npx -y --package=@xgamesfun/solana@0.28.3 xsolana mcp`.
 
 **Any agent that reads skills** (Copilot, Gemini CLI, Windsurf…): `npx skills add XGamesFun/solana-kit`.
 
@@ -88,26 +88,26 @@ are in [docs/harnesses.md](docs/harnesses.md).
 
 ```bash
 # find a worked example close to your idea
-npx -y @xgamesfun/solana@0.28.2 examples shop with loot boxes
+npx -y @xgamesfun/solana@0.28.3 examples shop with loot boxes
 
 # using a coin you already launched? read it from the chain into its "tokens" entry
-npx -y @xgamesfun/solana@0.28.2 token <its mint address>
+npx -y @xgamesfun/solana@0.28.3 token <its mint address>
 
 # does it work? where does the money go? what does it cost?
-npx -y @xgamesfun/solana@0.28.2 check xsolana.json
-npx -y @xgamesfun/solana@0.28.2 simulate xsolana.json
-npx -y @xgamesfun/solana@0.28.2 cost xsolana.json
+npx -y @xgamesfun/solana@0.28.3 check xsolana.json
+npx -y @xgamesfun/solana@0.28.3 simulate xsolana.json
+npx -y @xgamesfun/solana@0.28.3 cost xsolana.json
 
 # the whole economy in plain words, and what a cheater could get
-npx -y @xgamesfun/solana@0.28.2 explain xsolana.json
-npx -y @xgamesfun/solana@0.28.2 review xsolana.json
+npx -y @xgamesfun/solana@0.28.3 explain xsolana.json
+npx -y @xgamesfun/solana@0.28.3 review xsolana.json
 
 # go live: a key file for the project (it prints the address to send SOL to, never the key)…
-npx -y @xgamesfun/solana@0.28.2 keygen ~/.config/xsolana/my-game.json
+npx -y @xgamesfun/solana@0.28.3 keygen ~/.config/xsolana/my-game.json
 # …then everything going live would send, and a code; nothing is sent
-npx -y @xgamesfun/solana@0.28.2 approve xsolana.json --keypair ~/.config/xsolana/my-game.json
+npx -y @xgamesfun/solana@0.28.3 approve xsolana.json --keypair ~/.config/xsolana/my-game.json
 # …and with that code, exactly what it listed is sent
-npx -y @xgamesfun/solana@0.28.2 approve xsolana.json --keypair ~/.config/xsolana/my-game.json --yes <code>
+npx -y @xgamesfun/solana@0.28.3 approve xsolana.json --keypair ~/.config/xsolana/my-game.json --yes <code>
 ```
 
 Each command names an exact version, so you always run the release you meant to. `xsolana help` lists them all.

package/js/play/index.js

@@ -4922,7 +4922,12 @@ export function solanaApp({
       only(others, ['server', 'token', 'fetchImpl'], 'claimWins');
       const base = server.replace(/\/$/, '');
       const ask = async (path, init) => {
-        const r = await fetchImpl(path.startsWith('http') ? path : `${base}${path}`, init);
+        // (one server answers for both clusters: a request for mainnet says so, one for devnet names none, as before)
+        const at = path.startsWith('http') ? path : `${base}${path}`;
+        const on = loot.cluster();
+        const url =
+          on === 'devnet' || /[?&]cluster=/.test(at) ? at : `${at}${at.includes('?') ? '&' : '?'}cluster=${on}`;
+        const r = await fetchImpl(url, init);
         // The status first: a proxy's error page is no JSON, and says nothing a player can act on but its status.
         const body = await r.json().catch(() => null);
         if (!r.ok)

package/js/results/index.js

@@ -135,7 +135,7 @@ export async function report({
 }) {
   const result = { game, round, endedAt, winners };
   const all = [await signResult(signer, result, cluster)];
-  const response = await fetchImpl(`${server.replace(/\/$/, '')}/v1/results`, {
+  const response = await fetchImpl(serverUrl(server, '/v1/results', cluster), {
     method: 'POST',
     headers: { 'content-type': 'application/json' },
     body: JSON.stringify({ ...result, cert, signatures: all }),
@@ -165,9 +165,16 @@ async function answerOf(response) {
 }
 
 /** A wallet's vouchers for a round it won: [{ grant, publicKey, signature, round, expires, … }]. */
-export async function fetchVouchers({ server, game, round, wallet, fetchImpl = globalThis.fetch }) {
+export async function fetchVouchers({
+  server,
+  game,
+  round,
+  wallet,
+  cluster = onCluster(),
+  fetchImpl = globalThis.fetch,
+}) {
   const response = await fetchImpl(
-    `${server.replace(/\/$/, '')}/v1/vouchers?game=${q(game)}&round=${q(round)}&wallet=${q(wallet)}`,
+    serverUrl(server, `/v1/vouchers?game=${q(game)}&round=${q(round)}&wallet=${q(wallet)}`, cluster),
   );
   return (await answerOf(response)).vouchers;
 }
@@ -226,9 +233,19 @@ export async function signVoucher({
   };
 }
 
+/**
+ * A path on a results server, for the cluster the request is on. One server answers for both clusters, and a request
+ * that names none is devnet's: so nothing is added on devnet (as every request was before), and `cluster=mainnet` on
+ * mainnet.
+ */
+export function serverUrl(server, path, cluster = onCluster()) {
+  const url = `${String(server).replace(/\/$/, '')}${path}`;
+  return cluster === 'devnet' ? url : `${url}${url.includes('?') ? '&' : '?'}cluster=${encodeURIComponent(cluster)}`;
+}
+
 /** Posts JSON to the server and answers its body, or throws its { code, why }. */
-async function post(server, path, body, fetchImpl) {
-  const response = await fetchImpl(`${server.replace(/\/$/, '')}${path}`, {
+async function post(server, path, body, fetchImpl, cluster = onCluster()) {
+  const response = await fetchImpl(serverUrl(server, path, cluster), {
     method: 'POST',
     headers: { 'content-type': 'application/json' },
     body: JSON.stringify(body),
@@ -237,7 +254,8 @@ async function post(server, path, body, fetchImpl) {
 }
 
 /** Gets JSON from the server and answers its body, or throws its { code, why }. */
-const fetchJson = async (server, path, fetchImpl) => answerOf(await fetchImpl(`${server.replace(/\/$/, '')}${path}`));
+const fetchJson = async (server, path, fetchImpl, cluster = onCluster()) =>
+  answerOf(await fetchImpl(serverUrl(server, path, cluster)));
 
 /**
  * A draw, from the organizer's side and the players'. `signMessage(text) → signature bytes` is the organizer's wallet
@@ -278,13 +296,14 @@ export const draws = {
     cluster = onCluster(),
     fetchImpl = globalThis.fetch,
   }) => {
-    if (token) return post(server, `/v1/draws/${seg(game)}/${seg(draw)}/entries`, { token }, fetchImpl);
+    if (token) return post(server, `/v1/draws/${seg(game)}/${seg(draw)}/entries`, { token }, fetchImpl, cluster);
     const text = entryText({ cluster, game, draw });
     return post(
       server,
       `/v1/draws/${seg(game)}/${seg(draw)}/entries`,
       { wallet, text, signature: encodeBase58(await signMessage(new TextEncoder().encode(text))) },
       fetchImpl,
+      cluster,
     );
   },
   /** Locks the players the server holds now to `beacon`, a drand round still to come. Checks their hash itself. */
@@ -300,7 +319,7 @@ export const draws = {
     net = 'quicknet',
     fetchImpl = globalThis.fetch,
   }) => {
-    const { draw: view } = await fetchJson(server, `/v1/draws/${seg(game)}/${seg(draw)}`, fetchImpl);
+    const { draw: view } = await fetchJson(server, `/v1/draws/${seg(game)}/${seg(draw)}`, fetchImpl, cluster);
     const text = lockText({
       cluster,
       game,
@@ -320,6 +339,7 @@ export const draws = {
         ...(cert ? { cert } : {}),
       },
       fetchImpl,
+      cluster,
     );
   },
   /** The draw as anyone may check it; settled, with its result, once its beacon round is out. */
@@ -358,6 +378,7 @@ export const giveaways = {
       `/v1/giveaways/${seg(game)}/${seg(giveaway)}/result`,
       { endedAt, winners: winners.map(({ wallet, place }) => ({ wallet, place })), signature },
       fetchImpl,
+      cluster,
     );
   },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xgamesfun/solana",
-  "version": "0.28.2",
+  "version": "0.28.3",
   "mcpName": "io.github.XGamesFun/solana-kit",
   "description": "Loot boxes, gacha, shops, lotteries, auctions, NFT staking, crafting and rewards on Solana without writing a smart contract: one shared program, its JS client, a CLI, and an MCP server and skill so Claude Code, Codex or any AI agent can design, check, simulate and launch an economy.",
   "license": "Apache-2.0",

package/skills/xsolana-economy/SKILL.md

@@ -11,9 +11,9 @@ signed by a key file on the owner's own machine, once they have read what will b
 **devnet**, where nothing is real money, and on **mainnet**, where everything is: an economy is on devnet unless its
 file says `"network": "mainnet"`.
 
-The tools are the `xsolana_*` MCP tools. Without MCP, the same from a terminal: `npx -y @xgamesfun/solana@0.28.2 <guide|examples|check|simulate|cost|explain|review|publish|status> [xsolana.json]`,
-`npx -y @xgamesfun/solana@0.28.2 token <mint>` for a coin made elsewhere,
-or `npx -y @xgamesfun/solana@0.28.2 tool <name> '<json>'` for any tool (always with the exact version).
+The tools are the `xsolana_*` MCP tools. Without MCP, the same from a terminal: `npx -y @xgamesfun/solana@0.28.3 <guide|examples|check|simulate|cost|explain|review|publish|status> [xsolana.json]`,
+`npx -y @xgamesfun/solana@0.28.3 token <mint>` for a coin made elsewhere,
+or `npx -y @xgamesfun/solana@0.28.3 tool <name> '<json>'` for any tool (always with the exact version).
 
 ## Rules (always)
 
@@ -141,7 +141,7 @@ or `npx -y @xgamesfun/solana@0.28.2 tool <name> '<json>'` for any tool (always w
 9. **When they say "put it live"**: `xsolana_publish` lists every step and its cost and gives the commands, which you
    run in the project folder exactly as given (they name the exact version; never drop it):
    - **A new economy gets a key file**, unless the project has one:
-     `npx -y @xgamesfun/solana@0.28.2 keygen ~/.config/xsolana/<name>.json`. Give the person the address it prints. A
+     `npx -y @xgamesfun/solana@0.28.3 keygen ~/.config/xsolana/<name>.json`. Give the person the address it prints. A
      Solana key file they already have and name themselves (`~/.config/solana/id.json`) works the same; never go
      looking for one.
    - **Say what the key file is** before anything is sent: the project's owner, and, unless the spec says otherwise,
@@ -156,7 +156,7 @@ or `npx -y @xgamesfun/solana@0.28.2 tool <name> '<json>'` for any tool (always w
      devnet SOL for an economy on devnet, real SOL for one on mainnet), any seed in a coin that already exists, and every NFT a stash, a raffle or an auction names. A
      collection they already have needs the key's address as its update authority. If they would rather not move
      those, offer the browser wallet.
-   - **Show it**: `npx -y @xgamesfun/solana@0.28.2 approve xsolana.json --keypair <key file>` prints every step with
+   - **Show it**: `npx -y @xgamesfun/solana@0.28.3 approve xsolana.json --keypair <key file>` prints every step with
      what it pays and trusts, the warnings, the notice and a code, and sends nothing. Give the person that printout as
      it is, not a summary of it, and ask.
    - **On their yes**, the same command with `--yes <code>`. What lands is written back into `xsolana.json`. If it

package/types/results/index.d.ts

@@ -40,7 +40,8 @@ export declare function report({ server, cert, signer, game, round, endedAt, win
     winners: any;
 }): Promise<any>;
 /** A wallet's vouchers for a round it won: [{ grant, publicKey, signature, round, expires, … }]. */
-export declare function fetchVouchers({ server, game, round, wallet, fetchImpl }: {
+export declare function fetchVouchers({ server, game, round, wallet, cluster, fetchImpl, }: {
+    cluster?: "devnet" | "mainnet" | undefined;
     fetchImpl?: typeof fetch | undefined;
     game: any;
     round: any;
@@ -80,6 +81,12 @@ export declare function signVoucher({ signer, game, grant, incarnation, wallet,
     personHash: string;
     amount: string;
 }>;
+/**
+ * A path on a results server, for the cluster the request is on. One server answers for both clusters, and a request
+ * that names none is devnet's: so nothing is added on devnet (as every request was before), and `cluster=mainnet` on
+ * mainnet.
+ */
+export declare function serverUrl(server: any, path: any, cluster?: "devnet" | "mainnet"): string;
 /**
  * A draw, from the organizer's side and the players'. `signMessage(text) → signature bytes` is the organizer's wallet
  * (its signMessage) or a host key's sign; `by` its address; `cert` the owner's host certificate when `by` is a host key.