one day coinbase maturity (#1457)

* one day coinbase maturity

* make one day maturity a soft fork
This commit is contained in:
John Tromp
2018-09-04 11:59:55 +02:00
committed by Antioch Peverell
parent 63880f71c7
commit c359c8aaf2
7 changed files with 22 additions and 14 deletions
+1 -1
View File
@@ -74,7 +74,7 @@ where
);
let lock_height = if *is_coinbase {
*height + global::coinbase_maturity()
*height + global::coinbase_maturity(*height) // ignores on/off spendability around soft fork height
} else {
*height
};
+1 -1
View File
@@ -383,7 +383,7 @@ where
let root_key_id = wallet.keychain().root_key_id();
let height = block_fees.height;
let lock_height = height + global::coinbase_maturity();
let lock_height = height + global::coinbase_maturity(height); // ignores on/off spendability around soft fork height
let key_id = block_fees.key_id();
let (key_id, derivation) = match key_id {