trustbase-seller-backend 0.5.6 → 0.5.7
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/chain-writes.js +3 -1
- package/routes/sp-notify.js +4 -1
package/package.json
CHANGED
package/routes/chain-writes.js
CHANGED
|
@@ -65,7 +65,9 @@ function cfg() {
|
|
|
65
65
|
// 相对 CHAIN_HOME (如安装器写的 ./tb-keyring) 必须按 base 解析成绝对路径:
|
|
66
66
|
// 原样传给 trustchaind --home 时, CLI 按进程 cwd 解析 → cwd 一变就指向
|
|
67
67
|
// /tb-keyring 这种空 keyring, tx sign 直接失败 (2026-09-22 .215 实测故障)。
|
|
68
|
-
|
|
68
|
+
// SP_CHAIN_HOME 优先: SP 网关的 provider key 环常与 CHAIN_HOME 不同目录
|
|
69
|
+
// (kimi 18462 修复: 只在调用侧写 c.keyringHome 是幻影字段, CLI 只认 c.home)。
|
|
70
|
+
home: base_paths.resolveHome(process.env.SP_CHAIN_HOME || process.env.CHAIN_HOME || '/root/.trustchain'),
|
|
69
71
|
chainId: process.env.CHAIN_ID || 'trustchain-1',
|
|
70
72
|
lcdUrl: process.env.CHAIN_LCD_URL || rpcUrl.replace(':26657', ':1317'),
|
|
71
73
|
rpcUrl,
|
package/routes/sp-notify.js
CHANGED
|
@@ -73,7 +73,6 @@ async function submitPaymentFactToChain(fact) {
|
|
|
73
73
|
// [P1 修复 kimi 18462] 默认值不再写死 emergency-key (SP 网关机器上该 key 不存在且非 provider)
|
|
74
74
|
// 必填: SP_CHAIN_KEY_NAME + SP_CHAIN_HOME (或 CHAIN_HOME)
|
|
75
75
|
c.keyName = process.env.SP_CHAIN_KEY_NAME || "";
|
|
76
|
-
c.keyringHome = process.env.SP_CHAIN_HOME || process.env.CHAIN_HOME || c.keyringHome;
|
|
77
76
|
if (!c.keyName) {
|
|
78
77
|
console.warn("[sp-notify] SP_CHAIN_KEY_NAME 未设置 — 上链签名将失败。");
|
|
79
78
|
console.warn("[sp-notify] 请在 .env 配置: SP_CHAIN_KEY_NAME=<provider专用key名> + CHAIN_HOME=<keyring目录>");
|
|
@@ -353,6 +352,10 @@ async function verifyChainSigning(deps) {
|
|
|
353
352
|
if (!chainHome) {
|
|
354
353
|
console.error("[sp-notify][STARTUP-CHECK] ⚠️ CHAIN_HOME/SP_CHAIN_HOME 未设置 — 使用默认 /root/.trustchain (可能没有 provider key)");
|
|
355
354
|
}
|
|
355
|
+
// 必须和 submitPaymentFactToChain 用同一个 key: cfg() 默认 keyName 是 CHAIN_KEY_NAME||'seller',
|
|
356
|
+
// 直接用会验错对象 → 误报 (kimi 18462 复核修复)。home 由 cfg() 自己按
|
|
357
|
+
// SP_CHAIN_HOME > CHAIN_HOME > 默认 解析, 这里不再重复设 (kimi 18462)。
|
|
358
|
+
c.keyName = keyName;
|
|
356
359
|
|
|
357
360
|
// 检查 key 是否能解析出地址
|
|
358
361
|
try {
|