[[FIX]] sort parachain transaction without miner tx

.github/workflows/automake.yml

@@ -19,7 +19,7 @@ on:
 jobs:
   automake:
     name: automake
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Set up Golang env
         uses: actions/setup-go@v3

.github/workflows/build.yml

@@ -3,7 +3,7 @@ on: [push,pull_request]
 
 jobs:
   check_fmt:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
         with:
@@ -20,22 +20,22 @@ jobs:
           export PATH=${PATH}:`go env GOPATH`/bin
           echo $GOPATH
           echo $PATH
-          go install golang.org/x/tools/cmd/goimports@latest
-          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 golang.org/x/tools/cmd/goimports@v0.24.0
+          go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.53.3
+          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: |
           make largefile-check
-          make checkgofmt && make fmt_go
-          make linter
+          # make checkgofmt && make fmt_go
+          # make linter
           make
 
   build-with-latest-stable-go:
     strategy:
       matrix:
-        os: [ ubuntu-20.04, macos-12 ]
+        os: [ ubuntu-22.04, macos-14 ]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
@@ -50,7 +50,7 @@ jobs:
 
   unit-test:
     name: unit-test
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: checkout
         uses: actions/checkout@v2
@@ -66,7 +66,7 @@ jobs:
 
   coverage:
     name: coverage
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: checkout
         uses: actions/checkout@v3
@@ -86,7 +86,7 @@ jobs:
 
   autotest:
     name: autotest
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: checkout
         uses: actions/checkout@v3
@@ -104,7 +104,7 @@ jobs:
 
   ci_base:
     name: ci_base
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: checkout
         uses: actions/checkout@v3
@@ -122,7 +122,7 @@ jobs:
 
   test-arch-386:
     name: Test GOARCH 386
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     env:
       GOARCH: 386
       CGO_ENABLED: 1

.github/workflows/build_cross2eth.yml

@@ -4,7 +4,7 @@ on: [push,pull_request]
 jobs:
   ci_cross2eth:
     name: ci_cross2eth
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: checkout
         uses: actions/checkout@v3

.github/workflows/build_evm.yml

@@ -4,7 +4,7 @@ on: [push,pull_request]
 jobs:
   ci_evm:
     name: ci_evm
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3

.github/workflows/build_mix.yml

@@ -4,7 +4,7 @@ on: [push,pull_request]
 jobs:
   ci_mix:
     name: ci_mix
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: checkout
         uses: actions/checkout@v3

.github/workflows/build_paracross.yml

@@ -4,7 +4,7 @@ on: [push,pull_request]
 jobs:
   paracross:
     name: ci_paracross
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: checkout
         uses: actions/checkout@v3

.github/workflows/build_relay.yml

@@ -4,7 +4,7 @@ on: [push,pull_request]
 jobs:
   ci_relay:
     name: ci_relay
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - name: Set up Golang

.github/workflows/ci_parachain_rollup.yml

@@ -4,7 +4,7 @@ on: [push,pull_request]
 jobs:
   paracross:
     name: ci_parachain_rollup
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3

.github/workflows/manual_make_bin.yml

@@ -9,7 +9,7 @@ on: [push,pull_request]
 jobs:
   automake:
     name: automake
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - name: Set up Golang env
@@ -22,7 +22,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: |

.github/workflows/release.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
 
       - name: checkout repo

build/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 WORKDIR /root
 COPY chain33 chain33

build/docker-compose-down.sh

