Merge remote-tracking branch 'upstream/master' into add-rpc-context

merge upstream master

Author: bysomeone

.github/workflows/build.yml

@@ -18,10 +18,10 @@ jobs:
           # TODO: this will hopefully be fixed by
           # https://github.com/actions/setup-go/issues/14
           export PATH=${PATH}:`go env GOPATH`/bin
-          go install golang.org/x/tools/cmd/goimports@latest
+          go install golang.org/x/tools/cmd/goimports@v0.24.0
           go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.44.2
-          go install mvdan.cc/sh/cmd/shfmt@latest
-          go install mvdan.cc/sh/cmd/gosh@latest
+          go install mvdan.cc/sh/v3/cmd/shfmt@v3.7.0
+          go install mvdan.cc/sh/v3/cmd/gosh@v3.7.0
 
       - name: Lint
         run: |
@@ -69,7 +69,7 @@ jobs:
   build-with-latest-stable-go:
     strategy:
       matrix:
-        os: [ ubuntu-20.04, macos-12 ]
+        os: [ ubuntu-20.04, macos-14 ]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3

.github/workflows/manual_make_bin.yml

@@ -20,7 +20,7 @@ jobs:
         run: make all-arch
 
       - name : Upload artifact bin
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: chain33-artifact
           path: |

build/autotest/gitlabci/autotest.sh

