Merge 6206e7a into 12798ae

.github/workflows/build.yml

@@ -8,7 +8,7 @@ jobs:
       - name: Set up Golang
         uses: actions/setup-go@v2
         with:
-          go-version: 1.13
+          go-version: 1.14
         id: go
       - name: checkout
         uses: actions/checkout@v2
@@ -39,7 +39,7 @@ jobs:
       - name: Set up Golang
         uses: actions/setup-go@v2
         with:
-          go-version: 1.13
+          go-version: 1.14
         id: go
       - name: set go env
         run: export PATH=${PATH}:`go env GOPATH`/bin
@@ -55,7 +55,7 @@ jobs:
       - name: Set up Golang
         uses: actions/setup-go@v2
         with:
-          go-version: 1.13
+          go-version: 1.14
         id: go
       - name: set go env
         run: export PATH=${PATH}:`go env GOPATH`/bin
@@ -74,7 +74,7 @@ jobs:
       - name: Set up Golang
         uses: actions/setup-go@v2
         with:
-          go-version: 1.13
+          go-version: 1.14
         id: go
       - name: set go env
         run: export PATH=${PATH}:`go env GOPATH`/bin

.travis.yml

@@ -12,7 +12,7 @@ matrix:
     - name: check_fmt
       sudo: require
       go:
-        - "1.13.x"
+        - "1.14.x"
         - master
       env:
         - GO111MODULE=on
@@ -26,7 +26,7 @@ matrix:
         - make linter
 
     - name: unit-test
-      go: "1.13.x"
+      go: "1.14.x"
       env:
         - GO111MODULE=on
 
@@ -37,7 +37,7 @@ matrix:
     - name: coverage
       if: branch = master
       go:
-        - "1.13.x"
+        - "1.14.x"
       env:
         - GO111MODULE=on
       before_install:
@@ -51,7 +51,7 @@ matrix:
     - name: deploy
       sudo: required
       go: 
-        - "1.13.x"
+        - "1.14.x"
       services:
         - docker
       env:

appveyor.yml

@@ -9,7 +9,7 @@ clone_folder: c:\gopath\src\github.com\33cn\chain33
 environment:
   GOPATH: c:\gopath
   DEPTESTBYPASS501: 1
-  GOVERSION: 1.13.8
+  GOVERSION: 1.14.14
   GO111MODULE: on
 
 #init:

common/db/table/table.go

@@ -564,7 +564,16 @@ func (table *Table) addRow(row *Row) (kvs []*types.KeyValue, err error) {
 }
 
 func (table *Table) updateRow(row *Row) (kvs []*types.KeyValue, err error) {
-	if proto.Equal(row.Data, row.old) {
+	// JoinData 为自定义的proto.Message而非protoc-gen-go生成的proto.Message
+	// 在旧版本的protobuf中直接使用proto.Equal(x, y Message)方法会返回false而在新版本中会返回true
+	// 因此此处对JoinData类型在判等时做一个特殊处理
+	jd, ok := row.Data.(*JoinData)
+	oldJd, ok2 := row.old.(*JoinData)
+	if ok && ok2 {
+		if proto.Equal(jd.Left, oldJd.Left) && proto.Equal(jd.Right, oldJd.Right) {
+			return nil, nil
+		}
+	} else if proto.Equal(row.Data, row.old) {
 		return nil, nil
 	}
 	if !table.opt.Join {

go.mod

@@ -1,56 +1,52 @@
 module github.com/33cn/chain33
 
-go 1.13
+go 1.14
 
 require (
 	github.com/BurntSushi/toml v0.3.1
 	github.com/XiaoMi/pegasus-go-client v0.0.0-20181029071519-9400942c5d1c
 	github.com/apache/thrift v0.0.0-20171203172758-327ebb6c2b6d // indirect
-	github.com/btcsuite/btcd v0.20.1-beta
-	github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d
+	github.com/btcsuite/btcd v0.21.0-beta
 	github.com/decred/base58 v1.0.2
-	github.com/dgraph-io/badger v1.6.1
+	github.com/dgraph-io/badger v1.6.2
 	github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2
 	github.com/fortytw2/leaktest v1.3.0 // indirect
 	github.com/go-stack/stack v1.8.0
-	github.com/gogo/protobuf v1.3.1
-	github.com/golang/protobuf v1.3.4
+	github.com/golang/protobuf v1.4.3
 	github.com/golang/snappy v0.0.2-0.20190904063534-ff6b7dc882cf
-	github.com/google/uuid v1.1.1
+	github.com/google/uuid v1.2.0
 	github.com/hashicorp/golang-lru v0.5.4
 	github.com/influxdata/influxdb v1.7.9
-	github.com/ipfs/go-log/v2 v2.1.1
+	github.com/ipfs/go-log/v2 v2.1.3
 	github.com/kevinms/leakybucket-go v0.0.0-20200115003610-082473db97ca
-	github.com/libp2p/go-libp2p v0.10.3
+	github.com/libp2p/go-libp2p v0.14.2
 	github.com/libp2p/go-libp2p-blankhost v0.2.0
-	github.com/libp2p/go-libp2p-circuit v0.3.1
+	github.com/libp2p/go-libp2p-circuit v0.4.0
 	github.com/libp2p/go-libp2p-connmgr v0.2.4
-	github.com/libp2p/go-libp2p-core v0.6.1
+	github.com/libp2p/go-libp2p-core v0.8.5
 	github.com/libp2p/go-libp2p-discovery v0.5.0
-	github.com/libp2p/go-libp2p-kad-dht v0.5.2
-	github.com/libp2p/go-libp2p-kbucket v0.2.3
-	github.com/libp2p/go-libp2p-pubsub v0.3.6
-	github.com/libp2p/go-libp2p-swarm v0.2.8
+	github.com/libp2p/go-libp2p-kad-dht v0.12.1
+	github.com/libp2p/go-libp2p-kbucket v0.4.7
+	github.com/libp2p/go-libp2p-pubsub v0.4.1
+	github.com/libp2p/go-libp2p-swarm v0.5.0
 	github.com/mattn/go-colorable v0.1.2
 	github.com/mr-tron/base58 v1.2.0
-	github.com/multiformats/go-multiaddr v0.2.2
-	github.com/multiformats/go-multiaddr-net v0.1.5
+	github.com/multiformats/go-multiaddr v0.3.1
+	github.com/multiformats/go-multiaddr-net v0.2.0
 	github.com/multiformats/go-multicodec v0.1.6
 	github.com/pkg/errors v0.9.1
 	github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563
 	github.com/rs/cors v1.6.0
 	github.com/spf13/cobra v0.0.5
-	github.com/stretchr/testify v1.6.1
+	github.com/stretchr/testify v1.7.0
 	github.com/syndtr/goleveldb v1.0.0
 	github.com/tjfoc/gmsm v1.3.2
-	golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9
-	golang.org/x/mod v0.3.0 // indirect
-	golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7
-	golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1
-	golang.org/x/tools v0.0.0-20200615222825-6aa8f57aacd9 // indirect
-	google.golang.org/genproto v0.0.0-20200310143817-43be25429f5a // indirect
-	google.golang.org/grpc v1.29.1
-	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15
+	golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
+	golang.org/x/net v0.0.0-20210423184538-5f58ad60dda6
+	golang.org/x/sys v0.0.0-20210426080607-c94f62235c83
+	google.golang.org/grpc v1.33.2
+	google.golang.org/protobuf v1.25.0
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
 	gopkg.in/go-playground/webhooks.v5 v5.2.0
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0-20170531160350-a96e63847dc3
 	gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637 // indirect