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

Arbitrator witness signing #4280

Merged
merged 8 commits into from Jul 3, 2020
Merged

Arbitrator witness signing #4280

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fba329d
Arbitrator sign single account age witness
sqrrm Apr 19, 2020
8bf0f33
Test dummy account age witness signing
sqrrm Apr 24, 2020
7bd5969
Refactor accountagewitnessservice log helpers
sqrrm Apr 28, 2020
0dc769b
Arbitrator signing of AccountAgeWitness with known pubkey
sqrrm May 31, 2020
752eb49
Log unique unsigned signer pubkeys
sqrrm Jun 1, 2020
ca9665f
Sign unsigned keys
sqrrm Jun 3, 2020
fabd592
Merge remote-tracking branch 'origin/master' into HEAD
sqrrm Jul 3, 2020
9a8622c
Fix codacy comments
sqrrm Jul 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 12 additions & 14 deletions core/src/main/java/bisq/core/account/sign/SignedWitnessService.java
View file
Open in desktop
Expand Up @@ -51,15 +51,13 @@

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.Stack;
import java.util.stream.Collector;
import java.util.stream.Collectors;

import lombok.Getter;
Expand Down Expand Up @@ -489,16 +487,16 @@ private void doRepublishAllSignedWitnesses() {

// Remove SignedWitnesses that are signed by TRADE that also have an ARBITRATOR signature
// for the same ownerPubKey and AccountAgeWitnessHash
private void cleanSignedWitnesses() {
var orphans = getRootSignedWitnessSet(false);
var signedWitnessesCopy = new HashSet<>(signedWitnessMap.values());
signedWitnessesCopy.forEach(sw -> orphans.forEach(orphan -> {
if (sw.getVerificationMethod() == SignedWitness.VerificationMethod.ARBITRATOR &&
Arrays.equals(sw.getWitnessOwnerPubKey(), orphan.getWitnessOwnerPubKey()) &&
Arrays.equals(sw.getAccountAgeWitnessHash(), orphan.getAccountAgeWitnessHash())) {
signedWitnessMap.remove(orphan.getHashAsByteArray());
log.info("Remove duplicate SignedWitness: {}", orphan.toString());
}
}));
}
// private void cleanSignedWitnesses() {
// var orphans = getRootSignedWitnessSet(false);
// var signedWitnessesCopy = new HashSet<>(signedWitnessMap.values());
// signedWitnessesCopy.forEach(sw -> orphans.forEach(orphan -> {
// if (sw.getVerificationMethod() == SignedWitness.VerificationMethod.ARBITRATOR &&
// Arrays.equals(sw.getWitnessOwnerPubKey(), orphan.getWitnessOwnerPubKey()) &&
// Arrays.equals(sw.getAccountAgeWitnessHash(), orphan.getAccountAgeWitnessHash())) {
// signedWitnessMap.remove(orphan.getHashAsByteArray());
// log.info("Remove duplicate SignedWitness: {}", orphan.toString());
// }
// }));
// }
}
12 changes: 6 additions & 6 deletions desktop/src/main/java/bisq/desktop/main/overlays/windows/SignUnsignedPubKeysWindow.java
View file
Open in desktop
Expand Up @@ -53,18 +53,18 @@

import lombok.extern.slf4j.Slf4j;

import static bisq.desktop.util.FormBuilder.*;
import static bisq.desktop.util.FormBuilder.add2ButtonsAfterGroup;
import static bisq.desktop.util.FormBuilder.addInputTextField;
import static bisq.desktop.util.FormBuilder.addTopLabelListView;
import static bisq.desktop.util.FormBuilder.removeRowsFromGridPane;

@Slf4j
public class SignUnsignedPubKeysWindow extends Overlay<SignUnsignedPubKeysWindow> {

private InputTextField searchTextField;
private ListView<SignedWitness> unsignedPubKeys = new ListView<>();
private InputTextField privateKey;
private final AccountAgeWitnessService accountAgeWitnessService;
private final ArbitratorManager arbitratorManager;
private ListView<SignedWitness> signedWitnessListView = new ListView<>();
private ListView<String> failedView = new ListView<>();
private List<SignedWitness> signedWitnessList = new ArrayList<>();
private List<String> failed = new ArrayList<>();
private Callback<ListView<SignedWitness>, ListCell<SignedWitness>> signedWitnessCellFactory;
Expand Down Expand Up @@ -168,12 +168,12 @@ private void showResult() {

Tuple3<Label, ListView<SignedWitness>, VBox> signedTuple = addTopLabelListView(gridPane, ++rowIndex,
Res.get("popup.accountSigning.unsignedPubKeys.result.signed"));
signedWitnessListView = signedTuple.second;
ListView<SignedWitness> signedWitnessListView = signedTuple.second;
signedWitnessListView.setCellFactory(signedWitnessCellFactory);
signedWitnessListView.setItems(FXCollections.observableArrayList(signedWitnessList));
Tuple3<Label, ListView<String>, VBox> failedTuple = addTopLabelListView(gridPane, ++rowIndex,
Res.get("popup.accountSigning.unsignedPubKeys.result.failed"));
failedView = failedTuple.second;
ListView<String> failedView = failedTuple.second;
failedView.setItems(FXCollections.observableArrayList(failed));

((AutoTooltipButton) actionButton).updateText(Res.get("shared.ok"));
Expand Down