Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release/v0.12.25 -> master #573

Open
wants to merge 35 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
2ab3663
Merge pull request #508 from KiraCore/release/v0.11.16
asmodat Apr 25, 2023
a62af5f
Merge pull request #518 from KiraCore/release/v0.11.21
MrLutik May 25, 2023
6440278
Merge pull request #523 from KiraCore/release/v0.11.22
MrLutik May 25, 2023
4084e55
Change workflow base-image ver v0.13.11 -> v0.13.12
MrLutik Jun 20, 2023
14567fa
Change release ver v0.11.22 -> v0.11.23
MrLutik Jun 20, 2023
266b2ac
Change base-image ver v0.13.11 -> v0.13.12
MrLutik Jun 20, 2023
1df381c
Update RELEASE.md
MrLutik Jun 20, 2023
0907f6b
Merge pull request #524 from KiraCore/feature/upd_base_img_to_v0.13.12
MrLutik Jun 20, 2023
1b5da5d
Merge pull request #527 from KiraCore/release/v0.11.23
MrLutik Jun 20, 2023
35b31fa
Change release ver v0.11.23 -> v0.11.24
MrLutik Jul 11, 2023
b8f3279
Change base_image ver v0.13.12 -> v0.13.13
MrLutik Jul 11, 2023
aeb55cf
Update RELEASE.md
MrLutik Jul 11, 2023
850ce43
Change release ver v0.11.24 -> v0.11.25
MrLutik Jul 12, 2023
ebc2f6b
Change base-image ver v0.13.13 -> v0.13.14
MrLutik Jul 12, 2023
9a47f8b
Update RELEASE.md
MrLutik Jul 12, 2023
20d35c0
Update RELEASE.md
MrLutik Jul 13, 2023
ec77918
Change release ver v0.11.25 -> v0.11.26
MrLutik Jul 13, 2023
6755344
Fix unquotaed varibale
MrLutik Jul 13, 2023
f03bcaa
Update RELEASE.md
MrLutik Jul 16, 2023
6b44cac
Changer release ver v0.11.26 -> v0.11.27
MrLutik Jul 16, 2023
eda167a
Decrease timeout commit 10000ms -> 3000ms
MrLutik Jul 16, 2023
ab5780a
Merge pull request #540 from KiraCore/feature/timeout_commit_3000ms
MrLutik Jul 16, 2023
3c7f93b
Bump release ver
MrLutik Feb 29, 2024
07557f1
Minor fixes
MrLutik Feb 29, 2024
b271966
Merge pull request #548 from KiraCore/feature/base_img_v0.13.19
MrLutik Feb 29, 2024
79dc6b0
feat(upd_base_img_to_v0.14.02): Update base-image and cosign
MrLutik Apr 8, 2024
4b77c05
feat(upd_base_img_to_v0.14.02): Update version
MrLutik Apr 8, 2024
c5d5a58
feat(feature/upd_base_img_to_v0.14.03): Update cosign ver
MrLutik Apr 8, 2024
05ce25b
feat(cidi): Bump release ver
MrLutik Apr 8, 2024
3360419
feat(cidi): Update arm and amd hashes
MrLutik Apr 10, 2024
a2ddd50
feat(update): Update tools version
MrLutik Apr 11, 2024
159247c
feat(update_app_config): Update config and set an app.toml var
MrLutik Apr 11, 2024
48fdc70
feat(upd_base_img_to_v0.14.04): Update base image
MrLutik Apr 12, 2024
90d3f86
feat(release): Bump release version
MrLutik Apr 12, 2024
efae790
Merge pull request #572 from KiraCore/feature/upd_base_img_to_v0.14.04
MrLutik Apr 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
id-token: write
pull-requests: write
container:
image: ghcr.io/kiracore/docker/base-image:v0.13.11
image: ghcr.io/kiracore/docker/base-image:v0.14.04
steps:
# Work around https://github.com/actions/checkout/issues/760
- name: Add safe.directory
Expand Down Expand Up @@ -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/[email protected]
with:
Expand Down
4 changes: 2 additions & 2 deletions RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Features:

* Update base image version
* Fix undeclared $files in seeds-edit.sh
* Update base-image to `v0.14.04`

4 changes: 2 additions & 2 deletions docs/DOCKER.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
```
```
25 changes: 17 additions & 8 deletions kira/configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
Empty file removed nvim
Empty file.
2 changes: 1 addition & 1 deletion scripts/version.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/usr/bin/env bash

echo "v0.11.22"
echo "v0.12.25"
2 changes: 1 addition & 1 deletion workstation/containers/start-validator.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
10 changes: 5 additions & 5 deletions workstation/init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ if [ "$USER" != root ]; then
fi

# Used To Initialize essential dependencies
BASE_IMAGE_VERSION="v0.13.11"
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
Expand All @@ -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'"
Expand Down
2 changes: 1 addition & 1 deletion workstation/menu/mnemonic-select.sh
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ while : ; do
echoNLog "Input 24 whitespace-separated bip39 words or press [ENTER] to autogen.: " && read MASTER_MNEMONIC
MASTER_MNEMONIC=$(echo "$MASTER_MNEMONIC" | xargs 2> /dev/null || echo -n "")
MASTER_MNEMONIC=$(echo ${MASTER_MNEMONIC//,/ })
if [ -z $MASTER_MNEMONIC ] ; then
if [ -z "$MASTER_MNEMONIC" ] ; then
rm -rfv "$KIRA_SECRETS"
mkdir -p "$KIRA_SECRETS" && touch $MNEMONICS
setVar MASTER_MNEMONIC "autogen" "$MNEMONICS"
Expand Down
Loading