Merge pull request #108 from republicprotocol/develop

Hotfix for order confirmed but not settled

Author: loongy

cmd/darknode/darknode.go

@@ -290,7 +290,9 @@ func main() {
 			// Prune the database every hour and update the network with the
 			// darknode address
 			for {
-				time.Sleep(time.Hour)
+				sleepTime := 50 + rand.Intn(20)
+				time.Sleep(time.Duration(sleepTime) * time.Minute)
+
 				if err := pingNetwork(swarmer); err != nil {
 					log.Printf("[error] (prune) cannot ping network: %v", err)
 					continue

crypto/keystore.go

@@ -60,7 +60,7 @@ func RandomKeystore() (Keystore, error) {
 
 // NewKeystore returns a new Keystore that stores an EcdsaKey and an RsaKey and
 // has a randomly generated UUID.
-func (keystore *Keystore) NewKeystore(ecdsaKey EcdsaKey, rsaKey RsaKey) Keystore {
+func NewKeystore(ecdsaKey EcdsaKey, rsaKey RsaKey) Keystore {
 	return Keystore{
 		ID:       uuid.NewRandom(),
 		Version:  "3",

ome/confirmer.go

@@ -44,7 +44,7 @@ type confirmer struct {
 // NewConfirmer returns a Confirmer that submits Computations to the
 // Orderbook for confirmation. It polls the Orderbook on an interval
 // and checks for consensus on confirmations by waiting until a submitted
-// Computation has been confirmed has the confirmation has passed the block
+// Computation has been confirmed and the confirmation has passed the block
 // depth limit.
 func NewConfirmer(computationStore ComputationStorer, fragmentStore OrderFragmentStorer, contract ContractBinder, orderbookPollInterval time.Duration, orderbookBlockDepth uint) Confirmer {
 	return &confirmer{
@@ -84,35 +84,35 @@ func (confirmer *confirmer) Confirm(done <-chan struct{}, coms <-chan Computatio
 					return
 				}
 
-				go func() {
-
-					// Wait for the confirmation of these orders to pass the depth
-					// limit
+				// Wait for the confirmation of these orders to pass the depth
+				// limit
+				func(com Computation) {
 					confirmer.confirmingMu.Lock()
+					defer confirmer.confirmingMu.Unlock()
+
 					// Check that these orders have not already been confirmed
 					if _, ok := confirmer.confirmed[com.Buy.OrderID]; ok {
-						confirmer.confirmingMu.Unlock()
 						return
 					}
 					if _, ok := confirmer.confirmed[com.Sell.OrderID]; ok {
-						confirmer.confirmingMu.Unlock()
 						return
 					}
 
 					confirmer.confirmingBuyOrders[com.Buy.OrderID] = time.Now()
 					confirmer.confirmingSellOrders[com.Sell.OrderID] = time.Now()
-					confirmer.confirmingMu.Unlock()
 
 					// Confirm Computations on the blockchain and register them for
 					// observation (we need to wait for finality)
-					if err := confirmer.beginConfirmation(com); err != nil {
-						// An error in confirmation should not stop the
-						// Confirmer from monitoring the Computation for
-						// confirmation (another node might have succeeded), so
-						// we pass through
-						logger.Error(err.Error())
-					}
-				}()
+					go func() {
+						if err := confirmer.beginConfirmation(com); err != nil {
+							// An error in confirmation should not stop the
+							// Confirmer from monitoring the Computation for
+							// confirmation (another node might have succeeded), so
+							// we pass through
+							logger.Error(err.Error())
+						}
+					}()
+				}(com)
 			}
 		}
 	}()