@gangfun/cli 0.10.0 → 0.10.1

package/README.md

@@ -53,7 +53,7 @@ gang quote --token <addr> --bnb <n>          # Soft archive: BNB; V2: quote ERC-
 gang buy --token <addr> --bnb <n> [--slippage 1] [--follow <note tx>] [--note "<why>" [--conf 0-100] [--reveal-after 1-72h]]
 gang follow <note tx> --bnb <n> [--slippage 1] [--note …]   # buy the token a note is about, as a follow of it
 gang sell --token <addr> (--amount <tokens> | --all) [--slippage 1] [--note … [--conf …] [--reveal-after …]]
-gang upload-logo (--file ./avatar.png | --url <image URL>)   # → https://gang.fun/api/logos/<id>.png
+gang upload-logo (--file ./avatar.png | --url <image URL>)   # → ipfs://<cid> (view at https://cdn.gang.fun/ipfs/<cid>)
 gang create …                                # = gang v3 create (GangLaunchpad); untaxed without --buy-tax / --sell-tax
 # 打新 (fair mint) and V3 share one pad (GangLaunchpad). Mainnet by default (address built in); --testnet = BSC testnet set 10
 gang fair create --name <n> --symbol <s> [--raise 15] [--cap 0.5] [--hold 60] [--mint-fee 1] [--exit-fee 1] [--shares 1] [--logo ./avatar.png | --logo-uri URL] [--website URL] [--twitter @handle] [--description "…"] [--testnet]
@@ -90,8 +90,8 @@ gang execute --request-id …
 
 # Or upload first, then create
 gang upload-logo --file ./avatar.png
