DO NOT MERGE: rgbx/chain33 peer-identity diagnostic

chain33.fork.toml

@@ -34,6 +34,8 @@ ForkParaFee=-1
 ForkEthAddressFormat=0
 # 交易chainID严格校验启用高度，启用后交易组内每笔交易及minTxFeeRate=0时的单笔交易都会校验chainID，防止跨链重放；-1 表示关闭
 ForkTxChainIDStrict=-1
+# 创世动作(Genesis)执行高度限制：启用后框架统一拒绝 height != 0 的 Exec_Genesis，防止执行器漏写 height 校验被创世重入；-1 表示关闭
+ForkGenesisOnlyAtHeightZero=0
 
 [fork.sub.none]
 ForkUseTimeDelay=0

chain33.para.toml

@@ -342,6 +342,8 @@ ForkParaFee=-1
 ForkEthAddressFormat=0
 # 交易chainID严格校验启用高度，启用后交易组内每笔交易及minTxFeeRate=0时的单笔交易都会校验chainID，防止跨链重放；-1 表示关闭
 ForkTxChainIDStrict=-1
+# 创世动作(Genesis)执行高度限制：启用后框架统一拒绝 height != 0 的 Exec_Genesis，防止执行器漏写 height 校验被创世重入；-1 表示关闭
+ForkGenesisOnlyAtHeightZero=0
 
 [fork.sub.none]
 ForkUseTimeDelay=0

go.mod

