From 4f07f6b18c1be00f95e978cfe936facf6b6c9006 Mon Sep 17 00:00:00 2001
From: rv-jenkins <admin@runtimeverification.com>
Date: Tue, 8 Oct 2019 09:12:31 -0500
Subject: [PATCH] Update dependencies (#507)

* deps/k: update submodule

* deps/plugin: update submodule

* deps/k: update submodule

* deps/k: update submodule

* Revert "deps/plugin: update submodule"

This reverts commit 7a552c885e718685035d07f133ce08ac859d18a5.

* Revert "Revert "deps/plugin: update submodule""

This reverts commit f09869713ca0973f6c1d1be5829946fe47cf2278.

* fix kore-json.py

* !!! (origin/update-labels) deps/plugin: update submodule

* deps/plugin: update submodule

* deps/k: update submodule

* add missing side condition

* deps/k: update submodule
---
 deps/k       |  2 +-
 deps/plugin  |  2 +-
 kore-json.py | 12 ++++++------
 web3.md      |  1 +
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/deps/k b/deps/k
index cf08050daf..b1e46e5f80 160000
--- a/deps/k
+++ b/deps/k
@@ -1 +1 @@
-Subproject commit cf08050daf69cfb886599a299c898a3a08592e05
+Subproject commit b1e46e5f80a5a289ec3520fc79d545eb9ce50cac
diff --git a/deps/plugin b/deps/plugin
index 918c5574a3..bded3f834c 160000
--- a/deps/plugin
+++ b/deps/plugin
@@ -1 +1 @@
-Subproject commit 918c5574a308fe9ae6b06c486714f5966082dd4c
+Subproject commit bded3f834ce765c1185955186931006075352305
diff --git a/kore-json.py b/kore-json.py
index 7ade3368f5..bf5858c7e7 100755
--- a/kore-json.py
+++ b/kore-json.py
@@ -14,24 +14,24 @@ def escape(data):
 
 def print_kast(data, sort="SortJSON"):
   if isinstance(data, list):
-    sys.stdout.write("Lbl'LSqBUndsRSqBUnds'EVM-DATA'UndsUnds'JSONList{}(")
+    sys.stdout.write("Lbl'LSqBUndsRSqBUnds'EVM-DATA'Unds'JSON'Unds'JSONList{}(")
     for elem in data:
-      sys.stdout.write("Lbl'UndsCommUndsUnds'EVM-DATA'UndsUnds'JSON'Unds'JSONList{}(")
+      sys.stdout.write("Lbl'UndsCommUndsUnds'EVM-DATA'Unds'JSONList'Unds'JSON'Unds'JSONList{}(")
       print_kast(elem)
       sys.stdout.write(',')
-    sys.stdout.write("Lbl'Stop'List'LBraQuotUndsCommUndsUnds'EVM-DATA'UndsUnds'JSON'Unds'JSONList'QuotRBraUnds'JSONList{}()")
+    sys.stdout.write("Lbl'Stop'List'LBraQuotUndsCommUndsUnds'EVM-DATA'Unds'JSONList'Unds'JSON'Unds'JSONList'QuotRBraUnds'JSONList{}()")
     for elem in data:
       sys.stdout.write(')')
     sys.stdout.write(')')
   elif isinstance(data, OrderedDict):
-    sys.stdout.write("Lbl'LBraUndsRBraUnds'EVM-DATA'UndsUnds'JSONList{}(")
+    sys.stdout.write("Lbl'LBraUndsRBraUnds'EVM-DATA'Unds'JSON'Unds'JSONList{}(")
     for key, value in data.items():
-      sys.stdout.write("Lbl'UndsCommUndsUnds'EVM-DATA'UndsUnds'JSON'Unds'JSONList{}(Lbl'UndsColnUndsUnds'EVM-DATA'UndsUnds'JSONKey'Unds'JSON{}(")
+      sys.stdout.write("Lbl'UndsCommUndsUnds'EVM-DATA'Unds'JSONList'Unds'JSON'Unds'JSONList{}(Lbl'UndsColnUndsUnds'EVM-DATA'Unds'JSON'Unds'JSONKey'Unds'JSON{}(")
       print_kast(key, "SortJSONKey")
       sys.stdout.write(',')
       print_kast(value)
       sys.stdout.write('),')
-    sys.stdout.write("Lbl'Stop'List'LBraQuotUndsCommUndsUnds'EVM-DATA'UndsUnds'JSON'Unds'JSONList'QuotRBraUnds'JSONList{}()")
+    sys.stdout.write("Lbl'Stop'List'LBraQuotUndsCommUndsUnds'EVM-DATA'Unds'JSONList'Unds'JSON'Unds'JSONList'QuotRBraUnds'JSONList{}()")
     for key in data:
       sys.stdout.write(')')
     sys.stdout.write(')')
diff --git a/web3.md b/web3.md
index 4039d5ff76..5395ee4b43 100644
--- a/web3.md
+++ b/web3.md
@@ -245,6 +245,7 @@ WEB3 JSON RPC
          <callid> CALLID </callid>
          <batch> [ _ ] </batch>
          <web3response> ... .List => ListItem({ "jsonrpc": "2.0", "id": CALLID, J }) </web3response>
+      requires CALLID =/=K undef
 
     rule <k> #sendResponse(_) ~> _ => #loadFromBatch </k>
          <callid> undef </callid>