Upgrade to tm version 23.0.

Gopkg.toml

@@ -57,7 +57,7 @@
 
 [[override]]
   name = "github.com/tendermint/tendermint"
-  version = "=v0.22.8"
+  version = "=v0.23.0"
 
 [[constraint]]
   name = "github.com/bartekn/go-bip39"

PENDING.md

@@ -1,3 +1,10 @@
+## v0.24.0 PENDING 
+^--- PENDING wasn't purged on sdk v0.23.0 release.
+
+BREAKING CHANGES
+* Update to tendermint v0.23.0. This involves removing crypto.Pubkey, 
+maintaining a validator address to pubkey map, and using time.Time instead of int64 for time. [SDK PR](https://github.com/cosmos/cosmos-sdk/pull/1927)
+
 ## PENDING
 
 BREAKING CHANGES

baseapp/baseapp.go

@@ -387,7 +387,8 @@ func (app *BaseApp) BeginBlock(req abci.RequestBeginBlock) (res abci.ResponseBeg
 	}
 
 	// set the signed validators for addition to context in deliverTx
-	app.signedValidators = req.Validators
+	// TODO: communicate this result to the address to pubkey map in slashing
+	app.signedValidators = req.LastCommitInfo.GetValidators()
 	return
 }
 
@@ -412,11 +413,7 @@ func (app *BaseApp) CheckTx(txBytes []byte) (res abci.ResponseCheckTx) {
 		Log:       result.Log,
 		GasWanted: result.GasWanted,
 		GasUsed:   result.GasUsed,
-		Fee: cmn.KI64Pair{
-			[]byte(result.FeeDenom),
-			result.FeeAmount,
-		},
-		Tags: result.Tags,
+		Tags:      result.Tags,
 	}
 }
 

client/lcd/lcd_test.go

