Merge branch 'danger' of github.com:MyHush/hush3 into danger

This commit is contained in:
Duke Leto
2020-09-09 11:43:00 -04:00

View File

@@ -1549,10 +1549,10 @@ uint64_t hush_block_subsidy(int nHeight)
// subsidy = ASSETCHAINS_REWARD[4]; // subsidy = ASSETCHAINS_REWARD[4];
//} else //} else
if (nHeight >= 2020000) { if (nHeight >= 2020000) {
subsidy = 14062500; subsidy = 140625000;
} else if (nHeight >= GetArg("-z2zheight",340000)) { } else if (nHeight >= GetArg("-z2zheight",340000)) {
subsidy = 281250000; subsidy = 281250000;
} else if (nHeight >= 129) { } else if (nHeight >= 128) {
subsidy = 1125000000; subsidy = 1125000000;
} }
return subsidy; return subsidy;