Merge pull request #92 from irisnet/develop

R4R: merge code to master for tag
irisnet · Mar 1, 2022 · 4844060 · 4844060
2 parents 1c693c9 + ba6c498
commit 4844060
Show file tree

Hide file tree

Showing 4 changed files with 1,020 additions and 128 deletions.
diff --git a/go.mod b/go.mod
@@ -4,11 +4,11 @@ go 1.15
 
 require (
 	github.com/jolestar/go-commons-pool v2.0.0+incompatible
-	github.com/kaifei-bianjie/msg-parser v0.0.0-20211021082441-2434f74678c4
-	github.com/tendermint/tendermint v0.34.11
+	github.com/kaifei-bianjie/msg-parser v0.0.0-20211216091414-ee014c99cd8d
+	github.com/tendermint/tendermint v0.34.13
 	github.com/weichang-bianjie/metric-sdk v1.0.0
-	go.uber.org/zap v1.13.0
-	golang.org/x/net v0.0.0-20201021035429-f5854403a974
+	go.uber.org/zap v1.17.0
+	golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f
 	gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0
 	gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637 // indirect