diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1dc77603b..9821f74fb 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.14.04 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@c3667d99424e7e6047999fb6246c0da843953c65 + 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 0325c6361..82a4e42f1 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,3 +1,4 @@ Features: -* Fix unquoted variable in mnemonic-select \ No newline at end of file +* Update base-image to `v0.14.04` + diff --git a/docs/DOCKER.md b/docs/DOCKER.md index e3fb77bd7..dd474e0a2 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.04" && \ 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 +``` diff --git a/kira/configure.sh b/kira/configure.sh index a17830879..665a8cdba 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 e69de29bb..000000000 diff --git a/scripts/version.sh b/scripts/version.sh index 42762bb32..d3a97c014 100644 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -echo "v0.11.26" +echo "v0.12.25" diff --git a/workstation/containers/start-validator.sh b/workstation/containers/start-validator.sh index 27c11d04d..70ca7b3ea 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] diff --git a/workstation/init.sh b/workstation/init.sh index 33f555c4a..cf23a2261 100755 --- a/workstation/init.sh +++ b/workstation/init.sh @@ -25,9 +25,9 @@ if [ "$USER" != root ]; then fi # Used To Initialize essential dependencies -BASE_IMAGE_VERSION="v0.13.14" -TOOLS_VERSION="v0.3.46" -COSIGN_VERSION="v2.0.2" +BASE_IMAGE_VERSION="v0.14.04" +TOOLS_VERSION="v0.3.54" +COSIGN_VERSION="v2.2.3" # Force console colour to be black tput setab 0 @@ -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'"