From 2f94fd2ce2d9daf9547222f336b9cff73355ba4c Mon Sep 17 00:00:00 2001 From: devops Date: Fri, 1 Mar 2024 19:06:42 +0000 Subject: [PATCH 01/29] deps/k_release: Set Version 6.3.24 --- deps/k_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/k_release b/deps/k_release index 02b0a53c..6d721abf 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -6.3.23 +6.3.24 From df705cec5cd317929cb947aaf8d98e6fe4287153 Mon Sep 17 00:00:00 2001 From: devops Date: Mon, 4 Mar 2024 13:44:39 +0000 Subject: [PATCH 02/29] deps/k_release: Set Version 6.3.25 --- deps/k_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/k_release b/deps/k_release index 6d721abf..c73b21b8 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -6.3.24 +6.3.25 From fd993f26069cabf6d7433f644dba8e26b0646bb1 Mon Sep 17 00:00:00 2001 From: devops Date: Wed, 6 Mar 2024 23:06:16 +0000 Subject: [PATCH 03/29] deps/k_release: Set Version 6.3.28 --- deps/k_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/k_release b/deps/k_release index c73b21b8..3906e50a 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -6.3.25 +6.3.28 From a339f237d0994b83bb65cfc27128eeacedcfe665 Mon Sep 17 00:00:00 2001 From: devops Date: Thu, 7 Mar 2024 17:36:23 +0000 Subject: [PATCH 04/29] deps/k_release: Set Version 6.3.29 --- deps/k_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/k_release b/deps/k_release index 3906e50a..c6acbd06 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -6.3.28 +6.3.29 From 73db86b51562cfd029e6eac25bb4c0e46b9a1d0a Mon Sep 17 00:00:00 2001 From: devops Date: Wed, 13 Mar 2024 00:42:21 +0000 Subject: [PATCH 05/29] deps/k_release: Set Version 6.3.30 --- deps/k_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/k_release b/deps/k_release index c6acbd06..f257f0b9 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -6.3.29 +6.3.30 From ae5a1bb8fbc588a4c3ce20c043cf00c5a0352164 Mon Sep 17 00:00:00 2001 From: devops Date: Wed, 13 Mar 2024 03:47:35 +0000 Subject: [PATCH 06/29] deps/k_release: Set Version 6.3.32 --- deps/k_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/k_release b/deps/k_release index f257f0b9..4b7d460f 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -6.3.30 +6.3.32 From 325798eae611031a6c404c362808ec4579aadd18 Mon Sep 17 00:00:00 2001 From: devops Date: Wed, 13 Mar 2024 14:44:54 +0000 Subject: [PATCH 07/29] deps/k_release: Set Version 6.3.33 --- deps/k_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/k_release b/deps/k_release index 4b7d460f..37c17bb5 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -6.3.32 +6.3.33 From 03ee46415d8d2d7632459b3fbf09f2a63023577c Mon Sep 17 00:00:00 2001 From: devops Date: Wed, 13 Mar 2024 16:57:49 +0000 Subject: [PATCH 08/29] deps/k_release: Set Version 6.3.34 --- deps/k_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/k_release b/deps/k_release index 37c17bb5..693ad225 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -6.3.33 +6.3.34 From d9331d2377ba0bb44ad54259d86658694b01f03a Mon Sep 17 00:00:00 2001 From: devops Date: Wed, 13 Mar 2024 19:32:58 +0000 Subject: [PATCH 09/29] deps/k_release: Set Version 6.3.35 --- deps/k_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/k_release b/deps/k_release index 693ad225..11cc4685 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -6.3.34 +6.3.35 From 975393b8f7ed21bf358e76dd118deeda5812aaf4 Mon Sep 17 00:00:00 2001 From: devops Date: Wed, 13 Mar 2024 21:07:36 +0000 Subject: [PATCH 10/29] deps/k_release: Set Version 6.3.37 --- deps/k_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/k_release b/deps/k_release index 11cc4685..4ae4ba47 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -6.3.35 +6.3.37 From 32c540d58eea06f5535059f9bd023fc4b0282f89 Mon Sep 17 00:00:00 2001 From: devops Date: Thu, 14 Mar 2024 11:47:24 +0000 Subject: [PATCH 11/29] deps/k_release: Set Version 6.3.39 --- deps/k_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/k_release b/deps/k_release index 4ae4ba47..323518cb 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -6.3.37 +6.3.39 From 023fe0399fb1ac295a2f74138c4a9e7f4e221151 Mon Sep 17 00:00:00 2001 From: devops Date: Fri, 15 Mar 2024 20:51:39 +0000 Subject: [PATCH 12/29] deps/k_release: Set Version 6.3.41 --- deps/k_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/k_release b/deps/k_release index 323518cb..cff1bba2 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -6.3.39 +6.3.41 From 2b902e9d00f562f84875e2e0cafbefca102081a7 Mon Sep 17 00:00:00 2001 From: devops Date: Fri, 15 Mar 2024 22:36:41 +0000 Subject: [PATCH 13/29] deps/k_release: Set Version 6.3.42 --- deps/k_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/k_release b/deps/k_release index cff1bba2..24f65e18 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -6.3.41 +6.3.42 From 34d9914f22e9135ba0de105906736ef5890015c1 Mon Sep 17 00:00:00 2001 From: devops Date: Mon, 18 Mar 2024 15:28:21 +0000 Subject: [PATCH 14/29] deps/k_release: Set Version 6.3.43 --- deps/k_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/k_release b/deps/k_release index 24f65e18..7326c5a9 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -6.3.42 +6.3.43 From d872cf5bd519176a9cff06c4b82a0afda9ebdf6b Mon Sep 17 00:00:00 2001 From: devops Date: Mon, 18 Mar 2024 20:54:05 +0000 Subject: [PATCH 15/29] deps/k_release: Set Version 6.3.44 --- deps/k_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/k_release b/deps/k_release index 7326c5a9..00a74176 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -6.3.43 +6.3.44 From 4f562fbe0305abc854928be4bf65a7d5b0f2f17a Mon Sep 17 00:00:00 2001 From: devops Date: Tue, 19 Mar 2024 12:32:00 +0000 Subject: [PATCH 16/29] deps/k_release: Set Version 6.3.45 --- deps/k_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/k_release b/deps/k_release index 00a74176..b92e1462 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -6.3.44 +6.3.45 From f12444505dfb952166c7b2e8f2d43a26718f006b Mon Sep 17 00:00:00 2001 From: devops Date: Wed, 20 Mar 2024 10:17:45 +0000 Subject: [PATCH 17/29] deps/k_release: Set Version 6.3.47 --- deps/k_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/k_release b/deps/k_release index b92e1462..117f9028 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -6.3.45 +6.3.47 From 03f57ea769796ec2bfac3862895bd05fd6dbcfb3 Mon Sep 17 00:00:00 2001 From: devops Date: Wed, 20 Mar 2024 17:10:24 +0000 Subject: [PATCH 18/29] deps/k_release: Set Version 6.3.50 --- deps/k_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/k_release b/deps/k_release index 117f9028..148535cd 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -6.3.47 +6.3.50 From 38c6c5e129444114671d3842145071ff221cc235 Mon Sep 17 00:00:00 2001 From: devops Date: Wed, 20 Mar 2024 19:14:39 +0000 Subject: [PATCH 19/29] deps/k_release: Set Version 6.3.51 --- deps/k_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/k_release b/deps/k_release index 148535cd..3492e94d 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -6.3.50 +6.3.51 From f9875628cf0b7fe7a50e6a29b9877dd82d0ab7f0 Mon Sep 17 00:00:00 2001 From: devops Date: Thu, 21 Mar 2024 10:21:24 +0000 Subject: [PATCH 20/29] deps/k_release: Set Version 6.3.52 --- deps/k_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/k_release b/deps/k_release index 3492e94d..b66560cc 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -6.3.51 +6.3.52 From 889f1b350908be2e1f3bda59d16d48edf7063d65 Mon Sep 17 00:00:00 2001 From: devops Date: Thu, 21 Mar 2024 22:34:40 +0000 Subject: [PATCH 21/29] deps/k_release: Set Version 6.3.54 --- deps/k_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/k_release b/deps/k_release index b66560cc..a339d8a4 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -6.3.52 +6.3.54 From b45b94273187464cea4c87564275b2b6130cdf7a Mon Sep 17 00:00:00 2001 From: Jost Berthold Date: Fri, 22 Mar 2024 10:53:24 +1100 Subject: [PATCH 22/29] update blockchain plugin, bump K dependency to latest --- deps/blockchain-k-plugin_release | 2 +- deps/k_release | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps/blockchain-k-plugin_release b/deps/blockchain-k-plugin_release index e4aa3283..4840ba79 100644 --- a/deps/blockchain-k-plugin_release +++ b/deps/blockchain-k-plugin_release @@ -1 +1 @@ -f27c5ec4861272c1ad4496bc6aab9f47dd6d473a +247588a696bdb7fcfc170c93a59bd86927a91b3c diff --git a/deps/k_release b/deps/k_release index a339d8a4..e31495f0 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -6.3.54 +6.3.57 From 49739f98364411115b213d34744f868b78b98b9b Mon Sep 17 00:00:00 2001 From: Jost Berthold Date: Fri, 22 Mar 2024 11:56:32 +1100 Subject: [PATCH 23/29] shoe-horn the secp256k1 dependency into the foundry test setup --- scripts/integration-tests.sh | 2 ++ test/rpc-integration/resources/foundry-bug-report.kompile | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/integration-tests.sh b/scripts/integration-tests.sh index 2adb01e7..2f7f9443 100755 --- a/scripts/integration-tests.sh +++ b/scripts/integration-tests.sh @@ -14,6 +14,8 @@ cabal test llvm-integration # The runDirectoryTest.sh script expects the following env vars to be set export PLUGIN_DIR=$(nix build github:runtimeverification/blockchain-k-plugin/$PLUGIN_VERSION --no-link --json | jq -r '.[].outputs | to_entries[].value') +export SECP256K1_DIR=$(nix build nixpkgs#secp256k1 --no-link --json | jq -r '.[].outputs | to_entries[].value') + cabal build all KORE_RPC_BOOSTER=$(cabal exec which kore-rpc-booster) BOOSTER_DEV=$(cabal exec which booster-dev) diff --git a/test/rpc-integration/resources/foundry-bug-report.kompile b/test/rpc-integration/resources/foundry-bug-report.kompile index 24be12fa..c5da934a 100755 --- a/test/rpc-integration/resources/foundry-bug-report.kompile +++ b/test/rpc-integration/resources/foundry-bug-report.kompile @@ -2,13 +2,13 @@ set -eux SCRIPT_DIR=$(dirname $0) PLUGIN_DIR=${PLUGIN_DIR:-""} - +SECP=${SECP256K1_DIR:-/usr} if [ -z "$PLUGIN_DIR" ]; then echo "PLUGIN_DIR required to link in a crypto plugin dependency" exit 1 else - for lib in libff libcryptopp libsecp256k1; do + for lib in libff libcryptopp; do LIBFILE=$(find ${PLUGIN_DIR} -name "${lib}.a" | head -1) [ -z "$LIBFILE" ] && (echo "[Error] Unable to locate ${lib}.a"; exit 1) PLUGIN_LIBS+="$LIBFILE " @@ -18,6 +18,8 @@ else PLUGIN_CPP="${PLUGIN_DIR}/include/plugin-c/blake2.cpp ${PLUGIN_DIR}/include/plugin-c/crypto.cpp ${PLUGIN_DIR}/include/plugin-c/plugin_util.cpp" fi +SECP_OPTS="-I${SECP}/include -L${SECP}/lib" + NAME=$(basename ${0%.tar.gz.kompile}) NAMETGZ=$(basename ${0%.kompile}) @@ -39,7 +41,7 @@ esac llvm-kompile foundry-bug-report.llvm.kore ./dt c -- \ -fPIC -std=c++17 -o interpreter \ $PLUGIN_LIBS $PLUGIN_INCLUDE $PLUGIN_CPP \ - -lcrypto -lssl $LPROCPS + -lcrypto -lssl $LPROCPS ${SECP_OPTS} mv interpreter.* foundry-bug-report.dylib # remove temporary artefacts From 2ce80600b1ce10062f191ab428ff843ce5ae69d4 Mon Sep 17 00:00:00 2001 From: devops Date: Fri, 22 Mar 2024 01:29:13 +0000 Subject: [PATCH 24/29] deps/k_release: Set Version 6.3.58 --- deps/k_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/k_release b/deps/k_release index e31495f0..b35e0e9e 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -6.3.57 +6.3.58 From 5bf5c256338bf2790aaef1e736511bfcd6857d85 Mon Sep 17 00:00:00 2001 From: Jost Berthold Date: Fri, 22 Mar 2024 12:25:36 +1100 Subject: [PATCH 25/29] make runDirectoryTest abort when the server does not start --- test/rpc-integration/runDirectoryTest.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/test/rpc-integration/runDirectoryTest.sh b/test/rpc-integration/runDirectoryTest.sh index 20599c87..3669f97b 100755 --- a/test/rpc-integration/runDirectoryTest.sh +++ b/test/rpc-integration/runDirectoryTest.sh @@ -85,7 +85,13 @@ done # find server port via lsof server_port=$(lsof -a -p${server_pid} -sTCP:LISTEN -iTCP | grep ${server_pid} | sed -e 's/.* TCP \*:\([0-9]*\).*$/\1/') -echo "Server listening on port ${server_port}" + +if [ -z "${server_port}" ]; then + echo "Unable to identify the server, aborting" + exit 4 +else + echo "Server listening on port ${server_port}" +fi client="$client -p ${server_port}" From 1622515140f07435ac07ca470dd46104ec5c7ce2 Mon Sep 17 00:00:00 2001 From: Jost Berthold Date: Fri, 22 Mar 2024 12:35:01 +1100 Subject: [PATCH 26/29] modify how blake2 is included in foundry dylib --- test/rpc-integration/resources/foundry-bug-report.kompile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/rpc-integration/resources/foundry-bug-report.kompile b/test/rpc-integration/resources/foundry-bug-report.kompile index c5da934a..a4867d9d 100755 --- a/test/rpc-integration/resources/foundry-bug-report.kompile +++ b/test/rpc-integration/resources/foundry-bug-report.kompile @@ -8,14 +8,14 @@ if [ -z "$PLUGIN_DIR" ]; then echo "PLUGIN_DIR required to link in a crypto plugin dependency" exit 1 else - for lib in libff libcryptopp; do + for lib in libff libcryptopp blake2; do LIBFILE=$(find ${PLUGIN_DIR} -name "${lib}.a" | head -1) [ -z "$LIBFILE" ] && (echo "[Error] Unable to locate ${lib}.a"; exit 1) PLUGIN_LIBS+="$LIBFILE " - PLUGIN_INCLUDE+="-I$(dirname $LIBFILE)/../include " + PLUGIN_INCLUDE+="-I$(dirname $LIBFILE) -I$(dirname $LIBFILE)/../include " done #PLUGIN_CPP=$(find ${PLUGIN_DIR}/plugin-c -name "*.cpp") - PLUGIN_CPP="${PLUGIN_DIR}/include/plugin-c/blake2.cpp ${PLUGIN_DIR}/include/plugin-c/crypto.cpp ${PLUGIN_DIR}/include/plugin-c/plugin_util.cpp" + PLUGIN_CPP="${PLUGIN_DIR}/include/plugin-c/crypto.cpp ${PLUGIN_DIR}/include/plugin-c/plugin_util.cpp" fi SECP_OPTS="-I${SECP}/include -L${SECP}/lib" From 2aa77ffa66a4eeea4c432344a2b291785b8477a4 Mon Sep 17 00:00:00 2001 From: Jost Berthold Date: Fri, 22 Mar 2024 13:15:48 +1100 Subject: [PATCH 27/29] follow name change for #if_#then_#else_#fi. Very important! --- .../test-simplify/response-if-then-else-arity-error.json | 6 +++--- .../test-simplify/response-if-then-else-indeterminate.json | 2 +- .../test-simplify/response-if-then-else-sort-error.json | 2 +- .../test-simplify/state-if-then-else-arity-error.simplify | 2 +- .../test-simplify/state-if-then-else-eval.simplify | 2 +- .../test-simplify/state-if-then-else-false.simplify | 2 +- .../test-simplify/state-if-then-else-indeterminate.simplify | 2 +- .../test-simplify/state-if-then-else-sort-error.simplify | 2 +- .../test-simplify/state-if-then-else-true.simplify | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/test/rpc-integration/test-simplify/response-if-then-else-arity-error.json b/test/rpc-integration/test-simplify/response-if-then-else-arity-error.json index beea6b3b..166fe565 100644 --- a/test/rpc-integration/test-simplify/response-if-then-else-arity-error.json +++ b/test/rpc-integration/test-simplify/response-if-then-else-arity-error.json @@ -24,7 +24,7 @@ "args": [ { "tag": "App", - "name": "Lbl'Hash'if'UndsHash'then'UndsHash'else'UndsHash'fi'Unds'K-EQUAL-SYNTAX'Unds'Sort'Unds'Bool'Unds'Sort'Unds'Sort", + "name": "Lblite", "sorts": [ { "tag": "SortApp", @@ -62,7 +62,7 @@ "context": [ { "tag": "App", - "name": "Lbl'Hash'if'UndsHash'then'UndsHash'else'UndsHash'fi'Unds'K-EQUAL-SYNTAX'Unds'Sort'Unds'Bool'Unds'Sort'Unds'Sort", + "name": "Lblite", "sorts": [ { "tag": "SortApp", @@ -92,7 +92,7 @@ ] } ], - "error": "Inconsistent pattern. Symbol 'Lbl'Hash'if'UndsHash'then'UndsHash'else'UndsHash'fi'Unds'K-EQUAL-SYNTAX'Unds'Sort'Unds'Bool'Unds'Sort'Unds'Sort' expected 3 arguments but got 2" + "error": "Inconsistent pattern. Symbol 'Lblite' expected 3 arguments but got 2" } ], "message": "Could not verify pattern" diff --git a/test/rpc-integration/test-simplify/response-if-then-else-indeterminate.json b/test/rpc-integration/test-simplify/response-if-then-else-indeterminate.json index 943a6120..8ce41ff7 100644 --- a/test/rpc-integration/test-simplify/response-if-then-else-indeterminate.json +++ b/test/rpc-integration/test-simplify/response-if-then-else-indeterminate.json @@ -23,7 +23,7 @@ "args": [ { "tag": "App", - "name": "Lbl'Hash'if'UndsHash'then'UndsHash'else'UndsHash'fi'Unds'K-EQUAL-SYNTAX'Unds'Sort'Unds'Bool'Unds'Sort'Unds'Sort", + "name": "Lblite", "sorts": [ { "tag": "SortApp", diff --git a/test/rpc-integration/test-simplify/response-if-then-else-sort-error.json b/test/rpc-integration/test-simplify/response-if-then-else-sort-error.json index dc39713a..d7d54aa7 100644 --- a/test/rpc-integration/test-simplify/response-if-then-else-sort-error.json +++ b/test/rpc-integration/test-simplify/response-if-then-else-sort-error.json @@ -24,7 +24,7 @@ "args": [ { "tag": "App", - "name": "Lbl'Hash'if'UndsHash'then'UndsHash'else'UndsHash'fi'Unds'K-EQUAL-SYNTAX'Unds'Sort'Unds'Bool'Unds'Sort'Unds'Sort", + "name": "Lblite", "sorts": [ { "tag": "SortApp", diff --git a/test/rpc-integration/test-simplify/state-if-then-else-arity-error.simplify b/test/rpc-integration/test-simplify/state-if-then-else-arity-error.simplify index e876bc21..b765d015 100644 --- a/test/rpc-integration/test-simplify/state-if-then-else-arity-error.simplify +++ b/test/rpc-integration/test-simplify/state-if-then-else-arity-error.simplify @@ -19,7 +19,7 @@ "args": [ { "tag": "App", - "name": "Lbl'Hash'if'UndsHash'then'UndsHash'else'UndsHash'fi'Unds'K-EQUAL-SYNTAX'Unds'Sort'Unds'Bool'Unds'Sort'Unds'Sort", + "name": "Lblite", "sorts": [ { "tag": "SortApp", diff --git a/test/rpc-integration/test-simplify/state-if-then-else-eval.simplify b/test/rpc-integration/test-simplify/state-if-then-else-eval.simplify index 8236ad34..b2830bfe 100644 --- a/test/rpc-integration/test-simplify/state-if-then-else-eval.simplify +++ b/test/rpc-integration/test-simplify/state-if-then-else-eval.simplify @@ -19,7 +19,7 @@ "args": [ { "tag": "App", - "name": "Lbl'Hash'if'UndsHash'then'UndsHash'else'UndsHash'fi'Unds'K-EQUAL-SYNTAX'Unds'Sort'Unds'Bool'Unds'Sort'Unds'Sort", + "name": "Lblite", "sorts": [ { "tag": "SortApp", diff --git a/test/rpc-integration/test-simplify/state-if-then-else-false.simplify b/test/rpc-integration/test-simplify/state-if-then-else-false.simplify index 6ed7c527..4bfada14 100644 --- a/test/rpc-integration/test-simplify/state-if-then-else-false.simplify +++ b/test/rpc-integration/test-simplify/state-if-then-else-false.simplify @@ -19,7 +19,7 @@ "args": [ { "tag": "App", - "name": "Lbl'Hash'if'UndsHash'then'UndsHash'else'UndsHash'fi'Unds'K-EQUAL-SYNTAX'Unds'Sort'Unds'Bool'Unds'Sort'Unds'Sort", + "name": "Lblite", "sorts": [ { "tag": "SortApp", diff --git a/test/rpc-integration/test-simplify/state-if-then-else-indeterminate.simplify b/test/rpc-integration/test-simplify/state-if-then-else-indeterminate.simplify index d4d1a58b..7348f80c 100644 --- a/test/rpc-integration/test-simplify/state-if-then-else-indeterminate.simplify +++ b/test/rpc-integration/test-simplify/state-if-then-else-indeterminate.simplify @@ -19,7 +19,7 @@ "args": [ { "tag": "App", - "name": "Lbl'Hash'if'UndsHash'then'UndsHash'else'UndsHash'fi'Unds'K-EQUAL-SYNTAX'Unds'Sort'Unds'Bool'Unds'Sort'Unds'Sort", + "name": "Lblite", "sorts": [ { "tag": "SortApp", diff --git a/test/rpc-integration/test-simplify/state-if-then-else-sort-error.simplify b/test/rpc-integration/test-simplify/state-if-then-else-sort-error.simplify index 13ed983a..8f66a227 100644 --- a/test/rpc-integration/test-simplify/state-if-then-else-sort-error.simplify +++ b/test/rpc-integration/test-simplify/state-if-then-else-sort-error.simplify @@ -19,7 +19,7 @@ "args": [ { "tag": "App", - "name": "Lbl'Hash'if'UndsHash'then'UndsHash'else'UndsHash'fi'Unds'K-EQUAL-SYNTAX'Unds'Sort'Unds'Bool'Unds'Sort'Unds'Sort", + "name": "Lblite", "sorts": [ { "tag": "SortApp", diff --git a/test/rpc-integration/test-simplify/state-if-then-else-true.simplify b/test/rpc-integration/test-simplify/state-if-then-else-true.simplify index c063162e..7427e7d0 100644 --- a/test/rpc-integration/test-simplify/state-if-then-else-true.simplify +++ b/test/rpc-integration/test-simplify/state-if-then-else-true.simplify @@ -19,7 +19,7 @@ "args": [ { "tag": "App", - "name": "Lbl'Hash'if'UndsHash'then'UndsHash'else'UndsHash'fi'Unds'K-EQUAL-SYNTAX'Unds'Sort'Unds'Bool'Unds'Sort'Unds'Sort", + "name": "Lblite", "sorts": [ { "tag": "SortApp", From 699cb55f82b0d3982a31ee2dd984ea7f884a1e09 Mon Sep 17 00:00:00 2001 From: Jost Berthold Date: Fri, 22 Mar 2024 15:40:01 +1100 Subject: [PATCH 28/29] TEMPORARY use fixed blockchain plugin from branch --- deps/blockchain-k-plugin_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/blockchain-k-plugin_release b/deps/blockchain-k-plugin_release index 4840ba79..f9b321af 100644 --- a/deps/blockchain-k-plugin_release +++ b/deps/blockchain-k-plugin_release @@ -1 +1 @@ -247588a696bdb7fcfc170c93a59bd86927a91b3c +b4c8fc85a3bb1d11d4dc07493c1f532ea3dea609 From 8f369e91feac7e29e53dbf4e754ff33a4310b24d Mon Sep 17 00:00:00 2001 From: Jost Berthold Date: Mon, 25 Mar 2024 10:16:29 +1100 Subject: [PATCH 29/29] use blockchain-k-plugin from master --- deps/blockchain-k-plugin_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/blockchain-k-plugin_release b/deps/blockchain-k-plugin_release index f9b321af..bad7f7fa 100644 --- a/deps/blockchain-k-plugin_release +++ b/deps/blockchain-k-plugin_release @@ -1 +1 @@ -b4c8fc85a3bb1d11d4dc07493c1f532ea3dea609 +5aa6993fab90675d971b8b98b3430d11f1ec2a2b