Merge pull request #144 from thirdweb-dev/vt-abicache-conc-writes

fix: concurrent writes to abi cache

Author: vernonjohnson

internal/common/abi.go

@@ -5,21 +5,26 @@ import (
 	"net/http"
 	"regexp"
 	"strings"
+	"sync"
 
 	config "github.com/thirdweb-dev/indexer/configs"
 
 	"github.com/ethereum/go-ethereum/accounts/abi"
 )
 
-func GetABIForContractWithCache(chainId string, contract string, abiCache map[string]*abi.ABI) *abi.ABI {
+func GetABIForContractWithCache(chainId string, contract string, abiCache map[string]*abi.ABI, mut *sync.Mutex) *abi.ABI {
 	abi, ok := abiCache[contract]
 	if !ok {
 		abiResult, err := GetABIForContract(chainId, contract)
 		if err != nil {
+			mut.Lock()
 			abiCache[contract] = nil
+			mut.Unlock()
 			return nil
 		} else {
+			mut.Lock()
 			abiCache[contract] = abiResult
+			mut.Unlock()
 			abi = abiResult
 		}
 	}

internal/common/log.go

@@ -44,9 +44,9 @@ func DecodeLogs(chainId string, logs []Log) []*DecodedLog {
 	decodedLogs := make([]*DecodedLog, len(logs))
 	abiCache := make(map[string]*abi.ABI)
 
-	decodeLogFunc := func(eventLog *Log) *DecodedLog {
+	decodeLogFunc := func(eventLog *Log, mut *sync.Mutex) *DecodedLog {
 		decodedLog := DecodedLog{Log: *eventLog}
-		abi := GetABIForContractWithCache(chainId, eventLog.Address, abiCache)
+		abi := GetABIForContractWithCache(chainId, eventLog.Address, abiCache, mut)
 		if abi == nil {
 			return &decodedLog
 		}
@@ -63,13 +63,14 @@ func DecodeLogs(chainId string, logs []Log) []*DecodedLog {
 	}
 
 	var wg sync.WaitGroup
+	var mut sync.Mutex
 	for idx, eventLog := range logs {
 		wg.Add(1)
-		go func(idx int, eventLog Log) {
+		go func(idx int, eventLog Log, mut *sync.Mutex) {
 			defer wg.Done()
-			decodedLog := decodeLogFunc(&eventLog)
+			decodedLog := decodeLogFunc(&eventLog, mut)
 			decodedLogs[idx] = decodedLog
-		}(idx, eventLog)
+		}(idx, eventLog, &mut)
 	}
 	wg.Wait()
 	return decodedLogs

internal/common/transaction.go

@@ -56,9 +56,9 @@ type DecodedTransaction struct {
 func DecodeTransactions(chainId string, txs []Transaction) []*DecodedTransaction {
 	decodedTxs := make([]*DecodedTransaction, len(txs))
 	abiCache := make(map[string]*abi.ABI)
-	decodeTxFunc := func(transaction *Transaction) *DecodedTransaction {
+	decodeTxFunc := func(transaction *Transaction, mut *sync.Mutex) *DecodedTransaction {
 		decodedTransaction := DecodedTransaction{Transaction: *transaction}
-		abi := GetABIForContractWithCache(chainId, transaction.ToAddress, abiCache)
+		abi := GetABIForContractWithCache(chainId, transaction.ToAddress, abiCache, mut)
 		if abi == nil {
 			return &decodedTransaction
 		}
@@ -84,13 +84,14 @@ func DecodeTransactions(chainId string, txs []Transaction) []*DecodedTransaction
 	}
 
 	var wg sync.WaitGroup
+	mut := &sync.Mutex{}
 	for idx, transaction := range txs {
 		wg.Add(1)
-		go func(idx int, transaction Transaction) {
+		go func(idx int, transaction Transaction, mut *sync.Mutex) {
 			defer wg.Done()
-			decodedTx := decodeTxFunc(&transaction)
+			decodedTx := decodeTxFunc(&transaction, mut)
 			decodedTxs[idx] = decodedTx
-		}(idx, transaction)
+		}(idx, transaction, mut)
 	}
 	wg.Wait()
 	return decodedTxs