Fix data race on service Proposal

Signed-off-by: Anton Litvinov <[email protected]>

core/service/pool.go

@@ -20,6 +20,7 @@ package service
 import (
 	"sync"
 
+	"github.com/jinzhu/copier"
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog/log"
 
@@ -149,13 +150,15 @@ func NewInstance(
 
 // Instance represents a run service
 type Instance struct {
-	ID              ID
-	state           servicestate.State
-	stateLock       sync.RWMutex
-	ProviderID      identity.Identity
-	Type            string
-	Options         Options
-	service         Service
+	ID         ID
+	state      servicestate.State
+	stateLock  sync.RWMutex
+	ProviderID identity.Identity
+	Type       string
+	Options    Options
+	service    Service
+
+	muProposal      sync.Mutex
 	Proposal        market.ServiceProposal
 	policyProvider  policy.Provider
 	discovery       Discovery
@@ -189,7 +192,9 @@ func (i *Instance) proposalWithCurrentLocation() market.ServiceProposal {
 		return i.Proposal
 	}
 
+	i.muProposal.Lock()
 	i.Proposal.Location = *market.NewLocation(location)
+	i.muProposal.Unlock()
 
 	return i.Proposal
 }
@@ -237,3 +242,16 @@ func (i *Instance) toEvent() servicestate.AppEventServiceStatus {
 		Status:     string(i.state),
 	}
 }
+
+// CopyProposal returns a copy of Proposal
+func (i *Instance) CopyProposal() market.ServiceProposal {
+	i.muProposal.Lock()
+	defer i.muProposal.Unlock()
+
+	var proposal market.ServiceProposal
+	if err := copier.CopyWithOption(&proposal, i.Proposal, copier.Option{DeepCopy: true}); err != nil {
+		panic(err)
+	}
+
+	return proposal
+}

core/state/state.go

@@ -240,9 +240,10 @@ func (k *Keeper) updateServices() {
 		// merge in the connection statistics
 		match, _ := k.getServiceByID(string(v.ID))
 
-		priced, err := k.deps.ProposalPricer.EnrichProposalWithPrice(v.Proposal)
+		proposal := v.CopyProposal()
+		priced, err := k.deps.ProposalPricer.EnrichProposalWithPrice(proposal)
 		if err != nil {
-			log.Warn().Msgf("could not load price for proposal %v(%v)", v.Proposal.ProviderID, v.Proposal.ServiceType)
+			log.Warn().Msgf("could not load price for proposal %v(%v)", proposal.ProviderID, proposal.ServiceType)
 		}
 
 		prop := contract.NewProposalDTO(priced)