@@ -6,6 +6,7 @@ import (
 	"net/http"
 	"regexp"
 	"testing"
+	"time"
 
 	"github.com/cosmos/cosmos-sdk/client/tx"
 
@@ -564,7 +565,7 @@ func TestUnrevoke(t *testing.T) {
 	signingInfo := getSigningInfo(t, port, pkString)
 	tests.WaitForHeight(4, port)
 	require.Equal(t, true, signingInfo.IndexOffset > 0)
-	require.Equal(t, int64(0), signingInfo.JailedUntil)
+	require.Equal(t, time.Unix(0, 0).UTC(), signingInfo.JailedUntil)
 	require.Equal(t, true, signingInfo.SignedBlocksCounter > 0)
 }
 

client/lcd/test_helpers.go

@@ -223,7 +223,7 @@ func startTM(
 		proxy.NewLocalClientCreator(app),
 		genDocProvider,
 		dbProvider,
-		nm.DefaultMetricsProvider,
+		nm.DefaultMetricsProvider(tmcfg.Instrumentation),
 		logger.With("module", "node"),
 	)
 	if err != nil {

client/tx/sign.go

@@ -44,5 +44,5 @@ func SignTxRequstHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	w.Write(sig.Bytes())
+	w.Write(sig)
 }

cmd/gaia/app/app.go

@@ -148,7 +148,8 @@ func (app *GaiaApp) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) ab
 func (app *GaiaApp) EndBlocker(ctx sdk.Context, req abci.RequestEndBlock) abci.ResponseEndBlock {
 	tags := gov.EndBlocker(ctx, app.govKeeper)
 	validatorUpdates := stake.EndBlocker(ctx, app.stakeKeeper)
-
+	// Add these new validators to the addr -> pubkey map.
+	app.slashingKeeper.AddValidators(ctx, validatorUpdates)
 	return abci.ResponseEndBlock{
 		ValidatorUpdates: validatorUpdates,
 		Tags:             tags,
@@ -181,6 +182,9 @@ func (app *GaiaApp) initChainer(ctx sdk.Context, req abci.RequestInitChain) abci
 		// return sdk.ErrGenesisParse("").TraceCause(err, "")
 	}
 
+	// load the address to pubkey map
+	slashing.InitGenesis(ctx, app.slashingKeeper, genesisState.StakeData)
+
 	gov.InitGenesis(ctx, app.govKeeper, gov.DefaultGenesisState())
 
 	return abci.ResponseInitChain{

crypto/encode_test.go

@@ -15,12 +15,14 @@ type byter interface {
 	Bytes() []byte
 }
 
-func checkAminoBinary(t *testing.T, src byter, dst interface{}, size int) {
+func checkAminoBinary(t *testing.T, src, dst interface{}, size int) {
 	// Marshal to binary bytes.
 	bz, err := cdc.MarshalBinaryBare(src)
 	require.Nil(t, err, "%+v", err)
-	// Make sure this is compatible with current (Bytes()) encoding.
-	require.Equal(t, src.Bytes(), bz, "Amino binary vs Bytes() mismatch")
+	if byterSrc, ok := src.(byter); ok {
+		// Make sure this is compatible with current (Bytes()) encoding.
+		require.Equal(t, byterSrc.Bytes(), bz, "Amino binary vs Bytes() mismatch")
+	}
 	// Make sure we have the expected length.
 	if size != -1 {
 		require.Equal(t, size, len(bz), "Amino binary size mismatch")
@@ -55,8 +57,6 @@ func ExamplePrintRegisteredTypes() {
 	//| PubKeySecp256k1 | tendermint/PubKeySecp256k1 | 0xEB5AE987 | 0x21 |  |
 	//| PrivKeyEd25519 | tendermint/PrivKeyEd25519 | 0xA3288910 | 0x40 |  |
 	//| PrivKeySecp256k1 | tendermint/PrivKeySecp256k1 | 0xE1B0F79B | 0x20 |  |
-	//| SignatureEd25519 | tendermint/SignatureEd25519 | 0x2031EA53 | 0x40 |  |
-	//| SignatureSecp256k1 | tendermint/SignatureSecp256k1 | 0x7FC4A495 | variable |  |
 }
 
 func TestKeyEncodings(t *testing.T) {
@@ -86,13 +86,11 @@ func TestKeyEncodings(t *testing.T) {
 		require.EqualValues(t, tc.privKey, priv3)
 
 		// Check (de/en)codings of Signatures.
-		var sig1, sig2, sig3 tcrypto.Signature
+		var sig1, sig2 []byte
 		sig1, err := tc.privKey.Sign([]byte("something"))
 		require.NoError(t, err)
 		checkAminoBinary(t, sig1, &sig2, -1) // Signature size changes for Secp anyways.
 		require.EqualValues(t, sig1, sig2)
-		checkAminoJSON(t, sig1, &sig3, false) // TODO also check Prefix bytes.
-		require.EqualValues(t, sig1, sig3)
 
 		// Check (de/en)codings of PubKeys.
 		pubKey := tc.privKey.PubKey()
@@ -107,7 +105,7 @@ func TestKeyEncodings(t *testing.T) {
 func TestNilEncodings(t *testing.T) {
 
 	// Check nil Signature.
-	var a, b tcrypto.Signature
+	var a, b []byte
 	checkAminoJSON(t, &a, &b, true)
 	require.EqualValues(t, a, b)
 

crypto/keys/keybase.go

@@ -199,7 +199,7 @@ func (kb dbKeybase) Get(name string) (Info, error) {
 
 // Sign signs the msg with the named key.
 // It returns an error if the key doesn't exist or the decryption fails.
-func (kb dbKeybase) Sign(name, passphrase string, msg []byte) (sig tmcrypto.Signature, pub tmcrypto.PubKey, err error) {
+func (kb dbKeybase) Sign(name, passphrase string, msg []byte) (sig []byte, pub tmcrypto.PubKey, err error) {
 	info, err := kb.Get(name)
 	if err != nil {
 		return

crypto/keys/keybase_test.go

@@ -146,7 +146,7 @@ func TestSignVerify(t *testing.T) {
 	cases := []struct {
 		key   crypto.PubKey
 		data  []byte
-		sig   crypto.Signature
+		sig   []byte
 		valid bool
 	}{
 		// proper matches

crypto/keys/types.go

@@ -16,7 +16,7 @@ type Keybase interface {
 	Delete(name, passphrase string) error
 
 	// Sign some bytes, looking up the private key to use
-	Sign(name, passphrase string, msg []byte) (crypto.Signature, crypto.PubKey, error)
+	Sign(name, passphrase string, msg []byte) ([]byte, crypto.PubKey, error)
 
 	// CreateMnemonic creates a new mnemonic, and derives a hierarchical deterministic
 	// key from that.

crypto/ledger_secp256k1.go

@@ -114,7 +114,7 @@ func (pkl PrivKeyLedgerSecp256k1) Equals(other tmcrypto.PrivKey) bool {
 // Communication is checked on NewPrivKeyLedger and PrivKeyFromBytes, returning
 // an error, so this should only trigger if the private key is held in memory
 // for a while before use.
-func (pkl PrivKeyLedgerSecp256k1) Sign(msg []byte) (tmcrypto.Signature, error) {
+func (pkl PrivKeyLedgerSecp256k1) Sign(msg []byte) ([]byte, error) {
 	sig, err := pkl.signLedgerSecp256k1(msg)
 	if err != nil {
 		return nil, err
@@ -135,13 +135,8 @@ func (pkl PrivKeyLedgerSecp256k1) getPubKey() (key tmcrypto.PubKey, err error) {
 	return key, err
 }
 
-func (pkl PrivKeyLedgerSecp256k1) signLedgerSecp256k1(msg []byte) (tmcrypto.Signature, error) {
-	sigBytes, err := pkl.ledger.SignSECP256K1(pkl.Path, msg)
-	if err != nil {
-		return nil, err
-	}
-
-	return tmsecp256k1.SignatureSecp256k1FromBytes(sigBytes), nil
+func (pkl PrivKeyLedgerSecp256k1) signLedgerSecp256k1(msg []byte) ([]byte, error) {
+	return pkl.ledger.SignSECP256K1(pkl.Path, msg)
 }
 
 func (pkl PrivKeyLedgerSecp256k1) pubkeyLedgerSecp256k1() (pub tmcrypto.PubKey, err error) {

docs/sdk/core/app2.md

@@ -150,7 +150,7 @@ func NewCodec() *wire.Codec {
 ```
 
 Note: We also register the types in the `tendermint/tendermint/crypto` module so that `crypto.PubKey`
-and `crypto.Signature` are encoded/decoded correctly.
+is encoded/decoded correctly.
 
 Amino supports encoding and decoding in both a binary and JSON format.
 See the [codec API docs](https://godoc.org/github.com/tendermint/go-amino#Codec) for more details.
@@ -166,7 +166,7 @@ type app2Tx struct {
     sdk.Msg
 
     PubKey    crypto.PubKey
-    Signature crypto.Signature
+    Signature []byte
 }
 
 // This tx only has one Msg.

docs/sdk/core/app3.md

@@ -160,7 +160,7 @@ The standard form for signatures is `StdSignature`:
 // the first transaction made by the account.
 type StdSignature struct {
 	crypto.PubKey    `json:"pub_key"` // optional
-	crypto.Signature `json:"signature"`
+	[]byte `json:"signature"`
 	AccountNumber    int64 `json:"account_number"`
 	Sequence         int64 `json:"sequence"`
 }

docs/sdk/core/examples/app2.go

@@ -183,15 +183,15 @@ type app2Tx struct {
 	sdk.Msg
 
 	PubKey    crypto.PubKey
-	Signature crypto.Signature
+	Signature []byte
 }
 
 // This tx only has one Msg.
 func (tx app2Tx) GetMsgs() []sdk.Msg {
 	return []sdk.Msg{tx.Msg}
 }
 
-func (tx app2Tx) GetSignature() crypto.Signature {
+func (tx app2Tx) GetSignature() []byte {
 	return tx.Signature
 }
 

examples/README.md

@@ -279,7 +279,7 @@ type TxInput struct {
   Address   []byte           `json:"address"`   // Hash of the PubKey
   Coins     Coins            `json:"coins"`     //
   Sequence  int              `json:"sequence"`  // Must be 1 greater than the last committed TxInput
-  Signature crypto.Signature `json:"signature"` // Depends on the PubKey type and the whole Tx
+  Signature []byte           `json:"signature"` // Depends on the PubKey type and the whole Tx
   PubKey    crypto.PubKey    `json:"pub_key"`   // Is present iff Sequence == 0
 }
 

server/start.go

@@ -101,7 +101,7 @@ func startInProcess(ctx *Context, appCreator AppCreator) (*node.Node, error) {
 		proxy.NewLocalClientCreator(app),
 		node.DefaultGenesisDocProviderFunc(cfg),
 		node.DefaultDBProvider,
-		node.DefaultMetricsProvider,
+		node.DefaultMetricsProvider(cfg.Instrumentation),
 		ctx.Logger.With("module", "node"),
 	)
 	if err != nil {

x/auth/stdtx.go

@@ -158,10 +158,10 @@ func (msg StdSignMsg) Bytes() []byte {
 
 // Standard Signature
 type StdSignature struct {
-	crypto.PubKey    `json:"pub_key"` // optional
-	crypto.Signature `json:"signature"`
-	AccountNumber    int64 `json:"account_number"`
-	Sequence         int64 `json:"sequence"`
+	crypto.PubKey `json:"pub_key"` // optional
+	Signature     []byte           `json:"signature"`
+	AccountNumber int64            `json:"account_number"`
+	Sequence      int64            `json:"sequence"`
 }
 
 // logic for standard transaction decoding

x/slashing/genesis.go

@@ -0,0 +1,14 @@
+package slashing
+
+import (
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/x/stake/types"
+)
+
+// InitGenesis initializes the keeper's address to pubkey map.
+func InitGenesis(ctx sdk.Context, keeper Keeper, data types.GenesisState) {
+	for _, validator := range data.Validators {
+		keeper.addPubkey(ctx, validator.GetPubKey())
+	}
+	return
+}

x/slashing/handler.go

@@ -39,7 +39,7 @@ func handleMsgUnrevoke(ctx sdk.Context, msg MsgUnrevoke, k Keeper) sdk.Result {
 	}
 
 	// Cannot be unrevoked until out of jail
-	if ctx.BlockHeader().Time < info.JailedUntil {
+	if ctx.BlockHeader().Time.Before(info.JailedUntil) {
 		return ErrValidatorJailed(k.codespace).Result()
 	}