Fix: deadlock

cmd/metadata/models/contract_metadata.go

@@ -2,6 +2,7 @@ package models
 
 import (
 	"context"
+	"sync"
 	"time"
 
 	"github.com/dipdup-net/go-lib/database"
@@ -87,11 +88,13 @@ func (cm *ContractMetadata) BeforeUpdate(ctx context.Context) (context.Context,
 // Contracts -
 type Contracts struct {
 	db *database.PgGo
+
+	mx sync.Mutex
 }
 
 // NewContracts -
 func NewContracts(db *database.PgGo) *Contracts {
-	return &Contracts{db}
+	return &Contracts{db: db}
 }
 
 // Get -
@@ -116,6 +119,9 @@ func (contracts *Contracts) Update(metadata []*ContractMetadata) error {
 		return nil
 	}
 
+	contracts.mx.Lock()
+	defer contracts.mx.Unlock()
+
 	_, err := contracts.db.DB().Model(&metadata).Column("metadata", "update_id", "status", "retry_count", "error").WherePK().Update()
 	return err
 }
@@ -138,6 +144,9 @@ func (contracts *Contracts) Save(metadata []*ContractMetadata) error {
 		return nil
 	}
 
+	contracts.mx.Lock()
+	defer contracts.mx.Unlock()
+
 	_, err := contracts.db.DB().Model(&savings).
 		OnConflict("(network, contract) DO UPDATE").
 		Set("metadata = excluded.metadata, link = excluded.link, update_id = excluded.update_id, status = excluded.status").

cmd/metadata/models/token_metadata.go

@@ -3,6 +3,7 @@ package models
 import (
 	"context"
 	"fmt"
+	"sync"
 	"time"
 
 	"github.com/dipdup-net/go-lib/database"
@@ -99,11 +100,13 @@ type TokenRepository interface {
 // Tokens -
 type Tokens struct {
 	db *database.PgGo
+
+	mx sync.Mutex
 }
 
 // NewTokens -
 func NewTokens(db *database.PgGo) *Tokens {
-	return &Tokens{db}
+	return &Tokens{db: db}
 }
 
 // Get -
@@ -128,6 +131,9 @@ func (tokens *Tokens) Update(metadata []*TokenMetadata) error {
 		return nil
 	}
 
+	tokens.mx.Lock()
+	defer tokens.mx.Unlock()
+
 	_, err := tokens.db.DB().Model(&metadata).Column("metadata", "update_id", "status", "retry_count", "error").WherePK().Update()
 	return err
 }
@@ -152,6 +158,9 @@ func (tokens *Tokens) Save(metadata []*TokenMetadata) error {
 		return nil
 	}
 
+	tokens.mx.Lock()
+	defer tokens.mx.Unlock()
+
 	_, err := tokens.db.DB().Model(&savings).
 		OnConflict("(network, contract, token_id) DO UPDATE").
 		Set("metadata = excluded.metadata, link = excluded.link, update_id = excluded.update_id, status = excluded.status").