trustbase-seller-backend 0.5.7 → 0.5.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/routes/sp-notify.js +25 -14
- package/run-unified.js +11 -0
package/package.json
CHANGED
package/routes/sp-notify.js
CHANGED
|
@@ -362,25 +362,36 @@ async function verifyChainSigning(deps) {
|
|
|
362
362
|
const addr = await chainWrites.keyAddress(c);
|
|
363
363
|
console.log("[sp-notify][STARTUP-CHECK] ✓ 签名 key 可用, provider 地址:", addr);
|
|
364
364
|
|
|
365
|
-
// 检查该地址是否是链上 ACTIVE provider
|
|
365
|
+
// 检查该地址是否是链上 ACTIVE provider。
|
|
366
|
+
// 用 trustchaind CLI 而不是 abci_query: 模块的 gRPC Query 路径不确定,
|
|
367
|
+
// 而 CLI 的 'q serviceprovider show' 是实机验证过的口径 (kimi 18462 复核修复:
|
|
368
|
+
// 原 abci_query path 未加引号 → 必 32602, 改对后仍返回空; 且非 200 时无任何输出)。
|
|
366
369
|
try {
|
|
367
|
-
const
|
|
368
|
-
|
|
369
|
-
const
|
|
370
|
-
const
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
370
|
+
const bin = c.bin || process.env.TRUSTCHAIND_BIN || "trustchaind";
|
|
371
|
+
const out = await new Promise((resolve) => {
|
|
372
|
+
const cp = require("child_process");
|
|
373
|
+
const child = cp.execFile(bin,
|
|
374
|
+
["q", "serviceprovider", "show", addr, "--node", c.rpcUrl, "--output", "json"],
|
|
375
|
+
{ timeout: 8000, maxBuffer: 1 << 20 },
|
|
376
|
+
(err, stdout) => resolve({ err, stdout }));
|
|
377
|
+
});
|
|
378
|
+
if (out.err || !out.stdout) {
|
|
379
|
+
console.error("[sp-notify][STARTUP-CHECK] ❌ provider 状态查询失败:",
|
|
380
|
+
String((out.err && out.err.message) || "无输出").slice(0, 160));
|
|
381
|
+
} else {
|
|
382
|
+
const parsed = JSON.parse(out.stdout);
|
|
383
|
+
const sp = parsed && (parsed.provider || parsed);
|
|
384
|
+
const status = sp && sp.status;
|
|
385
|
+
if (status === "ACTIVE") {
|
|
386
|
+
console.log("[sp-notify][STARTUP-CHECK] ✓ provider 状态 ACTIVE (质押 " + (sp.stake || "?") + " utct)");
|
|
387
|
+
} else if (status) {
|
|
388
|
+
console.error("[sp-notify][STARTUP-CHECK] ❌ provider 状态 " + status + " (需 ACTIVE) — 支付事实将被链上拒绝");
|
|
378
389
|
} else {
|
|
379
|
-
console.
|
|
390
|
+
console.error("[sp-notify][STARTUP-CHECK] ❌ provider 查询结果里没有 status 字段, 请人工核: trustchaind q serviceprovider show " + addr);
|
|
380
391
|
}
|
|
381
392
|
}
|
|
382
393
|
} catch (queryErr) {
|
|
383
|
-
console.warn("[sp-notify][STARTUP-CHECK] ⚠️ provider
|
|
394
|
+
console.warn("[sp-notify][STARTUP-CHECK] ⚠️ provider 状态查询异常 (链节点可能未启动):", queryErr.message);
|
|
384
395
|
}
|
|
385
396
|
return true;
|
|
386
397
|
} catch (keyErr) {
|
package/run-unified.js
CHANGED
|
@@ -633,6 +633,17 @@ async function startUnifiedServer() {
|
|
|
633
633
|
// 2026-09-26: 微信支付服务商 (SP) 模式三件套 — 特约商户回调 (/api/sp/notify/wechat) + 抽佣登记 (/api/sp/commission-rate*)
|
|
634
634
|
// 分账骨架在 payments/wechat/profitsharing.js (纯函数, 由 sp-notify 按抽佣比例触发, 默认 mock)
|
|
635
635
|
app.use('/api/sp', (0, sp_notify_1.createSpNotifyRouter)({ db: sqliteIndexer.getRawDb() }));
|
|
636
|
+
// 上链签名自检 (kimi 18462 接线): 签名 key 缺失 / 不是 ACTIVE provider 时启动即报,
|
|
637
|
+
// 不用等第一笔真实支付才发现写不上去。异步跑, 不阻塞启动, 失败只告警不退出。
|
|
638
|
+
try {
|
|
639
|
+
Promise.resolve(sp_notify_1.verifyChainSigning({ db: sqliteIndexer.getRawDb() }))
|
|
640
|
+
.then((ok) => {
|
|
641
|
+
if (!ok) console.warn(" ⚠️ [sp] 上链签名自检未通过, 支付事实将无法上链 (见上方 STARTUP-CHECK)");
|
|
642
|
+
})
|
|
643
|
+
.catch((e) => console.warn(" ⚠️ [sp] 上链签名自检异常 (不阻塞):", e && e.message));
|
|
644
|
+
} catch (e) {
|
|
645
|
+
console.warn(" ⚠️ [sp] 上链签名自检无法执行:", e && e.message);
|
|
646
|
+
}
|
|
636
647
|
// P1 fix: retryPending 此前只导出无调度方 — 支付事实上链失败的补链清扫, 每 5min 一轮
|
|
637
648
|
// (unref 不拖住进程退出; 连续 3 轮有失败额外告警, 单轮失败明细由 retryPending 内部 warn)
|
|
638
649
|
let spRetryFailStreak = 0;
|