Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions chain33.fork.toml
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,8 @@ ForkStorageLocalDB=0
Enable=0
ForkTicketId=1062000
ForkTicketVrf=1770000
# TicketOpen 的 MinerAddress 归属校验(H-2):MinerAddress 只能是签名者自己,或 ReturnAddress 通过 Tbind 授权的矿工
ForkTicketMinerAuth=48100000
# 拒绝同一笔 tclose 交易内重复的 ticketId(重复会等价于同一张票被多次付款)
ForkTicketCloseDup=0
ForkMinerExecerCheck=0
Expand Down
2 changes: 2 additions & 0 deletions chain33.para.toml
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,8 @@ Enable=0
Enable=0
ForkTicketId =0
ForkTicketVrf =0
# TicketOpen 的 MinerAddress 归属校验(H-2):MinerAddress 只能是签名者自己,或 ReturnAddress 通过 Tbind 授权的矿工
ForkTicketMinerAuth =0
# 拒绝同一笔 tclose 交易内重复的 ticketId(重复会等价于同一张票被多次付款)
ForkTicketCloseDup=0
ForkMinerExecerCheck=0
Expand Down
2 changes: 2 additions & 0 deletions chain33.para.toml.readme
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,8 @@ Enable=0
Enable=0
ForkTicketId =0
ForkTicketVrf =0
# TicketOpen 的 MinerAddress 归属校验(H-2):MinerAddress 只能是签名者自己,或 ReturnAddress 通过 Tbind 授权的矿工
ForkTicketMinerAuth =0
# 拒绝同一笔 tclose 交易内重复的 ticketId(重复会等价于同一张票被多次付款)
ForkTicketCloseDup=0
ForkMinerExecerCheck=0
Expand Down
4 changes: 4 additions & 0 deletions chain33.toml
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,10 @@ signType="secp256k1"

[wallet.sub.ticket]
minerdisable=false
# 矿工本地批准的 ReturnAddress 白名单:
# - 买票时只动用名单内冷地址的票面资金;
# - 选票(挖矿)时只挖自挖票和名单内 ReturnAddress 的票,避免第三方把票挂到本矿工名下占用算力;
# ["*"] 表示不限制(保持原有行为)。
minerwhitelist=["*"]

[wallet.sub.multisig]
Expand Down
320 changes: 320 additions & 0 deletions docs/security/ticket-topen-mineraddress-injection-analysis.md

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions plugin/dapp/evm/cmd/ci2/chain33.proxyminer.toml
Original file line number Diff line number Diff line change
Expand Up @@ -725,6 +725,8 @@ ForkStorageLocalDB=0
Enable=0
ForkTicketId=1062000
ForkTicketVrf=1770000
# TicketOpen 的 MinerAddress 归属校验(H-2):MinerAddress 只能是签名者自己,或 ReturnAddress 通过 Tbind 授权的矿工
ForkTicketMinerAuth=48100000
# 拒绝同一笔 tclose 交易内重复的 ticketId(重复会等价于同一张票被多次付款)
ForkTicketCloseDup=0
ForkMinerExecerCheck=0
Expand Down
1 change: 1 addition & 0 deletions plugin/dapp/ticket/executor/testdata/chain33.cfg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ Enable=0
Enable=0
ForkTicketId = 1600000
ForkTicketVrf = 2070000
ForkTicketMinerAuth = 0
ForkTicketCloseDup = 0
ForkMinerExecerCheck = 0

Expand Down
Loading
Loading