adjust the whitelist checking

Author: Cmdv

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

@@ -142,7 +142,8 @@ storePage ::
   ExceptT SyncNodeError (ReaderT SqlBackend m) ()
 storePage syncEnv cache percQuantum (n, ls) = do
   when (n `mod` 10 == 0) $ liftIO $ logInfo trce $ "Bootstrap in progress " <> prc <> "%"
-  txOuts <- mapMaybeM (prepareTxOut syncEnv cache) ls
+  txOuts <- do
+    mapM (prepareTxOut syncEnv cache) ls
   txOutIds <- lift . DB.insertManyTxOutPlex True False $ etoTxOut . fst <$> txOuts
   let maTxOuts = concatMap mkmaTxOuts $ zip txOutIds (snd <$> txOuts)
   void . lift $ DB.insertManyMaTxOut maTxOuts
@@ -162,12 +163,12 @@ prepareTxOut ::
   SyncEnv ->
   TxCache ->
   (TxIn StandardCrypto, BabbageTxOut era) ->
-  ExceptT SyncNodeError (ReaderT SqlBackend m) (Maybe (ExtendedTxOut, [MissingMaTxOut]))
+  ExceptT SyncNodeError (ReaderT SqlBackend m) (ExtendedTxOut, [MissingMaTxOut])
 prepareTxOut syncEnv txCache (TxIn txHash (TxIx index), txOut) = do
   let txHashByteString = Generic.safeHashToByteString $ unTxId txHash
   let genTxOut = fromTxOut index txOut
   txId <- queryTxIdWithCache txCache txHashByteString
-  Insert.prepareTxOut syncEnv trce cache iopts (txId, txHashByteString) genTxOut
+  Insert.prepareTxOut trce iopts cache (txId, txHashByteString) genTxOut
   where
     trce = getTrace syncEnv
     cache = envCache syncEnv

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

@@ -20,16 +20,19 @@ module Cardano.DbSync.Config (
   readCardanoGenesisConfig,
   readSyncNodeConfig,
   configureLogging,
+  plutusWhitelistCheckTxOut,
 ) where
 
 import qualified Cardano.BM.Configuration.Model as Logging
 import qualified Cardano.BM.Setup as Logging
 import Cardano.BM.Trace (Trace)
 import qualified Cardano.BM.Trace as Logging
+import Cardano.DbSync.Api.Types (InsertOptions (..), SyncEnv, SyncOptions (..), envOptions)
 import Cardano.DbSync.Config.Cardano
 import Cardano.DbSync.Config.Node (NodeConfig (..), parseNodeConfig, parseSyncPreConfig, readByteStringFromFile)
 import Cardano.DbSync.Config.Shelley
 import Cardano.DbSync.Config.Types
+import qualified Cardano.DbSync.Era.Shelley.Generic as Generic
 import Cardano.Prelude
 import System.FilePath (takeDirectory, (</>))
 
@@ -91,3 +94,27 @@ coalesceConfig pcfg ncfg adjustGenesisPath = do
 
 mkAdjustPath :: SyncPreConfig -> (FilePath -> FilePath)
 mkAdjustPath cfg fp = takeDirectory (pcNodeConfigFilePath cfg) </> fp
+
+-- do a whitelist check against a list of TxOut and if one matches we keep them all
+plutusWhitelistCheckTxOut :: SyncEnv -> [Generic.TxOut] -> Bool
+plutusWhitelistCheckTxOut syncEnv txOuts = do
+  let iopts = soptInsertOptions $ envOptions syncEnv
+  case ioPlutusExtra iopts of
+    PlutusWhitelistScripts whitelist -> do
+      -- we map over our txOuts and check if txOutAddress OR txOutScript are in the whitelist
+      let whitelistCheck =
+            ( \txOut ->
+                case (Generic.txOutScript txOut, Generic.maybePaymentCred $ Generic.txOutAddress txOut) of
+                  (Just script, _) ->
+                    if Generic.txScriptHash script `elem` whitelist
+                      then Just txOut
+                      else Nothing
+                  (_, Just address) ->
+                    if address `elem` whitelist
+                      then Just txOut
+                      else Nothing
+                  (Nothing, Nothing) -> Nothing
+            )
+              <$> txOuts
+      any isJust whitelistCheck
+    _ -> False

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

