From f03bcaacbad6835f8927676194825398628c03fd Mon Sep 17 00:00:00 2001 From: mrlutik Date: Sun, 16 Jul 2023 19:01:24 +0200 Subject: [PATCH 01/12] Update RELEASE.md --- RELEASE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE.md b/RELEASE.md index 0325c636..52c103f6 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,3 +1,3 @@ Features: -* Fix unquoted variable in mnemonic-select \ No newline at end of file +* Decreasse commit timeout 10000ms -> 30000ms \ No newline at end of file From 6b44cac9cb000db1132aad8de5e4781ed83a8df8 Mon Sep 17 00:00:00 2001 From: mrlutik Date: Sun, 16 Jul 2023 19:02:33 +0200 Subject: [PATCH 02/12] Changer release ver v0.11.26 -> v0.11.27 --- scripts/version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/version.sh b/scripts/version.sh index 42762bb3..29164095 100644 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -echo "v0.11.26" +echo "v0.11.27" From eda167a8314dd039e95991b5ac88f2cd67fd25db Mon Sep 17 00:00:00 2001 From: mrlutik Date: Sun, 16 Jul 2023 19:03:47 +0200 Subject: [PATCH 03/12] Decrease timeout commit 10000ms -> 3000ms --- workstation/containers/start-validator.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workstation/containers/start-validator.sh b/workstation/containers/start-validator.sh index 27c11d04..70ca7b3e 100644 --- a/workstation/containers/start-validator.sh +++ b/workstation/containers/start-validator.sh @@ -113,7 +113,7 @@ if (! $($KIRA_COMMON/container-healthy.sh "$CONTAINER_NAME")) ; then globSet cfg_statesync_enable "true" $GLOBAL_COMMON globSet cfg_statesync_temp_dir "/tmp" $GLOBAL_COMMON # CFG [CONSENSUS] - globSet cfg_consensus_timeout_commit "10000ms" $GLOBAL_COMMON + globSet cfg_consensus_timeout_commit "3000ms" $GLOBAL_COMMON globSet cfg_consensus_create_empty_blocks_interval "20s" $GLOBAL_COMMON globSet cfg_consensus_skip_timeout_commit "false" $GLOBAL_COMMON # CFG [INSTRUMENTATION] From 3c7f93b79fac8f5b268b784cfe7eb7336810d51b Mon Sep 17 00:00:00 2001 From: mrlutik Date: Thu, 29 Feb 2024 01:22:25 +0100 Subject: [PATCH 04/12] Bump release ver --- .github/workflows/main.yml | 2 +- RELEASE.md | 2 +- scripts/version.sh | 2 +- workstation/init.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1dc77603..e555c10f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,7 +16,7 @@ jobs: id-token: write pull-requests: write container: - image: ghcr.io/kiracore/docker/base-image:v0.13.12 + image: ghcr.io/kiracore/docker/base-image:v0.13.19 steps: # Work around https://github.com/actions/checkout/issues/760 - name: Add safe.directory diff --git a/RELEASE.md b/RELEASE.md index 52c103f6..d6fdff0c 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,3 +1,3 @@ Features: -* Decreasse commit timeout 10000ms -> 30000ms \ No newline at end of file +* Base image update diff --git a/scripts/version.sh b/scripts/version.sh index 29164095..c24f42ce 100644 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -echo "v0.11.27" +echo "v0.12.00" diff --git a/workstation/init.sh b/workstation/init.sh index 33f555c4..ee1ae804 100755 --- a/workstation/init.sh +++ b/workstation/init.sh @@ -25,7 +25,7 @@ if [ "$USER" != root ]; then fi # Used To Initialize essential dependencies -BASE_IMAGE_VERSION="v0.13.14" +BASE_IMAGE_VERSION="v0.13.19" TOOLS_VERSION="v0.3.46" COSIGN_VERSION="v2.0.2" From 07557f1538a88e6b1acf4fef5cd251ab6f5c53fe Mon Sep 17 00:00:00 2001 From: mrlutik Date: Thu, 29 Feb 2024 01:31:26 +0100 Subject: [PATCH 05/12] Minor fixes --- .github/workflows/main.yml | 2 +- RELEASE.md | 1 + scripts/version.sh | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e555c10f..abcead65 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -202,7 +202,7 @@ jobs: # Install the cosign tool # ref.: https://github.com/sigstore/cosign-installer, v3.0.1 - name: Install cosign - uses: sigstore/cosign-installer@c3667d99424e7e6047999fb6246c0da843953c65 + uses: sigstore/cosign-installer@1fc5bd396d372bee37d608f955b336615edf79c8 with: cosign-release: 'v2.0.0' - name: Download artifacts diff --git a/RELEASE.md b/RELEASE.md index d6fdff0c..22608250 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,3 +1,4 @@ Features: +* Fix cosign installer * Base image update diff --git a/scripts/version.sh b/scripts/version.sh index c24f42ce..fec91d16 100644 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -echo "v0.12.00" +echo "v0.12.01" From 79dc6b092d45f0e30728007f478107ec0c479168 Mon Sep 17 00:00:00 2001 From: mrlutik Date: Mon, 8 Apr 2024 15:05:20 +0200 Subject: [PATCH 06/12] feat(upd_base_img_to_v0.14.02): Update base-image and cosign * Update base-image to `v0.14.03` * Update cosign-installer to `v2.2.3` * Update DOCKER.md and RELEASE.md files --- .github/workflows/main.yml | 8 ++++---- RELEASE.md | 2 +- docs/DOCKER.md | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index abcead65..496d6ac3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,7 +16,7 @@ jobs: id-token: write pull-requests: write container: - image: ghcr.io/kiracore/docker/base-image:v0.13.19 + image: ghcr.io/kiracore/docker/base-image:v0.14.03 steps: # Work around https://github.com/actions/checkout/issues/760 - name: Add safe.directory @@ -200,11 +200,11 @@ jobs: pull-requests: write steps: # Install the cosign tool - # ref.: https://github.com/sigstore/cosign-installer, v3.0.1 + # ref.: https://github.com/sigstore/cosign-installer, v3.4.0 - name: Install cosign - uses: sigstore/cosign-installer@1fc5bd396d372bee37d608f955b336615edf79c8 + uses: sigstore/cosign-installer@e1523de7571e31dbe865fd2e80c5c7c23ae71eb4 with: - cosign-release: 'v2.0.0' + cosign-release: 'v2.2.3' - name: Download artifacts uses: actions/download-artifact@v3.0.0 with: diff --git a/RELEASE.md b/RELEASE.md index 22608250..21ff0ab6 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,4 +1,4 @@ Features: -* Fix cosign installer +* Update cosign installer * Base image update diff --git a/docs/DOCKER.md b/docs/DOCKER.md index e3fb77bd..788cb27e 100644 --- a/docs/DOCKER.md +++ b/docs/DOCKER.md @@ -19,7 +19,7 @@ docker rm -f $(docker ps -a -q) && \ # echo $(globGet BASE_IMAGE_SRC) BASE_NAME="test" && \ - BASE_IMG="ghcr.io/kiracore/docker/kira-base:v0.11.4" && \ + BASE_IMG="ghcr.io/kiracore/docker/kira-base:v0.14.03" && \ docker run -i -t -d --privileged --net bridge --name $BASE_NAME --hostname test.local $BASE_IMG /bin/bash # Find container by name @@ -32,4 +32,4 @@ docker start -i $id # Delete specific container # one liner: docker rm -f $(timeout 3 docker ps --no-trunc -aqf "name=^${BASE_NAME}$" 2> /dev/null || echo -n "") docker rm -f $id -``` \ No newline at end of file +``` From 4b77c05e5f0560a84b6944af5647418e0f7d4b6c Mon Sep 17 00:00:00 2001 From: mrlutik Date: Mon, 8 Apr 2024 15:09:43 +0200 Subject: [PATCH 07/12] feat(upd_base_img_to_v0.14.02): Update version --- scripts/version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/version.sh b/scripts/version.sh index fec91d16..77adf618 100644 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -echo "v0.12.01" +echo "v0.12.20" From c5d5a588c3e8b3ebb0b7af3fb74eccb13c7e05ef Mon Sep 17 00:00:00 2001 From: mrlutik Date: Mon, 8 Apr 2024 15:23:24 +0200 Subject: [PATCH 08/12] feat(feature/upd_base_img_to_v0.14.03): Update cosign ver * Bump the cosign in init.sh script --- workstation/init.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workstation/init.sh b/workstation/init.sh index ee1ae804..4e136886 100755 --- a/workstation/init.sh +++ b/workstation/init.sh @@ -27,7 +27,7 @@ fi # Used To Initialize essential dependencies BASE_IMAGE_VERSION="v0.13.19" TOOLS_VERSION="v0.3.46" -COSIGN_VERSION="v2.0.2" +COSIGN_VERSION="v2.2.3" # Force console colour to be black tput setab 0 From 05ce25b2603ed009277b420336bbffd50c22cb30 Mon Sep 17 00:00:00 2001 From: mrlutik Date: Mon, 8 Apr 2024 15:46:10 +0200 Subject: [PATCH 09/12] feat(cidi): Bump release ver --- scripts/version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/version.sh b/scripts/version.sh index 77adf618..29915fe4 100644 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -echo "v0.12.20" +echo "v0.12.21" From 33604191f14ce04824aeaa1d1afd8f439cfa2a64 Mon Sep 17 00:00:00 2001 From: mrlutik Date: Wed, 10 Apr 2024 16:58:10 +0200 Subject: [PATCH 10/12] feat(cidi): Update arm and amd hashes * Update release ver to v0.12.22 * Update AMD and ARM hashes --- RELEASE.md | 3 +-- scripts/version.sh | 2 +- workstation/init.sh | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index 21ff0ab6..be14ef0b 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,4 +1,3 @@ Features: -* Update cosign installer -* Base image update +* Update ARM and AMD hashes diff --git a/scripts/version.sh b/scripts/version.sh index 29915fe4..8a7c8e71 100644 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -echo "v0.12.21" +echo "v0.12.22" diff --git a/workstation/init.sh b/workstation/init.sh index 4e136886..70c24ead 100755 --- a/workstation/init.sh +++ b/workstation/init.sh @@ -48,8 +48,8 @@ if [ "$COSIGN_INSTALLED" == "false" ] ; then FILE_NAME=$(echo "cosign-${PLATFORM}-${ARCH}") wget https://github.com/sigstore/cosign/releases/download/${COSIGN_VERSION}/$FILE_NAME && chmod +x -v ./$FILE_NAME FILE_HASH=$(sha256sum ./$FILE_NAME | awk '{ print $1 }' | xargs || echo -n "") - COSIGN_HASH_ARM="517e96f9d036c4b77db01132cacdbef21e4266e9ad3a93e67773c590ba54e26f" - COSIGN_HASH_AMD="dc641173cbda29ba48580cdde3f80f7a734f3b558a25e5950a4b19f522678c70" + COSIGN_HASH_ARM="b088d676f0c0123b8c348e18d421cf966020edc4977a486115a12643dea99a3f" + COSIGN_HASH_AMD="f669f41176cb1d58bb6a3fdb06e24861540cfdb5a571b4ec5eb2218b0df5d304" if [ "$FILE_HASH" != "$COSIGN_HASH_ARM" ] && [ "$FILE_HASH" != "$COSIGN_HASH_AMD" ] ; then echoErr "ERROR: Failed to download cosign tool, expected checksum to be '$COSIGN_HASH', but got '$FILE_HASH'" From a2ddd502f361f1b3312ae09235886b259e177366 Mon Sep 17 00:00:00 2001 From: mrlutik Date: Thu, 11 Apr 2024 16:23:03 +0200 Subject: [PATCH 11/12] feat(update): Update tools version --- RELEASE.md | 2 +- scripts/version.sh | 2 +- workstation/init.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index be14ef0b..367d7f11 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,3 +1,3 @@ Features: -* Update ARM and AMD hashes +* Update tools version diff --git a/scripts/version.sh b/scripts/version.sh index 8a7c8e71..04c5c673 100644 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -echo "v0.12.22" +echo "v0.12.23" diff --git a/workstation/init.sh b/workstation/init.sh index 70c24ead..819c7c41 100755 --- a/workstation/init.sh +++ b/workstation/init.sh @@ -25,8 +25,8 @@ if [ "$USER" != root ]; then fi # Used To Initialize essential dependencies -BASE_IMAGE_VERSION="v0.13.19" -TOOLS_VERSION="v0.3.46" +BASE_IMAGE_VERSION="v0.14.03" +TOOLS_VERSION="v0.3.54" COSIGN_VERSION="v2.2.3" # Force console colour to be black From 159247c3a447cf9a3890bca20cc8feea91754775 Mon Sep 17 00:00:00 2001 From: mrlutik Date: Thu, 11 Apr 2024 19:24:07 +0200 Subject: [PATCH 12/12] feat(update_app_config): Update config and set an app.toml var * Fix streamers error * Set grpc in the app.toml to 0.0.0.0:9090 --- RELEASE.md | 4 +++- kira/configure.sh | 25 +++++++++++++++++-------- nvim | 0 scripts/version.sh | 2 +- 4 files changed, 21 insertions(+), 10 deletions(-) delete mode 100644 nvim diff --git a/RELEASE.md b/RELEASE.md index 367d7f11..eec3bbd1 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,3 +1,5 @@ Features: -* Update tools version +* Update app.toml configuration +* Add app.toml grpc setting + diff --git a/kira/configure.sh b/kira/configure.sh index a1783087..665a8cdb 100644 --- a/kira/configure.sh +++ b/kira/configure.sh @@ -57,6 +57,9 @@ globSet EXTERNAL_ADDRESS "$cfg_p2p_external_address" globSet EXTERNAL_DNS "$EXTERNAL_DNS" globSet EXTERNAL_PORT "$EXTERNAL_P2P_PORT" +#Set grpc listening address for app.toml +globSet app_grpc_address "0.0.0.0:9090" + echoInfo "INFO: Local Addr: $LOCAL_IP" echoInfo "INFO: Public Addr: $PUBLIC_IP" echoInfo "INFO: External Addr: $EXTERNAL_ADDRESS" @@ -281,19 +284,25 @@ for row in "${cfg_rows[@]}"; do done echoInfo "INFO: Updating APP file..." + getTomlVarNames $APP > /tmp/app_names.tmp + mapfile app_rows < /tmp/app_names.tmp + for row in "${app_rows[@]}"; do ( $(isNullOrWhitespaces $row) ) && continue - tag=$(echo $row | cut -d' ' -f1 | tr -d '\011\012\013\014\015\040\133\135' | xargs) - name=$(echo $row | cut -d' ' -f2 | tr -d '\011\012\013\014\015\040\133\135' | xargs) - val_target_1=$(echo "app_${tag}_${name}" | tr -d '\011\012\013\014\015\040\133\135' | xargs) - val_target_2=$(echo "$val_target_1" | sed -r 's/[-]+/_/g' | xargs) - val="${!val_target_2}" - [ -z "$val" ] && val=$(globGet "$val_target_1") + + tag=$(echo $row | cut -d' ' -f1 | tr -d '\\011\\012\\013\\014\\015\\040\\133\\135' | xargs) + name=$(echo $row | cut -d' ' -f2 | tr -d '\\011\\012\\013\\014\\015\\040\\133\\135' | xargs) + + val_target_1="app_${tag}_${name}" + val_target_2=$(echo "$val_target_1" | sed -r 's/\[-\]+/\_/g') + + val=$(globGet "$val_target_1") [ -z "$val" ] && val=$(globGet "$val_target_2") - if [ ! -z "$val" ] ; then - echoWarn "WARNING: Updating APP value: [$tag] $name -> '$val' " + + if [ ! -z "$val" ]; then + echoWarn "WARNING: Updating APP value: [$tag] $name -> '$val'" setTomlVar "[$tag]" "$name" "$val" $APP else echoInfo "INFO: APP value: [$tag] $name will NOT change, glob val was NOT found" diff --git a/nvim b/nvim deleted file mode 100644 index e69de29b..00000000 diff --git a/scripts/version.sh b/scripts/version.sh index 04c5c673..9f8c3106 100644 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -echo "v0.12.23" +echo "v0.12.24"