Handle data init after trade interruption

core/src/main/java/io/bitsquare/arbitration/ArbitrationRepository.java

@@ -88,7 +88,7 @@ public class ArbitrationRepository implements Serializable {
             arbitratorsMap.putAll(persisted.getArbitratorsMap());
         }
         arbitratorsObservableMap.putAll(arbitratorsMap);
-        arbitratorsObservableMap.addListener((MapChangeListener<String, Arbitrator>) change -> storage.save());
+        arbitratorsObservableMap.addListener((MapChangeListener<String, Arbitrator>) change -> storage.queueUpForSave());
         allArbitratorsSynced = false;
     }
 

core/src/main/java/io/bitsquare/arbitration/Arbitrator.java

@@ -112,7 +112,7 @@ public class Arbitrator implements Serializable {
     }
 
     public void save() {
-        storage.save();
+        storage.queueUpForSave();
     }
 
     @Override

core/src/main/java/io/bitsquare/btc/AddressEntryList.java

@@ -67,7 +67,7 @@ public class AddressEntryList extends ArrayList<AddressEntry> implements Seriali
         DeterministicKey key = wallet.freshReceiveKey();
         AddressEntry addressEntry = new AddressEntry(key, wallet.getParams(), context, offerId);
         add(addressEntry);
-        storage.save();
+        storage.queueUpForSave();
         return addressEntry;
     }
 
@@ -75,7 +75,7 @@ public class AddressEntryList extends ArrayList<AddressEntry> implements Seriali
         DeterministicKey registrationKey = wallet.currentReceiveKey();
         AddressEntry registrationAddressEntry = new AddressEntry(registrationKey, wallet.getParams(), AddressEntry.Context.REGISTRATION_FEE);
         add(registrationAddressEntry);
