haskoin-store 1.5.2 → 1.5.4

raw patch · 3 files changed

+9/−21 lines, 3 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

app/Main.hs +1/−12
haskoin-store.cabal +1/−1
src/Haskoin/Store/Cache.hs +7/−8

app/Main.hs view

@@ -194,7 +194,7 @@   statsdAggregates <-     env "STATSD_AGGREGATES" False parseBool   statsdPrefix <--    getStatsdPrefix+    env "STATSD_PREFIX" "haskoin_store" pure   tickerRefresh <-     env "TICKER_REFRESH" (90 * 1000 * 1000) readMaybe   tickerURL <-@@ -235,17 +235,6 @@       txTimeout <-         env "TX_TIMEOUT" d.txTimeout readMaybe       return WebLimits {..}-    getStatsdPrefix = do-      let go = prefix <|> nomad-          prefix =-            MaybeT $ lookupEnv "STATSD_PREFIX"-          nomad = do-            task <--              MaybeT $ lookupEnv "NOMAD_TASK_NAME"-            service <--              MaybeT $ lookupEnv "NOMAD_ALLOC_INDEX"-            return $ "app." <> task <> "." <> service-      fromMaybe "haskoin_store" <$> runMaybeT go  netNames :: String netNames = intercalate "|" $ map (.name) allNets

haskoin-store.cabal view

@@ -5,7 +5,7 @@ -- see: https://github.com/sol/hpack  name:           haskoin-store-version:        1.5.2+version:        1.5.4 synopsis:       Storage and index for Bitcoin and Bitcoin Cash description:    Please see the README on GitHub at <https://github.com/haskoin/haskoin-store#readme> category:       Bitcoin, Finance, Network

src/Haskoin/Store/Cache.hs view

@@ -772,14 +772,14 @@       refreshLock  pruneDB ::-  (MonadLoggerIO m, StoreReadBase m) => CacheX m ()+  (MonadUnliftIO m, MonadLoggerIO m, StoreReadBase m) => CacheX m () pruneDB = do   x <- asks (.maxKeys)   s <- runRedis Redis.dbsize   $(logDebugS) "Cache" "Pruning old xpubs"-  when (s > x) $+  when (s > x) . void . withLock $     void . delXPubKeys . map fst-      =<< runRedis (getFromSortedSet maxKey Nothing 0 32)+      =<< runRedis (getFromSortedSet maxKey Nothing 0 (fromIntegral (s - x)))  touchKeys :: (MonadLoggerIO m) => [XPubSpec] -> CacheX m () touchKeys xpubs = do@@ -797,14 +797,17 @@   CacheX m () cacheWriterReact CacheNewBlock = do   $(logDebugS) "Cache" "Received new block event"+  pruneDB   newBlockC   syncMempoolC cacheWriterReact (CacheNewTx txid) = do   $(logDebugS) "Cache" $     "Received new transaction event: " <> txHashToHex txid+  pruneDB   syncNewTxC [txid] cacheWriterReact (CacheSyncMempool l) = do   $(logDebugS) "Cache" "Received sync mempool event"+  pruneDB   newBlockC   syncMempoolC   atomically $ l ()@@ -857,11 +860,7 @@     should_index =       asks (.minAddrs) >>= \x ->         if x <= lenNotNull xbals-          then-            inSync >>= \s ->-              if s-                then pruneDB >> return True-                else return False+          then inSync           else return False     key = idxPfx <> encode xpub     opts =