diff --git a/src/main/java/io/bitsquare/btc/WalletService.java b/src/main/java/io/bitsquare/btc/WalletService.java index d34f515b17..3780083a5e 100644 --- a/src/main/java/io/bitsquare/btc/WalletService.java +++ b/src/main/java/io/bitsquare/btc/WalletService.java @@ -20,7 +20,7 @@ package io.bitsquare.btc; import io.bitsquare.btc.listeners.AddressConfidenceListener; import io.bitsquare.btc.listeners.BalanceListener; import io.bitsquare.btc.listeners.TxConfidenceListener; -import io.bitsquare.crypto.CryptoService; +import io.bitsquare.crypto.SignatureService; import io.bitsquare.persistence.Persistence; import org.bitcoinj.core.Address; @@ -105,7 +105,7 @@ public class WalletService { private final NetworkParameters params; private final FeePolicy feePolicy; - private final CryptoService cryptoService; + private final SignatureService signatureService; private final Persistence persistence; private final File walletDir; private final String walletPrefix; @@ -123,12 +123,12 @@ public class WalletService { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - public WalletService(NetworkParameters params, FeePolicy feePolicy, CryptoService cryptoService, + public WalletService(NetworkParameters params, FeePolicy feePolicy, SignatureService signatureService, Persistence persistence, UserAgent userAgent, @Named(DIR_KEY) File walletDir, @Named(PREFIX_KEY) String walletPrefix) { this.params = params; this.feePolicy = feePolicy; - this.cryptoService = cryptoService; + this.signatureService = signatureService; this.persistence = persistence; this.walletDir = walletDir; this.walletPrefix = walletPrefix; @@ -555,7 +555,7 @@ public class WalletService { Transaction tx = new Transaction(params); - byte[] data = cryptoService.getEmbeddedAccountRegistrationData( + byte[] data = signatureService.getEmbeddedAccountRegistrationData( getRegistrationAddressEntry().getKey(), stringifiedBankAccounts); tx.addOutput(Transaction.MIN_NONDUST_OUTPUT, new ScriptBuilder().op(OP_RETURN).data(data).build()); diff --git a/src/main/java/io/bitsquare/crypto/CryptoModule.java b/src/main/java/io/bitsquare/crypto/CryptoModule.java index e7f2cfe7f0..22738e55e1 100644 --- a/src/main/java/io/bitsquare/crypto/CryptoModule.java +++ b/src/main/java/io/bitsquare/crypto/CryptoModule.java @@ -29,6 +29,6 @@ public class CryptoModule extends BitsquareModule { @Override protected void configure() { - bind(CryptoService.class).asEagerSingleton(); + bind(SignatureService.class).asEagerSingleton(); } } diff --git a/src/main/java/io/bitsquare/crypto/CryptoService.java b/src/main/java/io/bitsquare/crypto/SignatureService.java similarity index 96% rename from src/main/java/io/bitsquare/crypto/CryptoService.java rename to src/main/java/io/bitsquare/crypto/SignatureService.java index e74ce4fd29..b9e42a9fdd 100644 --- a/src/main/java/io/bitsquare/crypto/CryptoService.java +++ b/src/main/java/io/bitsquare/crypto/SignatureService.java @@ -42,12 +42,12 @@ import org.spongycastle.util.encoders.Base64; * That service delivers crypto functionality from the bitcoinJ library * //TODO still very basic as not much used yet, missing implementations */ -public class CryptoService { - private static final Logger log = LoggerFactory.getLogger(CryptoService.class); +public class SignatureService { + private static final Logger log = LoggerFactory.getLogger(SignatureService.class); @Inject - public CryptoService() { + public SignatureService() { } // DeterministicKey does not support signMessage yet. diff --git a/src/main/java/io/bitsquare/trade/TradeManager.java b/src/main/java/io/bitsquare/trade/TradeManager.java index 272d4d1d31..6e99c8bead 100644 --- a/src/main/java/io/bitsquare/trade/TradeManager.java +++ b/src/main/java/io/bitsquare/trade/TradeManager.java @@ -20,7 +20,7 @@ package io.bitsquare.trade; import io.bitsquare.account.AccountSettings; import io.bitsquare.btc.BlockChainService; import io.bitsquare.btc.WalletService; -import io.bitsquare.crypto.CryptoService; +import io.bitsquare.crypto.SignatureService; import io.bitsquare.msg.Message; import io.bitsquare.msg.MessageService; import io.bitsquare.network.Peer; @@ -78,7 +78,7 @@ public class TradeManager { private final MessageService messageService; private final BlockChainService blockChainService; private final WalletService walletService; - private final CryptoService cryptoService; + private final SignatureService signatureService; private final OfferRepository offerRepository; //TODO store TakerAsSellerProtocol in trade @@ -99,9 +99,9 @@ public class TradeManager { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - public TradeManager(User user, AccountSettings accountSettings, Persistence persistence, - MessageService messageService, - BlockChainService blockChainService, WalletService walletService, CryptoService cryptoService, + public TradeManager(User user, AccountSettings accountSettings, Persistence persistence, + MessageService messageService, BlockChainService blockChainService, + WalletService walletService, SignatureService signatureService, OfferRepository offerRepository) { this.user = user; this.accountSettings = accountSettings; @@ -109,7 +109,7 @@ public class TradeManager { this.messageService = messageService; this.blockChainService = blockChainService; this.walletService = walletService; - this.cryptoService = cryptoService; + this.signatureService = signatureService; this.offerRepository = offerRepository; Object offersObject = persistence.read(this, "offers"); @@ -249,7 +249,7 @@ public class TradeManager { messageService, walletService, blockChainService, - cryptoService, + signatureService, user, new BuyerAcceptsOfferProtocolListener() { @Override @@ -372,7 +372,7 @@ public class TradeManager { }; SellerTakesOfferProtocol sellerTakesOfferProtocol = new SellerTakesOfferProtocol( - trade, listener, messageService, walletService, blockChainService, cryptoService, + trade, listener, messageService, walletService, blockChainService, signatureService, user); takerAsSellerProtocolMap.put(trade.getId(), sellerTakesOfferProtocol); sellerTakesOfferProtocol.start(); diff --git a/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAcceptsOfferProtocol.java b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAcceptsOfferProtocol.java index 8587d0df19..a108585be6 100644 --- a/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAcceptsOfferProtocol.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAcceptsOfferProtocol.java @@ -21,7 +21,7 @@ import io.bitsquare.bank.BankAccount; import io.bitsquare.btc.BlockChainService; import io.bitsquare.btc.FeePolicy; import io.bitsquare.btc.WalletService; -import io.bitsquare.crypto.CryptoService; +import io.bitsquare.crypto.SignatureService; import io.bitsquare.msg.MessageService; import io.bitsquare.network.Peer; import io.bitsquare.offer.Offer; @@ -99,7 +99,7 @@ public class BuyerAcceptsOfferProtocol { private final MessageService messageService; private final WalletService walletService; private final BlockChainService blockChainService; - private final CryptoService cryptoService; + private final SignatureService signatureService; private final BuyerAcceptsOfferProtocolListener listener; // derived @@ -142,7 +142,7 @@ public class BuyerAcceptsOfferProtocol { MessageService messageService, WalletService walletService, BlockChainService blockChainService, - CryptoService cryptoService, + SignatureService signatureService, User user, BuyerAcceptsOfferProtocolListener listener) { this.trade = trade; @@ -151,7 +151,7 @@ public class BuyerAcceptsOfferProtocol { this.messageService = messageService; this.walletService = walletService; this.blockChainService = blockChainService; - this.cryptoService = cryptoService; + this.signatureService = signatureService; tradeId = trade.getId(); offer = trade.getOffer(); @@ -297,7 +297,7 @@ public class BuyerAcceptsOfferProtocol { state = State.VerifyAndSignContract; VerifyAndSignContract.run(this::onResultVerifyAndSignContract, this::onFault, - cryptoService, + signatureService, accountId, tradeAmount, takeOfferFeeTxId, diff --git a/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyAndSignContract.java b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyAndSignContract.java index aca46ebabe..c18f76c8ea 100644 --- a/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyAndSignContract.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyAndSignContract.java @@ -18,7 +18,7 @@ package io.bitsquare.trade.protocol.trade.offerer.tasks; import io.bitsquare.bank.BankAccount; -import io.bitsquare.crypto.CryptoService; +import io.bitsquare.crypto.SignatureService; import io.bitsquare.offer.Offer; import io.bitsquare.trade.Contract; import io.bitsquare.util.Utilities; @@ -37,7 +37,7 @@ public class VerifyAndSignContract { public static void run(ResultHandler resultHandler, ExceptionHandler exceptionHandler, - CryptoService cryptoService, + SignatureService signatureService, String accountId, Coin tradeAmount, String takeOfferFeeTxId, @@ -56,7 +56,7 @@ public class VerifyAndSignContract { String contractAsJson = Utilities.objectToJson(contract); log.trace("The 2 contracts as json does match"); - String signature = cryptoService.signContract(registrationKey, contractAsJson); + String signature = signatureService.signContract(registrationKey, contractAsJson); //log.trace("signature: " + signature); resultHandler.onResult(contract, contractAsJson, signature); } diff --git a/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerTakesOfferProtocol.java b/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerTakesOfferProtocol.java index 6dedee7bb4..c291b72634 100644 --- a/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerTakesOfferProtocol.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerTakesOfferProtocol.java @@ -20,7 +20,7 @@ package io.bitsquare.trade.protocol.trade.taker; import io.bitsquare.bank.BankAccount; import io.bitsquare.btc.BlockChainService; import io.bitsquare.btc.WalletService; -import io.bitsquare.crypto.CryptoService; +import io.bitsquare.crypto.SignatureService; import io.bitsquare.msg.MessageService; import io.bitsquare.network.Peer; import io.bitsquare.offer.Offer; @@ -89,7 +89,7 @@ public class SellerTakesOfferProtocol { private final MessageService messageService; private final WalletService walletService; private final BlockChainService blockChainService; - private final CryptoService cryptoService; + private final SignatureService signatureService; // derived private final Offer offer; @@ -136,14 +136,14 @@ public class SellerTakesOfferProtocol { MessageService messageService, WalletService walletService, BlockChainService blockChainService, - CryptoService cryptoService, + SignatureService signatureService, User user) { this.trade = trade; this.listener = listener; this.messageService = messageService; this.walletService = walletService; this.blockChainService = blockChainService; - this.cryptoService = cryptoService; + this.signatureService = signatureService; offer = trade.getOffer(); tradeId = trade.getId(); @@ -257,7 +257,7 @@ public class SellerTakesOfferProtocol { state = State.CreateAndSignContract; CreateAndSignContract.run(this::onResultCreateAndSignContract, this::onFault, - cryptoService, + signatureService, offer, tradeAmount, takeOfferFeeTxId, diff --git a/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignContract.java b/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignContract.java index e2d3e6fb2f..ac0b291358 100644 --- a/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignContract.java +++ b/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignContract.java @@ -18,7 +18,7 @@ package io.bitsquare.trade.protocol.trade.taker.tasks; import io.bitsquare.bank.BankAccount; -import io.bitsquare.crypto.CryptoService; +import io.bitsquare.crypto.SignatureService; import io.bitsquare.offer.Offer; import io.bitsquare.trade.Contract; import io.bitsquare.util.Utilities; @@ -37,7 +37,7 @@ public class CreateAndSignContract { public static void run(ResultHandler resultHandler, ExceptionHandler exceptionHandler, - CryptoService cryptoService, + SignatureService signatureService, Offer offer, Coin tradeAmount, String takeOfferFeeTxId, @@ -54,7 +54,7 @@ public class CreateAndSignContract { peersBankAccount, bankAccount, peersMessagePublicKey, messagePublicKey); String contractAsJson = Utilities.objectToJson(contract); - String signature = cryptoService.signContract(registrationKey, contractAsJson); + String signature = signatureService.signContract(registrationKey, contractAsJson); resultHandler.onResult(contract, contractAsJson, signature); } catch (Throwable t) { log.error("Exception at sign contract " + t);