add resume

pact-core/Pact/Core/Builtin.hs

@@ -221,6 +221,7 @@ data RawBuiltin
   | RawB64Decode
   | RawStrToList
   | RawYield
+  | RawResume
   | RawBind
   deriving (Eq, Show, Ord, Bounded, Enum)
 
@@ -303,6 +304,7 @@ rawBuiltinToText = \case
   RawB64Decode -> "base64-decode"
   RawStrToList -> "str-to-list"
   RawYield -> "yield"
+  RawResume -> "resume"
   RawBind -> "bind"
 
 instance IsBuiltin RawBuiltin where
@@ -382,6 +384,7 @@ instance IsBuiltin RawBuiltin where
     RawB64Decode -> 1
     RawStrToList -> 1
     RawYield -> 1
+    RawResume -> 1
     RawBind -> 2
 
 rawBuiltinNames :: [Text]

pact-core/Pact/Core/Errors.hs

@@ -289,6 +289,9 @@ data EvalError
   -- ^ Def is not a closure
   | NoSuchKeySet KeySetName
   | YieldOutsiteDefPact
+  | NoActivePactExec
+  | NoYieldInPactExec
+  | ContinuePactInvalidContext Integer Integer Integer
   deriving Show
 
 instance Pretty EvalError where
@@ -319,8 +322,12 @@ instance Pretty EvalError where
     EvalError txt ->
       Pretty.hsep ["Program encountered an unhandled raised error:", pretty txt]
     YieldOutsiteDefPact ->
-      Pretty.hsep ["Scope error: executed yield outsite a defpact"]
-
+      "Scope error: executed yield outsite a defpact"
+    NoActivePactExec ->
+      "No active pactExec"
+    NoYieldInPactExec -> "No yield in pact exec"
+    ContinuePactInvalidContext userStep currStep maxStep ->
+      Pretty.hsep ["Continue pact step with invalid context: user: ", pretty userStep, ", current: ", pretty currStep, ", max: ", pretty maxStep]
     _ -> error "todo: render"
 
 

pact-core/Pact/Core/IR/Eval/CEK.hs

@@ -208,7 +208,7 @@ mkDefPactClosure
   => FullyQualifiedName
   -> DefPact Name Type b i
   -> m (CEKValue b i m)
-mkDefPactClosure fqn (DefPact _ _ mrty (step :| steps) _) = case step of
+mkDefPactClosure fqn (DefPact _ _ mrty (step :| steps) info) = case step of
   Step step' _ -> toClosure False step'
   StepWithRollback step' _ _ -> toClosure True step'
   where
@@ -217,7 +217,7 @@ mkDefPactClosure fqn (DefPact _ _ mrty (step :| steps) _) = case step of
       Lam li args body i ->
         let dpc = DefPactClosure fqn li (_argType <$> args) (NE.length args) body rb nSteps mrty i
         in pure (VDefPactClosure dpc)
-      _ -> undefined
+      _ -> throwExecutionError info (InvariantFailure "Step is not lambda")
 
 -- Todo: fail invariant
 nameToFQN :: Applicative f => Name -> f FullyQualifiedName

pact-core/Pact/Core/IR/Eval/RawBuiltin.hs

@@ -594,9 +594,19 @@ coreYield info b = mkBuiltinFn info b \cont handler -> \case
       Nothing -> throwExecutionError info YieldOutsiteDefPact
       Just pe -> do
         setEvalState esPactExec (Just pe{_peYield = Just (Yield o)})
-        returnCEKValue cont handler VUnit
+        returnCEKValue cont handler (VObject o)
   args -> argsError info b args
 
+coreResume :: (IsBuiltin b, MonadEval b i m) => i -> b -> NativeFn b i m
+coreResume info b = mkBuiltinFn info b \cont handler -> \case
+  [VClosure clo] -> do
+    mpe <- useEvalState esPactExec
+    case mpe of
+      Nothing -> throwExecutionError info NoActivePactExec
+      Just pe -> case _peYield pe of
+        Nothing -> throwExecutionError info NoYieldInPactExec
+        Just (Yield resumeObj) -> applyLam clo [VObject resumeObj] cont handler
+  args -> argsError info b args
 
 -----------------------------------
 -- try-related ops
@@ -911,4 +921,5 @@ rawBuiltinLiftedRuntime f i = \case
   RawB64Decode -> coreB64Decode i (f RawB64Decode)
   RawStrToList -> strToList i (f RawStrToList)
   RawYield -> coreYield i (f RawYield)
+  RawResume -> coreResume i (f RawResume)
   RawBind -> coreBind i (f RawBind)

pact-core/Pact/Core/Repl/Runtime/ReplBuiltin.hs

@@ -12,7 +12,7 @@ import Control.Lens
 import Pact.Core.Builtin
 import Pact.Core.Literal
 -- import Pact.Core.Gas
--- import Pact.Core.Errors
+import Pact.Core.Errors
 
 import Pact.Core.IR.Eval.Runtime
 import Pact.Core.IR.Term
@@ -104,9 +104,8 @@ continuePact info b = mkReplBuiltinFn info b \cont handler -> \case
       Nothing -> pure (VError "No pact exec environment found!")
       Just pe -> lookupFqName (pe ^. peContinuation . pcName) >>= \case
         Just (DPact dp)
-          | s >= toInteger (_peStepCount pe) -> undefined
-          | s <= toInteger (_peStep pe) -> undefined
-          | otherwise -> do
+          | s == toInteger (_peStep pe) + 1 &&
+            s < toInteger (_peStepCount pe) -> do
               let
                 step = _dpSteps dp NE.!! fromInteger s
                 args' = VPactValue <$> pe ^. peContinuation . pcArgs
@@ -119,9 +118,12 @@ continuePact info b = mkReplBuiltinFn info b \cont handler -> \case
                 StepWithRollback s' _rb _ -> toClosure s'
               setEvalState esPactExec (Just $ over peStep (+1) pe)
               returnCEK cont handler v
+          | otherwise ->
+            throwExecutionError info (ContinuePactInvalidContext s (toInteger (_peStep pe)) (toInteger (_peStepCount pe)))
         _ -> pure (VError "continuation is not a defpact")
   args -> argsError info b args
 
+
 coreEnvStackFrame :: (IsBuiltin b, Default i) => i -> ReplBuiltin b -> ReplBuiltinFn b i
 coreEnvStackFrame info b = mkReplBuiltinFn info b \cont handler -> \case
   [_] -> do