mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 07:07:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use getActiveBurningManCandidates for fee distribution

Browse source 
Signed-off-by: HenrikJannsen <boilingfrog@gmx.com>
This commit is contained in:
HenrikJannsen 2023-01-03 12:08:12 -05:00
parent 0c4199fef4
commit a296887a73
No known key found for this signature in database
GPG key ID: 02AA2BAE387C8307
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/src/main/java/bisq/core/dao/burningman/BtcFeeReceiverService.java
View file

@ -29,7 +29,6 @@ import com.google.common.annotations.VisibleForTesting;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Random; import java.util.Random;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -75,8 +74,8 @@ public class BtcFeeReceiverService implements DaoStateListener {
return BurningManPresentationService.LEGACY_BURNING_MAN_BTC_FEES_ADDRESS; return BurningManPresentationService.LEGACY_BURNING_MAN_BTC_FEES_ADDRESS;
} }
Map<String, BurningManCandidate> burningManCandidatesByName = burningManService.getBurningManCandidatesByName(currentChainHeight); List<BurningManCandidate> activeBurningManCandidates = new ArrayList<>(burningManService.getActiveBurningManCandidates(currentChainHeight));
if (burningManCandidatesByName.isEmpty()) { if (activeBurningManCandidates.isEmpty()) {
// If there are no compensation requests (e.g. at dev testing) we fall back to the default address // If there are no compensation requests (e.g. at dev testing) we fall back to the default address
return burningManService.getLegacyBurningManAddress(currentChainHeight); return burningManService.getLegacyBurningManAddress(currentChainHeight);
} }
@ -86,9 +85,9 @@ public class BtcFeeReceiverService implements DaoStateListener {
// cappedBurnAmountShare is a % value represented as double. Smallest supported value is 0.01% -> 0.0001. // cappedBurnAmountShare is a % value represented as double. Smallest supported value is 0.01% -> 0.0001.
// By multiplying it with 10000 and using Math.floor we limit the candidate to 0.01%. // By multiplying it with 10000 and using Math.floor we limit the candidate to 0.01%.
// Entries with 0 will be ignored in the selection method, so we do not need to filter them out. // Entries with 0 will be ignored in the selection method, so we do not need to filter them out.
List<BurningManCandidate> burningManCandidates = new ArrayList<>(burningManCandidatesByName.values()); // List<BurningManCandidate> burningManCandidates = new ArrayList<>(burningManCandidatesByName.values());
int ceiling = 10000; int ceiling = 10000;
List<Long> amountList = burningManCandidates.stream() List<Long> amountList = activeBurningManCandidates.stream()
.map(BurningManCandidate::getCappedBurnAmountShare) .map(BurningManCandidate::getCappedBurnAmountShare)
.map(cappedBurnAmountShare -> (long) Math.floor(cappedBurnAmountShare * ceiling)) .map(cappedBurnAmountShare -> (long) Math.floor(cappedBurnAmountShare * ceiling))
.collect(Collectors.toList()); .collect(Collectors.toList());
@ -99,12 +98,12 @@ public class BtcFeeReceiverService implements DaoStateListener {
} }
int winnerIndex = getRandomIndex(amountList, new Random()); int winnerIndex = getRandomIndex(amountList, new Random());
if (winnerIndex == burningManCandidates.size()) { if (winnerIndex == activeBurningManCandidates.size()) {
// If we have filled up the missing gap to 100% with the legacy BM we would get an index out of bounds of // If we have filled up the missing gap to 100% with the legacy BM we would get an index out of bounds of
// the burningManCandidates as we added for the legacy BM an entry at the end. // the burningManCandidates as we added for the legacy BM an entry at the end.
return burningManService.getLegacyBurningManAddress(currentChainHeight); return burningManService.getLegacyBurningManAddress(currentChainHeight);
} }
return burningManCandidates.get(winnerIndex).getMostRecentAddress() return activeBurningManCandidates.get(winnerIndex).getMostRecentAddress()
.orElse(burningManService.getLegacyBurningManAddress(currentChainHeight)); .orElse(burningManService.getLegacyBurningManAddress(currentChainHeight));
} }