From c5223c4c0b86fa60e27228fb2f85ee7d2ac08ad6 Mon Sep 17 00:00:00 2001 From: Major Date: Tue, 20 Jun 2023 20:57:23 +0200 Subject: [PATCH] fix: db sync --- common/store/store.setter.go | 8 ++++++++ external/vaults/route.vaults.one.go | 2 +- internal/events/filterStrategyAdded.go | 5 +++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/common/store/store.setter.go b/common/store/store.setter.go index 5f9a266bd..fa3a676b0 100644 --- a/common/store/store.setter.go +++ b/common/store/store.setter.go @@ -318,6 +318,14 @@ func StoreStrategies(chainID uint64, strat models.TStrategyAdded) { } } +/************************************************************************************************** +** AppendInStrategyMap will add a new vault in the _strategiesSyncMap +**************************************************************************************************/ +func AppendInStrategyMap(chainID uint64, strat models.TStrategyAdded) { + syncMap := _strategiesSyncMap[chainID] + syncMap.Store(strat.StrategyAddress, strat) +} + /************************************************************************************************** ** StoreSyncRegistry will store the sync status indicating we went up to the block number to check ** for new vaults. diff --git a/external/vaults/route.vaults.one.go b/external/vaults/route.vaults.one.go index bc27319c5..53d46625b 100755 --- a/external/vaults/route.vaults.one.go +++ b/external/vaults/route.vaults.one.go @@ -34,11 +34,11 @@ func (y Controller) GetVault(c *gin.Context) { vaultStrategies := strategies.ListStrategiesForVault(chainID, currentVault.Address) newVault.Strategies = []*TStrategy{} + for _, strategy := range vaultStrategies { var externalStrategy *TStrategy strategyWithDetails := NewStrategy().AssignTStrategy(strategy) if !strategyWithDetails.ShouldBeIncluded(strategiesCondition) { - // logs.Pretty(`SHOULD NOT BE INCLUDED`, strategyWithDetails) continue } diff --git a/internal/events/filterStrategyAdded.go b/internal/events/filterStrategyAdded.go index 1280f1b82..431086c16 100644 --- a/internal/events/filterStrategyAdded.go +++ b/internal/events/filterStrategyAdded.go @@ -386,7 +386,7 @@ func HandleStrategyAdded( strategies[vaultAddressParsed][strategyAddressParsed] = valueParsed valueParsed.ChainID = chainID allStrategiesList = append(allStrategiesList, valueParsed) - go store.StoreStrategies(chainID, valueParsed) + store.StoreStrategies(chainID, valueParsed) count++ return true }) @@ -431,7 +431,7 @@ func HandleStrategyAdded( newStrategy.VaultVersion = vaultsMap[vaultAddressParsed].APIVersion strategies[vaultAddressParsed][newStrategyAddressParsed] = newStrategy allStrategiesList = append(allStrategiesList, newStrategy) - go store.StoreStrategies(chainID, newStrategy) + store.StoreStrategies(chainID, newStrategy) count++ return true }) @@ -440,5 +440,6 @@ func HandleStrategyAdded( allStrategiesList = append(allStrategiesList, strat) } + logs.Info(`DONE HERE`) return allStrategiesList }