@@ -27,9 +27,9 @@ module Cardano.DbSync.Config.Types (
   NetworkName (..),
   NodeConfigFile (..),
   SocketPath (..),
-  isMetaDataConfigEnabled,
-  isMultiAssetConfigEnabled,
-  isPlutusConfigEnabled,
+  isDisableOrWhiteListMetaData,
+  isDissableOrWhitelistMultiAsset,
+  isPlutusDisableOrWhitelist,
   adjustGenesisFilePath,
   adjustNodeConfigFilePath,
   pcNodeConfigFilePath,
@@ -144,10 +144,10 @@ data MetadataConfig
   | MetadataWhitelistKeys (NonEmpty ByteString)
   deriving (Eq, Show)
 
-isMetaDataConfigEnabled :: MetadataConfig -> Bool
-isMetaDataConfigEnabled = \case
-  MetadataEnable -> True
-  MetadataDisable -> False
+isDisableOrWhiteListMetaData :: MetadataConfig -> Bool
+isDisableOrWhiteListMetaData = \case
+  MetadataEnable -> False
+  MetadataDisable -> True
   MetadataWhitelistKeys _ -> True
 
 data MultiAssetConfig
@@ -156,10 +156,10 @@ data MultiAssetConfig
   | MultiAssetWhitelistPolicies (NonEmpty ByteString)
   deriving (Eq, Show)
 
-isMultiAssetConfigEnabled :: MultiAssetConfig -> Bool
-isMultiAssetConfigEnabled = \case
-  MultiAssetEnable -> True
-  MultiAssetDisable -> False
+isDissableOrWhitelistMultiAsset :: MultiAssetConfig -> Bool
+isDissableOrWhitelistMultiAsset = \case
+  MultiAssetEnable -> False
+  MultiAssetDisable -> True
   MultiAssetWhitelistPolicies _ -> True
 
 data PlutusConfig
@@ -168,11 +168,11 @@ data PlutusConfig
   | PlutusWhitelistScripts (NonEmpty ByteString)
   deriving (Eq, Show)
 
-isPlutusConfigEnabled :: PlutusConfig -> Bool
-isPlutusConfigEnabled = \case
-  PlutusEnable -> True
-  PlutusDisable -> False
+isPlutusDisableOrWhitelist :: PlutusConfig -> Bool
+isPlutusDisableOrWhitelist = \case
+  PlutusEnable -> False
   PlutusWhitelistScripts _ -> True
+  PlutusDisable -> True
 
 newtype GenesisFile = GenesisFile
   { unGenesisFile :: FilePath

cardano-db-sync/src/Cardano/DbSync/Era/Shelley/Generic/Tx/Alonzo.hs

@@ -26,7 +26,7 @@ module Cardano.DbSync.Era.Shelley.Generic.Tx.Alonzo (
 
 import qualified Cardano.Crypto.Hash as Crypto
 import Cardano.Db (ScriptType (..))
-import Cardano.DbSync.Config.Types (PlutusConfig, isPlutusConfigEnabled)
+import Cardano.DbSync.Config.Types (PlutusConfig, isPlutusDisableOrWhitelist)
 import Cardano.DbSync.Era.Shelley.Generic.Metadata
 import Cardano.DbSync.Era.Shelley.Generic.Script (fromTimelock)
 import Cardano.DbSync.Era.Shelley.Generic.ScriptData (ScriptData (..))
@@ -185,7 +185,7 @@ resolveRedeemers ::
   (TxCert era -> Cert) ->
   (RedeemerMaps, [(Word64, TxRedeemer)])
 resolveRedeemers ioExtraPlutus mprices tx toCert =
-  if not $ isPlutusConfigEnabled ioExtraPlutus
+  if not $ isPlutusDisableOrWhitelist ioExtraPlutus
     then (initRedeemersMaps, [])
     else
       mkRdmrAndUpdateRec (initRedeemersMaps, []) $