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

Merge pull request #2409 from ripcurlx/fix-make-proposal-initialization

Browse source 
Update view on activation with block at current chain height
This commit is contained in:
Manfred Karrer 2019-02-12 09:54:01 -05:00 • committed by GitHub
commit fc9119bd2b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/src/main/java/bisq/core/dao/DaoFacade.java
View file

@ -55,6 +55,7 @@ import bisq.core.dao.governance.proposal.role.RoleProposalFactory;
import bisq.core.dao.state.DaoStateListener;
import bisq.core.dao.state.DaoStateService;
import bisq.core.dao.state.DaoStateStorageService;
import bisq.core.dao.state.model.blockchain.Block;
import bisq.core.dao.state.model.blockchain.Tx;
import bisq.core.dao.state.model.blockchain.TxOutput;
import bisq.core.dao.state.model.blockchain.TxOutputKey;
@ -484,6 +485,14 @@ public class DaoFacade implements DaoSetupService {
return daoStateService.getChainHeight();
}
public Optional<Block> getBlockAtChainHeight() {
return getBlockAtHeight(getChainHeight());
}
public Optional<Block> getBlockAtHeight(int chainHeight) {
return daoStateService.getBlockAtHeight(chainHeight);
}
///////////////////////////////////////////////////////////////////////////////////////////
// Use case: Bonding

6
desktop/src/main/java/bisq/desktop/main/dao/governance/make/MakeProposalView.java
View file

@ -85,6 +85,7 @@ import javafx.util.StringConverter;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicBoolean;
import javax.annotation.Nullable;
@ -199,7 +200,10 @@ public class MakeProposalView extends ActivatableView<GridPane, Void> implements
if (makeProposalButton != null)
setMakeProposalButtonHandler();
onNewBlockHeight(daoFacade.getChainHeight());
Optional<Block> blockAtChainHeight = daoFacade.getBlockAtChainHeight();
if (blockAtChainHeight.isPresent())
onParseTxsCompleteAfterBatchProcessing(blockAtChainHeight.get());
}
@Override