Merge pull request #947 from HenrikJannsen/add_seed_node_to_bonded_roles

Add seed node to bonded roles

application/src/main/java/bisq/application/BridgeApplicationService.java

@@ -20,10 +20,10 @@
 import bisq.identity.IdentityService;
 import bisq.network.NetworkService;
 import bisq.network.NetworkServiceConfig;
-import bisq.oracle.OracleService;
-import bisq.oracle.daobridge.DaoBridgeHttpService;
-import bisq.oracle.daobridge.DaoBridgeService;
-import bisq.oracle.timestamp.TimestampService;
+import bisq.oracle.node.bisq1_bridge.Bisq1BridgeHttpService;
+import bisq.oracle.node.bisq1_bridge.Bisq1BridgeService;
+import bisq.oracle.node.timestamp.TimestampService;
+import bisq.oracle.service.OracleService;
 import bisq.security.SecurityService;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -37,8 +37,8 @@
 @Getter
 public class BridgeApplicationService extends ApplicationService {
     private final IdentityService identityService;
-    private final DaoBridgeService daoBridgeService;
-    private final DaoBridgeHttpService daoBridgeHttpService;
+    private final Bisq1BridgeService bisq1BridgeService;
+    private final Bisq1BridgeHttpService bisq1BridgeHttpService;
     private final SecurityService securityService;
     private final NetworkService networkService;
     private final TimestampService timestampService;
@@ -60,25 +60,26 @@ public BridgeApplicationService(String[] args) {
                 networkService
         );
 
-        DaoBridgeHttpService.Config daoBridgeConfig = DaoBridgeHttpService.Config.from(getConfig("oracle.daoBridgeHttpService"));
-        daoBridgeHttpService = new DaoBridgeHttpService(daoBridgeConfig, networkService);
+        Bisq1BridgeHttpService.Config daoBridgeConfig = Bisq1BridgeHttpService.Config.from(getConfig("oracle.daoBridgeHttpService"));
+        bisq1BridgeHttpService = new Bisq1BridgeHttpService(daoBridgeConfig, networkService);
 
         OracleService.Config oracleConfig = OracleService.Config.from(getConfig("oracle"));
-        daoBridgeService = new DaoBridgeService(oracleConfig,
+        bisq1BridgeService = new Bisq1BridgeService(oracleConfig,
                 networkService,
                 identityService,
-                daoBridgeHttpService);
+                persistenceService,
+                bisq1BridgeHttpService);
 
-        timestampService = new TimestampService(oracleConfig, getPersistenceService(), identityService, networkService);
+        timestampService = new TimestampService(oracleConfig, persistenceService, identityService, networkService);
     }
 
     @Override
     public CompletableFuture<Boolean> initialize() {
         return securityService.initialize()
                 .thenCompose(result -> networkService.initialize())
                 .thenCompose(result -> identityService.initialize())
-                .thenCompose(result -> daoBridgeHttpService.initialize())
-                .thenCompose(result -> daoBridgeService.initialize())
+                .thenCompose(result -> bisq1BridgeHttpService.initialize())
+                .thenCompose(result -> bisq1BridgeService.initialize())
                 .thenCompose(result -> timestampService.initialize())
                 .orTimeout(5, TimeUnit.MINUTES)
                 .whenComplete((success, throwable) -> {
@@ -94,8 +95,8 @@ public CompletableFuture<Boolean> initialize() {
     public CompletableFuture<Boolean> shutdown() {
         // We shut down services in opposite order as they are initialized
         return supplyAsync(() -> timestampService.shutdown()
-                        .thenCompose(result -> daoBridgeService.shutdown())
-                        .thenCompose(result -> daoBridgeHttpService.shutdown())
+                .thenCompose(result -> bisq1BridgeService.shutdown())
+                .thenCompose(result -> bisq1BridgeHttpService.shutdown())
                         .thenCompose(result -> identityService.shutdown())
                         .thenCompose(result -> networkService.shutdown())
                         .thenCompose(result -> securityService.shutdown())

application/src/main/java/bisq/application/DefaultApplicationService.java

@@ -27,7 +27,7 @@
 import bisq.network.NetworkService;
 import bisq.network.NetworkServiceConfig;
 import bisq.offer.OfferService;
-import bisq.oracle.OracleService;
+import bisq.oracle.service.OracleService;
 import bisq.presentation.notifications.NotificationsService;
 import bisq.security.KeyPairService;
 import bisq.security.SecurityService;

application/src/main/java/bisq/application/ResolverConfig.java

@@ -21,9 +21,15 @@
 import bisq.network.p2p.message.NetworkMessageResolver;
 import bisq.network.p2p.services.data.storage.DistributedDataResolver;
 import bisq.offer.OfferMessage;
-import bisq.oracle.daobridge.model.*;
-import bisq.oracle.timestamp.AuthorizeTimestampRequest;
-import bisq.oracle.timestamp.AuthorizedTimestampData;
+import bisq.oracle.node.AuthorizedOracleNode;
+import bisq.oracle.node.bisq1_bridge.data.AuthorizedAccountAgeData;
+import bisq.oracle.node.bisq1_bridge.data.AuthorizedBondedReputationData;
+import bisq.oracle.node.bisq1_bridge.data.AuthorizedProofOfBurnData;
+import bisq.oracle.node.bisq1_bridge.data.AuthorizedSignedWitnessData;
+import bisq.oracle.node.bisq1_bridge.requests.AuthorizeAccountAgeRequest;
+import bisq.oracle.node.bisq1_bridge.requests.AuthorizeSignedWitnessRequest;
+import bisq.oracle.node.timestamp.AuthorizeTimestampRequest;
+import bisq.oracle.node.timestamp.AuthorizedTimestampData;
 import bisq.support.MediationRequest;
 import bisq.support.MediationResponse;
 import bisq.trade.protocol.messages.TradeMessage;
@@ -37,7 +43,7 @@ public static void config() {
         DistributedDataResolver.addResolver("user.UserProfile", UserProfile.getResolver());
         DistributedDataResolver.addResolver("offer.OfferMessage", OfferMessage.getResolver());
         DistributedDataResolver.addResolver("user.AuthorizedRoleRegistrationData", AuthorizedRoleRegistrationData.getResolver());
-        DistributedDataResolver.addResolver("oracle.AuthorizedDaoBridgeServiceProvider", AuthorizedDaoBridgeServiceProvider.getResolver());
+        DistributedDataResolver.addResolver("oracle.AuthorizedOracleNode", AuthorizedOracleNode.getResolver());
         DistributedDataResolver.addResolver("oracle.AuthorizedProofOfBurnData", AuthorizedProofOfBurnData.getResolver());
         DistributedDataResolver.addResolver("oracle.AuthorizedBondedReputationData", AuthorizedBondedReputationData.getResolver());
         DistributedDataResolver.addResolver("oracle.AuthorizedAccountAgeData", AuthorizedAccountAgeData.getResolver());

application/src/main/resources/network.conf

@@ -6,19 +6,6 @@ application {
     identity = {
         minPoolSize = 5
     }
-
-    oracle = {
-        privateKey = ""
-        publicKey = ""
-
-        marketPrice = {
-            // todo
-        }
-
-        daoBridgeHttpService = {
-            url = "http://localhost:8082"
-        }
-    }
 
     network = {
         supportedTransportTypes = ["CLEAR", "TOR"]

bisq1Bridge/src/main/java/bisq/bisq1Bridge/Bisq1BridgeClient.java

@@ -19,8 +19,7 @@
 
 import bisq.application.BridgeApplicationService;
 import bisq.common.timer.Scheduler;
-import bisq.oracle.daobridge.DaoBridgeHttpService;
-import bisq.oracle.daobridge.DaoBridgeService;
+import bisq.oracle.node.bisq1_bridge.Bisq1BridgeService;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.concurrent.CompletableFuture;
@@ -35,27 +34,25 @@
  */
 @Slf4j
 public class Bisq1BridgeClient {
-    private final DaoBridgeService daoBridgeService;
-    private final DaoBridgeHttpService daoBridgeHttpService;
+    private final Bisq1BridgeService bisq1BridgeService;
 
     public Bisq1BridgeClient(String[] args) {
         BridgeApplicationService applicationService = new BridgeApplicationService(args);
-        daoBridgeHttpService = applicationService.getDaoBridgeHttpService();
-        daoBridgeService = applicationService.getDaoBridgeService();
+        bisq1BridgeService = applicationService.getBisq1BridgeService();
 
         applicationService.readAllPersisted()
                 .thenCompose(result -> applicationService.initialize())
                 .thenRun(this::startRequests);
     }
 
     private void startRequests() {
-        Scheduler.run(this::requestSerial).periodically(0, 5, TimeUnit.SECONDS);
+        Scheduler.run(this::request).periodically(0, 5, TimeUnit.SECONDS);
     }
 
-    private CompletableFuture<Boolean> requestSerial() {
-        return daoBridgeHttpService.requestProofOfBurnTxs()
-                .thenCompose(daoBridgeService::publishProofOfBurnDtoSet)
-                .thenCompose(result -> daoBridgeHttpService.requestBondedReputations())
-                .thenCompose(daoBridgeService::publishBondedReputationDtoSet);
+    private CompletableFuture<Boolean> request() {
+        return bisq1BridgeService.requestProofOfBurnTxs()
+                .thenCompose(bisq1BridgeService::publishProofOfBurnDtoSet)
+                .thenCompose(result -> bisq1BridgeService.requestBondedReputations())
+                .thenCompose(bisq1BridgeService::publishBondedReputationDtoSet);
     }
 }

desktop/src/main/java/bisq/desktop/common/view/NavigationTarget.java

@@ -160,6 +160,7 @@ public enum NavigationTarget {
     REGISTER_ARBITRATOR(ROLES_TABS, false),
     REGISTER_MODERATOR(ROLES_TABS, false),
     REGISTER_ORACLE(ROLES_TABS, false),
+    REGISTER_SEED(ROLES_TABS, false),
 
     WALLET(CONTENT),
     WALLET_DASHBOARD(WALLET),

desktop/src/main/java/bisq/desktop/common/view/TabView.java

@@ -118,7 +118,7 @@ void onViewDetachedInternal() {
 
     @Override
     public void onStartTransition() {
-        this.transitionStarted = true;
+        transitionStarted = true;
         UIThread.runOnNextRenderFrame(this::maybeAnimateMark);
     }
 

desktop/src/main/java/bisq/desktop/primary/main/content/dashboard/DashboardController.java

@@ -26,8 +26,8 @@
 import bisq.desktop.common.view.Controller;
 import bisq.desktop.common.view.Navigation;
 import bisq.desktop.common.view.NavigationTarget;
-import bisq.oracle.marketprice.MarketPrice;
-import bisq.oracle.marketprice.MarketPriceService;
+import bisq.oracle.service.market_price.MarketPrice;
+import bisq.oracle.service.market_price.MarketPriceService;
 import bisq.presentation.formatters.PriceFormatter;
 import bisq.user.profile.UserProfileService;
 import lombok.Getter;

desktop/src/main/java/bisq/desktop/primary/main/content/trade_apps/bisqEasy/chat/offer_details/BisqEasyOfferDetailsController.java

@@ -27,7 +27,7 @@
 import bisq.offer.options.OfferOptionUtil;
 import bisq.offer.payment_method.PaymentMethodSpecFormatter;
 import bisq.offer.price.PriceUtil;
-import bisq.oracle.marketprice.MarketPriceService;
+import bisq.oracle.service.market_price.MarketPriceService;
 import bisq.presentation.formatters.DateFormatter;
 import bisq.presentation.formatters.PercentageFormatter;
 import bisq.presentation.formatters.PriceFormatter;

desktop/src/main/java/bisq/desktop/primary/main/content/trade_apps/bisqEasy/chat/trade_state/TradeStateController.java

@@ -30,7 +30,7 @@
 import bisq.offer.amount.spec.AmountSpec;
 import bisq.offer.bisq_easy.BisqEasyOffer;
 import bisq.offer.payment_method.FiatPaymentMethodSpec;
-import bisq.oracle.marketprice.MarketPriceService;
+import bisq.oracle.service.market_price.MarketPriceService;
 import bisq.settings.CookieKey;
 import bisq.settings.SettingsService;
 import bisq.trade.Trade;

desktop/src/main/java/bisq/desktop/primary/main/content/trade_apps/bisqEasy/chat/trade_state/states/BaseState.java

@@ -25,7 +25,7 @@
 import bisq.offer.amount.OfferAmountFormatter;
 import bisq.offer.amount.spec.AmountSpec;
 import bisq.offer.bisq_easy.BisqEasyOffer;
-import bisq.oracle.marketprice.MarketPriceService;
+import bisq.oracle.service.market_price.MarketPriceService;
 import bisq.trade.bisq_easy.BisqEasyTrade;
 import bisq.trade.bisq_easy.BisqEasyTradeService;
 import bisq.user.identity.UserIdentityService;

desktop/src/main/java/bisq/desktop/primary/main/content/trade_apps/bisqEasy/chat/trade_state/states/BuyerState4.java

@@ -27,8 +27,8 @@
 import bisq.desktop.components.controls.MaterialTextField;
 import bisq.desktop.components.overlay.Popup;
 import bisq.i18n.Res;
-import bisq.oracle.explorer.ExplorerService;
-import bisq.oracle.explorer.dto.Output;
+import bisq.oracle.service.explorer.ExplorerService;
+import bisq.oracle.service.explorer.dto.Output;
 import bisq.presentation.formatters.AmountFormatter;
 import bisq.trade.TradeException;
 import bisq.trade.bisq_easy.BisqEasyTrade;

desktop/src/main/java/bisq/desktop/primary/main/content/trade_apps/bisqEasy/chat/trade_state/states/BuyerState5.java

@@ -29,7 +29,7 @@
 import bisq.desktop.components.controls.MaterialTextField;
 import bisq.desktop.components.overlay.Popup;
 import bisq.i18n.Res;
-import bisq.oracle.explorer.ExplorerService;
+import bisq.oracle.service.explorer.ExplorerService;
 import bisq.settings.DontShowAgainService;
 import bisq.trade.bisq_easy.BisqEasyTrade;
 import de.jensd.fx.fontawesome.AwesomeIcon;

desktop/src/main/java/bisq/desktop/primary/main/content/trade_apps/bisqEasy/chat/trade_state/states/SellerState4.java

@@ -27,8 +27,8 @@
 import bisq.desktop.components.controls.MaterialTextField;
 import bisq.desktop.components.overlay.Popup;
 import bisq.i18n.Res;
-import bisq.oracle.explorer.ExplorerService;
-import bisq.oracle.explorer.dto.Output;
+import bisq.oracle.service.explorer.ExplorerService;
+import bisq.oracle.service.explorer.dto.Output;
 import bisq.presentation.formatters.AmountFormatter;
 import bisq.trade.TradeException;
 import bisq.trade.bisq_easy.BisqEasyTrade;

desktop/src/main/java/bisq/desktop/primary/main/content/trade_apps/bisqEasy/chat/trade_state/states/SellerState5.java

@@ -29,7 +29,7 @@
 import bisq.desktop.components.controls.MaterialTextField;
 import bisq.desktop.components.overlay.Popup;
 import bisq.i18n.Res;
-import bisq.oracle.explorer.ExplorerService;
+import bisq.oracle.service.explorer.ExplorerService;
 import bisq.settings.DontShowAgainService;
 import bisq.trade.bisq_easy.BisqEasyTrade;
 import de.jensd.fx.fontawesome.AwesomeIcon;

desktop/src/main/java/bisq/desktop/primary/main/content/user/reputation/accountAge/AccountAgeView.java

@@ -64,10 +64,6 @@ public AccountAgeView(AccountAgeModel model, AccountAgeController controller) {
 
     @Override
     protected void onViewAttached() {
-        line.prefWidthProperty().unbind();
-        double paddings = root.getPadding().getLeft() + root.getPadding().getRight();
-        line.prefWidthProperty().bind(root.widthProperty().subtract(paddings));
-
         line.prefWidthProperty().unbind();
         line.prefWidthProperty().bind(root.widthProperty().subtract(136));
         closeButton.setOnAction(e -> controller.onClose());

desktop/src/main/java/bisq/desktop/primary/main/content/user/reputation/bond/BondedReputationView.java

@@ -64,10 +64,6 @@ public BondedReputationView(BondedReputationModel model, BondedReputationControl
 
     @Override
     protected void onViewAttached() {
-        line.prefWidthProperty().unbind();
-        double paddings = root.getPadding().getLeft() + root.getPadding().getRight();
-        line.prefWidthProperty().bind(root.widthProperty().subtract(paddings));
-
         line.prefWidthProperty().unbind();
         line.prefWidthProperty().bind(root.widthProperty().subtract(136));
         closeButton.setOnAction(e -> controller.onClose());

desktop/src/main/java/bisq/desktop/primary/main/content/user/reputation/burn/BurnBsqView.java

@@ -41,7 +41,7 @@ public BurnBsqView(BurnBsqModel model, BurnBsqController controller) {
         double width = PrimaryStageModel.MIN_WIDTH - 20;
         root.setMinWidth(width);
         root.setMaxWidth(width);
-        double height = PrimaryStageModel.MIN_HEIGHT - 40;
+        double height = PrimaryStageModel.MIN_HEIGHT;
         root.setMinHeight(height);
         root.setMaxHeight(height);
 
@@ -64,10 +64,6 @@ public BurnBsqView(BurnBsqModel model, BurnBsqController controller) {
 
     @Override
     protected void onViewAttached() {
-        line.prefWidthProperty().unbind();
-        double paddings = root.getPadding().getLeft() + root.getPadding().getRight();
-        line.prefWidthProperty().bind(root.widthProperty().subtract(paddings));
-
         line.prefWidthProperty().unbind();
         line.prefWidthProperty().bind(root.widthProperty().subtract(136));
         closeButton.setOnAction(e -> controller.onClose());

desktop/src/main/java/bisq/desktop/primary/main/content/user/reputation/burn/tab1/BurnBsqTab1View.java

@@ -36,9 +36,8 @@ public class BurnBsqTab1View extends View<VBox, BurnBsqTab1Model, BurnBsqTab1Con
 
     public BurnBsqTab1View(BurnBsqTab1Model model,
                            BurnBsqTab1Controller controller) {
-        super(new VBox(), model, controller);
+        super(new VBox(20), model, controller);
 
-        root.setSpacing(20);
         root.setAlignment(Pos.TOP_LEFT);
 
         Label headline = new Label(Res.get("user.reputation.burnedBsq.infoHeadline"));

desktop/src/main/java/bisq/desktop/primary/main/content/user/reputation/signedAccount/SignedWitnessView.java

@@ -64,10 +64,6 @@ public SignedWitnessView(SignedWitnessModel model, SignedWitnessController contr
 
     @Override
     protected void onViewAttached() {
-        line.prefWidthProperty().unbind();
-        double paddings = root.getPadding().getLeft() + root.getPadding().getRight();
-        line.prefWidthProperty().bind(root.widthProperty().subtract(paddings));
-
         line.prefWidthProperty().unbind();
         line.prefWidthProperty().bind(root.widthProperty().subtract(136));
         closeButton.setOnAction(e -> controller.onClose());