-        storage.save();
+        storage.queueUpForSave();
     }
 
     public AddressEntry getRegistrationAddressEntry() {

core/src/main/java/io/bitsquare/gui/Navigation.java

@@ -104,7 +104,7 @@ public class Navigation implements Serializable {
 
         currentPath = newPath;
         previousPath = currentPath;
-        storage.save();
+        storage.queueUpForSave();
         listeners.stream().forEach((e) -> e.onNavigationRequested(currentPath));
     }
 

core/src/main/java/io/bitsquare/storage/FileManager.java

@@ -235,7 +235,7 @@ public class FileManager<T> {
     private void saveNowInternal(T serializable) throws IOException {
         long now = System.currentTimeMillis();
         saveToFile(serializable, dir, storageFile);
-        log.info("Save completed in {}msec", System.currentTimeMillis() - now);
+        log.info("Save {} completed in {}msec", storageFile, System.currentTimeMillis() - now);
     }
 
     private void saveToFile(T serializable, File dir, File storageFile) throws IOException {
@@ -268,10 +268,13 @@ public class FileManager<T> {
             objectOutputStream.close();
 
             renameTempFileToFile(tempFile, storageFile);
+        } catch (Throwable t) {
+            t.printStackTrace();
         } finally {
             if (tempFile != null && tempFile.exists()) {
-                log.warn("Temp file still exists after failed save.");
+                log.warn("Temp file still exists after failed save. storageFile=" + storageFile);
-                if (!tempFile.delete()) log.error("Cannot delete temp file.");
+                if (!tempFile.delete()) 
+                    log.error("Cannot delete temp file.");
             }
 
             try {

core/src/main/java/io/bitsquare/storage/Storage.java

@@ -20,7 +20,6 @@ package io.bitsquare.storage;
 import com.google.common.base.Throwables;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InvalidClassException;
 import java.io.Serializable;
@@ -78,13 +77,14 @@ public class Storage<T extends Serializable> {
         this.serializable = serializable;
         this.fileName = fileName;
         storageFile = new File(dir, fileName);
-        fileManager = new FileManager<>(dir, storageFile, 500, TimeUnit.MILLISECONDS);
+        fileManager = new FileManager<>(dir, storageFile, 600, TimeUnit.MILLISECONDS);
 
         return getPersisted(serializable);
     }
 
     // Save delayed and on a background thread
-    public void save() {
+    public void queueUpForSave() {
+        log.debug("save " + fileName);
         if (storageFile == null)
             throw new RuntimeException("storageFile = null. Call setupFileStorage before using read/write.");
 
@@ -103,11 +103,9 @@ public class Storage<T extends Serializable> {
     // We do the file read on the UI thread to avoid problems from multi threading. 
     // Data are small and read is done only at startup, so it is no performance issue.
     private T getPersisted(T serializable) {
-        if (storageFile == null)
+        if (storageFile.exists()) {
-            throw new RuntimeException("storageFile = null. Call init before using read/write.");
-
-        try {
             long now = System.currentTimeMillis();
+            try {
                 T persistedObject = (T) fileManager.read(storageFile);
                 log.info("Read {} completed in {}msec", serializable.getClass().getSimpleName(), System.currentTimeMillis() - now);
 
@@ -118,7 +116,8 @@ public class Storage<T extends Serializable> {
 
                 return persistedObject;
             } catch (InvalidClassException e) {
-            log.error("Version of persisted class has changed. We cannot read the persisted data anymore. We make a backup and remove the inconsistent file.");
+                log.error("Version of persisted class has changed. We cannot read the persisted data anymore. We make a backup and remove the inconsistent " +
+                        "file.");
                 try {
                     // In case the persisted data have been critical (keys) we keep a backup which might be used for recovery
                     fileManager.removeAndBackupFile(fileName);
@@ -127,14 +126,13 @@ public class Storage<T extends Serializable> {
                     log.error(e1.getMessage());
                     // We swallow Exception if backup fails
                 }
-        } catch (FileNotFoundException e) {
-            log.info("File not available. That is OK for the first run.");
             } catch (IOException | ClassNotFoundException e) {
                 e.printStackTrace();
                 log.error(e.getMessage());
                 Throwables.propagate(e);
 
             }
+        }
         return null;
     }
 }

core/src/main/java/io/bitsquare/trade/OffererTrade.java

@@ -17,7 +17,13 @@
 
 package io.bitsquare.trade;
 
+import io.bitsquare.btc.BlockChainService;
+import io.bitsquare.btc.TradeWalletService;
+import io.bitsquare.btc.WalletService;
+import io.bitsquare.crypto.SignatureService;
 import io.bitsquare.offer.Offer;
+import io.bitsquare.p2p.MailboxService;
+import io.bitsquare.p2p.MessageService;
 import io.bitsquare.p2p.Peer;
 import io.bitsquare.storage.Storage;
 import io.bitsquare.trade.protocol.trade.offerer.OffererProtocol;
@@ -78,7 +84,7 @@ public class OffererTrade extends Trade implements Serializable {
     private Peer tradingPeer;
     private OffererProcessState processState;
     private OffererLifeCycleState lifeCycleState;
-    private OffererTradeProcessModel offererTradeProcessModel;
+    private OffererTradeProcessModel processModel;
 
     transient private ObjectProperty<OffererProcessState> processStateProperty = new SimpleObjectProperty<>();
     transient private ObjectProperty<OffererLifeCycleState> lifeCycleStateProperty = new SimpleObjectProperty<>();
@@ -88,10 +94,10 @@ public class OffererTrade extends Trade implements Serializable {
     // Constructor
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    public OffererTrade(Offer offer, OffererTradeProcessModel offererTradeProcessModel, Storage storage) {
+    public OffererTrade(Offer offer, OffererTradeProcessModel processModel, Storage storage) {
         super(offer, storage);
 
-        this.offererTradeProcessModel = offererTradeProcessModel;
+        this.processModel = processModel;
         protocol = new OffererProtocol(this);
         setLifeCycleState(OffererTrade.OffererLifeCycleState.OFFER_OPEN);
     }
@@ -102,17 +108,44 @@ public class OffererTrade extends Trade implements Serializable {
 
         processStateProperty = new SimpleObjectProperty<>(processState);
         lifeCycleStateProperty = new SimpleObjectProperty<>(lifeCycleState);
-        protocol = new OffererProtocol(this);
+        tradeAmountProperty = new SimpleObjectProperty<>();
+        tradeVolumeProperty = new SimpleObjectProperty<>();
+        if (tradeAmount != null) {
+            tradeAmountProperty.set(tradeAmount);
+            tradeVolumeProperty.set(getTradeVolume());
+        }
     }
 
     public void onFiatPaymentStarted() {
         ((OffererProtocol) protocol).onFiatPaymentStarted();
     }
 
-    public OffererTradeProcessModel getOffererTradeProcessModel() {
+    public OffererTradeProcessModel getProcessModel() {
-        return offererTradeProcessModel;
+        return processModel;
     }
 
+    public void reActivate(MessageService messageService,
+                           MailboxService mailboxService,
+                           WalletService walletService,
+                           TradeWalletService tradeWalletService,
+                           BlockChainService blockChainService,
+                           SignatureService signatureService) {
+
+        processModel.messageService = messageService;
+        processModel.mailboxService = mailboxService;
+        processModel.walletService = walletService;
+        processModel.tradeWalletService = tradeWalletService;
+        processModel.blockChainService = blockChainService;
+        processModel.signatureService = signatureService;
+
+        processModel.offerer.registrationKeyPair = walletService.getRegistrationAddressEntry().getKeyPair();
+        processModel.offerer.addressEntry = walletService.getAddressEntry(getId());
+
+        protocol = new OffererProtocol(this);
+
+        if (mailboxMessage != null)
+            protocol.setMailboxMessage(mailboxMessage);
+    }
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Setters

core/src/main/java/io/bitsquare/trade/TakerTrade.java

@@ -17,7 +17,13 @@
 
 package io.bitsquare.trade;
 
+import io.bitsquare.btc.BlockChainService;
+import io.bitsquare.btc.TradeWalletService;
+import io.bitsquare.btc.WalletService;
+import io.bitsquare.crypto.SignatureService;
 import io.bitsquare.offer.Offer;
+import io.bitsquare.p2p.MailboxService;
+import io.bitsquare.p2p.MessageService;
 import io.bitsquare.p2p.Peer;
 import io.bitsquare.storage.Storage;
 import io.bitsquare.trade.protocol.trade.taker.TakerProtocol;
@@ -47,8 +53,8 @@ public class TakerTrade extends Trade implements Serializable {
     private static final long serialVersionUID = 1L;
     transient private static final Logger log = LoggerFactory.getLogger(TakerTrade.class);
 
-    public TakerTradeProcessModel getTakerTradeProcessModel() {
+    public TakerTradeProcessModel getProcessModel() {
-        return takerTradeProcessModel;
+        return processModel;
     }
 
 
@@ -81,7 +87,7 @@ public class TakerTrade extends Trade implements Serializable {
 
     private final Coin tradeAmount;
     private final Peer tradingPeer;
-    private final TakerTradeProcessModel takerTradeProcessModel;
+    private TakerTradeProcessModel processModel;
 
     private TakerProcessState processState;
     private TakerLifeCycleState lifeCycleState;
@@ -94,12 +100,12 @@ public class TakerTrade extends Trade implements Serializable {
     // Constructor
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    public TakerTrade(Offer offer, Coin tradeAmount, Peer peer, TakerTradeProcessModel takerTradeProcessModel, Storage storage) {
+    public TakerTrade(Offer offer, Coin tradeAmount, Peer peer, TakerTradeProcessModel processModel, Storage storage) {
         super(offer, storage);
 
         this.tradeAmount = tradeAmount;
         this.tradingPeer = peer;
-        this.takerTradeProcessModel = takerTradeProcessModel;
+        this.processModel = processModel;
         protocol = new TakerProtocol(this);
         setLifeCycleState(TakerTrade.TakerLifeCycleState.PENDING);
 
@@ -117,9 +123,29 @@ public class TakerTrade extends Trade implements Serializable {
         lifeCycleStateProperty = new SimpleObjectProperty<>(lifeCycleState);
         tradeAmountProperty = new SimpleObjectProperty<>(tradeAmount);
         tradeVolumeProperty = new SimpleObjectProperty<>(getTradeVolume());
-        protocol = new TakerProtocol(this);
     }
 
+    public void reActivate(MessageService messageService,
+                           MailboxService mailboxService,
+                           WalletService walletService,
+                           TradeWalletService tradeWalletService,
+                           BlockChainService blockChainService,
+                           SignatureService signatureService) {
+        processModel.messageService = messageService;
+        processModel.mailboxService = mailboxService;
+        processModel.walletService = walletService;
+        processModel.tradeWalletService = tradeWalletService;
+        processModel.blockChainService = blockChainService;
+        processModel.signatureService = signatureService;
+
+        processModel.taker.registrationKeyPair =walletService.getRegistrationAddressEntry().getKeyPair();
+        processModel.taker.addressEntry = walletService.getAddressEntry(getId());
+
+        protocol = new TakerProtocol(this);
+        
+        if (mailboxMessage != null)
+            protocol.setMailboxMessage(mailboxMessage);
+    }
 
     public void onFiatPaymentReceived() {
         ((TakerProtocol) protocol).onFiatPaymentReceived();

core/src/main/java/io/bitsquare/trade/Trade.java

@@ -63,7 +63,6 @@ abstract public class Trade extends Model implements Serializable {
     protected final Offer offer;
     protected final Date date;
    
-    protected Protocol protocol;
     protected Contract contract;
     protected String contractAsJson;
     protected String takerContractSignature;
@@ -78,7 +77,7 @@ abstract public class Trade extends Model implements Serializable {
     transient protected ObjectProperty<Fiat> tradeVolumeProperty = new SimpleObjectProperty<>();
 
     transient private Storage<TakerTradeProcessModel> storage;
-
+    transient protected Protocol protocol;
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Constructor
@@ -91,12 +90,13 @@ abstract public class Trade extends Model implements Serializable {
         date = new Date();
     }
 
+    
     ///////////////////////////////////////////////////////////////////////////////////////////
     // API
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     // The deserialized tx has not actual confidence data, so we need to get the fresh one from the wallet.
-    public void updateTxFromWallet(TradeWalletService tradeWalletService) {
+    public void syncDepositTxWithWallet(TradeWalletService tradeWalletService) {
         if (depositTx != null)
             setDepositTx(tradeWalletService.commitsDepositTx(depositTx));
     }
@@ -106,20 +106,16 @@ abstract public class Trade extends Model implements Serializable {
         setConfidenceListener();
     }
 
-    public void reActivate() {
-        if (mailboxMessage != null)
-            protocol.setMailboxMessage(mailboxMessage);
-    }
 
     // Get called from taskRunner after each completed task
     @Override
     public void persist() {
-        storage.save();
+        storage.queueUpForSave();
     }
 
     @Override
     public void onComplete() {
-        storage.save();
+        storage.queueUpForSave();
     }
 
     ///////////////////////////////////////////////////////////////////////////////////////////

core/src/main/java/io/bitsquare/trade/TradeList.java

@@ -58,7 +58,7 @@ public class TradeList<T> extends ArrayList<T> implements Serializable {
     public boolean add(T trade) {
         boolean result = super.add(trade);
         observableList.add(trade);
-        storage.save();
+        storage.queueUpForSave();
         return result;
     }
 
@@ -66,7 +66,7 @@ public class TradeList<T> extends ArrayList<T> implements Serializable {
     public boolean remove(Object trade) {
         boolean result = super.remove(trade);
         observableList.remove(trade);
-        storage.save();
+        storage.queueUpForSave();
         return result;
     }
 

core/src/main/java/io/bitsquare/trade/TradeManager.java

@@ -85,6 +85,7 @@ public class TradeManager {
     private final BlockChainService blockChainService;
     private final WalletService walletService;
     private final Storage pendingTradesStorage;
+    private final Storage openOfferTradesStorage;
     private TradeWalletService tradeWalletService;
     private final SignatureService signatureService;
     private final EncryptionService<MailboxMessage> encryptionService;
@@ -124,14 +125,16 @@ public class TradeManager {
         this.arbitrationRepository = arbitrationRepository;
         this.storageDir = storageDir;
 
+        openOfferTradesStorage = new Storage(storageDir);
         pendingTradesStorage = new Storage(storageDir);
-        this.openOfferTrades = new TradeList<>(pendingTradesStorage, "OpenOfferTrades");
+
-        this.pendingTrades = new TradeList<>(new Storage(storageDir), "PendingTrades");
+        this.openOfferTrades = new TradeList<>(openOfferTradesStorage, "OpenOfferTrades");
+        this.pendingTrades = new TradeList<>(pendingTradesStorage, "PendingTrades");
         this.closedTrades = new TradeList<>(new Storage(storageDir), "ClosedTrades");
 
 
         // In case the app did get killed the shutDown from the modules is not called, so we use a shutdown hook
-        Thread shutDownHookThread = new Thread(TradeManager.this::shutDown, "TradeManager:ShutDownHook");
+        Thread shutDownHookThread = new Thread(TradeManager.this::shutDown, "TradeManager.ShutDownHook");
         Runtime.getRuntime().addShutdownHook(shutDownHookThread);
     }
 
@@ -163,17 +166,37 @@ public class TradeManager {
             offerBookService.addOffer(offer,
                     () -> log.debug("Successful removed open offer from DHT"),
                     (message, throwable) -> log.error("Remove open offer from DHT failed. " + message));
-
+            offererTrade.setStorage(openOfferTradesStorage);
-            offererTrade.reActivate();
+            offererTrade.reActivate(messageService,
+                    mailboxService,
+                    walletService,
+                    tradeWalletService,
+                    blockChainService,
+                    signatureService);
 
         }
         for (Trade trade : pendingTrades) {
             // We continue an interrupted trade.
             // TODO if the peer has changed its IP address, we need to make another findPeer request. At the moment we use the peer stored in trade to
             // continue the trade, but that might fail.
-            trade.reActivate();
+            trade.syncDepositTxWithWallet(tradeWalletService);
-            trade.updateTxFromWallet(tradeWalletService);
             trade.setStorage(pendingTradesStorage);
+            if (trade instanceof TakerTrade) {
+                ((TakerTrade) trade).reActivate(messageService,
+                        mailboxService,
+                        walletService,
+                        tradeWalletService,
+                        blockChainService,
+                        signatureService);
+            }
+            else if (trade instanceof OffererTrade) {
+                ((OffererTrade) trade).reActivate(messageService,
+                        mailboxService,
+                        walletService,
+                        tradeWalletService,
+                        blockChainService,
+                        signatureService);
+            }
         }
 
         mailboxService.getAllMessages(user.getP2PSigPubKey(),
@@ -218,7 +241,7 @@ public class TradeManager {
                 model,
                 (transaction) -> {
                     OffererTradeProcessModel processModel = createOffererTradeProcessModel(offer);
-                    OffererTrade offererTrade = new OffererTrade(offer, processModel, pendingTradesStorage);
+                    OffererTrade offererTrade = new OffererTrade(offer, processModel, openOfferTradesStorage);
                     openOfferTrades.add(offererTrade);
 
                     offererTrade.processStateProperty().addListener((ov, oldValue, newValue) -> {
@@ -229,6 +252,7 @@ public class TradeManager {
                                     (message) -> log.error(message),
                                     false);
                             pendingTrades.add(offererTrade);
+                            offererTrade.setStorage(pendingTradesStorage);
                         }
                     });
 
@@ -406,14 +430,14 @@ public class TradeManager {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     private TakerTrade takeAvailableOffer(Coin amount, Offer offer, Peer peer) {
-        TakerTradeProcessModel takerTradeProcessModel = createTakerProcessModel(offer);
+        TakerTradeProcessModel takerTradeProcessModel = createTakerTradeProcessModel(offer);
         TakerTrade takerTrade = new TakerTrade(offer, amount, peer, takerTradeProcessModel, pendingTradesStorage);
         pendingTrades.add(takerTrade);
         return takerTrade;
     }
 
 
-    private TakerTradeProcessModel createTakerProcessModel(Offer offer) {
+    private TakerTradeProcessModel createTakerTradeProcessModel(Offer offer) {
         return new TakerTradeProcessModel(
                 offer,
                 messageService,
@@ -433,8 +457,7 @@ public class TradeManager {
                 blockChainService,
                 signatureService,
                 arbitrationRepository,
-                user,
+                user);
-                storageDir);
     }
 
 

core/src/main/java/io/bitsquare/trade/protocol/trade/TradeProcessModel.java

@@ -40,23 +40,19 @@ public class TradeProcessModel extends Model implements Serializable {
 
     protected static final Logger log = LoggerFactory.getLogger(TradeProcessModel.class);
 
+    public final String id;
+    public final Offer offer;
+    public byte[] arbitratorPubKey;
+
+
+    transient public MessageService messageService;
+    transient public MailboxService mailboxService;
+    transient public WalletService walletService;
+    transient public TradeWalletService tradeWalletService;
+    transient public BlockChainService blockChainService;
+    transient public SignatureService signatureService;
+
     transient public MailboxMessage mailboxMessage;
-    // provided
-    transient public final Offer offer;
-    transient public final MessageService messageService;
-    transient public final MailboxService mailboxService;
-    transient public final WalletService walletService;
-    transient public final BlockChainService blockChainService;
-    transient public final SignatureService signatureService;
-
-    // derived
-    transient public final String id;
-    transient public final TradeWalletService tradeWalletService;
-
-    // get set async when arbitrators are loaded from arbitratorService
-    transient public byte[] arbitratorPubKey;
-
-    // data written/read by tasks
     transient private TradeMessage tradeMessage;
 
     protected TradeProcessModel(Offer offer,

core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/OffererProtocol.java

@@ -62,9 +62,9 @@ public class OffererProtocol implements Protocol {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     public OffererProtocol(OffererTrade model) {
-        log.debug("New BuyerAsOffererProtocol " + this);
+        log.debug("New OffererProtocol " + this);
         this.offererTrade = model;
-        offererTradeProcessModel = offererTrade.getOffererTradeProcessModel();
+        offererTradeProcessModel = offererTrade.getProcessModel();
         messageHandler = this::handleMessage;
 
         offererTradeProcessModel.messageService.addMessageHandler(messageHandler);

core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/models/Offerer.java

@@ -34,16 +34,14 @@ public class Offerer implements Serializable {
     // That object is saved to disc. We need to take care of changes to not break deserialization.
     private static final long serialVersionUID = 1L;
 
-    // Those fields are set at constructor but not declared as final because constructor is not called in case model gets created from a persisted model
+    public FiatAccount fiatAccount;
-    // Declared transient as they will be provided in any case at construction time
+    public String accountId;
-    transient public FiatAccount fiatAccount;
+    public PublicKey p2pSigPubKey;
-    transient public String accountId;
+    public PublicKey p2pEncryptPubKey;
-    transient public PublicKey p2pSigPubKey;
+    public byte[] registrationPubKey;
-    transient public PublicKey p2pEncryptPubKey;
-    transient public byte[] registrationPubKey;
     transient public DeterministicKey registrationKeyPair;
-    transient public AddressEntry addressEntry;
+    public AddressEntry addressEntry;
-    transient public byte[] tradeWalletPubKey;
+    public byte[] tradeWalletPubKey;
 
     // written by tasks
     public byte[] payoutTxSignature;

core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/models/OffererTradeProcessModel.java

@@ -24,11 +24,9 @@ import io.bitsquare.crypto.SignatureService;
 import io.bitsquare.offer.Offer;
 import io.bitsquare.p2p.MailboxService;
 import io.bitsquare.p2p.MessageService;
-import io.bitsquare.storage.Storage;
 import io.bitsquare.trade.protocol.trade.TradeProcessModel;
 import io.bitsquare.user.User;
 
-import java.io.File;
 import java.io.Serializable;
 
 import org.slf4j.Logger;
@@ -40,10 +38,8 @@ public class OffererTradeProcessModel extends TradeProcessModel implements Seria
 
     transient private static final Logger log = LoggerFactory.getLogger(OffererTradeProcessModel.class);
 
-    transient private Storage<OffererTradeProcessModel> storage;
+    public final Taker taker = new Taker();
-
+    public final Offerer offerer = new Offerer();
-    public final Taker taker;
-    public final Offerer offerer;
 
     // written by tasks
     private String takeOfferFeeTxId;
@@ -55,8 +51,7 @@ public class OffererTradeProcessModel extends TradeProcessModel implements Seria
                                     BlockChainService blockChainService,
                                     SignatureService signatureService,
                                     ArbitrationRepository arbitrationRepository,
-                                    User user,
+                                    User user) {
-                                    File storageDir) {
         super(offer,
                 messageService,
                 mailboxService,
@@ -65,22 +60,6 @@ public class OffererTradeProcessModel extends TradeProcessModel implements Seria
                 signatureService,
                 arbitrationRepository);
 
-        this.storage = new Storage<>(storageDir);
-
-        OffererTradeProcessModel persisted = storage.initAndGetPersisted(this, getFileName());
-        if (persisted != null) {
-            log.debug("Model reconstructed form persisted model.");
-
-            setTakeOfferFeeTxId(persisted.takeOfferFeeTxId);
-
-            taker = persisted.taker;
-            offerer = persisted.offerer;
-        }
-        else {
-            taker = new Taker();
-            offerer = new Offerer();
-        }
-
         offerer.registrationPubKey = walletService.getRegistrationAddressEntry().getPubKey();
         offerer.registrationKeyPair = walletService.getRegistrationAddressEntry().getKeyPair();
         offerer.addressEntry = walletService.getAddressEntry(id);
@@ -92,18 +71,6 @@ public class OffererTradeProcessModel extends TradeProcessModel implements Seria
         log.debug("BuyerAsOffererModel addressEntry " + offerer.addressEntry);
     }
 
-    // Get called form taskRunner after each completed task
-    @Override
-    public void persist() {
-        storage.save();
-    }
-
-    @Override
-    public void onComplete() {
-        // Just in case of successful completion we delete our persisted object
-        storage.remove(getFileName());
-    }
-
     public String getTakeOfferFeeTxId() {
         return takeOfferFeeTxId;
     }
@@ -111,8 +78,4 @@ public class OffererTradeProcessModel extends TradeProcessModel implements Seria
     public void setTakeOfferFeeTxId(String takeOfferFeeTxId) {
         this.takeOfferFeeTxId = takeOfferFeeTxId;
     }
-
-    private String getFileName() {
-        return getClass().getSimpleName() + "_" + id;
-    }
 }

core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/CreateAndSignPayoutTx.java

@@ -55,6 +55,7 @@ public class CreateAndSignPayoutTx extends OffererTradeTask {
 
             complete();
         } catch (Throwable t) {
+            t.printStackTrace();
             offererTrade.setThrowable(t);
             failed(t);
         }

core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/CreateOffererDepositTxInputs.java

@@ -47,6 +47,7 @@ public class CreateOffererDepositTxInputs extends OffererTradeTask {
 
             complete();
         } catch (Throwable t) {
+            t.printStackTrace();
             offererTrade.setThrowable(t);
             offererTrade.setLifeCycleState(OffererTrade.OffererLifeCycleState.OFFER_OPEN);
             failed(t);

core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/OffererTradeTask.java

@@ -37,7 +37,7 @@ public class OffererTradeTask extends Task<OffererTrade> {
         super(taskHandler, model);
 
         offererTrade = model;
-        offererTradeProcessModel = offererTrade.getOffererTradeProcessModel();
+        offererTradeProcessModel = offererTrade.getProcessModel();
     }
 
     @Override

core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessPayoutTxPublishedMessage.java

@@ -45,6 +45,7 @@ public class ProcessPayoutTxPublishedMessage extends OffererTradeTask {
 
             complete();
         } catch (Throwable t) {
+            t.printStackTrace();
             offererTrade.setThrowable(t);
             failed(t);
         }

core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestDepositTxInputsMessage.java

@@ -46,6 +46,7 @@ public class ProcessRequestDepositTxInputsMessage extends OffererTradeTask {
 
             complete();
         } catch (Throwable t) {
+            t.printStackTrace();
             offererTrade.setThrowable(t);
             offererTrade.setLifeCycleState(OffererTrade.OffererLifeCycleState.OFFER_OPEN);
             failed(t);

core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestOffererPublishDepositTxMessage.java

@@ -53,6 +53,7 @@ public class ProcessRequestOffererPublishDepositTxMessage extends OffererTradeTa
 
             complete();
         } catch (Throwable t) {
+            t.printStackTrace();
             offererTrade.setThrowable(t);
             offererTrade.setLifeCycleState(OffererTrade.OffererLifeCycleState.OFFER_OPEN);
             failed(t);

core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/RequestTakerDepositPayment.java

@@ -62,6 +62,7 @@ public class RequestTakerDepositPayment extends OffererTradeTask {
                 }
             });
         } catch (Throwable t) {
+            t.printStackTrace();
             offererTrade.setThrowable(t);
             offererTrade.setLifeCycleState(OffererTrade.OffererLifeCycleState.OFFER_OPEN);
             failed(t);

core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendBankTransferStartedMessage.java

@@ -61,6 +61,7 @@ public class SendBankTransferStartedMessage extends OffererTradeTask {
                         }
                     });
         } catch (Throwable t) {
+            t.printStackTrace();
             offererTrade.setThrowable(t);
             failed(t);
         }

core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendDepositTxToTaker.java

@@ -53,6 +53,7 @@ public class SendDepositTxToTaker extends OffererTradeTask {
                 }
             });
         } catch (Throwable t) {
+            t.printStackTrace();
             offererTrade.setThrowable(t);
             failed(t);
         }

core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignAndPublishDepositTx.java

@@ -65,12 +65,14 @@ public class SignAndPublishDepositTx extends OffererTradeTask {
 
                         @Override
                         public void onFailure(@NotNull Throwable t) {
+                            t.printStackTrace();
                             offererTrade.setThrowable(t);
                             offererTrade.setLifeCycleState(OffererTrade.OffererLifeCycleState.OFFER_OPEN);
                             failed(t);
                         }
                     });
         } catch (Throwable t) {
+            t.printStackTrace();
             offererTrade.setThrowable(t);
             offererTrade.setLifeCycleState(OffererTrade.OffererLifeCycleState.OFFER_OPEN);
             failed(t);

core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyAndSignContract.java

@@ -55,6 +55,7 @@ public class VerifyAndSignContract extends OffererTradeTask {
 
             complete();
         } catch (Throwable t) {
+            t.printStackTrace();
             offererTrade.setThrowable(t);
             offererTrade.setLifeCycleState(OffererTrade.OffererLifeCycleState.OFFER_OPEN);
             failed(t);

core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakeOfferFeePayment.java

@@ -41,6 +41,7 @@ public class VerifyTakeOfferFeePayment extends OffererTradeTask {
 
             complete();
         } catch (Throwable t) {
+            t.printStackTrace();
             offererTrade.setThrowable(t);
             failed(t);
         }

core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakerAccount.java

@@ -49,6 +49,7 @@ public class VerifyTakerAccount extends OffererTradeTask {
                 offererTrade.setLifeCycleState(OffererTrade.OffererLifeCycleState.OFFER_OPEN);
             }
         } catch (Throwable t) {
+            t.printStackTrace();
             offererTrade.setThrowable(t);
             offererTrade.setLifeCycleState(OffererTrade.OffererLifeCycleState.OFFER_OPEN);
             failed(t);

core/src/main/java/io/bitsquare/trade/protocol/trade/taker/TakerProtocol.java

@@ -64,7 +64,7 @@ public class TakerProtocol implements Protocol {
     public TakerProtocol(TakerTrade takerTrade) {
         log.debug("New SellerAsTakerProtocol " + this);
         this.takerTrade = takerTrade;
-        takerTradeProcessModel = takerTrade.getTakerTradeProcessModel();
+        takerTradeProcessModel = takerTrade.getProcessModel();
         
         messageHandler = this::handleMessage;
         takerTradeProcessModel.messageService.addMessageHandler(messageHandler);

core/src/main/java/io/bitsquare/trade/protocol/trade/taker/models/Taker.java

@@ -35,16 +35,14 @@ public class Taker implements Serializable {
     // That object is saved to disc. We need to take care of changes to not break deserialization.
     private static final long serialVersionUID = 1L;
 
-    // Those fields are set at constructor but not declared as final because constructor is not called in case model gets created from a persisted model
+    public FiatAccount fiatAccount;
-    // Declared transient as they will be provided in any case at construction time
+    public String accountId;
-    transient public FiatAccount fiatAccount;
+    public PublicKey p2pSigPubKey;
-    transient public String accountId;
+    public PublicKey p2pEncryptPublicKey;
-    transient public PublicKey p2pSigPubKey;
+    public byte[] registrationPubKey; // TODO not read yet, missing impl.
-    transient public PublicKey p2pEncryptPublicKey;
-    transient public byte[] registrationPubKey; // TODO not read yet, missing impl.
     transient public DeterministicKey registrationKeyPair;
-    transient public AddressEntry addressEntry;
+    public AddressEntry addressEntry;
-    transient public byte[] tradeWalletPubKey;
+    public byte[] tradeWalletPubKey;
 
     // written by tasks
     public List<TransactionOutput> connectedOutputsForAllInputs;

core/src/main/java/io/bitsquare/trade/protocol/trade/taker/models/TakerTradeProcessModel.java

@@ -66,22 +66,6 @@ public class TakerTradeProcessModel extends TradeProcessModel implements Seriali
                 signatureService,
                 arbitrationRepository);
 
-
-        /*TakerProcessModel persisted = storage.initAndGetPersisted(this, getFileName());
-        if (persisted != null) {
-            log.debug("Model reconstructed from persisted model.");
-
-            setTakeOfferFeeTx(persisted.getTakeOfferFeeTx());
-            setPayoutTx(persisted.payoutTx);
-
-            taker = persisted.taker;
-            offerer = persisted.offerer;
-        }
-        else {
-            taker = new Taker();
-            offerer = new Offerer();
-        }*/
-
         taker.registrationPubKey = walletService.getRegistrationAddressEntry().getPubKey();
         taker.registrationKeyPair = walletService.getRegistrationAddressEntry().getKeyPair();
         taker.addressEntry = walletService.getAddressEntry(id);
@@ -92,18 +76,6 @@ public class TakerTradeProcessModel extends TradeProcessModel implements Seriali
         taker.tradeWalletPubKey = taker.addressEntry.getPubKey();
     }
 
-    // Get called form taskRunner after each completed task
- /*   @Override
-    public void persist() {
-        storage.save();
-    }
-
-    @Override
-    public void onComplete() {
-        // Just in case of successful completion we delete our persisted object
-        storage.remove(getFileName());
-    }*/
-
     public Transaction getTakeOfferFeeTx() {
         return takeOfferFeeTx;
     }
@@ -120,8 +92,4 @@ public class TakerTradeProcessModel extends TradeProcessModel implements Seriali
         this.payoutTx = payoutTx;
     }
 
-    /*private String getFileName() {
-        return getClass().getSimpleName() + "_" + id;
-    }*/
-
 }

core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/BroadcastTakeOfferFeeTx.java

@@ -52,6 +52,7 @@ public class BroadcastTakeOfferFeeTx extends TakerTradeTask {
 
                         @Override
                         public void onFailure(@NotNull Throwable t) {
+                            t.printStackTrace();
                             appendToErrorMessage("Take offer fee payment failed. Maybe your network connection was lost. Please try again.");
                             takerTrade.setErrorMessage(errorMessage);
                             takerTrade.setProcessState(TakerTrade.TakerProcessState.TAKE_OFFER_FEE_PUBLISH_FAILED);
@@ -60,6 +61,7 @@ public class BroadcastTakeOfferFeeTx extends TakerTradeTask {
                         }
                     });
         } catch (Throwable t) {
+            t.printStackTrace();
             takerTrade.setThrowable(t);
             failed(t);
         }

core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignContract.java

@@ -54,6 +54,7 @@ public class CreateAndSignContract extends TakerTradeTask {
 
             complete();
         } catch (Throwable t) {
+            t.printStackTrace();
             takerTrade.setThrowable(t);
             failed(t);
         }

core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateTakeOfferFeeTx.java

@@ -42,6 +42,7 @@ public class CreateTakeOfferFeeTx extends TakerTradeTask {
 
             complete();
         } catch (Throwable t) {
+            t.printStackTrace();
             takerTrade.setThrowable(t);
             failed(t);
         }

core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessDepositTxPublishedMessage.java

@@ -45,6 +45,7 @@ public class ProcessDepositTxPublishedMessage extends TakerTradeTask {
 
             complete();
         } catch (Throwable t) {
+            t.printStackTrace();
             takerTrade.setThrowable(t);
             failed(t);
         }

core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessFiatTransferStartedMessage.java

@@ -48,6 +48,7 @@ public class ProcessFiatTransferStartedMessage extends TakerTradeTask {
 
             complete();
         } catch (Throwable t) {
+            t.printStackTrace();
             takerTrade.setThrowable(t);
             failed(t);
         }

core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessRequestTakerDepositPaymentMessage.java

@@ -51,6 +51,7 @@ public class ProcessRequestTakerDepositPaymentMessage extends TakerTradeTask {
 
             complete();
         } catch (Throwable t) {
+            t.printStackTrace();
             takerTrade.setThrowable(t);
             failed(t);
         }

core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendPayoutTxToOfferer.java

@@ -56,6 +56,7 @@ public class SendPayoutTxToOfferer extends TakerTradeTask {
                         }
                     });
         } catch (Throwable t) {
+            t.printStackTrace();
             takerTrade.setThrowable(t);
             failed(t);
         }

core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendRequestDepositTxInputsMessage.java

@@ -74,6 +74,7 @@ public class SendRequestDepositTxInputsMessage extends TakerTradeTask {
                 }
             });
         } catch (Throwable t) {
+            t.printStackTrace();
             takerTrade.setThrowable(t);
             failed(t);
         }

core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendSignedTakerDepositTx.java

@@ -65,6 +65,7 @@ public class SendSignedTakerDepositTx extends TakerTradeTask {
                 }
             });
         } catch (Throwable t) {
+            t.printStackTrace();
             takerTrade.setThrowable(t);
             failed(t);
         }

core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SignAndPublishPayoutTx.java

@@ -60,11 +60,13 @@ public class SignAndPublishPayoutTx extends TakerTradeTask {
 
                         @Override
                         public void onFailure(@NotNull Throwable t) {
+                            t.printStackTrace();
                             takerTrade.setThrowable(t);
                             failed(t);
                         }
                     });
         } catch (Throwable t) {
+            t.printStackTrace();
             takerTrade.setThrowable(t);
             failed(t);
         }

core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCommitDepositTx.java

@@ -42,6 +42,7 @@ public class TakerCommitDepositTx extends TakerTradeTask {
 
             complete();
         } catch (Throwable t) {
+            t.printStackTrace();
             takerTrade.setThrowable(t);
             failed(t);
         }

core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCreatesAndSignsDepositTx.java

@@ -57,6 +57,7 @@ public class TakerCreatesAndSignsDepositTx extends TakerTradeTask {
 
             complete();
         } catch (Throwable t) {
+            t.printStackTrace();
             takerTrade.setThrowable(t);
             failed(t);
         }

core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerTradeTask.java

@@ -37,7 +37,7 @@ public class TakerTradeTask extends Task<TakerTrade> {
         super(taskHandler, model);
 
         takerTrade = model;
-        takerTradeProcessModel = takerTrade.getTakerTradeProcessModel();
+        takerTradeProcessModel = takerTrade.getProcessModel();
     }
 
     @Override

core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOfferFeePayment.java

@@ -40,6 +40,7 @@ public class VerifyOfferFeePayment extends TakerTradeTask {
         }*/
             complete();
         } catch (Throwable t) {
+            t.printStackTrace();
             takerTrade.setThrowable(t);
             failed(t);
         }

core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOffererAccount.java

@@ -34,7 +34,8 @@ public class VerifyOffererAccount extends TakerTradeTask {
     protected void doRun() {
         try {
             if (takerTradeProcessModel.blockChainService.verifyAccountRegistration()) {
-                if (takerTradeProcessModel.blockChainService.isAccountBlackListed(takerTradeProcessModel.offerer.accountId, takerTradeProcessModel.offerer.fiatAccount)) {
+                if (takerTradeProcessModel.blockChainService.isAccountBlackListed(takerTradeProcessModel.offerer.accountId, takerTradeProcessModel.offerer
+                        .fiatAccount)) {
                     failed("Taker is blacklisted.");
                 }
                 else {
@@ -45,6 +46,7 @@ public class VerifyOffererAccount extends TakerTradeTask {
                 failed("Account registration validation for peer faultHandler.onFault.");
             }
         } catch (Throwable t) {
+            t.printStackTrace();
             takerTrade.setThrowable(t);
             failed(t);
         }

core/src/main/java/io/bitsquare/user/AccountSettings.java

@@ -78,7 +78,7 @@ public class AccountSettings implements Serializable {
     public void addAcceptedLanguageLocale(String localeCode) {
         if (!acceptedLanguageLocaleCodes.contains(localeCode)) {
             acceptedLanguageLocaleCodes.add(localeCode);
-            storage.save();
+            storage.queueUpForSave();
         }
     }
 
@@ -89,7 +89,7 @@ public class AccountSettings implements Serializable {
     public void addAcceptedCountry(Country locale) {
         if (!acceptedCountryLocales.contains(locale)) {
             acceptedCountryLocales.add(locale);
-            storage.save();
+            storage.queueUpForSave();
         }
     }
 
@@ -100,13 +100,13 @@ public class AccountSettings implements Serializable {
     public void addAcceptedArbitrator(Arbitrator arbitrator) {
         if (!acceptedArbitrators.contains(arbitrator)) {
             acceptedArbitrators.add(arbitrator);
-            storage.save();
+            storage.queueUpForSave();
         }
     }
 
     public void removeAcceptedArbitrator(Arbitrator item) {
         acceptedArbitrators.remove(item);
-        storage.save();
+        storage.queueUpForSave();
     }
 
 

core/src/main/java/io/bitsquare/user/Preferences.java

@@ -81,15 +81,15 @@ public class Preferences implements Serializable {
         // Use that to guarantee update of the serializable field and to make a storage update in case of a change
         btcDenominationProperty.addListener((ov) -> {
             btcDenomination = btcDenominationProperty.get();
-            storage.save();
+            storage.queueUpForSave();
         });
         useAnimationsProperty.addListener((ov) -> {
             useAnimations = useAnimationsProperty.get();
-            storage.save();
+            storage.queueUpForSave();
         });
         useEffectsProperty.addListener((ov) -> {
             useEffects = useEffectsProperty.get();
-            storage.save();
+            storage.queueUpForSave();
         });
     }
 
@@ -112,7 +112,7 @@ public class Preferences implements Serializable {
 
     public void setDisplaySecurityDepositInfo(Boolean displaySecurityDepositInfo) {
         this.displaySecurityDepositInfo = displaySecurityDepositInfo;
-        storage.save();
+        storage.queueUpForSave();
     }
 
 

core/src/main/java/io/bitsquare/user/User.java

@@ -98,15 +98,15 @@ public class User implements Serializable {
                 Throwables.propagate(e);
             }
         }
-        storage.save();
+        storage.queueUpForSave();
         // Use that to guarantee update of the serializable field and to make a storage update in case of a change
         fiatAccountsObservableList.addListener((ListChangeListener<FiatAccount>) change -> {
             fiatAccounts = new ArrayList<>(fiatAccountsObservableList);
-            storage.save();
+            storage.queueUpForSave();
         });
         currentFiatAccountProperty.addListener((ov) -> {
             currentFiatAccount = currentFiatAccountProperty.get();
-            storage.save();
+            storage.queueUpForSave();
         });
     }
 
@@ -153,7 +153,7 @@ public class User implements Serializable {
     // Public key from the input for the registration payment tx (or address) will be used
     public void setAccountID(String accountID) {
         this.accountID = accountID;
-        storage.save();
+        storage.queueUpForSave();
     }
 
     public void setCurrentFiatAccountProperty(@Nullable FiatAccount fiatAccount) {

core/src/main/resources/logback.xml

@@ -29,6 +29,8 @@
     </root>
 
     <logger name="io.bitsquare" level="TRACE"/>
+    <logger name="io.bitsquare.btc.AddressBasedCoinSelector" level="OFF"/>
+    
     <logger name="io.bitsquare.gui.util.Profiler" level="ERROR"/>
   <!--  <logger name="io.bitsquare.persistence.Persistence" level="ERROR"/>-->
     <logger name="io.bitsquare.locale.BSResources" level="ERROR"/>