Merge pull request #99 from input-output-hk/KtorZ/cardano-db-sync-bump-6.0.0

upgrade cardano-db-sync's dependency to 6.x.x

Author: KtorZ

cabal.project

@@ -3,6 +3,7 @@ version: "3.5"
 services:
   postgres:
     image: postgres:11.5-alpine
+    command: postgres -c 'max_pred_locks_per_transaction=128' -c 'max_locks_per_transaction=128'
     environment:
       - POSTGRES_LOGGING=true
       - POSTGRES_DB_FILE=/run/secrets/postgres_db
@@ -14,6 +15,8 @@ services:
       - postgres_db
     volumes:
       - postgres:/var/lib/postgresql/data
+    ports:
+      - 5432:5432
     restart: on-failure
     logging:
       driver: "json-file"
@@ -22,7 +25,7 @@ services:
         max-file: "20"
 
   cardano-node:
-    image: inputoutput/cardano-node:${CARDANO_NODE_VERSION:-1.18.0}
+    image: inputoutput/cardano-node:${CARDANO_NODE_VERSION:-1.21.1}
     environment:
       - NETWORK=${NETWORK:-mainnet}
     volumes:
@@ -35,7 +38,7 @@ services:
         max-file: "10"
 
   cardano-db-sync:
-    image: inputoutput/cardano-db-sync:${CARDANO_DB_SYNC_VERSION:-3.1.0}
+    image: inputoutput/cardano-db-sync:${CARDANO_DB_SYNC_VERSION:-6.0.0}
     environment:
       - NETWORK=${NETWORK:-mainnet}
       - POSTGRES_HOST=postgres
@@ -57,7 +60,7 @@ services:
         max-file: "10"
 
   cardano-explorer-api:
-    image: inputoutput/cardano-explorer-api:${CARDANO_EXPLORER_API_VERSION:-2.1.3}
+    image: inputoutput/cardano-explorer-api:${CARDANO_EXPLORER_API_VERSION:-3.0.0}
     depends_on:
       - postgres
       - cardano-db-sync
@@ -79,7 +82,7 @@ services:
         max-file: "10"
 
   cardano-submit-api:
-    image: inputoutput/cardano-submit-api:${CARDANO_SUBMIT_API_VERSION:-2.1.3}
+    image: inputoutput/cardano-submit-api:${CARDANO_SUBMIT_API_VERSION:-3.0.0}
     environment:
       - NETWORK=${NETWORK:-mainnet}
     depends_on:

cabal.project.freeze

