1333 - add new AddressDetail table for TxOut

Author: Cmdv

cardano-chain-gen/test/Test/Cardano/Db/Mock/Unit/Alonzo/Config.hs

@@ -34,6 +34,7 @@ insertConfig = do
           , sioPoolStats = PoolStatsConfig False
           , sioJsonType = JsonTypeDisable
           , sioRemoveJsonbFromSchema = RemoveJsonbFromSchemaConfig False
+          , sioAddressDetail = AddressDetailConfig False
           }
 
   dncInsertOptions cfg @?= expected

cardano-chain-gen/test/Test/Cardano/Db/Mock/Unit/Alonzo/Plutus.hs

@@ -95,7 +95,7 @@ simpleScript =
     testLabel = "simpleScript-alonzo"
     getOutFields txOut = (DB.txOutAddress txOut, DB.txOutAddressHasScript txOut, DB.txOutValue txOut, DB.txOutDataHash txOut)
     expectedFields =
-      ( renderAddress alwaysSucceedsScriptAddr
+      ( Just $ renderAddress alwaysSucceedsScriptAddr
       , True
       , DB.DbLovelace 20000
       , Just $ Crypto.hashToBytes (extractHash $ hashData @StandardAlonzo plutusDataList)

cardano-chain-gen/test/Test/Cardano/Db/Mock/Unit/Babbage/Config/Parse.hs

@@ -34,6 +34,7 @@ insertConfig = do
           , sioPoolStats = PoolStatsConfig False
           , sioJsonType = JsonTypeDisable
           , sioRemoveJsonbFromSchema = RemoveJsonbFromSchemaConfig False
+          , sioAddressDetail = AddressDetailConfig False
           }
 
   dncInsertOptions cfg @?= expected

cardano-chain-gen/test/Test/Cardano/Db/Mock/Unit/Babbage/Plutus.hs

@@ -102,7 +102,7 @@ simpleScript =
     testLabel = "simpleScript"
     getOutFields txOut = (DB.txOutAddress txOut, DB.txOutAddressHasScript txOut, DB.txOutValue txOut, DB.txOutDataHash txOut)
     expectedFields =
-      ( renderAddress alwaysSucceedsScriptAddr
+      ( Just $ renderAddress alwaysSucceedsScriptAddr
       , True
       , DB.DbLovelace 20000
       , Just $ Crypto.hashToBytes (extractHash $ hashData @StandardBabbage plutusDataList)

cardano-chain-gen/test/Test/Cardano/Db/Mock/Unit/Conway/Config/Parse.hs

@@ -104,6 +104,7 @@ insertConfig = do
           , sioPoolStats = PoolStatsConfig False
           , sioJsonType = JsonTypeDisable
           , sioRemoveJsonbFromSchema = RemoveJsonbFromSchemaConfig False
+          , sioAddressDetail = AddressDetailConfig False
           }
 
   dncInsertOptions cfg @?= expected

cardano-chain-gen/test/Test/Cardano/Db/Mock/Unit/Conway/Plutus.hs

@@ -90,7 +90,7 @@ simpleScript =
       , DB.txOutDataHash txOut
       )
     expectedFields =
-      ( renderAddress Examples.alwaysSucceedsScriptAddr
+      ( Just $ renderAddress Examples.alwaysSucceedsScriptAddr
       , True
       , DB.DbLovelace 20_000
       , Just $

cardano-chain-gen/test/Test/Cardano/Db/Mock/Validate.hs

@@ -44,7 +44,6 @@ module Test.Cardano.Db.Mock.Validate (
 
 import Cardano.Db
 import qualified Cardano.Db as DB
-import qualified Cardano.DbSync.Era.Shelley.Generic as Generic
 import Cardano.DbSync.Era.Shelley.Generic.Util
 import qualified Cardano.Ledger.Address as Ledger
 import Cardano.Ledger.BaseTypes
@@ -212,7 +211,7 @@ assertAddrValues ::
   IO ()
 assertAddrValues env ix expected sta = do
   addr <- assertRight $ resolveAddress ix sta
-  let address = Generic.renderAddress addr
+  let address = Ledger.serialiseAddr addr
       q = queryAddressOutputs address
   assertEqBackoff env q expected defaultDelays "Unexpected Balance"
 

cardano-db-sync/src/Cardano/DbSync.hs

@@ -278,6 +278,7 @@ extractSyncOptions snp aop snc =
         , ioPoolStats = isPoolStatsEnabled (sioPoolStats (dncInsertOptions snc))
         , ioGov = useGovernance
         , ioRemoveJsonbFromSchema = isRemoveJsonbFromSchemaEnabled (sioRemoveJsonbFromSchema (dncInsertOptions snc))
+        , ioAddressDetail = useAddressDetailTable (sioAddressDetail (dncInsertOptions snc))
         }
 
     useLedger = sioLedger (dncInsertOptions snc) == LedgerEnable

cardano-db-sync/src/Cardano/DbSync/Api/Types.hs

@@ -87,6 +87,7 @@ data InsertOptions = InsertOptions
   , ioPoolStats :: !Bool
   , ioGov :: !Bool
   , ioRemoveJsonbFromSchema :: !Bool
+  , ioAddressDetail :: !Bool
   }
   deriving (Show)
 

cardano-db-sync/src/Cardano/DbSync/Config/Types.hs

@@ -19,6 +19,7 @@ module Cardano.DbSync.Config.Types (
   GenesisHashAlonzo (..),
   GenesisHashConway (..),
   RemoveJsonbFromSchemaConfig (..),
+  AddressDetailConfig (..),
   SyncNodeConfig (..),
   SyncPreConfig (..),
   SyncInsertConfig (..),
@@ -183,6 +184,7 @@ data SyncInsertOptions = SyncInsertOptions
   , sioPoolStats :: PoolStatsConfig
   , sioJsonType :: JsonTypeConfig
   , sioRemoveJsonbFromSchema :: RemoveJsonbFromSchemaConfig
+  , sioAddressDetail :: AddressDetailConfig
   }
   deriving (Eq, Show)
 
@@ -257,6 +259,11 @@ newtype RemoveJsonbFromSchemaConfig = RemoveJsonbFromSchemaConfig
   }
   deriving (Eq, Show)
 
+newtype AddressDetailConfig = AddressDetailConfig
+  { useAddressDetailTable :: Bool
+  }
+  deriving (Eq, Show)
+
 data JsonTypeConfig
   = JsonTypeText
   | JsonTypeJsonb
@@ -439,6 +446,7 @@ parseOverrides obj baseOptions = do
     <*> obj .:? "pool_stats" .!= sioPoolStats baseOptions
     <*> obj .:? "json_type" .!= sioJsonType baseOptions
     <*> obj .:? "remove_jsonb_from_schema" .!= sioRemoveJsonbFromSchema baseOptions
+    <*> obj .:? "use_address_table" .!= sioAddressDetail baseOptions
 
 instance ToJSON SyncInsertConfig where
   toJSON (SyncInsertConfig preset options) =
@@ -481,6 +489,7 @@ instance FromJSON SyncInsertOptions where
       <*> obj .:? "pool_stat" .!= sioPoolStats def
       <*> obj .:? "json_type" .!= sioJsonType def
       <*> obj .:? "remove_jsonb_from_schema" .!= sioRemoveJsonbFromSchema def
+      <*> obj .:? "use_address_table" .!= sioAddressDetail def
 
 instance ToJSON SyncInsertOptions where
   toJSON SyncInsertOptions {..} =
@@ -671,6 +680,15 @@ instance FromJSON RemoveJsonbFromSchemaConfig where
 instance ToJSON RemoveJsonbFromSchemaConfig where
   toJSON = boolToEnableDisable . isRemoveJsonbFromSchemaEnabled
 
+instance FromJSON AddressDetailConfig where
+  parseJSON = Aeson.withText "use_address_table" $ \v ->
+    case enableDisableToBool v of
+      Just g -> pure (AddressDetailConfig g)
+      Nothing -> fail $ "unexpected use_address_table: " <> show v
+
+instance ToJSON AddressDetailConfig where
+  toJSON = boolToEnableDisable . useAddressDetailTable
+
 instance FromJSON OffchainPoolDataConfig where
   parseJSON = Aeson.withText "offchain_pool_data" $ \v ->
     case enableDisableToBool v of
@@ -708,6 +726,7 @@ instance Default SyncInsertOptions where
       , sioPoolStats = PoolStatsConfig False
       , sioJsonType = JsonTypeText
       , sioRemoveJsonbFromSchema = RemoveJsonbFromSchemaConfig False
+      , sioAddressDetail = AddressDetailConfig False
       }
 
 fullInsertOptions :: SyncInsertOptions
@@ -726,6 +745,7 @@ fullInsertOptions =
     , sioPoolStats = PoolStatsConfig True
     , sioJsonType = JsonTypeText
     , sioRemoveJsonbFromSchema = RemoveJsonbFromSchemaConfig False
+    , sioAddressDetail = AddressDetailConfig False
     }
 
 onlyUTxOInsertOptions :: SyncInsertOptions
@@ -744,6 +764,7 @@ onlyUTxOInsertOptions =
     , sioPoolStats = PoolStatsConfig False
     , sioJsonType = JsonTypeText
     , sioRemoveJsonbFromSchema = RemoveJsonbFromSchemaConfig False
+    , sioAddressDetail = AddressDetailConfig False
     }
 
 onlyGovInsertOptions :: SyncInsertOptions
@@ -770,6 +791,7 @@ disableAllInsertOptions =
     , sioGovernance = GovernanceConfig False
     , sioJsonType = JsonTypeText
     , sioRemoveJsonbFromSchema = RemoveJsonbFromSchemaConfig False
+    , sioAddressDetail = AddressDetailConfig False
     }
 
 boolToEnableDisable :: IsString s => Bool -> s