@@ -54,17 +54,17 @@ function init() {
 function start() {
 
     # remove exsit container
-    docker-compose -p "${PROJECT_NAME}" -f compose-autotest.yml down --remove-orphans
+    docker compose -p "${PROJECT_NAME}" -f compose-autotest.yml down --remove-orphans
 
     # create and run docker-compose container
-    docker-compose -p "${PROJECT_NAME}" -f compose-autotest.yml up --build -d
+    docker compose -p "${PROJECT_NAME}" -f compose-autotest.yml up --build -d
 
     local SLEEP=30
     echo "=========== sleep ${SLEEP}s ============="
     sleep ${SLEEP}
 
-    # docker-compose ps
-    docker-compose -p "${PROJECT_NAME}" -f compose-autotest.yml ps
+    # docker compose ps
+    docker compose -p "${PROJECT_NAME}" -f compose-autotest.yml ps
 
     # query node run status
     ${CLI} block last_header
@@ -218,7 +218,7 @@ function stop_chain33() {
 
     rv=$?
     echo "=========== #stop docker-compose ============="
-    docker-compose -p "${PROJECT_NAME}" -f compose-autotest.yml down && rm -rf ./chain33* ./*.toml ./autotest
+    docker compose -p "${PROJECT_NAME}" -f compose-autotest.yml down && rm -rf ./chain33* ./*.toml ./autotest
     echo "=========== #remove related images ============"
     docker rmi "${PROJECT_NAME}"_autotest || true
     exit ${rv}

build/autotest/jerkinsci/autotest.sh

@@ -58,13 +58,13 @@ function config_autotest() {
 function start_chain33() {
 
     # create and run docker-compose container
-    docker-compose -p "${PROJECT_NAME}" -f compose-autotest.yml up --build -d
+    docker compose -p "${PROJECT_NAME}" -f compose-autotest.yml up --build -d
 
     local SLEEP=2
     sleep ${SLEEP}
 
-    # docker-compose ps
-    docker-compose -p "${PROJECT_NAME}" -f compose-autotest.yml ps
+    # docker compose ps
+    docker compose -p "${PROJECT_NAME}" -f compose-autotest.yml ps
 
     # query node run status
     ${CLI} block last_header
@@ -146,7 +146,7 @@ function stop_chain33() {
 
     rv=$?
     echo "=========== #stop docker-compose ============="
-    docker-compose -p "${PROJECT_NAME}" -f compose-autotest.yml down
+    docker compose -p "${PROJECT_NAME}" -f compose-autotest.yml down
     echo "=========== #remove related images ============"
     docker rmi "${PROJECT_NAME}"_autotest || true
     pwd

build/docker-compose-dapp.sh

@@ -90,20 +90,20 @@ function base_init() {
 
 function start() {
     echo "=========== # docker-compose ps ============="
-    docker-compose ps
+    docker compose ps
 
     # remove exsit container
-    docker-compose down
+    docker compose down
 
     # create and run docker-compose container
-    #docker-compose -f docker-compose.yml -f docker-compose-paracross.yml -f docker-compose-relay.yml up --build -d
-    docker-compose up --build -d
+    #docker compose -f docker-compose.yml -f docker-compose-paracross.yml -f docker-compose-relay.yml up --build -d
+    docker compose up --build -d
 
     local SLEEP=30
     echo "=========== sleep ${SLEEP}s ============="
     sleep ${SLEEP}
 
-    docker-compose ps
+    docker compose ps
 
     # query node run status
     ${CLI} block last_header

build/docker-compose-down.sh

@@ -29,17 +29,17 @@ echo "COMPOSE_PROJECT_NAME=$COMPOSE_PROJECT_NAME"
 
 function down() {
     echo "=========== # docker-compose ps ============="
-    docker-compose ps
+    docker compose ps
     # shellchk not recommend the first way
-    # remains=( $(docker-compose ps -q | awk '{print $1}') )
-    mapfile -t remains < <(docker-compose ps -q | awk '{print $1}')
+    # remains=( $(docker compose ps -q | awk '{print $1}') )
+    mapfile -t remains < <(docker compose ps -q | awk '{print $1}')
     # shellcheck disable=SC2154
     num=${#remains[@]}
     echo "container num=$num"
     if [ "$num" -gt 0 ]; then
         # remove exsit container
         echo "=========== # docker-compose down ============="
-        docker-compose down --rmi local
+        docker compose down --rmi local
     fi
 
 }

build/docker-compose.sh

@@ -15,16 +15,16 @@ set -o pipefail
 PWD=$(cd "$(dirname "$0")" && pwd)
 export PATH="$PWD:$PATH"
 
-NODE3="${1}_chain33_1"
+NODE3="${1}-chain33-1"
 CLI="docker exec ${NODE3} /root/chain33-cli"
 
-NODE2="${1}_chain32_1"
+NODE2="${1}-chain32-1"
 
-NODE1="${1}_chain31_1"
+NODE1="${1}-chain31-1"
 
-NODE4="${1}_chain30_1"
+NODE4="${1}-chain30-1"
 
-NODE5="${1}_chain29_1"
+NODE5="${1}-chain29-1"
 CLI5="docker exec ${NODE5} /root/chain33-cli"
 
 containers=("${NODE1}" "${NODE2}" "${NODE3}" "${NODE4}")
@@ -123,20 +123,20 @@ function consens_init() {
 }
 function start() {
     echo "=========== # docker-compose ps ============="
-    docker-compose ps
+    docker compose ps
 
     # remove exsit container
-    docker-compose down
+    docker compose down
 
     # create and run docker-compose container
     #docker-compose -f docker-compose.yml -f docker-compose-paracross.yml -f docker-compose-relay.yml up --build -d
-    docker-compose up --build -d
+    docker compose up --build -d
 
     local SLEEP=5
     echo "=========== sleep ${SLEEP}s ============="
     sleep ${SLEEP}
 
-    docker-compose ps
+    docker compose ps
 
     # query node run status
     check_docker_status
@@ -206,10 +206,10 @@ function start() {
 }
 
 function check_docker_status() {
-    status=$(docker-compose ps | grep chain33_1 | awk '{print $6}')
-    if [ "${status}" == "Exit" ]; then
+    res=$(docker compose ps | grep chain33-1 )
+    if grep -q Exit <<< "$res"; then
         echo "=========== chain33 service Exit logs ========== "
-        docker-compose logs chain33
+        docker compose logs chain33
         echo "=========== chain33 service Exit logs End========== "
     fi
 

build/docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3'
 
 services:
   chain33:

build/system-fork-test.sh

@@ -90,21 +90,21 @@ function base_init() {
 }
 
 function start() {
-    # docker-compose ps
-    docker-compose ps
+
+    docker compose ps
 
     # remove exsit container
-    docker-compose down
+    docker compose down
 
     # create and run docker-compose container
-    #    docker-compose -f docker-compose.yml -f docker-compose-para.yml up --build -d
-    docker-compose up --build -d
+    #    docker compose -f docker-compose.yml -f docker-compose-para.yml up --build -d
+    docker compose up --build -d
 
     local SLEEP=30
     echo "=========== sleep ${SLEEP}s ============="
     sleep ${SLEEP}
 
-    docker-compose ps
+    docker compose ps
 
     # query node run status