@@ -7,7 +7,7 @@ toolchain go1.22.12
 replace github.com/ava-labs/avalanchego => github.com/33cn/avalanchego v1.10.10-0.20240529041529-ada691598153
 
 require (
-	github.com/33cn/chain33 v1.72.0
+	github.com/33cn/chain33 v1.72.7-0.20261016053907-a95e7f042582
 	github.com/BurntSushi/toml v1.3.2
 	github.com/NebulousLabs/Sia v1.3.7
 	github.com/bitly/go-simplejson v0.5.0
@@ -247,7 +247,7 @@ require (
 	github.com/status-im/keycard-go v0.2.0 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/supranational/blst v0.3.11 // indirect
-	github.com/syndtr/goleveldb v1.0.1-0.20220614013038-64ee5596c38a // indirect
+	github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
 	github.com/tklauser/go-sysconf v0.3.12 // indirect
 	github.com/tklauser/numcpus v0.6.1 // indirect
 	github.com/tyler-smith/go-bip39 v1.1.0 // indirect

go.sum

@@ -48,6 +48,8 @@ dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D
 git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
 github.com/33cn/chain33 v1.72.0 h1:Nk1CYLSYd5rfvhw1szE2Jt0cJx3A8nZCZZvIEIfTarw=
 github.com/33cn/chain33 v1.72.0/go.mod h1:QCdEczXYJI43WTeFuzEpEhNZ/SfEnLOdFaw6r6LvPz8=
+github.com/33cn/chain33 v1.72.7-0.20261016053907-a95e7f042582 h1:oeeusTut2d1I2qkAdR30Iix7VWY5sDcKi51e4VVzkfE=
+github.com/33cn/chain33 v1.72.7-0.20261016053907-a95e7f042582/go.mod h1:6C5lKl8ejjoXtyhetFXz13t+JV4UQvp9H4t9eLOTNXs=
 github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 h1:cTp8I5+VIoKjsnZuH8vjyaysT/ses3EvZeaV/1UkF2M=
 github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
 github.com/Azure/azure-sdk-for-go v41.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
@@ -1358,6 +1360,8 @@ github.com/supranational/blst v0.3.11/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc=
 github.com/syndtr/goleveldb v1.0.1-0.20220614013038-64ee5596c38a h1:1ur3QoCqvE5fl+nylMaIr9PVV1w343YRDtsy+Rwu7XI=
 github.com/syndtr/goleveldb v1.0.1-0.20220614013038-64ee5596c38a/go.mod h1:RRCYJbIwD5jmqPI9XoAFR0OcDxqUctll6zUj/+B4S48=
+github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d h1:vfofYNRScrDdvS342BElfbETmL1Aiz3i2t0zfRj16Hs=
+github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d/go.mod h1:RRCYJbIwD5jmqPI9XoAFR0OcDxqUctll6zUj/+B4S48=
 github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=

plugin/consensus/qbft/chain33.qbft.toml

@@ -146,6 +146,8 @@ superManager=[
 ForkExecKey=0
 # 交易chainID严格校验启用高度，启用后交易组内每笔交易及minTxFeeRate=0时的单笔交易都会校验chainID，防止跨链重放；-1 表示关闭
 ForkTxChainIDStrict=-1
+# 创世动作(Genesis)执行高度限制：启用后框架统一拒绝 height != 0 的 Exec_Genesis，防止执行器漏写 height 校验被创世重入；-1 表示关闭
+ForkGenesisOnlyAtHeightZero=0
 
 [fork.sub.manage]
 Enable=0

plugin/dapp/evm/cmd/ci2/chain33.proxyminer.toml

@@ -539,6 +539,8 @@ ForkParaFee=-1
 ForkEthAddressFormat=0
 # 交易chainID严格校验启用高度，启用后交易组内每笔交易及minTxFeeRate=0时的单笔交易都会校验chainID，防止跨链重放；-1 表示关闭
 ForkTxChainIDStrict=-1
+# 创世动作(Genesis)执行高度限制：启用后框架统一拒绝 height != 0 的 Exec_Genesis，防止执行器漏写 height 校验被创世重入；-1 表示关闭
+ForkGenesisOnlyAtHeightZero=0
 
 [fork.sub.none]
 ForkUseTimeDelay=0

plugin/dapp/rgbx/cmd/ci/docker-compose.sh

@@ -524,6 +524,20 @@ function apply_dynamic_tss_peers_and_restart() {
     wait_cli_ready "${PARA2_CLI}"
     wait_cli_ready "${PARA3_CLI}"
     wait_cli_ready "${PARA4_CLI}"
+
+    # 临时诊断：重启后重新发现一次 peer 名，与写进配置的 TSS_PEERS(重启前) 对比。
+    # 若不一致，说明节点 DHT 身份在重启后发生变化，配置里的 TSS peers 已失效。
+    local after=""
+    local k
+    for ((k = 0; k < 30; k++)); do
+        after=$(collect_peer_names_from_cli "${PARA1_CLI}" | sort | uniq | sed '/^$/d' | paste -sd, -)
+        if [ -n "${after}" ]; then
+            break
+        fi
+        sleep 1
+    done
+    log_step "DIAG TSS_PEERS(before restart)=${TSS_PEERS}"
+    log_step "DIAG peer names(after restart)=${after}"
 }
 
 function setup_para_nodegroup_on_main() {
@@ -581,8 +595,20 @@ function wait_auto_dkg_commit() {
             log_step "auto DKG done, tssAddress=${tss_addr}"
             return 0
         fi
+        # 临时诊断：记录 DKG 等待期间 para1 看到的 peer 名，与配置里的 TSS_PEERS 对比
+        if [ "${i}" = "20" ] || [ "${i}" = "60" ]; then
+            local now_peers
+            now_peers=$(collect_peer_names_from_cli "${PARA1_CLI}" | sort | uniq | sed '/^$/d' | paste -sd, -)
+            log_step "DIAG t=${i}s TSS_PEERS(config)=${TSS_PEERS} peer names(now)=${now_peers}"
+        fi
         sleep 1
     done
+    # 临时诊断：超时时导出容器日志，确认是节点未启动还是 TSS 流程未完成
+    compose_cmd ps || true
+    for svc in main para1 para2 para3 para4; do
+        echo "===== ${svc} logs (tail 120) ====="
+        compose_cmd logs --tail=120 --no-log-prefix "${svc}" 2>&1 | tail -120 || true
+    done
     fail "auto DKG commit timeout"
 }
 

plugin/dapp/ticket/executor/exec.go

@@ -12,6 +12,13 @@ import (
 
 // Exec_Genesis exec genesis
 func (t *Ticket) Exec_Genesis(payload *ty.TicketGenesis, tx *types.Transaction, index int) (*types.Receipt, error) {
+	// 创世动作只允许在高度 0 执行, 与 coins/coinsx/token 对齐:
+	// 否则可在任意高度重入 GenesisInit 造出 isGenesis=true 的 3 段 ticketId 票据,
+	// 绕过 pubHash 校验/成熟期/提现等待, 把出块奖励记到攻击者 ReturnAddress。
+	if t.GetHeight() != 0 {
+		tlog.Error("ticket genesis is only allowed at height 0", "height", t.GetHeight())
+		return nil, types.ErrReRunGenesis
+	}
 	if payload.Count <= 0 {
 		return nil, ty.ErrTicketCount
 	}

plugin/dapp/ticket/executor/testdata/chain33.cfg.toml

@@ -226,6 +226,8 @@ ForkAccountBlacklist=-1
 ForkAccountBlacklistV2=-1
 # 交易chainID严格校验启用高度，启用后交易组内每笔交易及minTxFeeRate=0时的单笔交易都会校验chainID，防止跨链重放；-1 表示关闭
 ForkTxChainIDStrict=-1
+# 创世动作(Genesis)执行高度限制：启用后框架统一拒绝 height != 0 的 Exec_Genesis，防止执行器漏写 height 校验被创世重入；-1 表示关闭
+ForkGenesisOnlyAtHeightZero=0
 
 [fork.sub.coins]
 Enable=0