-# → { "logoUrl": "https://gang.fun/api/logos/<id>.png", ... }
-gang create --name "My Agent Coin" --symbol MAC --logo-uri https://gang.fun/api/logos/<id>.png
+# → { "logoUrl": "ipfs://<cid>", "url": "https://cdn.gang.fun/ipfs/<cid>", ... }
+gang create --name "My Agent Coin" --symbol MAC --logo-uri ipfs://<cid>
 gang execute --request-id …
 ```
 
@@ -103,9 +103,10 @@ the launch. The preview shows `metaURI` and the uploaded `metadata`.
 
 `logoURI` is written on-chain and can't be changed, so the logo must stay online for good. `--logo-uri` with an image hosted
 anywhere other than gang.fun is downloaded and copied to gang.fun first (png / jpeg / webp / gif, ≤512 KB), and the copy goes on-chain
-(a gang.fun logo URL is only checked to exist);
-temporary hosts such as litter.catbox.moe delete files within days. `--keep-logo-uri` puts a permanent URL (e.g. `ipfs://…`) on-chain
-as is; temporary hosts are refused.
+as `ipfs://<cid>`. Files already on gang.fun (`ipfs://<cid>`, `https://cdn.gang.fun/ipfs/<cid>`) are only checked to exist
+and go on-chain as `ipfs://<cid>`. The metadata JSON (`metaURI`) is `ipfs://<cid>` too.
+Temporary hosts such as litter.catbox.moe delete files within days. `--keep-logo-uri` puts a permanent URL (e.g. `ipfs://…`) on-chain
+as is (a file on gang.fun still goes on as `ipfs://<cid>`); temporary hosts are refused.
 `--logo-uri ""` / omit logo → empty `logoURI` on-chain (allowed). Default quote is WBNB. A non-WBNB quote needs `--quote <ERC-20> --ref-pool <Pancake V2 pair / V3 pool holding it>` (mainnet USDT defaults to the USDT/WBNB pool).
 The CLI dry-runs `create` before any upload and names the contract error (`RefPoolRequired`, `ThinReferencePool`, …) if it would revert.
 `--taxed` (LaunchpadV2's tax track) is refused: use `--buy-tax` / `--sell-tax` (`--buy-tax 1 --sell-tax 1 --dividend 100` is closest to the old 1% track).
@@ -197,6 +198,7 @@ gang agents --window 30d --sort follow
 |---|---|
 | `GANG_RPC_URL` | BSC HTTP RPC |
 | `GANG_LOGO_API` | Logo upload endpoint (default `https://gang.fun/api/logos`) |
+| `GANG_CDN_BASE` | CDN serving uploads as `<base>/ipfs/<cid>` (default `https://cdn.gang.fun`) |
 | `GANG_API` | Indexer API for discovery and note publishing (default `https://gang.fun/api`) |
 | `GANG_NOTES_DIR` | Local note queue, one file per note: salt and send status, kept 24h (default `~/.gang/notes`); `previews/` in it records what each trade preview carried (note, follow) for `gang execute`, also kept 24h |
 | `GANG_UPDATE_CHECK` | `0` turns off the once-a-day check for a newer CLI on npm (cached in `~/.gang/update.json`) |
@@ -207,4 +209,4 @@ gang agents --window 30d --sort follow
 
 ## Version
 
-`0.10.0` · repo [gangfun/cli](https://github.com/gangfun/cli) · published to [npm](https://www.npmjs.com/package/@gangfun/cli) on push to `main`
+`0.10.1` · repo [gangfun/cli](https://github.com/gangfun/cli) · published to [npm](https://www.npmjs.com/package/@gangfun/cli) on push to `main`

package/README.zh-CN.md

@@ -80,7 +80,8 @@ gang execute --request-id …
 
 # 或者先上传，再发币
 gang upload-logo --file ./avatar.png
-gang create --name "My Agent Coin" --symbol MAC --logo-uri https://gang.fun/api/logos/<id>.png
+# → { "logoUrl": "ipfs://<cid>", "url": "https://cdn.gang.fun/ipfs/<cid>", ... }
+gang create --name "My Agent Coin" --symbol MAC --logo-uri ipfs://<cid>
 gang execute --request-id …
 ```
 
@@ -90,8 +91,8 @@ x.com / twitter.com 链接（主页、帖子、社区），统一存成 `https:/
 地址作为 `contractURI()` / `metaURI()` 固定在链上；和 `logoURI` 一样，发币后不能再改。preview 会显示 `metaURI` 和上传的 `metadata`。
 
 `logoURI` 写在链上，发币后改不了，所以 logo 必须长期能打开。`--logo-uri` 填的不是 gang.fun 的图片时，CLI 会先下载这张图，
-转存到 gang.fun（png / jpeg / webp / gif，≤512 KB），上链的是转存后的地址（gang.fun 的地址只检查图片存在）；litter.catbox.moe 这类临时图床几天内就会删图。
-确定地址是永久的（比如 `ipfs://…`），可以加 `--keep-logo-uri` 原样上链；临时图床会被拒绝。
+转存到 gang.fun（png / jpeg / webp / gif，≤512 KB），上链的是转存后的 `ipfs://<cid>`（已经在 gang.fun 的文件——`ipfs://<cid>` 或 `https://cdn.gang.fun/ipfs/<cid>`——只检查存在，同样以 `ipfs://<cid>` 上链；metadata JSON 的 `metaURI` 也是 `ipfs://<cid>`）；litter.catbox.moe 这类临时图床几天内就会删图。
+确定地址是永久的（比如 `ipfs://…`），可以加 `--keep-logo-uri` 原样上链（gang.fun 上的文件加了也照样以 `ipfs://<cid>` 上链）；临时图床会被拒绝。
 
 默认计价是 WBNB。用其他代币计价时，加 `--quote <ERC-20> --ref-pool <持有该代币的 Pancake V2 pair / V3 池>`（主网 USDT 默认用 USDT/WBNB 池）。
 上传任何东西之前 CLI 会先模拟一次 `create`，如果会回滚，就直接报出合约的错误名（`RefPoolRequired`、`ThinReferencePool` 等）。
@@ -170,6 +171,7 @@ gang agents --window 30d --sort follow
 |---|---|
 | `GANG_RPC_URL` | BSC RPC |
 | `GANG_LOGO_API` | Logo 上传 API（默认 `https://gang.fun/api/logos`） |
+| `GANG_CDN_BASE` | 上传文件的 CDN，地址为 `<base>/ipfs/<cid>`（默认 `https://cdn.gang.fun`） |
 | `GANG_API` | indexer API，发现命令和公开附言都用它（默认 `https://gang.fun/api`） |
 | `GANG_NOTES_DIR` | 附言的本地队列，每条一个文件，记着 salt 和提交状态，保留 24 小时（默认 `~/.gang/notes`）；其中的 `previews/` 记着每次交易 preview 带了什么（附言、跟单），供 `gang execute` 使用，也保留 24 小时 |
 | `GANG_UPDATE_CHECK` | 设为 `0` 关闭每天一次的新版本检查（查 npm，缓存在 `~/.gang/update.json`） |
@@ -180,4 +182,4 @@ gang agents --window 30d --sort follow
 
 ## 版本
 
-`0.10.0` · [gangfun/cli](https://github.com/gangfun/cli) · push 到 `main` 自动发布到 [npm](https://www.npmjs.com/package/@gangfun/cli)
+`0.10.1` · [gangfun/cli](https://github.com/gangfun/cli) · push 到 `main` 自动发布到 [npm](https://www.npmjs.com/package/@gangfun/cli)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gangfun/cli",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "Gang launchpad CLI for Binance Agentic Wallet agents: create on GangLaunchpad (untaxed or tax tokens), 打新 fair mint, PancakeSwap pool trades, LaunchpadV2 and legacy Soft/U/S trade.",
   "type": "module",
   "bin": {

package/src/index.js

@@ -4,7 +4,7 @@ import {
   calldata, decodeTx, parseEther, fmt, fmtTok, resolvePad, isAddress, client,
 } from './chain.js'
 import { bawAddress, bawSettings, bawStatus, bawPreview, bawExecute } from './baw.js'
-import { uploadLogoFile, uploadMetadata, rehostLogoUrl, isGangLogo, checkGangLogo, tempHost, LOGO_UI } from './logo.js'
+import { uploadLogoFile, uploadMetadata, rehostLogoUrl, isGangLogo, checkGangLogo, tempHost, ipfsCid, ipfsUri, isIpfsUri, cdnUrl, LOGO_UI } from './logo.js'
 import { API, fetchMarket, rank, watch, parseDuration } from './discover.js'
 import {
   makeNote, withNote, queueNote, findByRequestId, findByHashes, hashesIn, publishNote, hasQueued, followSuffix, readFollowRef,
@@ -220,12 +220,13 @@ const HELP = `gang — agent-only launchpad on BNB Chain (Binance Agentic Wallet
   gang sell --token <addr> (--amount <tokens> | --all) [--slippage 1] [--note … [--conf …] [--reveal-after …]]
                                          graduated: sells into the pool through GangRouter ([--to-bnb] [--from] [--calldata])
   gang upload-logo (--file <path> | --url <image URL>)
-                                         copy an image to https://gang.fun/api/logos → logoUrl
+                                         copy an image to gang.fun → logoUrl (ipfs://<cid>, for --logo-uri) and url (CDN)
   gang create …                          = gang v3 create (below): new tokens go to GangLaunchpad. Untaxed unless
                                          --buy-tax / --sell-tax are given. LaunchpadV2 / Soft / U / S take no new tokens
                                          (their tokens still trade with gang buy / sell); --taxed (the old V2 track) is refused
                                          --logo-uri images are copied to gang.fun first (logoURI is permanent on-chain;
-                                         other hosts expire). --keep-logo-uri puts a permanent URL (e.g. ipfs://) on-chain as is
+                                         other hosts expire). --keep-logo-uri puts a permanent URL (e.g. ipfs://) on-chain as is;
+                                         gang.fun files (ipfs://<cid>, cdn.gang.fun/ipfs/<cid>) always go on as ipfs://<cid>
   gang fair create --name <n> --symbol <s> [--raise 15] [--cap 0.5] [--hold 60] [--mint-fee 1] [--exit-fee 1]
                  [--shares 1] [--quote 0x… --ref-pool 0x…] [--logo <file> | --logo-uri URL] [--website URL]
                  [--twitter @handle] [--description <text>]
@@ -408,9 +409,18 @@ async function resolveLogoUri() {
   if (uri && file) fail('use either --logo-uri or --logo/--logo-file, not both')
   if (flag('keep-logo-uri') && !uri) fail('--keep-logo-uri only applies together with --logo-uri <URL>')
   if (uri) {
-    if (isGangLogo(uri)) {
-      try { await checkGangLogo(uri) } catch (e) { fail(e.message, retryHint(e)) }
-      return { logoURI: uri, uploaded: false }
+    // a file on gang.fun's IPFS bucket (ipfs://<cid> or its CDN URL) goes on-chain as ipfs://<cid>, once the CDN serves it
+    const cid = ipfsCid(uri)
+    if (cid || isGangLogo(uri)) {
+      try {
+        await checkGangLogo(cid ? cdnUrl(cid) : uri)
+      } catch (e) {
+        // an ipfs:// file that is not on gang.fun may be pinned elsewhere: on-chain as is only when asked
+        const elsewhere = isIpfsUri(uri) && !e.retryable
+        if (elsewhere && flag('keep-logo-uri')) return { logoURI: uri, uploaded: false }
+        fail(e.message, elsewhere ? { hint: 'not on gang.fun: use --logo ./file.png, or --keep-logo-uri if this file stays pinned on IPFS' } : retryHint(e))
+      }
+      return { logoURI: cid ? ipfsUri(cid) : uri, uploaded: false }
     }
     const temp = tempHost(uri)
     // logoURI can't be changed after create, so an image on another host is copied to gang.fun first
@@ -457,7 +467,7 @@ async function resolveMetaUri({ name, symbol, logoURI }) {
   const meta = { name, symbol, description, image: logoURI, external_link: links?.website, twitter: links?.twitter }
   try {
     const up = await uploadMetadata(meta)
-    return { metaURI: up.url, metadata: up.metadata }
+    return { metaURI: up.uri, metadata: up.metadata }
   } catch (e) {
     return fail(e.message, retryHint(e))
   }

package/src/logo.js

@@ -9,6 +9,11 @@ const UPLOAD_TIMEOUT_MS = 60_000
 
 export const LOGO_API = (process.env.GANG_LOGO_API || 'https://gang.fun/api/logos').replace(/\/+$/, '')
 export const LOGO_UI = 'https://gang.fun/dev/logo'
+// the upload endpoint stores files in an IPFS bucket as ipfs/<cid>, served by this CDN
+// (where --logo-uri ipfs://<cid> is checked; an upload's own url comes from the endpoint)
+export const CDN_BASE = (process.env.GANG_CDN_BASE || 'https://cdn.gang.fun').replace(/\/+$/, '')
+// CIDv1 (raw, sha2-256, base32) as the upload endpoint makes it
+const CID_RE = /^b[a-z2-7]{58}$/
 
 // file hosts that delete uploads after hours or days: a logoURI there turns into a broken image, and it can't be changed on-chain
 const TEMP_HOSTS = ['litter.catbox.moe', 'tmpfiles.org', '0x0.st', 'uguu.se', 'file.io', 'transfer.sh']
@@ -32,7 +37,35 @@ function sniffMime(buf) {
   return null
 }
 
-/** Image bytes → data URL → POST /api/logos → { logoUrl, id, bytes }. */
+/** On-chain form of an uploaded file: ipfs://<cid>, not the CDN URL. */
+export const ipfsUri = (cid) => `ipfs://${cid}`
+export const cdnUrl = (cid) => `${CDN_BASE}/ipfs/${cid}`
+
+export const isIpfsUri = (uri) => /^ipfs:\/\//i.test(String(uri || '').trim())
+
+/**
+ * The cid in ipfs://<cid> (also ipfs://ipfs/<cid>) or <CDN>/ipfs/<cid>, when it is a CIDv1 like ours; else null. A
+ * ?query / #hash / trailing slash is dropped: the CDN's ?x-tos-process=… thumbnail still names the original file.
+ */
+export function ipfsCid(uri) {
+  const s = String(uri || '').trim()
+  const cid = s.startsWith(`${CDN_BASE}/ipfs/`) ? s.slice(CDN_BASE.length + 6) : s.replace(/^ipfs:\/\/(ipfs\/)?/i, '')
+  if (cid === s) return null
+  const bare = cid.replace(/[?#].*$/s, '').replace(/\/+$/, '')
+  return CID_RE.test(bare) ? bare : null
+}
+
+/** The upload response's cid (or the one in its URL); an upload without one has nothing to put on-chain. */
+function uploadedCid(json, what, status) {
+  const cid = CID_RE.test(json?.cid) ? json.cid : ipfsCid(json?.url || json?.logoUrl)
+  if (!cid) {
+    throw statusError(`${what} upload returned no cid (${status}), so there is no ipfs:// URI to put on-chain; ${LOGO_API} `
+      + `must answer like gang.fun's upload endpoint (GANG_LOGO_API): ${JSON.stringify(json).slice(0, 200)}`, status)
+  }
+  return cid
+}
+
+/** Image bytes → data URL → POST /api/logos → { logoUrl: ipfs://<cid>, url: the endpoint's CDN URL, cid, id, bytes }. */
 async function postLogo(buf, what) {
   if (buf.length <= 0) throw new Error(`empty image: ${what}`)
   if (buf.length > MAX_BYTES) throw new Error(`logo too large: ${buf.length} bytes (max ${MAX_BYTES}): ${what}`)
@@ -56,12 +89,13 @@ async function postLogo(buf, what) {
   if (!res.ok || !json?.ok || !json?.logoUrl) {
     throw statusError(`logo upload failed (${res.status}): ${json?.error || text.slice(0, 200)}`, res.status)
   }
-  return { logoUrl: json.logoUrl, id: json.id, bytes: json.bytes ?? buf.length, api: LOGO_API }
+  const cid = uploadedCid(json, 'logo', res.status)
+  return { logoUrl: ipfsUri(cid), url: json.url || cdnUrl(cid), cid, id: json.id, bytes: json.bytes ?? buf.length, api: LOGO_API }
 }
 
 /**
  * Token metadata JSON (the token's contractURI / metaURI, permanent on-chain) → POST /api/logos as application/json →
- * { url, id, bytes }. Keys with no value are left out. Same upload endpoint and CDN as logos.
+ * { uri: ipfs://<cid>, url: the endpoint's CDN URL, cid, id, bytes }. Keys with no value are left out. Same upload endpoint and CDN as logos.
  */
 export async function uploadMetadata(meta) {
   const clean = Object.fromEntries(Object.entries(meta).filter(([, v]) => v != null && v !== ''))
@@ -81,14 +115,14 @@ export async function uploadMetadata(meta) {
   }
   let json
   try { json = JSON.parse(text) } catch { throw statusError(`metadata upload non-JSON (${res.status}): ${text.slice(0, 200)}`, res.status) }
-  const url = json?.url || json?.logoUrl
-  if (!res.ok || !json?.ok || !url) {
+  if (!res.ok || !json?.ok || !(json?.url || json?.logoUrl)) {
     throw statusError(`metadata upload failed (${res.status}): ${json?.error || text.slice(0, 200)}`, res.status)
   }
-  return { url, id: json.id, bytes: json.bytes ?? buf.length, metadata: clean }
+  const cid = uploadedCid(json, 'metadata', res.status)
+  return { uri: ipfsUri(cid), url: json.url || cdnUrl(cid), cid, id: json.id, bytes: json.bytes ?? buf.length, metadata: clean }
 }
 
-/** Read a local image → POST /api/logos → { logoUrl, id, bytes }. */
+/** Read a local image → POST /api/logos → { logoUrl, url, cid, id, bytes }. */
 export async function uploadLogoFile(filePath) {
   const abs = resolve(filePath)
   const st = statSync(abs)
@@ -97,7 +131,7 @@ export async function uploadLogoFile(filePath) {
   return postLogo(readFileSync(abs), abs)
 }
 
-/** True when the URL is already a gang.fun logo (nothing to copy). */
+/** True when the URL is an old gang.fun logo, from before the IPFS bucket (nothing to copy). */
 export const isGangLogo = (uri) => uri.startsWith(`${LOGO_API}/`)
 
 /** Throw unless a gang.fun logo URL serves an image (a typo'd id would go on-chain as a broken logo). Reads headers only. */
@@ -122,7 +156,7 @@ export function tempHost(uri) {
   return TEMP_HOSTS.find((h) => host === h || host.endsWith(`.${h}`)) || null
 }
 
-/** Download an image URL (≤512 KB) → POST /api/logos → { logoUrl, id, bytes, source }. */
+/** Download an image URL (≤512 KB) → POST /api/logos → { logoUrl, url, cid, id, bytes, source }. */
 export async function rehostLogoUrl(uri) {
   const msg = `could not download logo ${uri}`
   let res