Skip to content

Commit

Permalink
Minor updates (#3474)
Browse files Browse the repository at this point in the history
* Remove unnecessary log statement

This seems to be a left over log statement from debugging.

* Use a small delay for MakerSetsLockTime on regtest

When testing on regtest, not in devmode, we want a relatively short
delay to be able to test the delay period.

* Clarify payment limits up to 30 days after signing
  • Loading branch information
devinbileck authored and sqrrm committed Oct 26, 2019
1 parent 05135a5 commit fee17a9
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
1 change: 0 additions & 1 deletion core/src/main/java/bisq/core/btc/wallet/WalletService.java
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,6 @@ public static Transaction maybeAddTxToWallet(byte[] serializedTransaction,
TransactionConfidence.Source source) throws VerificationException {
Transaction tx = new Transaction(wallet.getParams(), serializedTransaction);
Transaction walletTransaction = wallet.getTransaction(tx.getHash());
log.error("maybeAddTxToWallet id={}, is walletTransaction==null? {}", tx.getHashAsString(), walletTransaction == null);

if (walletTransaction == null) {
// We need to recreate the transaction otherwise we get a null pointer...
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package bisq.core.trade.protocol.tasks.maker;

import bisq.core.app.BisqEnvironment;
import bisq.core.trade.Trade;
import bisq.core.trade.protocol.tasks.TradeTask;

Expand All @@ -39,8 +40,8 @@ protected void run() {

// 10 days for altcoins, 20 days for other payment methods
int delay = processModel.getOffer().getPaymentMethod().isAsset() ? 144 * 10 : 144 * 20;
if (DevEnv.isDevMode()) {
delay = 1;
if (BisqEnvironment.getBaseCurrencyNetwork().isRegtest()) {
delay = 5;
}

long lockTime = processModel.getBtcWalletService().getBestChainHeight() + delay;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/resources/i18n/displayStrings.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2898,7 +2898,7 @@ payment.limits.info=To limit chargeback risk, Bisq sets per-trade buy limits bas
so it is limited to buying {0} per trade. \
After it is signed, buy limits will increase as follows:\n\
\n\
● Before signing, and 30 days after signing, your per-trade buy limit will be {0}\n\
● Before signing, and up to 30 days after signing, your per-trade buy limit will be {0}\n\
● 30 days after signing, your per-trade buy limit will be {1}\n\
● 60 days after signing, your per-trade buy limit will be {2}\n\
\n\
Expand Down

0 comments on commit fee17a9

Please sign in to comment.