Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-07-28 09:24:15 -04:00
Code Issues Projects Releases Packages Wiki Activity

Rename io.bitsquare.crypto.{Crypto=>Signature}Service

Browse source
This commit is contained in:
Chris Beams 2014-11-12 11:05:32 +01:00
parent 80758a0a47
commit 99dcea4001
No known key found for this signature in database
GPG key ID: 3D214F8F5BC5ED73
8 changed files with 33 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/io/bitsquare/btc/WalletService.java
View file

@ -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());

2
src/main/java/io/bitsquare/crypto/CryptoModule.java
View file

@ -29,6 +29,6 @@ public class CryptoModule extends BitsquareModule {
@Override
protected void configure() {
bind(CryptoService.class).asEagerSingleton();
bind(SignatureService.class).asEagerSingleton();
}
}

6
src/main/java/io/bitsquare/crypto/CryptoService.java → src/main/java/io/bitsquare/crypto/SignatureService.java
View file

@ -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.

14
src/main/java/io/bitsquare/trade/TradeManager.java
View file

@ -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
@ -100,8 +100,8 @@ public class TradeManager {
@Inject
public TradeManager(User user, AccountSettings accountSettings, Persistence persistence,
MessageService messageService,
BlockChainService blockChainService, WalletService walletService, CryptoService cryptoService,
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();

10
src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAcceptsOfferProtocol.java
View file

@ -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,

6
src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyAndSignContract.java
View file

@ -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);
}

10
src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerTakesOfferProtocol.java
View file

@ -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,

6
src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignContract.java
View file

@ -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);