From c323d144a383350ef5ee9eb90025f1ddc4e5cadf Mon Sep 17 00:00:00 2001 From: nhenin Date: Sun, 10 Mar 2024 13:48:56 +0100 Subject: [PATCH] wip benchmark --- .../example/sanchonet/benchmark-sanchonet.yaml | 2 +- marlowe-benchmark/example/sanchonet/environment | 8 ++++---- marlowe-cli/run-test.sh | 2 +- .../src/Language/Marlowe/Runtime/Core/ScriptRegistry.hs | 6 +++--- nix/marlowe-cardano/deploy/oci-images.nix | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/marlowe-benchmark/example/sanchonet/benchmark-sanchonet.yaml b/marlowe-benchmark/example/sanchonet/benchmark-sanchonet.yaml index 5c5edccd56..8695f691ed 100644 --- a/marlowe-benchmark/example/sanchonet/benchmark-sanchonet.yaml +++ b/marlowe-benchmark/example/sanchonet/benchmark-sanchonet.yaml @@ -46,7 +46,7 @@ spec: - mountPath: /var/lib/postgresql/data name: pg-db - name: node - image: docker.io/inputoutput/cardano-node:8.1.2 + image: ghcr.io/intersectmbo/cardano-node:8.8.1-pre command: - /usr/local/bin/entrypoint env: diff --git a/marlowe-benchmark/example/sanchonet/environment b/marlowe-benchmark/example/sanchonet/environment index dc6fd4d65d..5f64b61cd3 100644 --- a/marlowe-benchmark/example/sanchonet/environment +++ b/marlowe-benchmark/example/sanchonet/environment @@ -1,8 +1,8 @@ export NETWORK=sanchonet -# export CARDANO_NODE_SOCKET_PATH=node.socket -# export CARDANO_TESTNET_MAGIC=2 -# export MARLOWE_RT_HOST=$(hostname) -# export MARLOWE_RT_PORT=37002 +export CARDANO_NODE_SOCKET_PATH=node.socket +export CARDANO_TESTNET_MAGIC=4 +export MARLOWE_RT_HOST=$(hostname) +export MARLOWE_RT_PORT=37002 export DB_PORT=54322 export PODNAME=benchmark-sanchonet export BENCHMARK_CONFIG=../benchmark-config.json diff --git a/marlowe-cli/run-test.sh b/marlowe-cli/run-test.sh index 8cf3578755..3714c7a8b6 100755 --- a/marlowe-cli/run-test.sh +++ b/marlowe-cli/run-test.sh @@ -18,7 +18,7 @@ # # cabal run exe:marlowe-cli -- \ - --babbage-era test \ + --conway-era test \ --testnet-magic $CARDANO_NODE_NETWORK_ID \ --max-concurrent-runners 8 \ --socket-path "$CARDANO_NODE_SOCKET_PATH" \ diff --git a/marlowe-runtime/src/Language/Marlowe/Runtime/Core/ScriptRegistry.hs b/marlowe-runtime/src/Language/Marlowe/Runtime/Core/ScriptRegistry.hs index 1c724c874d..f8a43e81da 100644 --- a/marlowe-runtime/src/Language/Marlowe/Runtime/Core/ScriptRegistry.hs +++ b/marlowe-runtime/src/Language/Marlowe/Runtime/Core/ScriptRegistry.hs @@ -112,7 +112,7 @@ caseAsDataV1Scripts = , ( sanchonetNetworkId , ReferenceScriptUtxo - { txOutRef = "dec7a723d65edc96405576a91462d6b43692f2d0d8bce1b5a1b67fdea5c72af9#1" + { txOutRef = "20cdaf23baa04c87f65e2eac8e7dbf7f81ba9cfa0a28e3f1368e0d4beb9eeacb#1" , txOut = Chain.TransactionOutput { address = @@ -175,7 +175,7 @@ caseAsDataV1Scripts = , ( sanchonetNetworkId , ReferenceScriptUtxo - { txOutRef = "dec7a723d65edc96405576a91462d6b43692f2d0d8bce1b5a1b67fdea5c72af9#2" + { txOutRef = "20cdaf23baa04c87f65e2eac8e7dbf7f81ba9cfa0a28e3f1368e0d4beb9eeacb#2" , txOut = Chain.TransactionOutput { address = @@ -238,7 +238,7 @@ caseAsDataV1Scripts = , ( (OpenRoleScript, sanchonetNetworkId) , ReferenceScriptUtxo - { txOutRef = "11a07c3ffff35f770ad0e65e1c868c59a1da89e9cd5362acfb754231958391a5#1" + { txOutRef = "cf31c53fde7430b9877d9ddee52130fb5ada800cb0185c6fbae52a604b5dd639#1" , txOut = Chain.TransactionOutput { address = diff --git a/nix/marlowe-cardano/deploy/oci-images.nix b/nix/marlowe-cardano/deploy/oci-images.nix index 51756f8cf5..3231de4c73 100644 --- a/nix/marlowe-cardano/deploy/oci-images.nix +++ b/nix/marlowe-cardano/deploy/oci-images.nix @@ -10,7 +10,7 @@ let mkImage = { name, description }: std.lib.ops.mkStandardOCI { inherit name; - tag = "latest"; + tag = "conway-test"; operable = operables.${name}; uid = "0"; gid = "0";