Fix broken SPV oracles

Change-Id: Id0000000fbd4c58b18ba9e4063c224da92b97b43

Author: edmundnoble

src/Chainweb/Pact/Backend/ChainwebPactDb.hs

@@ -261,7 +261,7 @@ chainwebPactBlockDb env = ChainwebPactDb
                 , consult = \(Parent hsh) -> do
                     throwOnDbError (lookupBlockHash (_blockHandlerDb env) hsh) <&> \case
                         Nothing -> False
-                        Just rootHeight -> rootHeight > currentHeight
+                        Just rootHeight -> rootHeight < currentHeight
                 }
         let spv = pactSPV headerOracle
         r <- liftIO $ kont pactDb spv

src/Chainweb/Pact/PactService/Pact4/ExecBlock.hs

@@ -50,6 +50,7 @@ import Chainweb.Pact.Types (ServiceEnv(..), Transactions (..), bctxParentCreatio
 import Chainweb.Pact4.Backend.ChainwebPactDb
 import Chainweb.Pact4.ModuleCache
 import Chainweb.Pact4.NoCoinbase
+import Chainweb.Pact4.SPV qualified as Pact4
 import Chainweb.Pact4.Transaction qualified as Pact4
 import Chainweb.Pact4.TransactionExec qualified as Pact4
 import Chainweb.Pact4.Types
@@ -505,9 +506,7 @@ applyPactCmd logger serviceEnv blockEnv txIdxInBlock miner cmd = StateT $ \(T2 m
     if _bctxIsGenesis bCtx
     then liftIO $! Pact4.applyGenesisCmd logger pactDb Pact4.noSPVSupport bCtx gasLimitedCmd
     else do
-      -- FIXME
-      -- let bhdb = view psBlockHeaderDb serviceEnv
-      -- let spv = Pact4.pactSPV bhdb (_parentHeader parent)
+      let spv = Pact4.pactSPV (_cpHeaderOracle $ _benvDbEnv blockEnv) bCtx
       let
         txTimeout io = do
             logFunctionText logger Debug $ "txTimeLimit was not set - defaulting to a function of the block gas limit"
@@ -516,7 +515,7 @@ applyPactCmd logger serviceEnv blockEnv txIdxInBlock miner cmd = StateT $ \(T2 m
         liftIO $ txTimeout $
           Pact4.applyCmd logger
             -- FIXME spv
-            blockEnv miner gasModel txIdxInBlock undefined gasLimitedCmd initialGas mcache
+            blockEnv miner gasModel txIdxInBlock spv gasLimitedCmd initialGas mcache
       pure $ T2 r c
 
   if _bctxIsGenesis bCtx

src/Chainweb/Pact4/Backend/ChainwebPactDb.hs

@@ -10,7 +10,6 @@
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE ImportQualifiedPost #-}
--- TODO pact5: fix the orphan PactDbFor instance
 {-# OPTIONS_GHC -Wno-orphans #-}
 {-# LANGUAGE ViewPatterns #-}
 
@@ -918,6 +917,6 @@ headerOracleForBlock env = HeaderOracle
     { consult = \(Parent blkHash) -> do
         lookupBlockHash (_blockHandlerDb env) blkHash <&> \case
             Nothing -> False
-            Just rootHeight -> rootHeight > _blockHandlerBlockHeight env
+            Just rootHeight -> rootHeight < _blockHandlerBlockHeight env
     , chain = _blockHandlerChainId env
     }