diff --git a/README.md b/README.md index 840cb6d..33d63ef 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,29 @@ -# MarloweScan +

+ + Logo + +
+ MarloweScan (Marlowe Cardano Explorer) +

+

+ +

+
+ Beta + + +
+ +> [!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.
+> 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).
+> 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 diff --git a/doc/image/favicon.ico b/doc/image/favicon.ico new file mode 100644 index 0000000..ca7487d Binary files /dev/null and b/doc/image/favicon.ico differ diff --git a/doc/image/github.svg b/doc/image/github.svg new file mode 100644 index 0000000..e6dbc42 --- /dev/null +++ b/doc/image/github.svg @@ -0,0 +1,3 @@ + + + diff --git a/doc/image/logo-header.svg b/doc/image/logo-header.svg new file mode 100644 index 0000000..050e729 --- /dev/null +++ b/doc/image/logo-header.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/doc/image/logo.png b/doc/image/logo.png new file mode 100644 index 0000000..f635aae Binary files /dev/null and b/doc/image/logo.png differ diff --git a/doc/image/logo.svg b/doc/image/logo.svg new file mode 100644 index 0000000..4d3e814 --- /dev/null +++ b/doc/image/logo.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Language/Marlowe/Runtime/Types/ContractsJSON.hs b/src/Language/Marlowe/Runtime/Types/ContractsJSON.hs index ae7e406..66856e0 100644 --- a/src/Language/Marlowe/Runtime/Types/ContractsJSON.hs +++ b/src/Language/Marlowe/Runtime/Types/ContractsJSON.hs @@ -38,7 +38,6 @@ instance FromJSON Block where data Resource = Resource { block :: Block - , continuations :: Maybe String , contractId :: String , roleTokenMintingPolicyId :: String , status :: String @@ -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" diff --git a/src/Language/Marlowe/Runtime/Types/TransactionJSON.hs b/src/Language/Marlowe/Runtime/Types/TransactionJSON.hs index 70281a1..393e242 100644 --- a/src/Language/Marlowe/Runtime/Types/TransactionJSON.hs +++ b/src/Language/Marlowe/Runtime/Types/TransactionJSON.hs @@ -38,7 +38,6 @@ data Token = Token data Resource = Resource { block :: Block, consumingTx :: Maybe String, - continuations :: Maybe String, contractId :: String, inputUtxo :: String, inputs :: [Input], @@ -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" @@ -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'