diff --git a/.github/workflows/automake.yml b/.github/workflows/automake.yml
index d06dd96f7c..1a4b1cfaa3 100644
--- a/.github/workflows/automake.yml
+++ b/.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
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ac6aeef442..9be3e568d2 100644
--- a/.github/workflows/build.yml
+++ b/.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
diff --git a/.github/workflows/build_cross2eth.yml b/.github/workflows/build_cross2eth.yml
index 17843a4c51..6e8fdbdbca 100644
--- a/.github/workflows/build_cross2eth.yml
+++ b/.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
diff --git a/.github/workflows/build_evm.yml b/.github/workflows/build_evm.yml
index 6924fd6ba2..6ce7a2d84a 100644
--- a/.github/workflows/build_evm.yml
+++ b/.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
diff --git a/.github/workflows/build_mix.yml b/.github/workflows/build_mix.yml
index 62f7d17602..ae47472975 100644
--- a/.github/workflows/build_mix.yml
+++ b/.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
diff --git a/.github/workflows/build_paracross.yml b/.github/workflows/build_paracross.yml
index 9716040ce8..194c0d0469 100644
--- a/.github/workflows/build_paracross.yml
+++ b/.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
diff --git a/.github/workflows/build_relay.yml b/.github/workflows/build_relay.yml
index be32f0d77e..80f7a5c490 100644
--- a/.github/workflows/build_relay.yml
+++ b/.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
diff --git a/.github/workflows/ci_parachain_rollup.yml b/.github/workflows/ci_parachain_rollup.yml
index 529def4f46..38837723bf 100644
--- a/.github/workflows/ci_parachain_rollup.yml
+++ b/.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
diff --git a/.github/workflows/manual_make_bin.yml b/.github/workflows/manual_make_bin.yml
index e8bd9fa78f..95c04934b9 100644
--- a/.github/workflows/manual_make_bin.yml
+++ b/.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: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 55e877d342..50bbcaa528 100644
--- a/.github/workflows/release.yml
+++ b/.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
diff --git a/build/Dockerfile b/build/Dockerfile
index 48804a9094..eef7db356f 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 WORKDIR /root
 COPY chain33 chain33
diff --git a/build/docker-compose-down.sh b/build/docker-compose-down.sh
index fa9f86a492..e1efb90304 100755
--- a/build/docker-compose-down.sh
+++ b/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
 }
 
diff --git a/build/docker-compose.sh b/build/docker-compose.sh
index cf745a832f..7bfd821bef 100755
--- a/build/docker-compose.sh
+++ b/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
 
diff --git a/build/system-fork-test.sh b/build/system-fork-test.sh
index eaf731d3be..65905f1ea0 100755
--- a/build/system-fork-test.sh
+++ b/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
 
diff --git a/go.mod b/go.mod
index cb5cb9965f..3aef202c5a 100644
--- a/go.mod
+++ b/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
diff --git a/go.sum b/go.sum
index 1c567ddd4d..768c2558ee 100644
--- a/go.sum
+++ b/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=
diff --git a/plugin/consensus/para/parasync.go b/plugin/consensus/para/parasync.go
index 0d27534a88..281924ba8e 100644
--- a/plugin/consensus/para/parasync.go
+++ b/plugin/consensus/para/parasync.go
@@ -22,7 +22,7 @@ const (
 	defaultMaxSyncErrCount = int32(100)
 )
 
