Fix incorrect accounting in nested contract calls.

Concordium · Aug 15, 2022 · ee0c7c5 · ee0c7c5
1 parent 5672885
commit ee0c7c5
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/concordium-consensus/src/Concordium/Scheduler/Environment.hs b/concordium-consensus/src/Concordium/Scheduler/Environment.hs
@@ -1043,16 +1043,13 @@ instance (MonadProtocolVersion m, StaticInformation m, AccountOperations m, Cont
       Nothing -> return $ netDeposit - max oldLockedUp staked
 
   {-# INLINE getCurrentContractAmount #-}
-  getCurrentContractAmount sv inst = do
-    let amnt = iiBalance inst
+  getCurrentContractAmount _ inst = do
     let addr = _instanceAddress . iiParameters $ inst
-    case sv of
-      Wasm.SV0 -> use (changeSet . instanceV0Updates . at addr) >>= \case
-        Just (_, delta, _) -> return $! applyAmountDelta delta amnt
-        Nothing -> return amnt
-      Wasm.SV1 -> use (changeSet . instanceV1Updates . at addr) >>= \case
-        Just (_, delta, _) -> return $! applyAmountDelta delta amnt
-        Nothing -> return amnt
+    getCurrentContractInstance addr >>= \case
+      Nothing -> error "Precondition violation."
+      Just ist -> case ist of
+          InstanceInfoV0 ii -> return (iiBalance ii)
+          InstanceInfoV1 ii -> return (iiBalance ii)
 
   {-# INLINE getEnergy #-}
   getEnergy = do