Sync calls

concordium-consensus/src/Concordium/Scheduler.hs

@@ -1034,7 +1034,7 @@ handleContractUpdateV1 originAddr istance checkAndGetSender transferAmount recei
                            -- If execution of the contract succeeds resume.
                            -- Otherwise rollback the state and report that to the caller.
                            runInnerTransaction runSuccess >>= \case
-                              Left err -> do -- execution failed, ignore the reject reason since V0 contract cannot return useful information
+                              Left _ -> -- execution failed, ignore the reject reason since V0 contract cannot return useful information
                                 go (resumeEvent False:interruptEvent:events) =<< runInterpreter (return . WasmV1.resumeReceiveFun rrdInterruptedConfig Nothing entryBalance WasmV1.MessageSendFailed Nothing)
                               Right evs -> do
                                 -- Execution of the contract might have changed our own state. If so, we need to resume in the new state, otherwise

concordium-consensus/src/Concordium/Scheduler/InvokeContract.hs

@@ -150,10 +150,10 @@ invokeContract _ ContractContext{..} cm bs = do
     -- cannot happen (this would mean out of block energy, and we set block energy no lower than energy),
     -- but this is safe to do and not wrong
     (Left Nothing, re) -> 
-      return Failure{rcrReason = OutOfEnergy, rcrUsedEnergy = ccEnergy - re}
+      return Failure{rcrReason = OutOfEnergy, rcrReturnValue=Nothing, rcrUsedEnergy = ccEnergy - re}
     -- Contract execution of a V0 contract failed with the given reason.
     (Left (Just rcrReason), re) ->
-      return Failure{rcrUsedEnergy = ccEnergy - re,..}
+      return Failure{rcrUsedEnergy = ccEnergy - re,rcrReturnValue=Nothing,..}
     -- Contract execution of a V0 contract succeeded with the given list of events
     (Right (Left rcrEvents), re) ->
       return Success{rcrReturnValue=Nothing,
@@ -163,6 +163,7 @@ invokeContract _ ContractContext{..} cm bs = do
     (Right (Right (Left cf)), re) ->
       return (Failure{
                  rcrReason = WasmV1.cerToRejectReasonReceive ccContract ccMethod ccParameter cf,
+                 rcrReturnValue = WasmV1.returnValueToByteString <$> WasmV1.ccfToReturnValue cf,
                  rcrUsedEnergy = ccEnergy - re})
     -- Contract execution of a V1 contract succeeded with the given return value.
     (Right (Right (Right (rv, reversedEvents))), re) -> -- handleUpdateContractV1 returns events in reverse order

docs/grpc.md

@@ -117,7 +117,7 @@ Returns a JSON object representing the branches of the tree from the last finali
 | `BlockHash` | base-16 encoded hash of a block (64 characters) |
 | `TransactionHash` | base-16 encoded hash of a transaction (64 characters) |
 | `ModuleRef` | base-16 encoded module reference (64 characters) |
-| `Int` | integer | 
+| `Int` | integer |
 | `EncryptionKey` | base-16 encoded string (192 characters) |
 | `EncryptedAmount` | base-16 encoded string (384 characters) |
 | `UTCTime` | UTC time. `yyyy-mm-ddThh:mm:ss[.sss]Z` (ISO 8601:2004(E) sec. 4.3.2 extended format) |
@@ -227,3 +227,38 @@ does not exist.
 
 Get the source of the module as it was deployed on the chain. The response is a
 byte array.
+
+## InvokeContract : `BlockHash -> ContractContext -> ?InvokeContractResult`
+
+Invoke a smart contract, returning any results. The contract is invoked in the
+state at the end of a given block.
+
+`ContractContext` is a record with fields
+- `invoker: ?Address` — address of the invoker. If not supplied it
+  defaults to the zero account address
+- `contract: ContractAddress` — address of the contract to invoke
+- `amount: ?Amount` — an amount to invoke with. Defaults to 0 if not
+  supplied.
+- `method: String` — name of the entrypoint to invoke. This needs to be
+  fully qualified in the format `contract.method`.
+- `parameter: ?String` — parameter to invoke the method with, encoded in
+  hex. Defaults to empty if not provided.
+- `energy: ?Number` — maximum amount of energy allowed for execution.
+  Defaults to 10_000_000 if not provided.
+
+The return value is either `null` if either the block does not exist, or parsing
+of any of the inputs failed. Otherwise it is a JSON encoded
+`InvokeContractResult`.
+
+This is a record with fields
+- `tag: String` — eiether `"success"` or `"failure"`.
+- `usedEnergy: Number` — the amount of NRG that was used during
+  execution
+- `returnValue: ?String` — if invoking a V1 contract this is the return
+  value that was produced, if any (in case of runtime failure or out of energy
+  there is no return value). If invoking a V0 contract this field is not present.
+- if `tag` is `"success"` the following fields are present
+  - `events: [Event]` — list of events generated as part of execution of
+    the contract
+- if `tag` is `"failure"` then the following fields are present
+  - `reason: RejectReason` — encoding of a rejection reason