core/go-blockchain
8
0
Fork 0
Code Issues 5 Pull requests Projects Releases Packages Wiki Activity Actions 2

fix(consensus): restore pre-hf1 miner tx version
Some checks are pending
Security Scan / security (push) Waiting to run
Details
Test / Test (push) Waiting to run
Details

Browse source
This commit is contained in:
Virgil 2026-04-04 21:37:38 +00:00
parent 0993b081c7
commit 2e92407233
2 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
consensus/block.go
View file

@ -67,8 +67,10 @@ func expectedMinerTxVersion(forks []config.HardFork, height uint64) uint64 {
return types.VersionPostHF5 return types.VersionPostHF5
case config.IsHardForkActive(forks, config.HF4Zarcanum, height): case config.IsHardForkActive(forks, config.HF4Zarcanum, height):
return types.VersionPostHF4 return types.VersionPostHF4
default: case config.IsHardForkActive(forks, config.HF1, height):
return types.VersionPreHF4 return types.VersionPreHF4
default:
return types.VersionInitial
} }
} }

28
consensus/block_test.go
View file

@ -66,7 +66,7 @@ func TestCheckTimestamp_Ugly(t *testing.T) {
func validMinerTx(height uint64) *types.Transaction { func validMinerTx(height uint64) *types.Transaction {
return &types.Transaction{ return &types.Transaction{
Version: types.VersionPreHF4, Version: types.VersionInitial,
Vin: []types.TxInput{types.TxInputGenesis{Height: height}}, Vin: []types.TxInput{types.TxInputGenesis{Height: height}},
Vout: []types.TxOutput{ Vout: []types.TxOutput{
types.TxOutputBare{Amount: config.BlockReward, Target: types.TxOutToKey{Key: types.PublicKey{1}}}, types.TxOutputBare{Amount: config.BlockReward, Target: types.TxOutToKey{Key: types.PublicKey{1}}},
@ -134,11 +134,21 @@ func TestValidateMinerTx_Version_Good(t *testing.T) {
height uint64 height uint64
}{ }{
{ {
name: "mainnet_pre_hf4_v1", name: "mainnet_pre_hf1_v0",
forks: config.MainnetForks, forks: config.MainnetForks,
height: 100, height: 100,
tx: validMinerTx(100), tx: validMinerTx(100),
}, },
{
name: "mainnet_post_hf1_pre_hf4_v1",
forks: config.MainnetForks,
height: 10081,
tx: &types.Transaction{
Version: types.VersionPreHF4,
Vin: []types.TxInput{types.TxInputGenesis{Height: 10081}},
Vout: []types.TxOutput{types.TxOutputBare{Amount: config.BlockReward, Target: types.TxOutToKey{Key: types.PublicKey{1}}}},
},
},
{ {
name: "testnet_post_hf4_v2", name: "testnet_post_hf4_v2",
forks: config.TestnetForks, forks: config.TestnetForks,
@ -178,15 +188,25 @@ func TestValidateMinerTx_Version_Bad(t *testing.T) {
tx *types.Transaction tx *types.Transaction
}{ }{
{ {
name: "mainnet_pre_hf4_v0", name: "mainnet_pre_hf1_v1",
forks: config.MainnetForks, forks: config.MainnetForks,
height: 100, height: 100,
tx: &types.Transaction{ tx: &types.Transaction{
Version: types.VersionInitial, Version: types.VersionPreHF4,
Vin: []types.TxInput{types.TxInputGenesis{Height: 100}}, Vin: []types.TxInput{types.TxInputGenesis{Height: 100}},
Vout: []types.TxOutput{types.TxOutputBare{Amount: config.BlockReward, Target: types.TxOutToKey{Key: types.PublicKey{1}}}}, Vout: []types.TxOutput{types.TxOutputBare{Amount: config.BlockReward, Target: types.TxOutToKey{Key: types.PublicKey{1}}}},
}, },
}, },
{
name: "mainnet_post_hf1_pre_hf4_v0",
forks: config.MainnetForks,
height: 10081,
tx: &types.Transaction{
Version: types.VersionInitial,
Vin: []types.TxInput{types.TxInputGenesis{Height: 10081}},
Vout: []types.TxOutput{types.TxOutputBare{Amount: config.BlockReward, Target: types.TxOutToKey{Key: types.PublicKey{1}}}},
},
},
{ {
name: "testnet_post_hf4_v1", name: "testnet_post_hf4_v1",
forks: config.TestnetForks, forks: config.TestnetForks,