@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.0.0 -- October 2020
+
+ * Upgrade dependencies to more recent version of the Cardano eco-system (cardano-db-sync-6.0.0) 
+
 ## 2.1.3 -- August 2020
 
  * Fix bug regarding Shelley addresses not being decoded correctly (#75)

docker-compose.yml

@@ -58,9 +58,9 @@ extractAddresses = List.map cgaiCardanoAddress
 genRandomPageNo :: MonadIO m => PageSize -> SqlPersistT m (Either LookupFail PageNo)
 genRandomPageNo (PageSize pageSize) = do
   res <- select . from $ \ (txOut `InnerJoin` tx `InnerJoin` blk) -> do
-            on (blk ^. BlockId ==. tx ^. TxBlock)
+            on (blk ^. BlockId ==. tx ^. TxBlockId)
             on (tx ^. TxId ==. txOut ^. TxOutTxId)
-            where_ (isNothing (blk ^. BlockPrevious))
+            where_ (isNothing (blk ^. BlockPreviousId))
             pure countRows
   case listToMaybe res of
     Nothing -> pure $ Left (DbLookupMessage "genRandomPageNo: Empty Block table")

explorer-api/CHANGELOG.md

@@ -69,7 +69,7 @@ queryRandomRedeemAddress :: MonadIO m => ReaderT SqlBackend m (Either LookupFail
 queryRandomRedeemAddress = do
     res <- select . from $ \ (tx `InnerJoin` txOut) -> do
              -- Block 1 contains all the TxOuts from the Genesis Distribution.
-             where_ (tx ^. TxBlock ==. val (mkBlockId 1))
+             where_ (tx ^. TxBlockId ==. val (mkBlockId 1))
              on (tx ^. TxId ==. txOut ^. TxOutTxId)
              firstRandomRow
              pure (txOut ^. TxOutAddress)

explorer-api/app/Explorer/Web/Validate/GenesisAddress.hs

@@ -3,7 +3,7 @@ cabal-version:          >= 1.10
 -- http://haskell.org/cabal/users-guide/
 
 name:                   cardano-explorer-api
-version:                2.1.3
+version:                3.0.0
 synopsis:               A Block Explorer for the Cardano network
 description:
 homepage:               https://github.com/input-output-hk/cardano-explorer

explorer-api/app/Explorer/Web/Validate/Random.hs

@@ -6,15 +6,15 @@ module Explorer.Web.Api.HttpBridge.AddressBalance
   ) where
 
 import Cardano.Db
-    ( EntityField (..), queryNetworkName, txOutUnspentP )
+    ( DbLovelace (..), EntityField (..), queryNetworkName, txOutUnspentP )
 import Control.Monad.IO.Class
     ( MonadIO )
 import Data.ByteString.Char8
     ( ByteString )
 import Data.Text
     ( Text )
 import Data.Word
-    ( Word16, Word64 )
+    ( Word16 )
 import Database.Esqueleto
     ( InnerJoin (..), Value (..), from, on, select, val, where_, (==.), (^.) )
 import Database.Persist.Sql
@@ -64,17 +64,17 @@ addressBalance (CNetwork networkName) (CAddress addrTxt) =
 queryAddressBalance :: MonadIO m => Text -> SqlPersistT m [CAddressBalance]
 queryAddressBalance addrTxt = do
     rows <- select . from $ \ (tx `InnerJoin` txOut) -> do
-              on (tx ^. TxId ==. txOut ^. TxOutTxId)
-              txOutUnspentP txOut
-              where_ (txOut ^. TxOutAddress ==. val addrTxt)
-              pure (txOut ^. TxOutAddress, tx ^. TxHash, txOut ^. TxOutIndex, txOut ^. TxOutValue)
+            on (tx ^. TxId ==. txOut ^. TxOutTxId)
+            txOutUnspentP txOut
+            where_ (txOut ^. TxOutAddress ==. val addrTxt)
+            pure (txOut ^. TxOutAddress, tx ^. TxHash, txOut ^. TxOutIndex, txOut ^. TxOutValue)
     pure $ map convert rows
   where
-    convert :: (Value Text, Value ByteString, Value Word16, Value Word64) -> CAddressBalance
+    convert :: (Value Text, Value ByteString, Value Word16, Value DbLovelace) -> CAddressBalance
     convert (Value addr, Value txhash, Value index, Value coin) =
       CAddressBalance
         { cuaAddress = addr
         , cuaTxHash = bsBase16Encode txhash
         , cuaIndex = index
-        , cuaCoin = coin
+        , cuaCoin = unDbLovelace coin
         }

explorer-api/cardano-explorer-api.cabal

@@ -9,7 +9,7 @@ module Explorer.Web.Api.Legacy.AddressSummary
   ) where
 
 import Cardano.Db
-    ( EntityField (..), TxId, unValue3 )
+    ( DbLovelace (..), EntityField (..), TxId, unValue3 )
 import Control.Monad.IO.Class
     ( MonadIO )
 import Control.Monad.Trans.Except.Extra
@@ -23,7 +23,7 @@ import Data.Text
 import Data.Time.Clock
     ( UTCTime )
 import Data.Word
