boldsuck/haveno
1
0
Fork 0
mirror of https://github.com/boldsuck/haveno.git synced 2024-12-22 20:19:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

make configurable if arbitrator assigns trade fee address

Browse source
This commit is contained in:
woodser 2024-05-10 10:04:50 -04:00
parent 7aebc7bc31
commit a9f7a06e1f
3 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/src/main/java/haveno/core/trade/HavenoUtils.java
View file

@ -72,6 +72,7 @@ public class HavenoUtils {
public static final int ARBITRATOR_ACK_TIMEOUT_SECONDS = 30; public static final int ARBITRATOR_ACK_TIMEOUT_SECONDS = 30;
// configure fees // configure fees
public static final boolean ARBITRATOR_ASSIGNS_TRADE_FEE_ADDRESS = true;
public static final double MAKER_FEE_PCT = 0.0015; // 0.15% public static final double MAKER_FEE_PCT = 0.0015; // 0.15%
public static final double TAKER_FEE_PCT = 0.0075; // 0.75% public static final double TAKER_FEE_PCT = 0.0075; // 0.75%
public static final double PENALTY_FEE_PCT = 0.02; // 2% public static final double PENALTY_FEE_PCT = 0.02; // 2%
@ -432,8 +433,17 @@ public class HavenoUtils {
// ----------------------------- OTHER UTILS ------------------------------ // ----------------------------- OTHER UTILS ------------------------------
public static String getTradeFeeAddress() { public static String getGlobalTradeFeeAddress() {
return xmrWalletService.getBaseAddressEntry().getAddressString(); switch (Config.baseCurrencyNetwork()) {
case XMR_LOCAL:
return "Bd37nTGHjL3RvPxc9dypzpWiXQrPzxxG4RsWAasD9CV2iZ1xfFZ7mzTKNDxWBfsqQSUimctAsGtTZ8c8bZJy35BYL9jYj88";
case XMR_STAGENET:
return "5B11hTJdG2XDNwjdKGLRxwSLwDhkbGg7C7UEAZBxjE6FbCeRMjudrpNACmDNtWPiSnNfjDQf39QRjdtdgoL69txv81qc2Mc";
case XMR_MAINNET:
throw new RuntimeException("Mainnet fee address not implemented");
default:
throw new RuntimeException("Unhandled base currency network: " + Config.baseCurrencyNetwork());
}
} }
public static String getBurnAddress() { public static String getBurnAddress() {

3
core/src/main/java/haveno/core/trade/protocol/tasks/ArbitratorSendInitTradeOrMultisigRequests.java
View file

@ -126,8 +126,9 @@ public class ArbitratorSendInitTradeOrMultisigRequests extends TradeTask {
trade.getSelf().setPreparedMultisigHex(preparedHex); trade.getSelf().setPreparedMultisigHex(preparedHex);
// set trade fee address // set trade fee address
String address = HavenoUtils.ARBITRATOR_ASSIGNS_TRADE_FEE_ADDRESS ? trade.getXmrWalletService().getBaseAddressEntry().getAddressString() : HavenoUtils.getGlobalTradeFeeAddress();
if (trade.getProcessModel().getTradeFeeAddress() == null) { if (trade.getProcessModel().getTradeFeeAddress() == null) {
trade.getProcessModel().setTradeFeeAddress(HavenoUtils.getTradeFeeAddress()); trade.getProcessModel().setTradeFeeAddress(address);
} }
// create message to initialize multisig // create message to initialize multisig

11
core/src/main/java/haveno/core/trade/protocol/tasks/ProcessInitMultisigRequest.java
View file

@ -21,6 +21,7 @@ import haveno.common.app.Version;
import haveno.common.crypto.PubKeyRing; import haveno.common.crypto.PubKeyRing;
import haveno.common.taskrunner.TaskRunner; import haveno.common.taskrunner.TaskRunner;
import haveno.core.trade.ArbitratorTrade; import haveno.core.trade.ArbitratorTrade;
import haveno.core.trade.HavenoUtils;
import haveno.core.trade.MakerTrade; import haveno.core.trade.MakerTrade;
import haveno.core.trade.TakerTrade; import haveno.core.trade.TakerTrade;
import haveno.core.trade.Trade; import haveno.core.trade.Trade;
@ -65,9 +66,13 @@ public class ProcessInitMultisigRequest extends TradeTask {
// get sender // get sender
TradePeer sender = trade.getTradePeer(processModel.getTempTradePeerNodeAddress()); TradePeer sender = trade.getTradePeer(processModel.getTempTradePeerNodeAddress());
// set trade fee address from arbitrator // set trade fee address
if (request.getTradeFeeAddress() != null && sender == trade.getArbitrator()) { if (HavenoUtils.ARBITRATOR_ASSIGNS_TRADE_FEE_ADDRESS) {
trade.getProcessModel().setTradeFeeAddress(request.getTradeFeeAddress()); if (request.getTradeFeeAddress() != null && sender == trade.getArbitrator()) {
trade.getProcessModel().setTradeFeeAddress(request.getTradeFeeAddress());
}
} else {
trade.getProcessModel().setTradeFeeAddress(HavenoUtils.getGlobalTradeFeeAddress());
} }
// reconcile peer's established multisig hex with message // reconcile peer's established multisig hex with message