-//blockSyncClient 区块同步控制和状态变量
+// blockSyncClient 区块同步控制和状态变量
 type blockSyncClient struct {
 	paraClient *client
 	//notifyChan 下载通知通道
@@ -43,7 +43,7 @@ type blockSyncClient struct {
 	isSyncFirstCaughtUp bool
 }
 
-//nextActionType 定义每一轮可执行操作
+// nextActionType 定义每一轮可执行操作
 type nextActionType int8
 
 const (
@@ -55,7 +55,7 @@ const (
 	nextActionAdd
 )
 
-//blockSyncState 定义当前区块同步状态
+// blockSyncState 定义当前区块同步状态
 type blockSyncState int32
 
 const (
@@ -84,12 +84,12 @@ func newBlockSyncCli(para *client, cfg *subConfig) *blockSyncClient {
 	return cli
 }
 
-//syncHasCaughtUp 判断同步是否已追赶上，供发送层调用
+// syncHasCaughtUp 判断同步是否已追赶上，供发送层调用
 func (client *blockSyncClient) syncHasCaughtUp() bool {
 	return atomic.LoadInt32(&client.isSyncCaughtUpAtom) == 1
 }
 
-//handleLocalChangedMsg 处理下载通知消息，供下载层调用
+// handleLocalChangedMsg 处理下载通知消息，供下载层调用
 func (client *blockSyncClient) handleLocalChangedMsg() {
 	client.printDebugInfo("Para sync - notify change")
 	if client.getBlockSyncState() == blockSyncStateSyncing || client.paraClient.isCancel() {
@@ -99,7 +99,7 @@ func (client *blockSyncClient) handleLocalChangedMsg() {
 	client.notifyChan <- true
 }
 
-//handleLocalCaughtUpMsg 处理下载已追赶上消息，供下载层调用
+// handleLocalCaughtUpMsg 处理下载已追赶上消息，供下载层调用
 func (client *blockSyncClient) handleLocalCaughtUpMsg() {
 	client.printDebugInfo("Para sync -notify download has caughtUp")
 	if !client.downloadHasCaughtUp() {
@@ -107,13 +107,13 @@ func (client *blockSyncClient) handleLocalCaughtUpMsg() {
 	}
 }
 
-//createGenesisBlock 创建创世区块
+// createGenesisBlock 创建创世区块
 func (client *blockSyncClient) createGenesisBlock(newblock *types.Block) error {
 	return client.writeBlock(zeroHash[:], newblock)
 }
 
-//syncBlocks 区块执行线程
-//循环执行
+// syncBlocks 区块执行线程
+// 循环执行
 func (client *blockSyncClient) syncBlocks() {
 
 	client.syncInit()
@@ -136,7 +136,7 @@ out:
 	client.paraClient.wg.Done()
 }
 
-//批量执行同步区块
+// 批量执行同步区块
 func (client *blockSyncClient) batchSyncBlocks() {
 	client.setBlockSyncState(blockSyncStateSyncing)
 	client.printDebugInfo("Para sync - syncing")
@@ -178,7 +178,7 @@ func (client *blockSyncClient) batchSyncBlocks() {
 
 }
 
-//获取每一轮可执行状态
+// 获取每一轮可执行状态
 func (client *blockSyncClient) getNextAction() (nextActionType, *types.Block, *pt.ParaLocalDbBlock, int64, error) {
 	lastBlock, err := client.paraClient.getLastBlockInfo()
 	if err != nil {
@@ -229,9 +229,9 @@ func (client *blockSyncClient) getNextAction() (nextActionType, *types.Block, *p
 	}
 }
 
-//根据当前可执行状态执行区块操作
-//返回参数
-//bool 是否已完成同步
+// 根据当前可执行状态执行区块操作
+// 返回参数
+// bool 是否已完成同步
 func (client *blockSyncClient) syncBlocksIfNeed() (bool, error) {
 	nextAction, lastBlock, localBlock, lastLocalHeight, err := client.getNextAction()
 	if err != nil {
@@ -283,7 +283,7 @@ func (client *blockSyncClient) syncBlocksIfNeed() (bool, error) {
 
 }
 
-//批量删除下载层缓冲数据
+// 批量删除下载层缓冲数据
 func (client *blockSyncClient) delLocalBlocks(startHeight int64, endHeight int64) error {
 	if startHeight > endHeight {
 		return errors.New("para sync - startHeight > endHeight,can't clear local blocks")
@@ -313,7 +313,7 @@ func (client *blockSyncClient) delLocalBlocks(startHeight int64, endHeight int64
 	return client.paraClient.setLocalDb(set)
 }
 
-//最低高度没有设置的时候设置一下最低高度
+// 最低高度没有设置的时候设置一下最低高度
 func (client *blockSyncClient) initFirstLocalHeightIfNeed() error {
 	height, err := client.getFirstLocalHeight()
 	cfg := client.paraClient.GetAPI().GetConfig()
@@ -329,7 +329,7 @@ func (client *blockSyncClient) initFirstLocalHeightIfNeed() error {
 	return err
 }
 
-//获取下载层缓冲数据的区块最低高度
+// 获取下载层缓冲数据的区块最低高度
 func (client *blockSyncClient) getFirstLocalHeight() (int64, error) {
 	cfg := client.paraClient.GetAPI().GetConfig()
 	key := calcTitleFirstHeightKey(cfg.GetTitle())
@@ -355,7 +355,7 @@ func (client *blockSyncClient) getFirstLocalHeight() (int64, error) {
 	return height.Data, nil
 }
 
-//清除指定数量(localCacheCount)以前的区块
+// 清除指定数量(localCacheCount)以前的区块
 func (client *blockSyncClient) clearLocalOldBlocks() error {
 	lastLocalHeight, err := client.paraClient.getLastLocalHeight()
 	if err != nil {
@@ -414,17 +414,14 @@ func (client *blockSyncClient) addMinerTx(preStateHash []byte, block *types.Bloc
 	return nil
 }
 
-//添加一个区块
+// 添加一个区块
 func (client *blockSyncClient) addBlock(lastBlock *types.Block, localBlock *pt.ParaLocalDbBlock) error {
 	cfg := client.paraClient.GetAPI().GetConfig()
 	var newBlock types.Block
 	newBlock.ParentHash = lastBlock.Hash(cfg)
 	newBlock.Height = lastBlock.Height + 1
 	newBlock.Txs = localBlock.Txs
-	err := client.addMinerTx(lastBlock.StateHash, &newBlock, localBlock)
-	if err != nil {
-		return err
-	}
+
 	//挖矿固定难度
 	newBlock.Difficulty = cfg.GetP(0).PowLimitBits
 	newBlock.BlockTime = localBlock.BlockTime
@@ -437,6 +434,10 @@ func (client *blockSyncClient) addBlock(lastBlock *types.Block, localBlock *pt.P
 	if cfg.IsFork(newBlock.GetMainHeight(), "ForkRootHash") {
 		newBlock.Txs = types.TransactionSort(newBlock.Txs)
 	}
+	err := client.addMinerTx(lastBlock.StateHash, &newBlock, localBlock)
+	if err != nil {
+		return err
+	}
 	//在之前版本中CalcMerkleRoot的height是未初始化的MainHeight，等于0，在这个平行链的分叉ForkParaRootHash高度后统一采用新高度
 	if cfg.IsDappFork(newBlock.Height, pt.ParaX, pt.ForkParaRootHash) {
 		newBlock.TxHash = merkle.CalcMerkleRoot(cfg, newBlock.GetMainHeight(), newBlock.Txs)
@@ -530,17 +531,17 @@ func (client *blockSyncClient) writeBlock(prev []byte, paraBlock *types.Block) e
 	return nil
 }
 
-//获取同步状态
+// 获取同步状态
 func (client *blockSyncClient) getBlockSyncState() blockSyncState {
 	return blockSyncState(atomic.LoadInt32(&client.syncState))
 }
 
-//设置同步状态
+// 设置同步状态
 func (client *blockSyncClient) setBlockSyncState(state blockSyncState) {
 	atomic.StoreInt32(&client.syncState, int32(state))
 }
 
-//设置是否追赶上
+// 设置是否追赶上
 func (client *blockSyncClient) setSyncCaughtUp(isCaughtUp bool) {
 	if isCaughtUp {
 		atomic.StoreInt32(&client.isSyncCaughtUpAtom, 1)
@@ -549,12 +550,12 @@ func (client *blockSyncClient) setSyncCaughtUp(isCaughtUp bool) {
 	}
 }
 
-//下载是否已经追赶上
+// 下载是否已经追赶上
 func (client *blockSyncClient) downloadHasCaughtUp() bool {
 	return atomic.LoadInt32(&client.isDownloadCaughtUpAtom) == 1
 }
 
-//设置下载同步追赶状态
+// 设置下载同步追赶状态
 func (client *blockSyncClient) setDownloadHasCaughtUp(isCaughtUp bool) {
 	if isCaughtUp {
 		atomic.CompareAndSwapInt32(&client.isDownloadCaughtUpAtom, 0, 1)
@@ -563,17 +564,17 @@ func (client *blockSyncClient) setDownloadHasCaughtUp(isCaughtUp bool) {
 	}
 }
 
-//打印错误日志
+// 打印错误日志
 func (client *blockSyncClient) printError(err error) {
 	plog.Error(fmt.Sprintf("Para sync - sync block error:%v", err.Error()))
 }
 
-//打印调试信息
+// 打印调试信息
 func (client *blockSyncClient) printDebugInfo(msg string, ctx ...interface{}) {
 	plog.Debug(msg, ctx...)
 }
 
-//初始化
+// 初始化
 func (client *blockSyncClient) syncInit() {
 	client.printDebugInfo("Para sync - init")
 	client.setBlockSyncState(blockSyncStateNone)
diff --git a/plugin/dapp/autonomy/cmd/build/autonomyTest.sh b/plugin/dapp/autonomy/cmd/build/autonomyTest.sh
index 9a1f0e716a..56a984ce17 100755
--- a/plugin/dapp/autonomy/cmd/build/autonomyTest.sh
+++ b/plugin/dapp/autonomy/cmd/build/autonomyTest.sh
@@ -377,7 +377,7 @@ function testProposalTerminate() {
 
 function mainTest() {
     # shellcheck disable=SC2154
-    docker_chain33_ip=$(get_docker_addr "${dockerNamePrefix}_chain33_1")
+    docker_chain33_ip=$(get_docker_addr "${dockerNamePrefix}-chain33-1")
     Chain33Cli="./chain33-cli --rpc_laddr http://${docker_chain33_ip}:8801"
     InitChain33Account
 
diff --git a/plugin/dapp/bridgevmxgo/cmd/build/Dockerfile b/plugin/dapp/bridgevmxgo/cmd/build/Dockerfile
index c2bc721de9..7142d89e66 100644
--- a/plugin/dapp/bridgevmxgo/cmd/build/Dockerfile
+++ b/plugin/dapp/bridgevmxgo/cmd/build/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:22.04
 
 WORKDIR /root
 COPY chain33 chain33
diff --git a/plugin/dapp/bridgevmxgo/cmd/build/Dockerfile-bridgevmxgo b/plugin/dapp/bridgevmxgo/cmd/build/Dockerfile-bridgevmxgo
index 5e70ea3a99..5523387364 100644
--- a/plugin/dapp/bridgevmxgo/cmd/build/Dockerfile-bridgevmxgo
+++ b/plugin/dapp/bridgevmxgo/cmd/build/Dockerfile-bridgevmxgo
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:22.04
 
 RUN apt-get -qq update \
     && apt-get -qq install -y --no-install-recommends ca-certificates curl
diff --git a/plugin/dapp/bridgevmxgo/cmd/build/dockerRelayerTestEvm.sh b/plugin/dapp/bridgevmxgo/cmd/build/dockerRelayerTestEvm.sh
index 56e5e58d49..718a5bcbab 100755
--- a/plugin/dapp/bridgevmxgo/cmd/build/dockerRelayerTestEvm.sh
+++ b/plugin/dapp/bridgevmxgo/cmd/build/dockerRelayerTestEvm.sh
@@ -272,27 +272,27 @@ function get_evm_cli() {
     {
         paraName="user.p.para."
         # shellcheck disable=SC2154
-        docker_chain33_ip=$(get_docker_addr "${dockerNamePrefix}_chain33_1")
+        docker_chain33_ip=$(get_docker_addr "${dockerNamePrefix}-chain33-1")
         MainCli="./chain33-cli --rpc_laddr http://${docker_chain33_ip}:8801"
         Para8801Cli="./chain33-cli --rpc_laddr http://${docker_chain33_ip}:8901 --paraName ${paraName}"
         Para8901Cli="./chain33-cli --rpc_laddr http://${docker_chain33_ip}:8901 --paraName ${paraName}"
 
-        docker_ebrelayera_ip=$(get_docker_addr "${dockerNamePrefix}_ebrelayera_1")
-        CLIA="docker exec ${dockerNamePrefix}_ebrelayera_1 /root/ebcli_A"
-        CLIB="docker exec ${dockerNamePrefix}_ebrelayerb_1 /root/ebcli_A"
-        CLIC="docker exec ${dockerNamePrefix}_ebrelayerc_1 /root/ebcli_A"
-        CLID="docker exec ${dockerNamePrefix}_ebrelayerd_1 /root/ebcli_A"
+        docker_ebrelayera_ip=$(get_docker_addr "${dockerNamePrefix}-ebrelayera-1")
+        CLIA="docker exec ${dockerNamePrefix}-ebrelayera-1 /root/ebcli_A"
+        CLIB="docker exec ${dockerNamePrefix}-ebrelayerb-1 /root/ebcli_A"
+        CLIC="docker exec ${dockerNamePrefix}-ebrelayerc-1 /root/ebcli_A"
+        CLID="docker exec ${dockerNamePrefix}-ebrelayerd-1 /root/ebcli_A"
 
-        docker_ganachetesteth_ip=$(get_docker_addr "${dockerNamePrefix}_ganachetesteth_1")
-        docker_ganachetestbsc_ip=$(get_docker_addr "${dockerNamePrefix}_ganachetestbsc_1")
-        Boss4xCLI="docker exec ${dockerNamePrefix}_ebrelayera_1 /root/boss4x --rpc_laddr http://${docker_chain33_ip}:8901 --rpc_laddr_ethereum http://${docker_ganachetesteth_ip}:8545 --paraName ${paraName} --chainID ${chain33ID} --chainEthId 1337"
+        docker_ganachetesteth_ip=$(get_docker_addr "${dockerNamePrefix}-ganachetesteth-1")
+        docker_ganachetestbsc_ip=$(get_docker_addr "${dockerNamePrefix}-ganachetestbsc-1")
+        Boss4xCLI="docker exec ${dockerNamePrefix}-ebrelayera-1 /root/boss4x --rpc_laddr http://${docker_chain33_ip}:8901 --rpc_laddr_ethereum http://${docker_ganachetesteth_ip}:8545 --paraName ${paraName} --chainID ${chain33ID} --chainEthId 1337"
 
-        Boss4xCLIeth="docker exec ${dockerNamePrefix}_ebrelayera_1 /root/boss4x --rpc_laddr http://${docker_chain33_ip}:8901 --rpc_laddr_ethereum http://${docker_ganachetesteth_ip}:8545 --paraName ${paraName} --chainID ${chain33ID} --chainEthId 1337"
-        Boss4xCLIbsc="docker exec ${dockerNamePrefix}_ebrelayera_1 /root/boss4x --rpc_laddr http://${docker_chain33_ip}:8901 --rpc_laddr_ethereum http://${docker_ganachetestbsc_ip}:8545 --paraName ${paraName} --chainID ${chain33ID} --chainEthId 1337"
-
-        CLIAeth="docker exec ${dockerNamePrefix}_ebrelayera_1 /root/ebcli_A --node_addr http://${docker_ganachetesteth_ip}:8545 --eth_chain_name Ethereum"
-        CLIAbsc="docker exec ${dockerNamePrefix}_ebrelayera_1 /root/ebcli_A --node_addr http://${docker_ganachetestbsc_ip}:8545 --eth_chain_name Binance"
+        Boss4xCLIeth="docker exec ${dockerNamePrefix}-ebrelayera-1 /root/boss4x --rpc_laddr http://${docker_chain33_ip}:8901 --rpc_laddr_ethereum http://${docker_ganachetesteth_ip}:8545 --paraName ${paraName} --chainID ${chain33ID} --chainEthId 1337"
+        Boss4xCLIbsc="docker exec ${dockerNamePrefix}-ebrelayera-1 /root/boss4x --rpc_laddr http://${docker_chain33_ip}:8901 --rpc_laddr_ethereum http://${docker_ganachetestbsc_ip}:8545 --paraName ${paraName} --chainID ${chain33ID} --chainEthId 1337"
 
+        CLIAeth="docker exec ${dockerNamePrefix}-ebrelayera-1 /root/ebcli_A --node_addr http://${docker_ganachetesteth_ip}:8545 --eth_chain_name Ethereum"
+        CLIAbsc="docker exec ${dockerNamePrefix}-ebrelayera-1 /root/ebcli_A --node_addr http://${docker_ganachetestbsc_ip}:8545 --eth_chain_name Binance"
+fix}_ebrelayer${name}
         EvmxgoBoss4xCLI="./evmxgoboss4x --rpc_laddr http://${docker_chain33_ip}:8901 --paraName user.p.para. --chainID ${chain33ID}"
     }
 }
diff --git a/plugin/dapp/cross2eth/cmd/build/Dockerfile b/plugin/dapp/cross2eth/cmd/build/Dockerfile
index c2bc721de9..7142d89e66 100644
--- a/plugin/dapp/cross2eth/cmd/build/Dockerfile
+++ b/plugin/dapp/cross2eth/cmd/build/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:22.04
 
 WORKDIR /root
 COPY chain33 chain33
diff --git a/plugin/dapp/cross2eth/cmd/build/Dockerfile-cross2eth b/plugin/dapp/cross2eth/cmd/build/Dockerfile-cross2eth
index 1f1053982f..5817d7e55b 100644
--- a/plugin/dapp/cross2eth/cmd/build/Dockerfile-cross2eth
+++ b/plugin/dapp/cross2eth/cmd/build/Dockerfile-cross2eth
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:22.04
 
 WORKDIR /root
 COPY ebrelayer ebrelayer
diff --git a/plugin/dapp/cross2eth/cmd/build/dockerRelayerTest_onlyETH.sh b/plugin/dapp/cross2eth/cmd/build/dockerRelayerTest_onlyETH.sh
index e88517c8db..0a5f1d65a2 100755
--- a/plugin/dapp/cross2eth/cmd/build/dockerRelayerTest_onlyETH.sh
+++ b/plugin/dapp/cross2eth/cmd/build/dockerRelayerTest_onlyETH.sh
@@ -22,8 +22,8 @@ function StartDockerRelayerDeploy_onlyETH() {
     # 启动 ebrelayer
     start_docker_ebrelayerA
 
-    docker cp "./deploy_chain33.toml" "${dockerNamePrefix}_ebrelayera_1":/root/deploy_chain33.toml
-    docker cp "./deploy_ethereum.toml" "${dockerNamePrefix}_ebrelayera_1":/root/deploy_ethereum.toml
+    docker cp "./deploy_chain33.toml" "${dockerNamePrefix}-ebrelayera-1":/root/deploy_chain33.toml
+    docker cp "./deploy_ethereum.toml" "${dockerNamePrefix}-ebrelayera-1":/root/deploy_ethereum.toml
 
     # 部署合约 设置 bridgeRegistry 地址
     OfflineDeploy_chain33
@@ -49,7 +49,7 @@ function StartDockerRelayerDeploy_onlyETH() {
     transferChain33MultisignFee
     Chain33Cli=${Para8901Cli}
 
-    docker cp "./relayer.toml" "${dockerNamePrefix}_ebrelayera_1":/root/relayer.toml
+    docker cp "./relayer.toml" "${dockerNamePrefix}-ebrelayera-1":/root/relayer.toml
     InitRelayerA
 
     # 设置 token 地址
@@ -72,12 +72,12 @@ function StartDockerRelayerDeploy_onlyETH() {
 
     # shellcheck disable=SC2086
     {
-        docker cp "${chain33BridgeBank}.abi" "${dockerNamePrefix}_ebrelayera_1":/root/${chain33BridgeBank}.abi
-        docker cp "${chain33BridgeRegistry}.abi" "${dockerNamePrefix}_ebrelayera_1":/root/${chain33BridgeRegistry}.abi
-        docker cp "${chain33USDTBridgeTokenAddrOnETH}.abi" "${dockerNamePrefix}_ebrelayera_1":/root/${chain33USDTBridgeTokenAddrOnETH}.abi
-        docker cp "${chain33MainBridgeTokenAddrETH}.abi" "${dockerNamePrefix}_ebrelayera_1":/root/${chain33MainBridgeTokenAddrETH}.abi
-        docker cp "${ethereumBridgeBankOnETH}.abi" "${dockerNamePrefix}_ebrelayera_1":/root/${ethereumBridgeBankOnETH}.abi
-        docker cp "${ethereumBridgeRegistryOnETH}.abi" "${dockerNamePrefix}_ebrelayera_1":/root/${ethereumBridgeRegistryOnETH}.abi
+        docker cp "${chain33BridgeBank}.abi" "${dockerNamePrefix}-ebrelayera-1":/root/${chain33BridgeBank}.abi
+        docker cp "${chain33BridgeRegistry}.abi" "${dockerNamePrefix}-ebrelayera-1":/root/${chain33BridgeRegistry}.abi
+        docker cp "${chain33USDTBridgeTokenAddrOnETH}.abi" "${dockerNamePrefix}-ebrelayera-1":/root/${chain33USDTBridgeTokenAddrOnETH}.abi
+        docker cp "${chain33MainBridgeTokenAddrETH}.abi" "${dockerNamePrefix}-ebrelayera-1":/root/${chain33MainBridgeTokenAddrETH}.abi
+        docker cp "${ethereumBridgeBankOnETH}.abi" "${dockerNamePrefix}-ebrelayera-1":/root/${ethereumBridgeBankOnETH}.abi
+        docker cp "${ethereumBridgeRegistryOnETH}.abi" "${dockerNamePrefix}-ebrelayera-1":/root/${ethereumBridgeRegistryOnETH}.abi
     }
 
     # start ebrelayer B C D
diff --git a/plugin/dapp/cross2eth/cmd/build/proxyVerifyTest.sh b/plugin/dapp/cross2eth/cmd/build/proxyVerifyTest.sh
index 3a2636b2c6..a5eb86a6f1 100755
--- a/plugin/dapp/cross2eth/cmd/build/proxyVerifyTest.sh
+++ b/plugin/dapp/cross2eth/cmd/build/proxyVerifyTest.sh
@@ -19,15 +19,15 @@ function start_docker_ebrelayerProxy() {
 
     sed -i 's/^pushName=.*/pushName="x2ethproxy"/g' "./relayerproxy.toml"
 
-    pushHost=$(get_docker_addr "${dockerNamePrefix}_ebrelayerproxy_1")
+    pushHost=$(get_docker_addr "${dockerNamePrefix}-ebrelayerproxy-1")
     sed -i 's/^pushHost=.*/pushHost="http:\/\/'"${pushHost}"':20000"/' "./relayerproxy.toml"
     sed -i 's/^pushBind=.*/pushBind="'"${pushHost}"':20000"/' "./relayerproxy.toml"
 
     # 代理转账中继器中的标志位ProcessWithDraw设置为true
     sed -i 's/^ProcessWithDraw=.*/ProcessWithDraw=true/' "./relayerproxy.toml"
 
-    docker cp "./relayerproxy.toml" "${dockerNamePrefix}_ebrelayerproxy_1":/root/relayer.toml
-    start_docker_ebrelayer "${dockerNamePrefix}_ebrelayerproxy_1" "/root/ebrelayer" "./ebrelayerproxy.log"
+    docker cp "./relayerproxy.toml" "${dockerNamePrefix}-ebrelayerproxy-1":/root/relayer.toml
+    start_docker_ebrelayer "${dockerNamePrefix}-ebrelayerproxy-1" "/root/ebrelayer" "./ebrelayerproxy.log"
     sleep 1
 
     init_validator_relayer "${CLIP}" "${validatorPwd}" "${chain33ValidatorKeyp}" "${ethValidatorAddrKeyp}"
diff --git a/plugin/dapp/cross2eth/cmd/build/public/mainPubilcRelayerTest.sh b/plugin/dapp/cross2eth/cmd/build/public/mainPubilcRelayerTest.sh
index 68e3ac1cc3..569c0336e4 100755
--- a/plugin/dapp/cross2eth/cmd/build/public/mainPubilcRelayerTest.sh
+++ b/plugin/dapp/cross2eth/cmd/build/public/mainPubilcRelayerTest.sh
@@ -121,8 +121,8 @@ source "./offlinePublic.sh"
 }
 
 function start_docker_ebrelayerA() {
-    docker cp "./relayer.toml" "${dockerNamePrefix}_ebrelayera_1":/root/relayer.toml
-    start_docker_ebrelayer "${dockerNamePrefix}_ebrelayera_1" "/root/ebrelayer" "./ebrelayera.log"
+    docker cp "./relayer.toml" "${dockerNamePrefix}-ebrelayera-1":/root/relayer.toml
+    start_docker_ebrelayer "${dockerNamePrefix}-ebrelayera-1" "/root/ebrelayer" "./ebrelayera.log"
     sleep 5
 }
 
@@ -134,17 +134,17 @@ function updata_toml_start_bcd() {
 
         # 修改 relayer.toml 配置文件 pushName 字段
         sed -i 's/^pushName=.*/pushName="x2eth'"${name}"'"/g' "${file}"
-        pushHost=$(get_docker_addr "${dockerNamePrefix}_ebrelayer${name}_1")
+        pushHost=$(get_docker_addr "${dockerNamePrefix}-ebrelayer${name}-1")
         sed -i 's/^pushHost=.*/pushHost="http:\/\/'"${pushHost}"':20000"/' "${file}"
         sed -i 's/^pushBind=.*/pushBind="'"${pushHost}"':20000"/' "${file}"
         if [[ ${name} == "d" ]]; then
             sed -i 's/^DelayedSendTime=.*/DelayedSendTime=180000/' "${file}"
         fi
 
-        docker cp "${file}" "${dockerNamePrefix}_ebrelayer${name}_1":/root/relayer.toml
-        start_docker_ebrelayer "${dockerNamePrefix}_ebrelayer${name}_1" "/root/ebrelayer" "./ebrelayer${name}.log"
+        docker cp "${file}" "${dockerNamePrefix}-ebrelayer${name}-1":/root/relayer.toml
+        start_docker_ebrelayer "${dockerNamePrefix}-ebrelayer${name}-1" "/root/ebrelayer" "./ebrelayer${name}.log"
 
-        CLI="docker exec ${dockerNamePrefix}_ebrelayer${name}_1 /root/ebcli_A"
+        CLI="docker exec ${dockerNamePrefix}-ebrelayer${name}-1 /root/ebcli_A"
         eval chain33ValidatorKey=\$chain33ValidatorKey${name}
         eval ethValidatorAddrKey=\$ethValidatorAddrKey${name}
 
@@ -154,7 +154,7 @@ function updata_toml_start_bcd() {
 
 function restart_ebrelayerA() {
     # 重启
-    kill_docker_ebrelayer "${dockerNamePrefix}_ebrelayera_1"
+    kill_docker_ebrelayer "${dockerNamePrefix}-ebrelayera-1"
     sleep 1
     start_docker_ebrelayerA
 
@@ -166,12 +166,12 @@ function restart_ebrelayerA() {
 function restart_ebrelayer_bcd() {
     # 重启
     local name=$1
-    kill_docker_ebrelayer "${dockerNamePrefix}_ebrelayer${name}_1"
+    kill_docker_ebrelayer "${dockerNamePrefix}-ebrelayer${name}-1"
     sleep 1
-    start_docker_ebrelayer "${dockerNamePrefix}_ebrelayer${name}_1" "/root/ebrelayer" "./ebrelayer${name}.log"
+    start_docker_ebrelayer "${dockerNamePrefix}-ebrelayer${name}-1" "/root/ebrelayer" "./ebrelayer${name}.log"
     sleep 5
 
-    result=$(docker exec "${dockerNamePrefix}_ebrelayer${name}_1" "/root/ebcli_A" unlock -p "${validatorPwd}")
+    result=$(docker exec "${dockerNamePrefix}-ebrelayer${name}-1" "/root/ebcli_A" unlock -p "${validatorPwd}")
     cli_ret "${result}" "unlock"
     sleep 20
 }
@@ -565,8 +565,8 @@ function StartDockerRelayerDeploy() {
     # 启动 ebrelayer
     start_docker_ebrelayerA
 
-    docker cp "./deploy_chain33.toml" "${dockerNamePrefix}_ebrelayera_1":/root/deploy_chain33.toml
-    docker cp "./deploy_ethereum.toml" "${dockerNamePrefix}_ebrelayera_1":/root/deploy_ethereum.toml
+    docker cp "./deploy_chain33.toml" "${dockerNamePrefix}-ebrelayera-1":/root/deploy_chain33.toml
+    docker cp "./deploy_ethereum.toml" "${dockerNamePrefix}-ebrelayera-1":/root/deploy_ethereum.toml
 
     # 部署合约 设置 bridgeRegistry 地址
     OfflineDeploy
@@ -578,7 +578,7 @@ function StartDockerRelayerDeploy() {
     Chain33Cli=${Para8901Cli}
 
     # 重启
-    kill_docker_ebrelayer "${dockerNamePrefix}_ebrelayera_1"
+    kill_docker_ebrelayer "${dockerNamePrefix}-ebrelayera-1"
     sleep 1
     start_docker_ebrelayerA
     InitRelayerA
@@ -609,16 +609,16 @@ function StartDockerRelayerDeploy() {
         offline_deploy_erc20_create_tether_usdt_USDT "BUSDT"
         ethereumUSDTERC20TokenAddrOnBSC="${ethereumUSDTERC20TokenAddr}"
 
-        docker cp "${chain33BridgeBank}.abi" "${dockerNamePrefix}_ebrelayera_1":/root/${chain33BridgeBank}.abi
-        docker cp "${chain33BridgeRegistry}.abi" "${dockerNamePrefix}_ebrelayera_1":/root/${chain33BridgeRegistry}.abi
-        docker cp "${chain33USDTBridgeTokenAddrOnETH}.abi" "${dockerNamePrefix}_ebrelayera_1":/root/${chain33USDTBridgeTokenAddrOnETH}.abi
-        docker cp "${chain33USDTBridgeTokenAddrOnBSC}.abi" "${dockerNamePrefix}_ebrelayera_1":/root/${chain33USDTBridgeTokenAddrOnBSC}.abi
-        docker cp "${chain33MainBridgeTokenAddrETH}.abi" "${dockerNamePrefix}_ebrelayera_1":/root/${chain33MainBridgeTokenAddrETH}.abi
-        docker cp "${chain33MainBridgeTokenAddrBNB}.abi" "${dockerNamePrefix}_ebrelayera_1":/root/${chain33MainBridgeTokenAddrBNB}.abi
-        docker cp "${ethereumBridgeBankOnETH}.abi" "${dockerNamePrefix}_ebrelayera_1":/root/${ethereumBridgeBankOnETH}.abi
-        docker cp "${ethereumBridgeRegistryOnETH}.abi" "${dockerNamePrefix}_ebrelayera_1":/root/${ethereumBridgeRegistryOnETH}.abi
-        docker cp "${ethereumBridgeBankOnBSC}.abi" "${dockerNamePrefix}_ebrelayera_1":/root/${ethereumBridgeBankOnBSC}.abi
-        docker cp "${ethereumBridgeRegistryOnBSC}.abi" "${dockerNamePrefix}_ebrelayera_1":/root/${ethereumBridgeRegistryOnBSC}.abi
+        docker cp "${chain33BridgeBank}.abi" "${dockerNamePrefix}-ebrelayera-1":/root/${chain33BridgeBank}.abi
+        docker cp "${chain33BridgeRegistry}.abi" "${dockerNamePrefix}-ebrelayera-1":/root/${chain33BridgeRegistry}.abi
+        docker cp "${chain33USDTBridgeTokenAddrOnETH}.abi" "${dockerNamePrefix}-ebrelayera-1":/root/${chain33USDTBridgeTokenAddrOnETH}.abi
+        docker cp "${chain33USDTBridgeTokenAddrOnBSC}.abi" "${dockerNamePrefix}-ebrelayera-1":/root/${chain33USDTBridgeTokenAddrOnBSC}.abi
+        docker cp "${chain33MainBridgeTokenAddrETH}.abi" "${dockerNamePrefix}-ebrelayera-1":/root/${chain33MainBridgeTokenAddrETH}.abi
+        docker cp "${chain33MainBridgeTokenAddrBNB}.abi" "${dockerNamePrefix}-ebrelayera-1":/root/${chain33MainBridgeTokenAddrBNB}.abi
+        docker cp "${ethereumBridgeBankOnETH}.abi" "${dockerNamePrefix}-ebrelayera-1":/root/${ethereumBridgeBankOnETH}.abi
+        docker cp "${ethereumBridgeRegistryOnETH}.abi" "${dockerNamePrefix}-ebrelayera-1":/root/${ethereumBridgeRegistryOnETH}.abi
+        docker cp "${ethereumBridgeBankOnBSC}.abi" "${dockerNamePrefix}-ebrelayera-1":/root/${ethereumBridgeBankOnBSC}.abi
+        docker cp "${ethereumBridgeRegistryOnBSC}.abi" "${dockerNamePrefix}-ebrelayera-1":/root/${ethereumBridgeRegistryOnBSC}.abi
     }
 
     # start ebrelayer B C D
@@ -672,33 +672,33 @@ function echo_addrs() {
 
 function get_cli() {
     paraName="user.p.para."
-    docker_chain33_ip=$(get_docker_addr "${dockerNamePrefix}_chain33_1")
+    docker_chain33_ip=$(get_docker_addr "${dockerNamePrefix}-chain33-1")
     MainCli="./chain33-cli --rpc_laddr http://${docker_chain33_ip}:8801"
     Para8801Cli="./chain33-cli --rpc_laddr http://${docker_chain33_ip}:8901 --paraName ${paraName}"
     Para8901Cli="./chain33-cli --rpc_laddr http://${docker_chain33_ip}:8901 --paraName ${paraName}"
-    docker_chain31_ip=$(get_docker_addr "${dockerNamePrefix}_chain31_1")
-    docker_chain32_ip=$(get_docker_addr "${dockerNamePrefix}_chain32_1")
-    docker_chain30_ip=$(get_docker_addr "${dockerNamePrefix}_chain30_1")
+    docker_chain31_ip=$(get_docker_addr "${dockerNamePrefix}-chain31-1")
+    docker_chain32_ip=$(get_docker_addr "${dockerNamePrefix}-chain32-1")
+    docker_chain30_ip=$(get_docker_addr "${dockerNamePrefix}-chain30-1")
 
-    docker_ebrelayera_ip=$(get_docker_addr "${dockerNamePrefix}_ebrelayera_1")
-    CLIP="docker exec ${dockerNamePrefix}_ebrelayerproxy_1 /root/ebcli_A"
-    CLIA="docker exec ${dockerNamePrefix}_ebrelayera_1 /root/ebcli_A"
-    CLIB="docker exec ${dockerNamePrefix}_ebrelayerb_1 /root/ebcli_A"
-    CLIC="docker exec ${dockerNamePrefix}_ebrelayerc_1 /root/ebcli_A"
-    CLID="docker exec ${dockerNamePrefix}_ebrelayerd_1 /root/ebcli_A"
+    docker_ebrelayera_ip=$(get_docker_addr "${dockerNamePrefix}-ebrelayera-1")
+    CLIP="docker exec ${dockerNamePrefix}-ebrelayerproxy-1 /root/ebcli_A"
+    CLIA="docker exec ${dockerNamePrefix}-ebrelayera-1 /root/ebcli_A"
+    CLIB="docker exec ${dockerNamePrefix}-ebrelayerb-1 /root/ebcli_A"
+    CLIC="docker exec ${dockerNamePrefix}-ebrelayerc-1 /root/ebcli_A"
+    CLID="docker exec ${dockerNamePrefix}-ebrelayerd-1 /root/ebcli_A"
 
-    docker_ganachetesteth_ip=$(get_docker_addr "${dockerNamePrefix}_ganachetesteth_1")
-    docker_ganachetestbsc_ip=$(get_docker_addr "${dockerNamePrefix}_ganachetestbsc_1")
-    Boss4xCLI="docker exec ${dockerNamePrefix}_ebrelayera_1 /root/boss4x --rpc_laddr http://${docker_chain33_ip}:8901 --rpc_laddr_ethereum http://${docker_ganachetesteth_ip}:8545 --paraName ${paraName} --chainID ${chain33ID} --chainEthId 1337"
+    docker_ganachetesteth_ip=$(get_docker_addr "${dockerNamePrefix}-ganachetesteth-1")
+    docker_ganachetestbsc_ip=$(get_docker_addr "${dockerNamePrefix}-ganachetestbsc-1")
+    Boss4xCLI="docker exec ${dockerNamePrefix}-ebrelayera-1 /root/boss4x --rpc_laddr http://${docker_chain33_ip}:8901 --rpc_laddr_ethereum http://${docker_ganachetesteth_ip}:8545 --paraName ${paraName} --chainID ${chain33ID} --chainEthId 1337"
 
-    Boss4xCLIeth="docker exec ${dockerNamePrefix}_ebrelayera_1 /root/boss4x --rpc_laddr http://${docker_chain33_ip}:8901 --rpc_laddr_ethereum http://${docker_ganachetesteth_ip}:8545 --paraName ${paraName} --chainID ${chain33ID} --chainEthId 1337"
-    Boss4xCLIbsc="docker exec ${dockerNamePrefix}_ebrelayera_1 /root/boss4x --rpc_laddr http://${docker_chain33_ip}:8901 --rpc_laddr_ethereum http://${docker_ganachetestbsc_ip}:8545 --paraName ${paraName} --chainID ${chain33ID} --chainEthId 1337"
+    Boss4xCLIeth="docker exec ${dockerNamePrefix}-ebrelayera-1 /root/boss4x --rpc_laddr http://${docker_chain33_ip}:8901 --rpc_laddr_ethereum http://${docker_ganachetesteth_ip}:8545 --paraName ${paraName} --chainID ${chain33ID} --chainEthId 1337"
+    Boss4xCLIbsc="docker exec ${dockerNamePrefix}-ebrelayera-1 /root/boss4x --rpc_laddr http://${docker_chain33_ip}:8901 --rpc_laddr_ethereum http://${docker_ganachetestbsc_ip}:8545 --paraName ${paraName} --chainID ${chain33ID} --chainEthId 1337"
 
-    CLIAeth="docker exec ${dockerNamePrefix}_ebrelayera_1 /root/ebcli_A --node_addr http://${docker_ganachetesteth_ip}:8545 --eth_chain_name Ethereum"
-    CLIAbsc="docker exec ${dockerNamePrefix}_ebrelayera_1 /root/ebcli_A --node_addr http://${docker_ganachetestbsc_ip}:8545 --eth_chain_name Binance"
+    CLIAeth="docker exec ${dockerNamePrefix}-ebrelayera-1 /root/ebcli_A --node_addr http://${docker_ganachetesteth_ip}:8545 --eth_chain_name Ethereum"
+    CLIAbsc="docker exec ${dockerNamePrefix}-ebrelayera-1 /root/ebcli_A --node_addr http://${docker_ganachetestbsc_ip}:8545 --eth_chain_name Binance"
 
-    CLIPeth="docker exec ${dockerNamePrefix}_ebrelayerproxy_1 /root/ebcli_A --node_addr http://${docker_ganachetesteth_ip}:8545 --eth_chain_name Ethereum"
-    CLIPbsc="docker exec ${dockerNamePrefix}_ebrelayerproxy_1 /root/ebcli_A --node_addr http://${docker_ganachetestbsc_ip}:8545 --eth_chain_name Binance"
+    CLIPeth="docker exec ${dockerNamePrefix}-ebrelayerproxy-1 /root/ebcli_A --node_addr http://${docker_ganachetesteth_ip}:8545 --eth_chain_name Ethereum"
+    CLIPbsc="docker exec ${dockerNamePrefix}-ebrelayerproxy-1 /root/ebcli_A --node_addr http://${docker_ganachetestbsc_ip}:8545 --eth_chain_name Binance"
 }
 
 function test_lock_and_burn() {
diff --git a/plugin/dapp/cross2eth/cmd/build/public/offlinePublic.sh b/plugin/dapp/cross2eth/cmd/build/public/offlinePublic.sh
index c103887964..075dc94e9e 100644
--- a/plugin/dapp/cross2eth/cmd/build/public/offlinePublic.sh
+++ b/plugin/dapp/cross2eth/cmd/build/public/offlinePublic.sh
@@ -256,7 +256,7 @@ function OfflineDeploy() {
         CLIA=${CLIAbsc}
         cp "./deploy_ethereum.toml" "./deploy_bsc.toml"
         sed -i 's/^symbol=.*/symbol="BNB"/g' "./deploy_bsc.toml"
-        docker cp "./deploy_bsc.toml" "${dockerNamePrefix}_ebrelayera_1":/root/deploy_bsc.toml
+        docker cp "./deploy_bsc.toml" "${dockerNamePrefix}-ebrelayera-1":/root/deploy_bsc.toml
         OfflineDeploy_ethereum "./deploy_bsc.toml"
         ethereumBridgeBankOnBSC="${ethereumBridgeBank}"
         ethereumBridgeRegistryOnBSC="${ethereumBridgeRegistry}"
diff --git a/plugin/dapp/cross2eth/cmd/build/public/publicTest.sh b/plugin/dapp/cross2eth/cmd/build/public/publicTest.sh
index 8c626c9016..317f7bef45 100644
--- a/plugin/dapp/cross2eth/cmd/build/public/publicTest.sh
+++ b/plugin/dapp/cross2eth/cmd/build/public/publicTest.sh
@@ -28,12 +28,12 @@ function exit_cp_file() {
 
     for name in a b c d; do
         # shellcheck disable=SC2154
-        docker cp "${dockerNamePrefix}_ebrelayer${name}_1":/root/logs/x2Ethereum_relayer.log "${dirName}/ebrelayer${name}.log"
-        docker exec "${dockerNamePrefix}_ebrelayer${name}_1" tail -n 1000 /root/logs/x2Ethereum_relayer.log
+        docker cp "${dockerNamePrefix}-ebrelayer${name}-1":/root/logs/x2Ethereum_relayer.log "${dirName}/ebrelayer${name}.log"
+        docker exec "${dockerNamePrefix}-ebrelayer${name}-1" tail -n 1000 /root/logs/x2Ethereum_relayer.log
     done
 
-    docker cp "${dockerNamePrefix}_chain33_1":/root/logs/chain33.log "${dirName}/chain33.log"
-    docker logs "${dockerNamePrefix}_chain33_1" | tail -n 1000
+    docker cp "${dockerNamePrefix}-chain33-1":/root/logs/chain33.log "${dirName}/chain33.log"
+    docker logs "${dockerNamePrefix}-chain33-1" | tail -n 1000
 
     exit 1
 }
diff --git a/plugin/dapp/evm/cmd/ci/Dockerfile b/plugin/dapp/evm/cmd/ci/Dockerfile
index 1ac56faeea..ef978e8ad2 100644
--- a/plugin/dapp/evm/cmd/ci/Dockerfile
+++ b/plugin/dapp/evm/cmd/ci/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 WORKDIR /root
 COPY chain33 chain33
diff --git a/plugin/dapp/evm/cmd/ci/docker-compose.sh b/plugin/dapp/evm/cmd/ci/docker-compose.sh
index 1289cd3970..fe89599512 100755
--- a/plugin/dapp/evm/cmd/ci/docker-compose.sh
+++ b/plugin/dapp/evm/cmd/ci/docker-compose.sh
@@ -22,7 +22,7 @@ set -o pipefail
 PWD=$(cd "$(dirname "$0")" && pwd)
 export PATH="$PWD:$PATH"
 
-SOLO_NODE="${1}_main_1"
+SOLO_NODE="${1}-main-1"
 SOLO_CLI="docker exec ${SOLO_NODE} /root/chain33-cli --rpc_laddr http://localhost:8545"
 Chain33_CLI="docker exec ${SOLO_NODE} /root/chain33-cli"
 DAPP="evm"
@@ -54,19 +54,19 @@ testAddr="0xDe79A84DD3A16BB91044167075dE17a1CA4b1d6b"
 
 function start_docker() {
     echo "=========== # docker-compose ps ============="
-    cd ../evm2 && docker-compose ps && docker-compose down
+    cd ../evm2 && docker compose ps && docker compose down
     cd ../evm-ci
-    docker-compose ps
+    docker compose ps
 
     # remove exsit container
-    docker-compose down
+    docker compose down
     # create and run docker-compose container
-    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
 }
 function check_docker_container() {
     echo "===== check_docker_container ======"
@@ -477,7 +477,7 @@ function main() {
     run_testcase
     check_docker_container
     #finish
-    docker-compose down
+    docker compose down
     echo "===============DAPP=$DAPP main end==============="
     echo "++++++++++++++++DAPP=$DAPP ci2  start++++++++++++++++"
     mkdir -p ../evm2-ci && cp ../evm2/* ../evm2-ci
diff --git a/plugin/dapp/evm/cmd/ci2/Dockerfile b/plugin/dapp/evm/cmd/ci2/Dockerfile
index c9312d9cf1..5fa25cedf0 100644
--- a/plugin/dapp/evm/cmd/ci2/Dockerfile
+++ b/plugin/dapp/evm/cmd/ci2/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 WORKDIR /root
 COPY chain33 chain33
diff --git a/plugin/dapp/evm/cmd/ci2/docker-compose.sh b/plugin/dapp/evm/cmd/ci2/docker-compose.sh
index 0ba237e9fc..fa26c465e0 100755
--- a/plugin/dapp/evm/cmd/ci2/docker-compose.sh
+++ b/plugin/dapp/evm/cmd/ci2/docker-compose.sh
@@ -25,10 +25,10 @@ source ../dapp-test-common.sh
 PWD=$(cd "$(dirname "$0")" && pwd)
 export PATH="$PWD:$PATH"
 
-M1_NODE="${1}_chain33_1"
-M2_NODE="${1}_chain32_1"
-M3_NODE="${1}_chain31_1"
-M4_NODE="${1}_chain30_1"
+M1_NODE="${1}-chain33-1"
+M2_NODE="${1}-chain32-1"
+M3_NODE="${1}-chain31-1"
+M4_NODE="${1}-chain30-1"
 #测试节点
 M1_NODE_CLI="docker exec ${M1_NODE} /root/chain33-cli"
 ETH_CLI="docker exec ${M1_NODE} /root/chain33-cli --rpc_laddr http://localhost:8545"
@@ -76,17 +76,17 @@ genesiskey="18f5bf55d3500d216ed3cba3bc1e417507c6c3daf951a3386a5477716d33a160"
 minerkeys=("${m4minerkey}" "${m1minerkey}" "${m2minerkey}" "${m3minerkey}")
 function start_docker() {
     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 up --build -d
+    docker compose up --build -d
     local SLEEP=5
     echo "=========== sleep ${SLEEP}s ============="
     sleep ${SLEEP}
 
-    docker-compose ps
+    docker compose ps
 }
 
 
@@ -439,7 +439,7 @@ function main() {
     run_testcase
     check_docker_container
     #finish
-    docker-compose down
+    docker compose down
     echo "===============DAPP=$DAPP main end==============="
 }
 
diff --git a/plugin/dapp/mix/cmd/build/Dockerfile b/plugin/dapp/mix/cmd/build/Dockerfile
index 55cce461cf..c2cec0d29c 100644
--- a/plugin/dapp/mix/cmd/build/Dockerfile
+++ b/plugin/dapp/mix/cmd/build/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:22.04
 
 WORKDIR /root
 COPY chain33 chain33
diff --git a/plugin/dapp/oracle/cmd/test/test-rpc.sh b/plugin/dapp/oracle/cmd/test/test-rpc.sh
index 527604bcf3..944857e0a9 100755
--- a/plugin/dapp/oracle/cmd/test/test-rpc.sh
+++ b/plugin/dapp/oracle/cmd/test/test-rpc.sh
@@ -23,7 +23,10 @@ oracle_AddPublisher() {
 }
 
 oracle_publish_transaction() {
-    req='{"method":"Chain33.CreateTransaction","params":[{"execer":"oracle","actionName":"EventPublish","payload":{"type":"football", "subType":"Premier League","time":1747814996,"content":"test","introduction":"test"}}]}'
+    #  time 参数必须是未来时刻
+    timestamp=$(date +%s)
+    timestamp=$((timestamp+3600))
+    req='{"method":"Chain33.CreateTransaction","params":[{"execer":"oracle","actionName":"EventPublish","payload":{"type":"football", "subType":"Premier League","time":'$timestamp',"content":"test","introduction":"test"}}]}'
     chain33_Http "$req" ${MAIN_HTTP} '(.error|not) and (.result != null)' "$FUNCNAME" ".result"
     chain33_SignAndSendTx "$RETURN_RESP" "${oracle_publisher_key}" "${MAIN_HTTP}"
     eventId="${txhash}"
diff --git a/plugin/dapp/paracross/cmd/build/Dockerfile b/plugin/dapp/paracross/cmd/build/Dockerfile
index c2bc721de9..7142d89e66 100644
--- a/plugin/dapp/paracross/cmd/build/Dockerfile
+++ b/plugin/dapp/paracross/cmd/build/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:22.04
 
 WORKDIR /root
 COPY chain33 chain33
diff --git a/plugin/dapp/paracross/cmd/scripts/autodeploy/Dockerfile b/plugin/dapp/paracross/cmd/scripts/autodeploy/Dockerfile
index 4a30408a68..354443b4d9 100644
--- a/plugin/dapp/paracross/cmd/scripts/autodeploy/Dockerfile
+++ b/plugin/dapp/paracross/cmd/scripts/autodeploy/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:22.04
 
 WORKDIR /root
 COPY chain33 chain33
diff --git a/plugin/dapp/paracross/cmd/scripts/autodeploy/docker-compose.sh b/plugin/dapp/paracross/cmd/scripts/autodeploy/docker-compose.sh
index 12971173ab..ebdf94227e 100755
--- a/plugin/dapp/paracross/cmd/scripts/autodeploy/docker-compose.sh
+++ b/plugin/dapp/paracross/cmd/scripts/autodeploy/docker-compose.sh
@@ -98,17 +98,17 @@ function para_unlock_wallet() {
 }
 function start() {
     echo "=========== # docker-compose ps ============="
-    docker-compose ps
-    docker-compose down
+    docker compose ps
+    docker compose down
 
     # create and run docker-compose container
-    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
 
     # query node run status
     echo "status"
@@ -124,7 +124,7 @@ function check_docker_status() {
     statusPara=$(docker-compose ps | grep parachain1_1 | awk '{print $3}')
     if [ "${status}" == "Exit" ] || [ "${statusPara}" == "Exit" ]; then
         echo "=========== chain33 service Exit logs ========== "
-        docker-compose logs parachain1
+        docker compose logs parachain1
         echo "=========== chain33 service Exit logs End========== "
     fi
 
diff --git a/plugin/dapp/relay/cmd/build/Dockerfile-relayd b/plugin/dapp/relay/cmd/build/Dockerfile-relayd
index 5083e434e2..f226ad3b2b 100644
--- a/plugin/dapp/relay/cmd/build/Dockerfile-relayd
+++ b/plugin/dapp/relay/cmd/build/Dockerfile-relayd
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:22.04
 
 WORKDIR /root
 COPY relayd.toml relayd.toml
diff --git a/plugin/dapp/relay/cmd/build/testcase.sh b/plugin/dapp/relay/cmd/build/testcase.sh
index efe3f22008..e7a33b622b 100755
--- a/plugin/dapp/relay/cmd/build/testcase.sh
+++ b/plugin/dapp/relay/cmd/build/testcase.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
-BTCD="${1}_btcd_1"
+BTCD="${1}-btcd-1"
 
-RELAYD="${1}_relayd_1"
+RELAYD="${1}-relayd-1"
 
 BTC_CTL="docker exec ${BTCD} btcctl"
 
@@ -50,9 +50,9 @@ function wait_btcd_up() {
         if [ "${status}" == "Up" ]; then
             break
         fi
-        docker-compose logs btcd
-        docker-compose restart btcd
-        docker-compose ps
+        docker compose logs btcd
+        docker compose restart btcd
+        docker compose ps
         echo "==============btcd fail $count  ================="
         ((count--))
         if [ $count == 0 ]; then
@@ -61,9 +61,9 @@ function wait_btcd_up() {
         fi
         mod=$((count % 4))
         if [ $mod == 0 ]; then
-            docker-compose down
+            docker compose down
             sleep 5
-            docker-compose up --build -d
+            docker compose up --build -d
             sleep 60
             continue
         fi
diff --git a/plugin/dapp/rollup/cmd/ci/Dockerfile b/plugin/dapp/rollup/cmd/ci/Dockerfile
index aba4c24929..b58c6dd058 100644
--- a/plugin/dapp/rollup/cmd/ci/Dockerfile
+++ b/plugin/dapp/rollup/cmd/ci/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 WORKDIR /root
 COPY chain33 chain33
diff --git a/plugin/dapp/rollup/cmd/ci/docker-compose.sh b/plugin/dapp/rollup/cmd/ci/docker-compose.sh
index 57659014f6..39f24d9a85 100755
--- a/plugin/dapp/rollup/cmd/ci/docker-compose.sh
+++ b/plugin/dapp/rollup/cmd/ci/docker-compose.sh
@@ -18,13 +18,13 @@ set -o pipefail
 PWD=$(cd "$(dirname "$0")" && pwd)
 export PATH="$PWD:$PATH"
 
-MAIN_NODE="${1}_main_1"
+MAIN_NODE="${1}-main-1"
 MAIN_CLI="docker exec ${MAIN_NODE} /root/chain33-cli --conf=chain33.test.toml"
 
-PARA_NODE="${1}_para1_1"
+PARA_NODE="${1}-para1-1"
 CLI="docker exec ${PARA_NODE} /root/chain33-cli --conf=chain33.para1.toml --paraName=user.p.para."
 
-PARA_NODE2="${1}_para2_1"
+PARA_NODE2="${1}-para2-1"
 CLI2="docker exec ${PARA_NODE2} /root/chain33-cli --conf=chain33.para2.toml --paraName=user.p.para."
 
 # shellcheck disable=SC2034
@@ -333,19 +333,19 @@ function test_rollup() {
 
 function start_docker() {
     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 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
diff --git a/plugin/dapp/x2ethereum/cmd/build/Dockerfile-x2ethrelay b/plugin/dapp/x2ethereum/cmd/build/Dockerfile-x2ethrelay
index 329c4e48ce..ed29f32d24 100644
--- a/plugin/dapp/x2ethereum/cmd/build/Dockerfile-x2ethrelay
+++ b/plugin/dapp/x2ethereum/cmd/build/Dockerfile-x2ethrelay
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:22.04
 
 WORKDIR /root
 COPY ebrelayer ebrelayer
diff --git a/plugin/dapp/x2ethereum/cmd/build/RopstenTest.sh b/plugin/dapp/x2ethereum/cmd/build/RopstenTest.sh
index 238c5ecd35..1a0a6b4460 100755
--- a/plugin/dapp/x2ethereum/cmd/build/RopstenTest.sh
+++ b/plugin/dapp/x2ethereum/cmd/build/RopstenTest.sh
@@ -525,8 +525,8 @@ function TestETH2Chain33Erc20Kill() {
 
 function AllRelayerMainTest() {
     set +e
-    #    docker cp ${GOPATH}/src/github.com/33cn/plugin/build/ci/x2ethereum build_chain33_1:/root/x2ethereum
-    #    docker cp ${GOPATH}/src/github.com/33cn/plugin/plugin/dapp/x2ethereum/cmd/build/RopstenTest.sh build_chain33_1:/root/x2ethereum/RopstenTest.sh
+    #    docker cp ${GOPATH}/src/github.com/33cn/plugin/build/ci/x2ethereum build_chain33-1:/root/x2ethereum
+    #    docker cp ${GOPATH}/src/github.com/33cn/plugin/plugin/dapp/x2ethereum/cmd/build/RopstenTest.sh build_chain33-1:/root/x2ethereum/RopstenTest.sh
 
     Chain33Cli="./../chain33-cli"
 
diff --git a/plugin/dapp/x2ethereum/cmd/build/allRelayerTest.sh b/plugin/dapp/x2ethereum/cmd/build/allRelayerTest.sh
index 9b1521ca4d..6b72147d3f 100755
--- a/plugin/dapp/x2ethereum/cmd/build/allRelayerTest.sh
+++ b/plugin/dapp/x2ethereum/cmd/build/allRelayerTest.sh
@@ -34,20 +34,20 @@ Chain33Cli=""
 
 function kill_ebrelayerC() {
     #shellcheck disable=SC2154
-    kill_docker_ebrelayer "${dockerNamePrefix}_ebrelayerc_1"
+    kill_docker_ebrelayer "${dockerNamePrefix}-ebrelayerc-1"
 }
 function kill_ebrelayerD() {
-    kill_docker_ebrelayer "${dockerNamePrefix}_ebrelayerd_1"
+    kill_docker_ebrelayer "${dockerNamePrefix}-ebrelayerd-1"
 }
 
 function start_ebrelayerA() {
-    docker cp "./relayer.toml" "${dockerNamePrefix}_ebrelayera_1":/root/relayer.toml
-    start_docker_ebrelayer "${dockerNamePrefix}_ebrelayera_1" "/root/ebrelayer" "./ebrelayera.log"
+    docker cp "./relayer.toml" "${dockerNamePrefix}-ebrelayera-1":/root/relayer.toml
+    start_docker_ebrelayer "${dockerNamePrefix}-ebrelayera-1" "/root/ebrelayer" "./ebrelayera.log"
     sleep 5
 }
 
 function start_ebrelayerC() {
-    start_docker_ebrelayer "${dockerNamePrefix}_ebrelayerc_1" "/root/ebrelayer" "./ebrelayerc.log"
+    start_docker_ebrelayer "${dockerNamePrefix}-ebrelayerc-1" "/root/ebrelayer" "./ebrelayerc.log"
     sleep 5
     ${CLIC} relayer unlock -p 123456hzj
     sleep 5
@@ -55,7 +55,7 @@ function start_ebrelayerC() {
     sleep 10
 }
 function start_ebrelayerD() {
-    start_docker_ebrelayer "${dockerNamePrefix}_ebrelayerd_1" "/root/ebrelayer" "./ebrelayerd.log"
+    start_docker_ebrelayer "${dockerNamePrefix}-ebrelayerd-1" "/root/ebrelayer" "./ebrelayerd.log"
     sleep 5
     ${CLID} relayer unlock -p 123456hzj
     sleep 5
@@ -81,11 +81,11 @@ function StartRelayerAndDeploy() {
     echo -e "${GRE}=========== $FUNCNAME begin ===========${NOC}"
 
     # change EthProvider url
-    dockerAddr=$(get_docker_addr "${dockerNamePrefix}_ganachetest_1")
+    dockerAddr=$(get_docker_addr "${dockerNamePrefix}-ganachetest-1")
     ethUrl="http://${dockerAddr}:8545"
 
     # 修改 relayer.toml 配置文件
-    updata_relayer_a_toml "${dockerAddr}" "${dockerNamePrefix}_ebrelayera_1" "./relayer.toml"
+    updata_relayer_a_toml "${dockerAddr}" "${dockerNamePrefix}-ebrelayera-1" "./relayer.toml"
     # start ebrelayer A
     start_ebrelayerA
     # 部署合约
@@ -96,7 +96,7 @@ function StartRelayerAndDeploy() {
     BridgeRegistry=$(cli_ret "${result}" "bridgeRegistry" ".addr")
 
     # kill ebrelayer A
-    kill_docker_ebrelayer "${dockerNamePrefix}_ebrelayera_1"
+    kill_docker_ebrelayer "${dockerNamePrefix}-ebrelayera-1"
     sleep 1
 
     # 修改 relayer.toml 配置文件
@@ -116,15 +116,15 @@ function StartRelayerAndDeploy() {
 
         sed -i 's/x2ethereum/x2ethereum'${name}'/g' "${file}"
 
-        pushHost=$(get_docker_addr "${dockerNamePrefix}_ebrelayer${name}_1")
+        pushHost=$(get_docker_addr "${dockerNamePrefix}-ebrelayer${name}-1")
         line=$(delete_line_show "${file}" "pushHost")
         sed -i ''"${line}"' a pushHost="http://'"${pushHost}"':20000"' "${file}"
 
         line=$(delete_line_show "${file}" "pushBind")
         sed -i ''"${line}"' a pushBind="'"${pushHost}"':20000"' "${file}"
 
-        docker cp "${file}" "${dockerNamePrefix}_ebrelayer${name}_1":/root/relayer.toml
-        start_docker_ebrelayer "${dockerNamePrefix}_ebrelayer${name}_1" "/root/ebrelayer" "./ebrelayer${name}.log"
+        docker cp "${file}" "${dockerNamePrefix}-ebrelayer${name}-1":/root/relayer.toml
+        start_docker_ebrelayer "${dockerNamePrefix}-ebrelayer${name}-1" "/root/ebrelayer" "./ebrelayer${name}.log"
     done
     sleep 5
 
@@ -137,7 +137,7 @@ function EthImportKey() {
     for name in a b c d; do
         # 导入测试地址私钥
         # shellcheck disable=SC2154
-        CLI="docker exec ${dockerNamePrefix}_ebrelayer${name}_1 /root/ebcli_A"
+        CLI="docker exec ${dockerNamePrefix}-ebrelayer${name}-1 /root/ebcli_A"
 
         result=$(${CLI} relayer set_pwd -p 123456hzj)
 
@@ -555,13 +555,13 @@ function TestETH2Chain33Erc20Kill() {
 
 function AllRelayerMainTest() {
     set +e
-    docker_chain33_ip=$(get_docker_addr "${dockerNamePrefix}_chain33_1")
+    docker_chain33_ip=$(get_docker_addr "${dockerNamePrefix}-chain33-1")
     Chain33Cli="./chain33-cli --rpc_laddr http://${docker_chain33_ip}:8801"
 
-    CLIA="docker exec ${dockerNamePrefix}_ebrelayera_1 /root/ebcli_A"
-    CLIB="docker exec ${dockerNamePrefix}_ebrelayerb_1 /root/ebcli_A"
-    CLIC="docker exec ${dockerNamePrefix}_ebrelayerc_1 /root/ebcli_A"
-    CLID="docker exec ${dockerNamePrefix}_ebrelayerd_1 /root/ebcli_A"
+    CLIA="docker exec ${dockerNamePrefix}-ebrelayera-1 /root/ebcli_A"
+    CLIB="docker exec ${dockerNamePrefix}-ebrelayerb-1 /root/ebcli_A"
+    CLIC="docker exec ${dockerNamePrefix}-ebrelayerc-1 /root/ebcli_A"
+    CLID="docker exec ${dockerNamePrefix}-ebrelayerd-1 /root/ebcli_A"
     echo "${CLIA}"
 
     echo -e "${GRE}=========== $FUNCNAME begin ===========${NOC}"
diff --git a/plugin/dapp/x2ethereum/cmd/build/publicTest.sh b/plugin/dapp/x2ethereum/cmd/build/publicTest.sh
index 57b89acfb9..88dfe2d0f3 100644
--- a/plugin/dapp/x2ethereum/cmd/build/publicTest.sh
+++ b/plugin/dapp/x2ethereum/cmd/build/publicTest.sh
@@ -26,12 +26,12 @@ function exit_cp_file() {
 
     for name in a b c d; do
         # shellcheck disable=SC2154
-        docker cp "${dockerNamePrefix}_ebrelayer${name}_1":/root/logs/x2Ethereum_relayer.log "${dirName}/ebrelayer${name}.log"
-        docker exec "${dockerNamePrefix}_ebrelayer${name}_1" tail -n 1000 /root/logs/x2Ethereum_relayer.log
+        docker cp "${dockerNamePrefix}-ebrelayer${name}-1":/root/logs/x2Ethereum_relayer.log "${dirName}/ebrelayer${name}.log"
+        docker exec "${dockerNamePrefix}-ebrelayer${name}-1" tail -n 1000 /root/logs/x2Ethereum_relayer.log
     done
 
-    docker cp "${dockerNamePrefix}_chain33_1":/root/logs/chain33.log "${dirName}/chain33.log"
-    docker logs "${dockerNamePrefix}_chain33_1" | tail -n 1000
+    docker cp "${dockerNamePrefix}-chain33-1":/root/logs/chain33.log "${dirName}/chain33.log"
+    docker logs "${dockerNamePrefix}-chain33-1" | tail -n 1000
 
     exit 1
 }
@@ -51,11 +51,11 @@ function copyErrLogs() {
 
         for name in a b c d; do
             # shellcheck disable=SC2154
-            docker cp "${dockerNamePrefix}_ebrelayer${name}_rpc_1":/root/logs/x2Ethereum_relayer.log "${dirName}/ebrelayer${name}_rpc.log"
-            docker exec "${dockerNamePrefix}_ebrelayer${name}_rpc_1" tail -n 1000 /root/logs/x2Ethereum_relayer.log
+            docker cp "${dockerNamePrefix}-ebrelayer${name}-rpc-1":/root/logs/x2Ethereum_relayer.log "${dirName}/ebrelayer${name}-rpc.log"
+            docker exec "${dockerNamePrefix}-ebrelayer${name}-rpc-1" tail -n 1000 /root/logs/x2Ethereum_relayer.log
         done
-        docker cp "${dockerNamePrefix}_chain33_1":/root/logs/chain33.log "${dirName}/chain33_rpc.log"
-        docker logs "${dockerNamePrefix}_chain33_1" | tail -n 1000
+        docker cp "${dockerNamePrefix}-chain33-1":/root/logs/chain33.log "${dirName}/chain33_rpc.log"
+        docker logs "${dockerNamePrefix}-chain33-1" | tail -n 1000
     fi
 }
 
@@ -412,7 +412,7 @@ function updata_relayer_a_toml() {
     line=$(delete_line_show "${file}" "pushBind")
     sed -i ''"${line}"' a pushBind="'"${pushHost}"':20000"' "${file}"
 
-    local chain33Host=$(get_docker_addr "${dockerNamePrefix}_chain33_1")
+    local chain33Host=$(get_docker_addr "${dockerNamePrefix}-chain33-1")
     if [[ ${chain33Host} == "" ]]; then
         echo -e "${RED}chain33Host is empty${NOC}"
         exit_cp_file