From 2736626fcab23f10019b7dd15ef8edb05a0e6e24 Mon Sep 17 00:00:00 2001 From: harkamal Date: Sat, 4 Oct 2025 21:58:39 +0530 Subject: [PATCH 1/7] rebase qlean cmd to new format --- client-cmds/qlean-cmd.sh | 14 ++++++++++++-- spin-node.sh | 7 +++++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/client-cmds/qlean-cmd.sh b/client-cmds/qlean-cmd.sh index 4ff639a..a84d1a2 100644 --- a/client-cmds/qlean-cmd.sh +++ b/client-cmds/qlean-cmd.sh @@ -1,8 +1,18 @@ #!/bin/bash #-----------------------qlean setup---------------------- -node_binary= +# expects "qlean" submodule or symlink inside "lean-quickstart" root directory +# https://github.com/qdrvm/qlean-mini +node_binary="$scriptDir/qlean/build/src/executable/qlean \ + --modules-dir $scriptDir/qlean/build/src/modules \ + --genesis $configDir/config.yaml \ + --validator-registry-path $configDir/validators.yaml \ + --bootnodes $configDir/nodes.yaml + --node-id $item --node-key /config/$privKeyPath \ + --listen-addr /ip4/0.0.0.0/udp/$quicPort/quic-v1 \ + 2>&1 | tee $dataDir/$item.log" + node_docker= # choose either binary or docker -node_setup="docker" \ No newline at end of file +node_setup="binary" \ No newline at end of file diff --git a/spin-node.sh b/spin-node.sh index c7baf20..8528e84 100755 --- a/spin-node.sh +++ b/spin-node.sh @@ -3,6 +3,9 @@ currentDir=$(pwd) scriptDir=$(dirname $0) +if [ "$scriptDir" == "." ]; then + scriptDir="$currentDir" +fi # 0. parse env and args source "$(dirname $0)/parse-env.sh" @@ -47,12 +50,12 @@ then fi; # 4. run clients -mkdir $dataDir +mkdir -p $dataDir popupTerminalCmd="gnome-terminal --disable-factory --" for item in "${spin_nodes[@]}"; do # create and/or cleanup datadirs itemDataDir="$dataDir/$item" - mkdir $itemDataDir + mkdir -p $itemDataDir cmd="sudo rm -rf $itemDataDir/*" echo $cmd eval $cmd From bfd75a1bed3af5ab6118bb6bfa2124dbc4ee484e Mon Sep 17 00:00:00 2001 From: harkamal Date: Sat, 4 Oct 2025 22:43:20 +0530 Subject: [PATCH 2/7] small cleanup --- spin-node.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/spin-node.sh b/spin-node.sh index 8528e84..274e37b 100755 --- a/spin-node.sh +++ b/spin-node.sh @@ -16,10 +16,7 @@ source "$(dirname $0)/set-up.sh" # should take config.yaml and validator-config.yaml and generate files # 1. nodes.yaml 2. validators.yaml 3. .key files for each of nodes -# 2. get the client cmds with args set -source "$scriptDir/$NETWORK_DIR/client_env.sh" - -# 3. collect the nodes that the user has asked us to spin and perform setup +# 2. collect the nodes that the user has asked us to spin and perform setup if [ "$validatorConfig" == "genesis_bootnode" ] || [ -z "$validatorConfig" ]; then validator_config_file="$configDir/validator-config.yaml" else @@ -49,7 +46,7 @@ then exit; fi; -# 4. run clients +# 3. run clients mkdir -p $dataDir popupTerminalCmd="gnome-terminal --disable-factory --" for item in "${spin_nodes[@]}"; do From 3037583a771d792b2fa64067e7dade20f35f4db9 Mon Sep 17 00:00:00 2001 From: turuslan Date: Sun, 5 Oct 2025 09:34:44 +0500 Subject: [PATCH 3/7] remove log capture --- client-cmds/qlean-cmd.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/client-cmds/qlean-cmd.sh b/client-cmds/qlean-cmd.sh index a84d1a2..3a995c5 100644 --- a/client-cmds/qlean-cmd.sh +++ b/client-cmds/qlean-cmd.sh @@ -9,8 +9,7 @@ node_binary="$scriptDir/qlean/build/src/executable/qlean \ --validator-registry-path $configDir/validators.yaml \ --bootnodes $configDir/nodes.yaml --node-id $item --node-key /config/$privKeyPath \ - --listen-addr /ip4/0.0.0.0/udp/$quicPort/quic-v1 \ - 2>&1 | tee $dataDir/$item.log" + --listen-addr /ip4/0.0.0.0/udp/$quicPort/quic-v1" node_docker= From b6ed186c997e92fdc002233bd351543661ca62a7 Mon Sep 17 00:00:00 2001 From: turuslan Date: Sun, 5 Oct 2025 09:45:07 +0500 Subject: [PATCH 4/7] fix merge --- client-cmds/qlean-cmd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client-cmds/qlean-cmd.sh b/client-cmds/qlean-cmd.sh index 3a995c5..19ec842 100644 --- a/client-cmds/qlean-cmd.sh +++ b/client-cmds/qlean-cmd.sh @@ -7,7 +7,7 @@ node_binary="$scriptDir/qlean/build/src/executable/qlean \ --modules-dir $scriptDir/qlean/build/src/modules \ --genesis $configDir/config.yaml \ --validator-registry-path $configDir/validators.yaml \ - --bootnodes $configDir/nodes.yaml + --bootnodes $configDir/nodes.yaml \ --node-id $item --node-key /config/$privKeyPath \ --listen-addr /ip4/0.0.0.0/udp/$quicPort/quic-v1" From be5a8e6dce62f5a45d76684f5ecfdcecb863dc84 Mon Sep 17 00:00:00 2001 From: turuslan Date: Sun, 5 Oct 2025 09:48:38 +0500 Subject: [PATCH 5/7] fix key path --- client-cmds/qlean-cmd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client-cmds/qlean-cmd.sh b/client-cmds/qlean-cmd.sh index 19ec842..d6b4693 100644 --- a/client-cmds/qlean-cmd.sh +++ b/client-cmds/qlean-cmd.sh @@ -8,7 +8,7 @@ node_binary="$scriptDir/qlean/build/src/executable/qlean \ --genesis $configDir/config.yaml \ --validator-registry-path $configDir/validators.yaml \ --bootnodes $configDir/nodes.yaml \ - --node-id $item --node-key /config/$privKeyPath \ + --node-id $item --node-key $configDir/$privKeyPath \ --listen-addr /ip4/0.0.0.0/udp/$quicPort/quic-v1" node_docker= From b0f123e64d0e4cc7f820b4dcf2317d07a3f5a1d3 Mon Sep 17 00:00:00 2001 From: turuslan Date: Sun, 5 Oct 2025 09:59:50 +0500 Subject: [PATCH 6/7] --data-dir --- client-cmds/qlean-cmd.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/client-cmds/qlean-cmd.sh b/client-cmds/qlean-cmd.sh index d6b4693..5b04d59 100644 --- a/client-cmds/qlean-cmd.sh +++ b/client-cmds/qlean-cmd.sh @@ -8,6 +8,7 @@ node_binary="$scriptDir/qlean/build/src/executable/qlean \ --genesis $configDir/config.yaml \ --validator-registry-path $configDir/validators.yaml \ --bootnodes $configDir/nodes.yaml \ + --data-dir $dataDir/$item \ --node-id $item --node-key $configDir/$privKeyPath \ --listen-addr /ip4/0.0.0.0/udp/$quicPort/quic-v1" From 0d4d022052d78c94731b4716480fe6d9d74b3562 Mon Sep 17 00:00:00 2001 From: turuslan Date: Sun, 5 Oct 2025 10:00:10 +0500 Subject: [PATCH 7/7] qlean docker --- client-cmds/qlean-cmd.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/client-cmds/qlean-cmd.sh b/client-cmds/qlean-cmd.sh index 5b04d59..1bf270b 100644 --- a/client-cmds/qlean-cmd.sh +++ b/client-cmds/qlean-cmd.sh @@ -12,7 +12,13 @@ node_binary="$scriptDir/qlean/build/src/executable/qlean \ --node-id $item --node-key $configDir/$privKeyPath \ --listen-addr /ip4/0.0.0.0/udp/$quicPort/quic-v1" -node_docker= +node_docker="--platform linux/amd64 qdrvm/qlean-mini:3f121fc \ + --genesis /config/config.yaml \ + --validator-registry-path /config/validators.yaml \ + --bootnodes /config/nodes.yaml \ + --data-dir /data \ + --node-id $item --node-key /config/$privKeyPath \ + --listen-addr /ip4/0.0.0.0/udp/$quicPort/quic-v1" # choose either binary or docker -node_setup="binary" \ No newline at end of file +node_setup="docker"