@@ -28,18 +28,18 @@ echo "COMPOSE_PROJECT_NAME=$COMPOSE_PROJECT_NAME"
 ####################
 
 function down() {
-    echo "=========== # docker-compose ps ============="
-    docker-compose ps
+    echo "=========== # 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

@@ -18,21 +18,21 @@ export PATH="$PWD:$PATH"
 dockerNamePrefix="${1}"
 echo "dockerNamePrefix : ${dockerNamePrefix}"
 
-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"
 #CLI4="docker exec ${NODE4} /root/chain33-cli"
 
-NODE5="${1}_chain29_1"
+NODE5="${1}-chain29-1"
 CLI5="docker exec ${NODE5} /root/chain33-cli"
 
 # shellcheck disable=SC2034
-NODE6="${1}_chain28_1"
+NODE6="${1}-chain28-1"
 
 containers=("${NODE1}" "${NODE2}" "${NODE3}" "${NODE4}")
 export COMPOSE_PROJECT_NAME="$1"
@@ -139,26 +139,26 @@ 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 up --build -d
 
     local SLEEP=10
     echo "=========== sleep ${SLEEP}s ============="
     sleep ${SLEEP}
 
-    docker-compose ps
+    docker compose ps
 
     set +e
-    influxdbcontainer=$(docker ps -a | grep build_influxdb_1)
+    influxdbcontainer=$(docker ps -a | grep build-influxdb-1)
     if [ -n "$influxdbcontainer" ]; then
         echo "create database chain33metrics in docker container build_influxdb_1"
-        docker exec build_influxdb_1 influx -execute 'create database chain33metrics'
+        docker exec build-influxdb-1 influx -execute 'create database chain33metrics'
     fi
     set -e
 
@@ -313,11 +313,11 @@ function block_wait2height() {
 }
 
 function check_docker_status() {
-    status=$(docker-compose ps | grep chain33_1 | awk '{print $6}')
-    statusPara=$(docker-compose ps | grep chain33_1 | awk '{print $3}')
+    status=$(docker compose ps | grep chain33-1 | awk '{print $6}')
+    statusPara=$(docker compose ps | grep chain33-1 | awk '{print $3}')
     if [ "${status}" == "Exit" ] || [ "${statusPara}" == "Exit" ]; then
         echo "=========== chain33 service Exit logs ========== "
-        docker-compose logs chain33
+        docker compose logs chain33
         echo "=========== chain33 service Exit logs End========== "
     fi
 

build/system-fork-test.sh

@@ -5,22 +5,22 @@ set +e
 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"
 CLI2="docker exec ${NODE2} /root/chain33-cli"
 
-NODE1="${1}_chain31_1"
+NODE1="${1}-chain31-1"
 CLI3="docker exec ${NODE1} /root/chain33-cli"
 
-NODE4="${1}_chain30_1"
+NODE4="${1}-chain30-1"
 CLI4="docker exec ${NODE4} /root/chain33-cli"
 
-NODE5="${1}_chain29_1"
+NODE5="${1}-chain29-1"
 CLI5="docker exec ${NODE5} /root/chain33-cli"
 
-NODE6="${1}_chain28_1"
+NODE6="${1}-chain28-1"
 CLI6="docker exec ${NODE6} /root/chain33-cli"
 
 containers=("${NODE1}" "${NODE2}" "${NODE3}" "${NODE4}" "${NODE5}" "${NODE6}")
@@ -91,20 +91,20 @@ 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 up --build -d
 
     local SLEEP=30
     echo "=========== sleep ${SLEEP}s ============="
     sleep ${SLEEP}
 
-    docker-compose ps
+    docker compose ps
 
     # query node run status
 

go.mod

@@ -9,7 +9,7 @@ replace (
 )
 
 require (
-	github.com/33cn/chain33 v1.69.0
+	github.com/33cn/chain33 v1.69.1-0.20250421040145-1bf4187c5141
 	github.com/BurntSushi/toml v1.2.1
 	github.com/NebulousLabs/Sia v1.3.7
 	github.com/bitly/go-simplejson v0.5.0

go.sum

@@ -52,8 +52,8 @@ dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D
 git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
 github.com/33cn/avalanchego v1.10.10-0.20240529041529-ada691598153 h1:fG9c8gQK312kjhHGZhiAp3QTpUU9etMnvIJQtkVcITk=
 github.com/33cn/avalanchego v1.10.10-0.20240529041529-ada691598153/go.mod h1:SgoXVssKD3a3diOV4qaTkOEQ+2KEfErcdOASIhV6a1s=
-github.com/33cn/chain33 v1.69.0 h1:EhDtwQRyf9AKCCfIvFI2fzTe0R0GqIBWZMleKv0/vNg=
-github.com/33cn/chain33 v1.69.0/go.mod h1:Sr0PFcmd96zJcRxKYkgceZZRfFd5CfbdfbfAzghyhB4=
+github.com/33cn/chain33 v1.69.1-0.20250421040145-1bf4187c5141 h1:uAHCiv/wKCuQpgzwkgv6eer11y8wnLc/pBMVIUeFeQ4=
+github.com/33cn/chain33 v1.69.1-0.20250421040145-1bf4187c5141/go.mod h1:Sr0PFcmd96zJcRxKYkgceZZRfFd5CfbdfbfAzghyhB4=
 github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
 github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 h1:cTp8I5+VIoKjsnZuH8vjyaysT/ses3EvZeaV/1UkF2M=
 github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=