inject publickeyring

build.gradle

@@ -209,7 +209,6 @@ configure(project(':p2p')) {
         testCompileOnly "org.projectlombok:lombok:$lombokVersion"
         testAnnotationProcessor "org.projectlombok:lombok:$lombokVersion"
         testCompile("org.mockito:mockito-core:$mockitoVersion")
-
     }
 }
 

common/src/main/java/bisq/common/crypto/KeyRing.java

@@ -36,7 +36,7 @@
 @EqualsAndHashCode
 @Slf4j
 @Singleton
-public class KeyRing {
+public final class KeyRing {
     private final KeyPair signatureKeyPair;
     private final KeyPair encryptionKeyPair;
     private final PubKeyRing pubKeyRing;

common/src/main/java/bisq/common/crypto/PubKeyRingProvider.java

@@ -0,0 +1,19 @@
+package bisq.common.crypto;
+
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+
+public class PubKeyRingProvider implements Provider<PubKeyRing> {
+
+    private PubKeyRing pubKeyRing;
+
+    @Inject
+    public PubKeyRingProvider(KeyRing keyRing) {
+        pubKeyRing = keyRing.getPubKeyRing();
+    }
+
+    @Override
+    public PubKeyRing get() {
+        return pubKeyRing;
+    }
+}

core/src/main/java/bisq/core/CoreModule.java

@@ -40,6 +40,8 @@
 import bisq.common.CommonOptionKeys;
 import bisq.common.app.AppModule;
 import bisq.common.crypto.KeyStorage;
+import bisq.common.crypto.PubKeyRing;
+import bisq.common.crypto.PubKeyRingProvider;
 import bisq.common.proto.network.NetworkProtoResolver;
 import bisq.common.proto.persistable.PersistenceProtoResolver;
 import bisq.common.storage.Storage;
@@ -96,6 +98,7 @@ protected void configure() {
         install(alertModule());
         install(filterModule());
         install(corePresentationModule());
+        bind(PubKeyRing.class).toProvider(PubKeyRingProvider.class);
     }
 
     private TradeModule tradeModule() {

core/src/main/java/bisq/core/app/misc/ModuleForAppWithP2p.java

@@ -43,6 +43,8 @@
 import bisq.common.app.AppModule;
 import bisq.common.crypto.KeyRing;
 import bisq.common.crypto.KeyStorage;
+import bisq.common.crypto.PubKeyRing;
+import bisq.common.crypto.PubKeyRingProvider;
 import bisq.common.proto.network.NetworkProtoResolver;
 import bisq.common.proto.persistable.PersistenceProtoResolver;
 import bisq.common.storage.Storage;
@@ -103,6 +105,8 @@ protected void configure() {
         install(daoModule());
         install(alertModule());
         install(filterModule());
+        bind(PubKeyRing.class).toProvider(PubKeyRingProvider.class);
+
     }
 
     protected void configEnvironment() {

core/src/main/java/bisq/core/dao/governance/period/PeriodService.java

@@ -32,7 +32,7 @@
 import javax.annotation.Nullable;
 
 @Slf4j
-public final class PeriodService {
+public class PeriodService {
     private final DaoStateService daoStateService;
 
 

core/src/main/java/bisq/core/dao/governance/proposal/MyProposalListService.java

@@ -32,7 +32,7 @@
 
 import bisq.common.UserThread;
 import bisq.common.app.DevEnv;
-import bisq.common.crypto.KeyRing;
+import bisq.common.crypto.PubKeyRing;
 import bisq.common.handlers.ErrorMessageHandler;
 import bisq.common.handlers.ResultHandler;
 import bisq.common.proto.persistable.PersistedDataHost;
@@ -85,14 +85,14 @@ public MyProposalListService(P2PService p2PService,
                                  PeriodService periodService,
                                  WalletsManager walletsManager,
                                  Storage<MyProposalList> storage,
-                                 KeyRing keyRing) {
+                                 PubKeyRing pubKeyRing) {
         this.p2PService = p2PService;
         this.daoStateService = daoStateService;
         this.periodService = periodService;
         this.walletsManager = walletsManager;
         this.storage = storage;
 
-        signaturePubKey = keyRing.getPubKeyRing().getSignaturePubKey();
+        signaturePubKey = pubKeyRing.getSignaturePubKey();
 
         numConnectedPeersListener = (observable, oldValue, newValue) -> rePublishMyProposalsOnceWellConnected();
         daoStateService.addDaoStateListener(this);
@@ -239,8 +239,8 @@ private void persist() {
     }
 
     private boolean canRemoveProposal(Proposal proposal, DaoStateService daoStateService, PeriodService periodService) {
-        boolean inPhase = periodService.isInPhase(daoStateService.getChainHeight(), DaoPhase.Phase.PROPOSAL);
-        return isMine(proposal) && inPhase;
+        boolean inProposalPhase = periodService.isInPhase(daoStateService.getChainHeight(), DaoPhase.Phase.PROPOSAL);
+        return isMine(proposal) && inProposalPhase;
 
     }
 }

core/src/test/java/bisq/core/dao/governance/proposal/MyProposalListServiceTest.java

@@ -0,0 +1,32 @@
+package bisq.core.dao.governance.proposal;
+
+import bisq.core.btc.wallet.WalletsManager;
+import bisq.core.dao.governance.period.PeriodService;
+import bisq.core.dao.state.DaoStateService;
+
+import bisq.network.p2p.P2PService;
+
+import bisq.common.crypto.PubKeyRing;
+import bisq.common.storage.Storage;
+
+import javafx.beans.property.SimpleIntegerProperty;
+
+import org.junit.Test;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class MyProposalListServiceTest {
+    @Test
+    public void canInstantiate() {
+        P2PService p2PService = mock(P2PService.class);
+        when(p2PService.getNumConnectedPeers()).thenReturn(new SimpleIntegerProperty(0));
+        Storage storage = mock(Storage.class);
+        MyProposalListService service = new MyProposalListService(p2PService,
+                mock(DaoStateService.class),
+                mock(PeriodService.class), mock(WalletsManager.class), storage, mock(PubKeyRing.class)
+        );
+    }
+
+
+}

desktop/src/main/java/bisq/desktop/main/offer/MakerFeeMaker.java → desktop/src/main/java/bisq/desktop/main/offer/MakerFeeProvider.java

@@ -6,7 +6,7 @@
 
 import org.bitcoinj.core.Coin;
 
-public class MakerFeeMaker {
+public class MakerFeeProvider {
     public Coin getMakerFee(BsqWalletService bsqWalletService, Preferences preferences, Coin amount) {
         return OfferUtil.getMakerFee(bsqWalletService, preferences, amount);
     }

desktop/src/main/java/bisq/desktop/main/offer/MutableOfferDataModel.java

@@ -106,7 +106,7 @@ public abstract class MutableOfferDataModel extends OfferDataModel implements Bs
     private final TxFeeEstimationService txFeeEstimationService;
     private final ReferralIdService referralIdService;
     private final BSFormatter btcFormatter;
-    private MakerFeeMaker makerFeeMaker;
+    private MakerFeeProvider makerFeeProvider;
     private final String offerId;
     private final BalanceListener btcBalanceListener;
     private final SetChangeListener<PaymentAccount> paymentAccountsChangeListener;
@@ -159,7 +159,7 @@ public MutableOfferDataModel(OpenOfferManager openOfferManager,
                                  TxFeeEstimationService txFeeEstimationService,
                                  ReferralIdService referralIdService,
                                  BSFormatter btcFormatter,
-                                 MakerFeeMaker makerFeeMaker) {
+                                 MakerFeeProvider makerFeeProvider) {
         super(btcWalletService);
 
         this.openOfferManager = openOfferManager;
@@ -175,7 +175,7 @@ public MutableOfferDataModel(OpenOfferManager openOfferManager,
         this.txFeeEstimationService = txFeeEstimationService;
         this.referralIdService = referralIdService;
         this.btcFormatter = btcFormatter;
-        this.makerFeeMaker = makerFeeMaker;
+        this.makerFeeProvider = makerFeeProvider;
 
         offerId = Utilities.getRandomPrefix(5, 8) + "-" +
                 UUID.randomUUID().toString() + "-" +
@@ -805,7 +805,7 @@ public Coin getMakerFee(boolean isCurrencyForMakerFeeBtc) {
     }
 
     public Coin getMakerFee() {
-        return makerFeeMaker.getMakerFee(bsqWalletService, preferences, amount.get());
+        return makerFeeProvider.getMakerFee(bsqWalletService, preferences, amount.get());
     }
 
     public Coin getMakerFeeInBtc() {

desktop/src/main/java/bisq/desktop/main/offer/createoffer/CreateOfferDataModel.java

@@ -21,7 +21,7 @@
 
 package bisq.desktop.main.offer.createoffer;
 
-import bisq.desktop.main.offer.MakerFeeMaker;
+import bisq.desktop.main.offer.MakerFeeProvider;
 import bisq.desktop.main.offer.MutableOfferDataModel;
 
 import bisq.core.account.witness.AccountAgeWitnessService;
@@ -65,7 +65,7 @@ public CreateOfferDataModel(OpenOfferManager openOfferManager,
                                 TxFeeEstimationService txFeeEstimationService,
                                 ReferralIdService referralIdService,
                                 BSFormatter btcFormatter,
-                                MakerFeeMaker makerFeeMaker) {
+                                MakerFeeProvider makerFeeProvider) {
         super(openOfferManager,
                 btcWalletService,
                 bsqWalletService,
@@ -80,6 +80,6 @@ public CreateOfferDataModel(OpenOfferManager openOfferManager,
                 txFeeEstimationService,
                 referralIdService,
                 btcFormatter,
-                makerFeeMaker);
+                makerFeeProvider);
     }
 }

desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferDataModel.java

@@ -18,7 +18,7 @@
 package bisq.desktop.main.portfolio.editoffer;
 
 
-import bisq.desktop.main.offer.MakerFeeMaker;
+import bisq.desktop.main.offer.MakerFeeProvider;
 import bisq.desktop.main.offer.MutableOfferDataModel;
 
 import bisq.core.account.witness.AccountAgeWitnessService;
@@ -75,7 +75,7 @@ class EditOfferDataModel extends MutableOfferDataModel {
                        ReferralIdService referralIdService,
                        BSFormatter btcFormatter,
                        CorePersistenceProtoResolver corePersistenceProtoResolver,
-                       MakerFeeMaker makerFeeMaker) {
+                       MakerFeeProvider makerFeeProvider) {
         super(openOfferManager,
                 btcWalletService,
                 bsqWalletService,
@@ -90,7 +90,7 @@ class EditOfferDataModel extends MutableOfferDataModel {
                 txFeeEstimationService,
                 referralIdService,
                 btcFormatter,
-                makerFeeMaker);
+                makerFeeProvider);
         this.corePersistenceProtoResolver = corePersistenceProtoResolver;
     }
 

desktop/src/test/java/bisq/desktop/GuiceSetupTest.java

@@ -46,6 +46,7 @@
 import bisq.common.ClockWatcher;
 import bisq.common.crypto.KeyRing;
 import bisq.common.crypto.KeyStorage;
+import bisq.common.crypto.PubKeyRing;
 import bisq.common.proto.network.NetworkProtoResolver;
 import bisq.common.proto.persistable.PersistenceProtoResolver;
 import bisq.common.storage.CorruptedDatabaseFilesHandler;
@@ -104,6 +105,7 @@ public void testGuiceSetup() {
         assertSingleton(TradeLimits.class);
         assertSingleton(KeyStorage.class);
         assertSingleton(KeyRing.class);
+        assertSingleton(PubKeyRing.class);
         assertSingleton(User.class);
         assertSingleton(ClockWatcher.class);
         assertSingleton(Preferences.class);

desktop/src/test/java/bisq/desktop/main/offer/createoffer/CreateOfferDataModelTest.java

@@ -1,6 +1,6 @@
 package bisq.desktop.main.offer.createoffer;
 
-import bisq.desktop.main.offer.MakerFeeMaker;
+import bisq.desktop.main.offer.MakerFeeProvider;
 
 import bisq.core.btc.TxFeeEstimationService;
 import bisq.core.btc.model.AddressEntry;
@@ -36,7 +36,7 @@ public class CreateOfferDataModelTest {
     private CreateOfferDataModel model;
     private User user;
     private Preferences preferences;
-    private MakerFeeMaker makerFeeMaker;
+    private MakerFeeProvider makerFeeProvider;
 
     @Before
     public void setUp() {
@@ -56,12 +56,12 @@ public void setUp() {
         when(preferences.isUsePercentageBasedPrice()).thenReturn(true);
         when(preferences.getBuyerSecurityDepositAsPercent(null)).thenReturn(0.01);
 
-        makerFeeMaker = mock(MakerFeeMaker.class);
+        makerFeeProvider = mock(MakerFeeProvider.class);
         model = new CreateOfferDataModel(null, btcWalletService,
                 null, preferences, user, null,
                 null, priceFeedService, null,
                 null, feeService, feeEstimationService,
-                null, null, makerFeeMaker);
+                null, null, makerFeeProvider);
     }
 
     @Test
@@ -78,7 +78,7 @@ public void testUseTradeCurrencySetInOfferViewWhenInPaymentAccountAvailable() {
 
         when(user.getPaymentAccounts()).thenReturn(paymentAccounts);
         when(preferences.getSelectedPaymentAccountForCreateOffer()).thenReturn(revolutAccount);
-        when(makerFeeMaker.getMakerFee(any(), any(), any())).thenReturn(Coin.ZERO);
+        when(makerFeeProvider.getMakerFee(any(), any(), any())).thenReturn(Coin.ZERO);
 
         model.initWithData(OfferPayload.Direction.BUY, new FiatCurrency("USD"));
         assertEquals("USD", model.getTradeCurrencyCode().get());
@@ -98,7 +98,7 @@ public void testUseTradeAccountThatMatchesTradeCurrencySetInOffer() {
         when(user.getPaymentAccounts()).thenReturn(paymentAccounts);
         when(user.findFirstPaymentAccountWithCurrency(new FiatCurrency("USD"))).thenReturn(zelleAccount);
         when(preferences.getSelectedPaymentAccountForCreateOffer()).thenReturn(revolutAccount);
-        when(makerFeeMaker.getMakerFee(any(), any(), any())).thenReturn(Coin.ZERO);
+        when(makerFeeProvider.getMakerFee(any(), any(), any())).thenReturn(Coin.ZERO);
 
         model.initWithData(OfferPayload.Direction.BUY, new FiatCurrency("USD"));
         assertEquals("USD", model.getTradeCurrencyCode().get());

desktop/src/test/java/bisq/desktop/main/offer/createoffer/CreateOfferViewModelTest.java

@@ -17,7 +17,7 @@
 
 package bisq.desktop.main.offer.createoffer;
 
-import bisq.desktop.main.offer.MakerFeeMaker;
+import bisq.desktop.main.offer.MakerFeeProvider;
 import bisq.desktop.util.validation.AltcoinValidator;
 import bisq.desktop.util.validation.BtcValidator;
 import bisq.desktop.util.validation.FiatPriceValidator;
@@ -104,7 +104,7 @@ public void setUp() {
         when(bsqFormatter.formatCoin(any())).thenReturn("0");
         when(bsqWalletService.getAvailableConfirmedBalance()).thenReturn(Coin.ZERO);
 
-        CreateOfferDataModel dataModel = new CreateOfferDataModel(null, btcWalletService, bsqWalletService, empty, user, null, null, priceFeedService, null, accountAgeWitnessService, feeService, txFeeEstimationService, null, bsFormatter, mock(MakerFeeMaker.class));
+        CreateOfferDataModel dataModel = new CreateOfferDataModel(null, btcWalletService, bsqWalletService, empty, user, null, null, priceFeedService, null, accountAgeWitnessService, feeService, txFeeEstimationService, null, bsFormatter, mock(MakerFeeProvider.class));
         dataModel.initWithData(OfferPayload.Direction.BUY, new CryptoCurrency("BTC", "bitcoin"));
         dataModel.activate();
 

desktop/src/test/java/bisq/desktop/main/portfolio/editoffer/EditOfferDataModelTest.java

@@ -1,6 +1,6 @@
 package bisq.desktop.main.portfolio.editoffer;
 
-import bisq.desktop.main.offer.MakerFeeMaker;
+import bisq.desktop.main.offer.MakerFeeProvider;
 import bisq.desktop.util.validation.SecurityDepositValidator;
 
 import bisq.core.account.witness.AccountAgeWitnessService;
@@ -93,7 +93,7 @@ public void setUp() {
                 btcWalletService, bsqWalletService, empty, user,
                 null, null, priceFeedService, null,
                 accountAgeWitnessService, feeService, null, null,
-                null, null, mock(MakerFeeMaker.class));
+                null, null, mock(MakerFeeProvider.class));
     }
 
     @Test