Update chain33

.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
@@ -41,7 +41,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
@@ -57,7 +57,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
@@ -76,7 +76,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
@@ -94,7 +94,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
@@ -112,7 +112,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
@@ -130,7 +130,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
@@ -148,7 +148,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
@@ -166,7 +166,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

.travis.yml

@@ -9,7 +9,7 @@ matrix:
   include:
     - name: check_fmt
       sudo: require
-      go: "1.13.x"
+      go: "1.14.x"
       env:
         - GO111MODULE=on
       install:
@@ -22,7 +22,7 @@ matrix:
         - make linter
 
     - name: unit-test
-      go: "1.13.x"
+      go: "1.14.x"
       env:
         - GO111MODULE=on
       install: skip
@@ -31,7 +31,7 @@ matrix:
 
     - name: coverage
       if: branch = master
-      go: "1.13.x"
+      go: "1.14.x"
       env:
         - GO111MODULE=on
       before_install:
@@ -43,7 +43,7 @@ matrix:
         - bash <(curl -s https://codecov.io/bash)
 
     - name: auto-test
-      go: "1.13.x"
+      go: "1.14.x"
       env:
         - GO111MODULE=on
       install: skip
@@ -56,7 +56,7 @@ matrix:
       sudo: required
       services:
         - docker
-      go: "1.13.x"
+      go: "1.14.x"
       env:
         - DOCKER_COMPOSE_VERSION=1.21.2
         - GO111MODULE=on

appveyor.yml

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

chain33.toml

@@ -48,15 +48,15 @@ enablePushSubscribe=false
 # 关闭分片存储,默认false为开启分片存储;平行链不需要分片需要修改此默认参数为true
 disableShard=false
 # 分片存储中每个大块包含的区块数
-chunkblockNum=1000
+chunkblockNum=100
 # 使能从P2pStore中获取数据
-enableFetchP2pstore=false
+enableFetchP2pstore=true
 # 使能假设已删除已归档数据后,获取数据情况
 enableIfDelLocalChunk=false
 
 [p2p]
 # p2p类型
-types=["dht", "gossip"]
+types=["dht"]
 # 是否启动P2P服务
 enable=true
 # 使用的数据库类型
@@ -86,12 +86,7 @@ maxConnectNum=100
 # 禁止通过局域网发现节点
 disableFindLANPeers=false
 # 配置为全节点模式，全节点保存所有分片数据
-isFullNode=true
-# 若本节点不是全节点，则需要配置全节点地址，当在分片网络中查不到数据时，会到全节点上获取数据
-# 格式: "/ip4/139.196.46.175/tcp/13803/p2p/16Uiu2HAkvnDRF8HQTTU5Uu5GmtbLDrgPxCwgVsn2QQ9VEU7Eiwjw"
-fullNodes=[]
-
-
+isFullNode=false
 
 [rpc]
 jrpcBindAddr="localhost:8801"

go.mod

@@ -1,9 +1,9 @@
 module github.com/33cn/plugin
 
-go 1.12
+go 1.14
 
 require (
-	github.com/33cn/chain33 v1.65.3-0.20210615095651-f6099d675f0e
+	github.com/33cn/chain33 v1.65.3-0.20210701072221-e36c055c9424
 	github.com/BurntSushi/toml v0.3.1
 	github.com/NebulousLabs/Sia v1.3.7
 	github.com/NebulousLabs/errors v0.0.0-20181203160057-9f787ce8f69e // indirect
@@ -12,15 +12,15 @@ require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bitly/go-simplejson v0.5.0
 	github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
-	github.com/btcsuite/btcd v0.20.1-beta
+	github.com/btcsuite/btcd v0.21.0-beta
 	github.com/coreos/etcd v3.3.15+incompatible
 	github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f // indirect
 	github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
 	github.com/davecgh/go-spew v1.1.1
 	github.com/ethereum/go-ethereum v1.9.9
 	github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
-	github.com/golang/protobuf v1.3.4
+	github.com/golang/protobuf v1.4.3
 	github.com/hashicorp/golang-lru v0.5.4
 	github.com/holiman/uint256 v1.1.1
 	github.com/huin/goupnp v1.0.0
@@ -37,15 +37,14 @@ require (
 	github.com/robertkrimen/otto v0.0.0-20180617131154-15f95af6e78d
 	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/tjfoc/gmsm v1.3.2
 	github.com/valyala/fasthttp v1.5.0
 	github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
-	go.uber.org/zap v1.16.0 // indirect
-	golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9
-	golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7
-	golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1
+	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
 	golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0 // indirect
-	google.golang.org/grpc v1.29.1
-	gopkg.in/yaml.v2 v2.2.4
+	google.golang.org/grpc v1.33.2
+	gopkg.in/yaml.v2 v2.3.0
 )