Merge pull request #838 from binance-chain/develop

[R4R]  Release v0.8.3

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.8.3
+IMPROVEMENTS
+* [\#836](https://github.com/binance-chain/node/pull/836) [Deps] Upgrade tendermint to v0.32.3-binance.6; upgrade cosmos-sdk to v0.25.0 binance.25
+
+
 ## 0.8.2
 BUG FIXES
 * [\#823](https://github.com/binance-chain/node/pull/823) [Pub] return error when executing mirror or mirror sync request failed

go.mod

@@ -1,6 +1,6 @@
 module github.com/binance-chain/node
 
-go 1.12
+go 1.16
 
 require (
 	github.com/Shopify/sarama v1.21.0
@@ -28,10 +28,10 @@ require (
 )
 
 replace (
-	github.com/cosmos/cosmos-sdk => github.com/binance-chain/bnc-cosmos-sdk v0.25.0-binance.24
+	github.com/cosmos/cosmos-sdk => github.com/binance-chain/bnc-cosmos-sdk v0.25.0-binance.25
 	github.com/tendermint/go-amino => github.com/binance-chain/bnc-go-amino v0.14.1-binance.2
 	github.com/tendermint/iavl => github.com/binance-chain/bnc-tendermint-iavl v0.12.0-binance.4
-	github.com/tendermint/tendermint => github.com/binance-chain/bnc-tendermint v0.32.3-binance.5
+	github.com/tendermint/tendermint => github.com/binance-chain/bnc-tendermint v0.32.3-binance.6
 	github.com/zondax/ledger-cosmos-go => github.com/binance-chain/ledger-cosmos-go v0.9.9-binance.3
 	golang.org/x/crypto => github.com/tendermint/crypto v0.0.0-20190823183015-45b1026d81ae
 )

go.sum

@@ -21,18 +21,17 @@ github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5
 github.com/bartekn/go-bip39 v0.0.0-20171116152956-a05967ea095d h1:1aAija9gr0Hyv4KfQcRcwlmFIrhkDmIj2dz5bkg/s/8=
 github.com/bartekn/go-bip39 v0.0.0-20171116152956-a05967ea095d/go.mod h1:icNx/6QdFblhsEjZehARqbNumymUT/ydwlLojFdv7Sk=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
-github.com/beorn7/perks v1.0.0 h1:HWo1m869IqiPhD389kmkxeTalrjNbbJTC8LXupb+sl0=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
-github.com/binance-chain/bnc-cosmos-sdk v0.25.0-binance.24 h1:niCO18xM7b02Bgs041aqc/L0VUZFDYbJb7l9uDeah1E=
-github.com/binance-chain/bnc-cosmos-sdk v0.25.0-binance.24/go.mod h1:nb0oQ4956Cmtx85AR3+k/PSnD2zZXv8OK8J41N8/jqs=
+github.com/binance-chain/bnc-cosmos-sdk v0.25.0-binance.25 h1:CFb+ATfmOy7wrt8GMwBCVnImOYWXrYGXXuxsgoLD13Q=
+github.com/binance-chain/bnc-cosmos-sdk v0.25.0-binance.25/go.mod h1:MX4eWWUtVhyAd9vzzT56PaK4s1jBl7kPhWLwEI0x2EA=
 github.com/binance-chain/bnc-go-amino v0.14.1-binance.2 h1:XcbcfisVItk92UKoGbtNT8nbcfadj3H3ayuM2srAfVs=
 github.com/binance-chain/bnc-go-amino v0.14.1-binance.2/go.mod h1:yaElUUxWtv/TC/ldGtlKAvS1vKwokxgJ1d97I+6is80=
-github.com/binance-chain/bnc-tendermint v0.32.3-binance.5 h1:t+gCaAoN3PLMFFayY8EtUkEftir9a0DM9uK2DR6ZCwU=
-github.com/binance-chain/bnc-tendermint v0.32.3-binance.5/go.mod h1:kN5dNxE8voFtDqx2HjbM8sBIH5cUuMtLg0XEHjqzUiY=
+github.com/binance-chain/bnc-tendermint v0.32.3-binance.6 h1:3Xt3IaH5zAGssK0ZxyGz5dQ7plxWdUCdtT4z7kS2M3U=
+github.com/binance-chain/bnc-tendermint v0.32.3-binance.6/go.mod h1:+5NnQZbpAijzpby/yOYlBwJjzvkXZKr6MGWZ9oI0p4Y=
 github.com/binance-chain/bnc-tendermint-iavl v0.12.0-binance.4 h1:BhaV2iiGWfRC6iB8HHOYJeUDwtQMB2pUA4ah+KCbBhI=
 github.com/binance-chain/bnc-tendermint-iavl v0.12.0-binance.4/go.mod h1:Zmh8GRdNJB8DULIOBar3JCZp6tSpcvM1NGKfE9U2EzA=
 github.com/binance-chain/ledger-cosmos-go v0.9.9-binance.3 h1:FFpFbkzlP2HUyxQCm0eoU6mkfgMNynfqZRbeWqlaLdQ=
@@ -395,7 +394,6 @@ github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFSt
 github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU=
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE=
-github.com/otiai10/curr v0.0.0-20190513014714-f5a3d24e5776 h1:o59bHXu8Ejas8Kq6pjoVJQ9/neN66SM8AKh6wI42BBs=
 github.com/otiai10/curr v0.0.0-20190513014714-f5a3d24e5776/go.mod h1:3HNVkVOU7vZeFXocWuvtcS0XSFLcf2XUSDHkq9t1jU4=
 github.com/otiai10/mint v1.2.4/go.mod h1:d+b7n/0R3tdyUYYylALXpWQ/kTN+QobSq/4SRGBkR3M=
 github.com/otiai10/mint v1.3.0 h1:Ady6MKVezQwHBkGzLFbrsywyp09Ah7rkmfjV3Bcr5uc=

plugins/dex/store/mapper_test.go

@@ -4,6 +4,7 @@ import (
 	"path"
 	"path/filepath"
 	"runtime"
+	"strconv"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -193,7 +194,7 @@ func BenchmarkMapper_DeleteRecentPrices(b *testing.B) {
 	defer db.Close()
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		pairMapper.DeleteRecentPrices(ctx, string(i)+"_"+string(i))
+		pairMapper.DeleteRecentPrices(ctx, strconv.Itoa(i)+"_"+strconv.Itoa(i))
 	}
 }
 
@@ -208,14 +209,14 @@ func setupForBenchTest() (dbm.DB, TradingPairMapper, sdk.Context) {
 	cdc.RegisterConcrete(RecentPrice{}, "dex/RecentPrice", nil)
 	pairMapper := NewTradingPairMapper(cdc, key)
 	for i := 0; i < pairNum; i++ {
-		tradingPair := dextypes.NewTradingPair(string(i), string(i), 102000)
+		tradingPair := dextypes.NewTradingPair(strconv.Itoa(i), strconv.Itoa(i), 102000)
 		pairMapper.AddTradingPair(ctx, tradingPair)
 	}
 
 	for i := 0; i < numPricesStored; i++ {
 		lastPrices := make(map[string]int64, pairNum)
 		for j := 0; j < pairNum; j++ {
-			lastPrices[string(j)+"_"+string(j)] = 8
+			lastPrices[strconv.Itoa(j)+"_"+strconv.Itoa(j)] = 8
 		}
 		ctx = ctx.WithBlockHeight(int64(priceStoreEvery * (i + 1)))
 		pairMapper.UpdateRecentPrices(ctx, priceStoreEvery, numPricesStored, lastPrices)

plugins/dex/utils/pair_test.go

@@ -3,6 +3,7 @@ package utils_test
 import (
 	"encoding/json"
 	"math/rand"
+	"strconv"
 	"sync"
 	"testing"
 
@@ -46,7 +47,7 @@ func BenchmarkRecentPrices_Size(b *testing.B) {
 
 	recentPrices := make(map[string]*cmnutils.FixedSizeRing, 256)
 	for i := 0; i < 10; i++ {
-		recentPrices[string(i)] = pricesRing
+		recentPrices[strconv.Itoa(i)] = pricesRing
 	}
 
 	bz, _ := json.Marshal(pricesRing.Elements())

plugins/tokens/issue/msg.go

@@ -3,11 +3,11 @@ package issue
 import (
 	"encoding/json"
 	"fmt"
-
-	sdk "github.com/cosmos/cosmos-sdk/types"
+	"strconv"
 
 	"github.com/binance-chain/node/common/types"
 	"github.com/binance-chain/node/common/upgrade"
+	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
 // TODO: "route expressions can only contain alphanumeric characters", we need to change the cosmos sdk to support slash
@@ -56,7 +56,7 @@ func (msg IssueMsg) ValidateBasic() sdk.Error {
 	}
 
 	if msg.TotalSupply <= 0 || msg.TotalSupply > types.TokenMaxTotalSupply {
-		return sdk.ErrInvalidCoins("total supply should be less than or equal to " + string(types.TokenMaxTotalSupply))
+		return sdk.ErrInvalidCoins("total supply should be less than or equal to " + strconv.FormatInt(types.TokenMaxTotalSupply, 10))
 	}
 
 	return nil
@@ -115,7 +115,7 @@ func (msg MintMsg) ValidateBasic() sdk.Error {
 
 	// handler will check:  msg.Amount + token.TotalSupply <= types.MaxTotalSupply
 	if msg.Amount <= 0 || msg.Amount > types.TokenMaxTotalSupply {
-		return sdk.ErrInvalidCoins("total supply should be less than or equal to " + string(types.TokenMaxTotalSupply))
+		return sdk.ErrInvalidCoins("total supply should be less than or equal to " + strconv.FormatInt(types.TokenMaxTotalSupply, 10))
 	}
 
 	return nil

version/version.go

@@ -12,7 +12,7 @@ var (
 	Version string
 )
 
-const NodeVersion = "v0.8.2"
+const NodeVersion = "v0.8.3"
 
 func init() {
 	Version = fmt.Sprintf("Binance Chain Release: %s;", NodeVersion)