Merge branch 'master' into master

Author: 33cn

.github/workflows/automake.yml

@@ -19,7 +19,7 @@ on:
 jobs:
   automake:
     name: automake
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
         with:

.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:
@@ -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 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.55.2
+          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: |
@@ -31,7 +31,7 @@ jobs:
 
   unit-test:
     name: unit-test
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
         with:
@@ -48,7 +48,7 @@ jobs:
 
   coverage:
     name: coverage
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
         with:
@@ -69,7 +69,7 @@ jobs:
   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
@@ -85,7 +85,7 @@ jobs:
 
   deploy:
     name: deploy
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
         with:
@@ -103,7 +103,7 @@ jobs:
 
   test-goarch-386:
     name: Run test cases with GOARCH=386
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v3
@@ -120,4 +120,3 @@ jobs:
         run: go test ./... -covermode=atomic
         env:
           GOARCH: 386
-

.github/workflows/codeql-analysis.yml

@@ -23,7 +23,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     permissions:
       actions: read
       contents: read

.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
       - uses: actions/setup-go@v3
@@ -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: |

.github/workflows/release.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
         with:

CHANGELOG.md

@@ -1,5 +1,13 @@
 changelog
 
+<a name="1.69.0"></a>
+# [1.69.0](https://github.com/33cn/chain33/compare/v1.68.2...v1.69.0) (2024-05-31)
+
+
+### Features
+
+* import avalanche snowman engine ([25b1b0c](https://github.com/33cn/chain33/commit/25b1b0c))
+
 <a name="1.68.2"></a>
 ## [1.68.2](https://github.com/33cn/chain33/compare/v1.68.1...v1.68.2) (2024-04-12)
 

Makefile

@@ -130,14 +130,14 @@ build_ci: depends ## Build the binary file for CI
 
 linter: vet ineffassign gosec ## Use gometalinter check code, ignore some unserious warning
 	@./golinter.sh "filter"
-	@find . -name '*.sh' -not -path "./vendor/*" | xargs shellcheck -e SC2086
+	@find . -name '*.sh' -not -path "./vendor/*" | xargs shellcheck -e SC2086,SC2004
 
 linter_test: ## Use gometalinter check code, for local test
 	@./golinter.sh "test" "${p}"
 	@find . -name '*.sh' -not -path "./vendor/*" | xargs shellcheck
 
 gosec:
-	@golangci-lint  run --no-config --issues-exit-code=1  --deadline=2m --disable-all --enable=gosec --skip-dirs=commands --exclude=G108,G204,G306,G404
+	@golangci-lint  run --no-config --issues-exit-code=1  --deadline=2m --disable-all --enable=gosec --skip-dirs=commands --exclude=G108,G204,G306,G404,G114
 
 race: ## Run data race detector
 	@go test -race -short `go list ./... | grep -v "mocks"`

README.md

@@ -39,7 +39,7 @@ L3 20000
 
 ## Building from source
 
-环境要求: Go 1.19+
+环境要求: Go 1.20+
 
 编译:
 

account/account.go

@@ -207,7 +207,7 @@ func (acc *DB) SaveAccount(acc1 *types.Account) {
 	}
 }
 
-//SaveKVSet 保存Key Value set
+// SaveKVSet 保存Key Value set
 func (acc *DB) SaveKVSet(set []*types.KeyValue) {
 	for i := 0; i < len(set); i++ {
 		err := acc.db.Set(set[i].GetKey(), set[i].Value)

account/execaccount.go

@@ -95,7 +95,7 @@ func (acc *DB) TransferWithdraw(from, to string, amount int64) (*types.Receipt,
 	return acc.mergeReceipt(receipt, receipt2), nil
 }
 
-//ExecFrozen 执行冻结资金，四个操作中 Deposit 自动完成，不需要模块外的函数来调用
+// ExecFrozen 执行冻结资金，四个操作中 Deposit 自动完成，不需要模块外的函数来调用
 func (acc *DB) ExecFrozen(addr, execaddr string, amount int64) (*types.Receipt, error) {
 	if addr == execaddr {
 		return nil, types.ErrSendSameToRecv