From 1881088e5e7e7f5efd38867cd8a2b6bd9978eb9b Mon Sep 17 00:00:00 2001 From: Barnabas Busa Date: Wed, 28 Aug 2024 12:36:49 +0200 Subject: [PATCH 1/3] fix: remove epoch checker for goomy --- src/goomy_blob/goomy_blob.star | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/goomy_blob/goomy_blob.star b/src/goomy_blob/goomy_blob.star index c856af241..45b7d08cd 100644 --- a/src/goomy_blob/goomy_blob.star +++ b/src/goomy_blob/goomy_blob.star @@ -60,14 +60,14 @@ def get_config( [ "apt-get update", "apt-get install -y curl jq", - 'current_epoch=$(curl -s {0}/eth/v2/beacon/blocks/head | jq -r ".version")'.format( - cl_context.beacon_http_url, - ), - 'while [ $current_epoch != "deneb" ]; do echo "waiting for deneb, current epoch is $current_epoch"; current_epoch=$(curl -s {0}/eth/v2/beacon/blocks/head | jq -r ".version"); sleep {1}; done'.format( - cl_context.beacon_http_url, - seconds_per_slot, - ), - 'echo "sleep is over, starting to send blob transactions"', + # 'current_epoch=$(curl -s {0}/eth/v2/beacon/blocks/head | jq -r ".version")'.format( + # cl_context.beacon_http_url, + # ), + # 'while [ $current_epoch != "deneb" ]; do echo "waiting for deneb, current epoch is $current_epoch"; current_epoch=$(curl -s {0}/eth/v2/beacon/blocks/head | jq -r ".version"); sleep {1}; done'.format( + # cl_context.beacon_http_url, + # seconds_per_slot, + # ), + # 'echo "sleep is over, starting to send blob transactions"', "./blob-spammer -p {0} {1}".format( prefunded_addresses[4].private_key, " ".join(goomy_cli_args), From 978f1eb55aff234cc943f4941b8b5896e76d2762 Mon Sep 17 00:00:00 2001 From: Barnabas Busa Date: Wed, 28 Aug 2024 12:38:26 +0200 Subject: [PATCH 2/3] remove goomy blob checker --- src/goomy_blob/goomy_blob.star | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/goomy_blob/goomy_blob.star b/src/goomy_blob/goomy_blob.star index 45b7d08cd..30618ea8f 100644 --- a/src/goomy_blob/goomy_blob.star +++ b/src/goomy_blob/goomy_blob.star @@ -58,16 +58,6 @@ def get_config( cmd=[ " && ".join( [ - "apt-get update", - "apt-get install -y curl jq", - # 'current_epoch=$(curl -s {0}/eth/v2/beacon/blocks/head | jq -r ".version")'.format( - # cl_context.beacon_http_url, - # ), - # 'while [ $current_epoch != "deneb" ]; do echo "waiting for deneb, current epoch is $current_epoch"; current_epoch=$(curl -s {0}/eth/v2/beacon/blocks/head | jq -r ".version"); sleep {1}; done'.format( - # cl_context.beacon_http_url, - # seconds_per_slot, - # ), - # 'echo "sleep is over, starting to send blob transactions"', "./blob-spammer -p {0} {1}".format( prefunded_addresses[4].private_key, " ".join(goomy_cli_args), From e541ab579b550e2248dc26860cc1f58c7ed37add Mon Sep 17 00:00:00 2001 From: Barnabas Busa Date: Wed, 28 Aug 2024 12:45:33 +0200 Subject: [PATCH 3/3] clenaup --- src/goomy_blob/goomy_blob.star | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/goomy_blob/goomy_blob.star b/src/goomy_blob/goomy_blob.star index 30618ea8f..b89207937 100644 --- a/src/goomy_blob/goomy_blob.star +++ b/src/goomy_blob/goomy_blob.star @@ -52,19 +52,14 @@ def get_config( goomy_args = "combined -b 2 -t 2 --max-pending 3" goomy_cli_args.append(goomy_args) + cmd = "./blob-spammer -p {0} {1}".format( + prefunded_addresses[4].private_key, " ".join(goomy_cli_args) + ) + return ServiceConfig( image=IMAGE_NAME, entrypoint=ENTRYPOINT_ARGS, - cmd=[ - " && ".join( - [ - "./blob-spammer -p {0} {1}".format( - prefunded_addresses[4].private_key, - " ".join(goomy_cli_args), - ), - ] - ) - ], + cmd=[cmd], min_cpu=MIN_CPU, max_cpu=MAX_CPU, min_memory=MIN_MEMORY,