-    ( Word16, Word64 )
+    ( Word16 )
 import Database.Esqueleto
     ( InnerJoin (..)
     , Value (..)
@@ -110,15 +110,15 @@ queryNonRedeemSummary :: MonadIO m => CChainTip -> Text -> SqlPersistT m CAddres
 queryNonRedeemSummary chainTip addr = do
     inrows <- select . from $ \ (blk `InnerJoin` tx `InnerJoin` txOut) -> do
                 on (tx ^. TxId ==. txOut ^. TxOutTxId)
-                on (blk ^. BlockId ==. tx ^. TxBlock)
+                on (blk ^. BlockId ==. tx ^. TxBlockId)
                 where_ (txOut ^. TxOutAddress ==. val addr)
                 pure (tx ^. TxId, tx ^. TxHash, blk ^. BlockTime)
     -- This needs to be distinct to avoid duplicate rows.
     outrows <- select . distinct . from $ \ (blk `InnerJoin` tx `InnerJoin` txIn `InnerJoin` txOut) -> do
                 on (txIn ^. TxInTxOutId ==. txOut ^. TxOutTxId
                     &&. txIn ^. TxInTxOutIndex ==. txOut ^. TxOutIndex)
                 on (tx ^. TxId ==. txIn ^. TxInTxInId)
-                on (blk ^. BlockId ==. tx ^. TxBlock)
+                on (blk ^. BlockId ==. tx ^. TxBlockId)
                 where_ (txOut ^. TxOutAddress ==. val addr)
                 pure (tx ^. TxId, tx ^. TxHash, blk ^. BlockTime)
 
@@ -159,29 +159,29 @@ queryCTxBriefs xs = do
 queryTxInputs :: MonadIO m => [TxId] -> SqlPersistT m [(TxId, [CTxAddressBrief])]
 queryTxInputs txids = do
     rows <- select . distinct . from $ \(tx `InnerJoin` txIn `InnerJoin` txOut `InnerJoin` txInTx) -> do
-              on (txInTx ^. TxId ==. txIn ^. TxInTxOutId)
+              on (txInTx ^. TxId ==. txOut ^. TxOutTxId)
               on (txIn ^. TxInTxOutId ==. txOut ^. TxOutTxId
                   &&. txIn ^. TxInTxOutIndex ==. txOut ^. TxOutIndex)
               on (tx ^. TxId ==. txIn ^. TxInTxInId)
               where_ (txIn ^. TxInTxInId `in_` valList txids)
               pure (tx ^. TxId, txOut ^. TxOutAddress, txOut ^. TxOutValue, txInTx ^. TxHash, txOut ^. TxOutIndex, txInTx ^. TxSize ==. val 0)
     pure $ map collapseTxGroup (groupOn fst $ map convert rows)
   where
-    convert :: (Value TxId, Value Text, Value Word64, Value ByteString, Value Word16, Value Bool) -> (TxId, CTxAddressBrief)
+    convert :: (Value TxId, Value Text, Value DbLovelace, Value ByteString, Value Word16, Value Bool) -> (TxId, CTxAddressBrief)
     convert (Value txid, Value addr, Value coin, Value txh, Value index, Value isGenesisTx) =
       ( txid
       , if isGenesisTx
           then
             CTxAddressBrief
               { ctaAddress = CAddress addr
-              , ctaAmount = fromIntegral coin
+              , ctaAmount = fromIntegral $ unDbLovelace coin
               , ctaTxHash = genesisDistributionTxHash
               , ctaTxIndex = 0
               }
           else
             CTxAddressBrief
               { ctaAddress = CAddress addr
-              , ctaAmount = fromIntegral coin
+              , ctaAmount = fromIntegral $ unDbLovelace coin
               , ctaTxHash = CTxHash $ CHash (bsBase16Encode txh)
               , ctaTxIndex = fromIntegral index
               }
@@ -195,12 +195,12 @@ queryTxOutputs txids = do
               pure (tx ^. TxId, txOut ^. TxOutAddress, txOut ^. TxOutValue, tx ^. TxHash, txOut ^. TxOutIndex)
     pure $ map collapseTxGroup (groupOn fst $ map convert rows)
   where
-    convert :: (Value TxId, Value Text, Value Word64, Value ByteString, Value Word16) -> (TxId, CTxAddressBrief)
+    convert :: (Value TxId, Value Text, Value DbLovelace, Value ByteString, Value Word16) -> (TxId, CTxAddressBrief)
     convert (Value txid, Value addr, Value coin, Value txhash, Value index) =
       ( txid
       , CTxAddressBrief
           { ctaAddress = CAddress addr
-          , ctaAmount = fromIntegral coin
+          , ctaAmount = fromIntegral $ unDbLovelace coin
           , ctaTxHash = CTxHash . CHash $ bsBase16Encode txhash
           , ctaTxIndex = fromIntegral index
           }

explorer-api/src/Explorer/Web/Api/HttpBridge/AddressBalance.hs

@@ -6,7 +6,7 @@ module Explorer.Web.Api.Legacy.BlockAddress
   ) where
 
 import Cardano.Db
-    ( EntityField (..), TxId, unValue3 )
+    ( DbLovelace (..), EntityField (..), TxId, unValue3 )
 import Control.Monad.IO.Class
     ( MonadIO )
 import Control.Monad.Trans.Except.Extra
@@ -24,7 +24,7 @@ import Data.Time.Clock
 import Data.Time.Clock.POSIX
     ( utcTimeToPOSIXSeconds )
 import Data.Word
-    ( Word16, Word64 )
+    ( Word16 )
 import Database.Esqueleto
     ( InnerJoin (..)
     , Value (..)
@@ -104,7 +104,7 @@ queryRedeemSummary chainTip blkHash addrTxt = do
               pure (txOut ^. TxOutValue)
     case rows of
       [] -> pure $ Left (Internal "queryRedeemSummary: Address not found")
-      [value] -> Right <$> queryRedeemed (fromIntegral $ unValue value)
+      [value] -> Right <$> queryRedeemed (fromIntegral $ unDbLovelace $ unValue value)
       _ -> pure $ Left (Internal "queryRedeemSummary: More than one entry")
   where
     queryRedeemed :: MonadIO m => CCoin -> SqlPersistT m CAddressSummary
@@ -116,7 +116,7 @@ queryRedeemSummary chainTip blkHash addrTxt = do
                     on (txIn ^. TxInTxOutId ==. txOut0 ^. TxOutTxId
                         &&. txIn ^. TxInTxOutIndex ==. txOut0 ^. TxOutIndex)
                     on (tx ^. TxId ==. txIn ^. TxInTxInId)
-                    on (blk ^. BlockId ==. tx ^. TxBlock)
+                    on (blk ^. BlockId ==. tx ^. TxBlockId)
                     where_ (blk ^. BlockHash <=. val blkHash)
                     where_ (txOut0 ^. TxOutAddress ==. val addrTxt)
                     pure (tx ^. TxHash, blk ^. BlockTime, txOut1 ^. TxOutAddress)
@@ -180,7 +180,7 @@ queryAddressSummary :: MonadIO m => CChainTip -> ByteString -> Text -> SqlPersis
 queryAddressSummary chainTip blkHash addr = do
     inrows <- select . from $ \ (blk `InnerJoin` tx `InnerJoin` txOut) -> do
                 on (tx ^. TxId ==. txOut ^. TxOutTxId)
-                on (blk ^. BlockId ==. tx ^. TxBlock)
+                on (blk ^. BlockId ==. tx ^. TxBlockId)
                 where_ (blk ^. BlockHash <=. val blkHash)
                 where_ (txOut ^. TxOutAddress ==. val addr)
                 pure (tx ^. TxId, tx ^. TxHash, blk ^. BlockTime)
@@ -189,7 +189,7 @@ queryAddressSummary chainTip blkHash addr = do
                 on (txIn ^. TxInTxOutId ==. txOut ^. TxOutTxId
                     &&. txIn ^. TxInTxOutIndex ==. txOut ^. TxOutIndex)
                 on (tx ^. TxId ==. txIn ^. TxInTxInId)
-                on (blk ^. BlockId ==. tx ^. TxBlock)
+                on (blk ^. BlockId ==. tx ^. TxBlockId)
                 where_ (blk ^. BlockHash <=. val blkHash)
                 where_ (txOut ^. TxOutAddress ==. val addr)
                 pure (tx ^. TxId, tx ^. TxHash, blk ^. BlockTime)
@@ -248,12 +248,12 @@ queryTxOutputs txids = do
 
 -- -------------------------------------------------------------------------------------------------
 
-convert :: (Value TxId, Value Text, Value Word64, Value ByteString, Value Word16) -> (TxId, CTxAddressBrief)
+convert :: (Value TxId, Value Text, Value DbLovelace, Value ByteString, Value Word16) -> (TxId, CTxAddressBrief)
 convert (Value txid, Value addr, Value coin, Value txhash, Value index) =
   ( txid
   , CTxAddressBrief
       { ctaAddress = CAddress addr
-      , ctaAmount = fromIntegral coin
+      , ctaAmount = fromIntegral $ unDbLovelace coin
       , ctaTxHash = CTxHash . CHash $ bsBase16Encode txhash
       , ctaTxIndex = fromIntegral index
       }