Skip to content

Commit

Permalink
Runtime v1.0.0 integration
Browse files Browse the repository at this point in the history
  • Loading branch information
nhenin committed May 16, 2024
1 parent 8998b2c commit 4996b51
Show file tree
Hide file tree
Showing 8 changed files with 71 additions and 7 deletions.
23 changes: 21 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,29 @@
# MarloweScan
<h2 align="center">
<a href="" target="blank_">
<img src="./doc/image/logo.svg" alt="Logo" height="75">
</a>
<br>
MarloweScan (Marlowe Cardano Explorer)
</h2>
<p align="center">
<a href="https://github.com/input-output-hk/marlowe-scan/releases"><img src="https://img.shields.io/github/v/release/input-output-hk/marlowe-scan?style=for-the-badge" /></a>
</p>
<div align="center">
<a href=""><img src="https://img.shields.io/badge/stability-beta-33bbff.svg" alt="Beta"></a>
<a href="./LICENSE"><img src="https://img.shields.io/badge/License-Apache_2.0-blue.svg"></a>
<a href="https://discord.com/invite/cmveaxuzBn"><img src="https://img.shields.io/discord/826816523368005654?label=Chat%20on%20Discord"></a>
</div>

> [!IMPORTANT]
> This Marlowe repository will soon be moved to https://github.com/marlowe-lang. The new repositories will be administered by an independent vehicle, a not-for-profit organization currently being set up by the transition team.<br>
> This will allow us to ensure community representation and stewardship. Future developments and support for Marlowe are transitioning to a community-driven model initially led by [Simon Thompson](https://github.com/simonjohnthompson), [Nicolas Henin](https://github.com/nhenin) and [Tomasz Rybarczyk](https://github.com/paluh). <br>
> See [here](https://github.com/marlowe-lang/.github/blob/main/profile/transition.md) for details.
MarloweScan is a tool that allows you to explore on-chain Marlowe contracts and watch their execution in Marlowe terms. This document provides instructions on how to build and develop the MarloweScan tool.

## Marlowe Runtime compatibility

This version of MarloweScan requires a running instance of the Marlowe Runtime. The compatible versions of the Marlowe Runtime include from 0.0.4 up to and including 0.0.6.
This version of MarloweScan requires a running instance of the Marlowe Runtime. The compatible versions of the Marlowe Runtime include from 0.0.4 up to and including 1.0.0.

## Using Nix

Expand Down
Binary file added doc/image/favicon.ico
Binary file not shown.
3 changes: 3 additions & 0 deletions doc/image/github.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions doc/image/logo-header.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/image/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 31 additions & 0 deletions doc/image/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 0 additions & 2 deletions src/Language/Marlowe/Runtime/Types/ContractsJSON.hs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ instance FromJSON Block where

data Resource = Resource
{ block :: Block
, continuations :: Maybe String
, contractId :: String
, roleTokenMintingPolicyId :: String
, status :: String
Expand All @@ -49,7 +48,6 @@ instance FromJSON Resource where
parseJSON :: Value -> Parser Resource
parseJSON = withObject "Resource" $ \o ->
Resource <$> o .: "block"
<*> o .: "continuations"
<*> o .: "contractId"
<*> o .: "roleTokenMintingPolicyId"
<*> o .: "status"
Expand Down
3 changes: 0 additions & 3 deletions src/Language/Marlowe/Runtime/Types/TransactionJSON.hs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ data Token = Token
data Resource = Resource
{ block :: Block,
consumingTx :: Maybe String,
continuations :: Maybe String,
contractId :: String,
inputUtxo :: String,
inputs :: [Input],
Expand Down Expand Up @@ -96,7 +95,6 @@ instance FromJSON Resource where
parseJSON = withObject "Resource" $ \v -> do
block' <- v .: "block"
consumingTx' <- v .:? "consumingTx"
continuations' <- v .:? "continuations"
contractId' <- v .: "contractId"
inputUtxo' <- v .: "inputUtxo"
inputs' <- v .: "inputs"
Expand All @@ -110,7 +108,6 @@ instance FromJSON Resource where
transactionId' <- v .: "transactionId"
return Resource { block = block'
, consumingTx = consumingTx'
, continuations = continuations'
, contractId = contractId'
, inputUtxo = inputUtxo'
, inputs = inputs'
Expand Down

0 comments on commit 4996b51

Please sign in to comment.