Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Minor updates #3474

Merged
merged 3 commits into from
Oct 26, 2019
Merged

Minor updates #3474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da523c5
Remove unnecessary log statement
devinbileck Oct 25, 2019
2710942
Use a small delay for MakerSetsLockTime on regtest
devinbileck Oct 25, 2019
7bc79a3
Clarify payment limits up to 30 days after signing
devinbileck Oct 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion core/src/main/java/bisq/core/btc/wallet/WalletService.java
View file
Open in desktop
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
5 changes: 3 additions & 2 deletions core/src/main/java/bisq/core/trade/protocol/tasks/maker/MakerSetsLockTime.java
View file
Open in desktop
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
View file
Open in desktop
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