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

Use constants for opReturn data. Rename hash to opReturnData.

Browse source 
Update UI.

Signed-off-by: HenrikJannsen <boilingfrog@gmx.com>
This commit is contained in:
HenrikJannsen 2022-12-09 13:45:52 -05:00
parent c8a9b9a7cc
commit e3a0ae9425
No known key found for this signature in database
GPG key ID: 02AA2BAE387C8307
2 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
core/src/main/java/bisq/core/dao/burningman/BurningManPresentationService.java
View file

@ -61,10 +61,23 @@ import lombok.extern.slf4j.Slf4j;
public class BurningManPresentationService implements DaoStateListener {
// Burn target gets increased by that amount to give more flexibility.
// Burn target is calculated from reimbursements + estimated BTC fees - burned amounts.
static final long BURN_TARGET_BOOST_AMOUNT = Config.baseCurrencyNetwork().isRegtest() ? 1000000 : 10000000;
private static final long BURN_TARGET_BOOST_AMOUNT = Config.baseCurrencyNetwork().isRegtest() ? 1000000 : 10000000;
public static final String LEGACY_BURNING_MAN_DPT_NAME = "Legacy Burningman (DPT)";
public static final String LEGACY_BURNING_MAN_BTC_FEES_NAME = "Legacy Burningman (BTC fees)";
public static final String LEGACY_BURNING_MAN_BTC_FEES_ADDRESS = "38bZBj5peYS3Husdz7AH3gEUiUbYRD951t";
static final String LEGACY_BURNING_MAN_BTC_FEES_ADDRESS = "38bZBj5peYS3Husdz7AH3gEUiUbYRD951t";
// Those are the opReturn data used by legacy BM for burning BTC received from DPT.
// For regtest testing burn bsq and use the pre-image `dpt` which has the hash 14af04ea7e34bd7378b034ddf90da53b7c27a277.
// The opReturn data gets additionally prefixed with 1701
private static final Set<String> OP_RETURN_DATA_LEGACY_BM_DPT = Config.baseCurrencyNetwork().isRegtest() ?
Set.of("170114af04ea7e34bd7378b034ddf90da53b7c27a277") :
Set.of("1701e47e5d8030f444c182b5e243871ebbaeadb5e82f",
"1701293c488822f98e70e047012f46f5f1647f37deb7");
// The opReturn data used by legacy BM for burning BTC received from BTC trade fees.
// For regtest testing burn bsq and use the pre-image `fee` which has the hash b3253b7b92bb7f0916b05f10d4fa92be8e48f5e6.
// The opReturn data gets additionally prefixed with 1701
private static final Set<String> OP_RETURN_DATA_LEGACY_BM_FEES = Config.baseCurrencyNetwork().isRegtest() ?
Set.of("1701b3253b7b92bb7f0916b05f10d4fa92be8e48f5e6") :
Set.of("1701721206fe6b40777763de1c741f4fd2706d94775d");
private final DaoStateService daoStateService;
private final CyclesInDaoStateService cyclesInDaoStateService;
@ -259,11 +272,7 @@ public class BurningManPresentationService implements DaoStateListener {
// We do not add the legacy burningman to the list but keep it as class field only to avoid that it
// interferes with usage of the burningManCandidatesByName map.
// Those are the hashes used by legacy BM for burning BTC received from DPT.
Set<String> hashes = Set.of("1701e47e5d8030f444c182b5e243871ebbaeadb5e82f",
"1701293c488822f98e70e047012f46f5f1647f37deb7");
LegacyBurningMan legacyBurningManDPT = getLegacyBurningMan(burningManService.getLegacyBurningManAddress(currentChainHeight), hashes);
LegacyBurningMan legacyBurningManDPT = getLegacyBurningMan(burningManService.getLegacyBurningManAddress(currentChainHeight), OP_RETURN_DATA_LEGACY_BM_DPT);
this.legacyBurningManDPT = Optional.of(legacyBurningManDPT);
return legacyBurningManDPT;
}
@ -275,22 +284,20 @@ public class BurningManPresentationService implements DaoStateListener {
// We do not add the legacy burningman to the list but keep it as class field only to avoid that it
// interferes with usage of the burningManCandidatesByName map.
// The hash used by legacy BM for burning BTC received from BTC trade fees.
Set<String> hashes = Set.of("1701721206fe6b40777763de1c741f4fd2706d94775d");
LegacyBurningMan legacyBurningManBtcFees = getLegacyBurningMan(LEGACY_BURNING_MAN_BTC_FEES_ADDRESS, hashes);
LegacyBurningMan legacyBurningManBtcFees = getLegacyBurningMan(LEGACY_BURNING_MAN_BTC_FEES_ADDRESS, OP_RETURN_DATA_LEGACY_BM_FEES);
this.legacyBurningManBtcFees = Optional.of(legacyBurningManBtcFees);
return legacyBurningManBtcFees;
}
private LegacyBurningMan getLegacyBurningMan(String address, Set<String> hashes) {
private LegacyBurningMan getLegacyBurningMan(String address, Set<String> opReturnData) {
LegacyBurningMan legacyBurningMan = new LegacyBurningMan(address);
// The hashes used by legacy BM at burning BSQ.
// The opReturnData used by legacy BM at burning BSQ.
getProofOfBurnOpReturnTxOutputByHash().values().stream()
.flatMap(txOutputs -> txOutputs.stream()
.filter(txOutput -> {
String hash = Hex.encode(txOutput.getOpReturnData());
return hashes.stream().anyMatch(e -> e.equals(hash));
String opReturnAsHex = Hex.encode(txOutput.getOpReturnData());
return opReturnData.stream().anyMatch(e -> e.equals(opReturnAsHex));
}))
.forEach(burnOutput -> {
int burnOutputHeight = burnOutput.getBlockHeight();

2
desktop/src/main/java/bisq/desktop/main/dao/burnbsq/burningman/BurningManView.java
View file

@ -733,7 +733,7 @@ public class BurningManView extends ActivatableView<ScrollPane, Void> implements
TableColumn<BurningManListItem, BurningManListItem> column;
column = new AutoTooltipTableColumn<>(Res.get("dao.burningman.table.name"));
column.setMinWidth(170);
column.setMinWidth(190);
column.setCellValueFactory((item) -> new ReadOnlyObjectWrapper<>(item.getValue()));
column.getStyleClass().add("first-column");
column.setCellFactory(new Callback<>() {