PLT-7260 Added guard for safety errors.

input-output-hk · Sep 10, 2023 · 3993642 · 3993642
1 parent 5e19245
commit 3993642
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 23 deletions.
diff --git a/lessons/08-cip45/marleon.html b/lessons/08-cip45/marleon.html
@@ -6,7 +6,7 @@
     <script src="controller.js" type="application/javascript"> </script>
     <title>Donate via Marleon</title>
   </head>
-  <body id="uiBody" style="color:darkblue;font-size:smaller" onload="Controller.initialize()">
+  <body id="uiBody" style="color:darkblue;background-color:aliceblue;font-size:smaller" onload="Controller.initialize()">
     <h1>Donate via Marleon</h1>
     <p>Marleon is a Marlowe contract for sending tokens to the holder of a Marlowe role token.</p>
     <ol>

diff --git a/lessons/08-cip45/src/controller.js b/lessons/08-cip45/src/controller.js
@@ -196,18 +196,22 @@ export async function createContract() {
   , uiRuntime.innerText + "/contracts"
   , "application/vendor.iog.marlowe-runtime.contract-tx-json"
   , function(res) {
-      uiFundingPolicy.disabled = true
-      uiFundingName.disabled = true
-      uiFundingAmount.disabled = true
-      uiDepositTime.disabled = true
-      setContract(res.resource.contractId)
-      contractUrl = uiRuntime.innerText + "/" + res.links.contract
-      const followup = function() {
-        uiCreate.disabled = true
-        uiDeposit.disabled = false
-        setTx(uiCreateTx, contractId.replace(/#.*$/, ""))
+      if (res.resource.safetyErrors.length > 0) {
+	report("Refusing to create contract with safety errors: " + res.resource.safetyErrors.map(x => x.detail).join(" "))
+      } else {
+        uiFundingPolicy.disabled = true
+        uiFundingName.disabled = true
+        uiFundingAmount.disabled = true
+        uiDepositTime.disabled = true
+        setContract(res.resource.contractId)
+        contractUrl = uiRuntime.innerText + "/" + res.links.contract
+        const followup = function() {
+          uiCreate.disabled = true
+          uiDeposit.disabled = false
+          setTx(uiCreateTx, contractId.replace(/#.*$/, ""))
+        }
+        submitTransaction(res.resource.tx.cborHex, contractUrl, waitForConfirmation(contractUrl, followup))
       }
-      submitTransaction(res.resource.tx.cborHex, contractUrl, waitForConfirmation(contractUrl, followup))
     }
   )
 }

diff --git a/lessons/08-cip45/view.css b/lessons/08-cip45/view.css
@@ -38,5 +38,4 @@ body {
   max-width: 100%;
   overflow-x: hidden;
   font-family: sans-serif;
-  background-color: aliceblue;
 }
diff --git a/lessons/08-cip45/webpack-production.config.js b/lessons/08-cip45/webpack-production.config.js
@@ -0,0 +1,30 @@
+const path = require('path')
+
+module.exports = {
+  entry           : './src/controller.js'
+, mode            : 'production'
+, output          : {
+    filename      : 'controller.js'
+  , path          : path.resolve(__dirname, '.')
+  , libraryTarget : "var"
+  , library       : "Controller"
+  },
+  devServer: {
+    static: ".",
+    allowedHosts: "all",
+    host: "0.0.0.0",
+    port: 8080,
+    headers: {
+      "Access-Control-Allow-Origin": "*",
+      "Access-Control-Allow-Methods": "GET, POST, PUT, DELETE, PATCH, OPTIONS",
+      "Access-Control-Allow-Headers": "X-Requested-With, content-type, Authorization"
+    },
+    https: {
+      key: 'key.pem',
+      cert: 'cert.pem'
+    },
+    client: {
+      overlay: false,
+    }
+  }
+}
diff --git a/lessons/08-cip45/webpack.config.js b/lessons/08-cip45/webpack.config.js
@@ -2,7 +2,7 @@ const path = require('path')
 
 module.exports = {
   entry           : './src/controller.js'
-, mode            : 'production'
+, mode            : 'development'
 , output          : {
     filename      : 'controller.js'
   , path          : path.resolve(__dirname, '.')
@@ -11,20 +11,12 @@ module.exports = {
   },
   devServer: {
     static: ".",
-    allowedHosts: "all",
-    host: "0.0.0.0",
+    host: "127.0.0.1",
     port: 8080,
     headers: {
       "Access-Control-Allow-Origin": "*",
       "Access-Control-Allow-Methods": "GET, POST, PUT, DELETE, PATCH, OPTIONS",
       "Access-Control-Allow-Headers": "X-Requested-With, content-type, Authorization"
-    },
-    https: {
-      key: 'key.pem',
-      cert: 'cert.pem'
-    },
-    client: {
-      overlay: false,
     }
   }
 }