Merge pull request #548 from cosmos/bucky/old-wire

revert to old go-wire

baseapp/baseapp_test.go

@@ -327,8 +327,8 @@ func (tx testUpdatePowerTx) Get(key interface{}) (value interface{}) { return ni
 func (tx testUpdatePowerTx) GetMsg() sdk.Msg                         { return tx }
 func (tx testUpdatePowerTx) GetSignBytes() []byte                    { return nil }
 func (tx testUpdatePowerTx) ValidateBasic() sdk.Error                { return nil }
-func (tx testUpdatePowerTx) GetSigners() []sdk.Address            { return nil }
+func (tx testUpdatePowerTx) GetSigners() []sdk.Address               { return nil }
-func (tx testUpdatePowerTx) GetFeePayer() sdk.Address             { return nil }
+func (tx testUpdatePowerTx) GetFeePayer() sdk.Address                { return nil }
 func (tx testUpdatePowerTx) GetSignatures() []sdk.StdSignature       { return nil }
 
 func TestValidatorChange(t *testing.T) {
@@ -430,7 +430,7 @@ func makePubKey(secret string) crypto.PubKey {
 
 func makePrivKey(secret string) crypto.PrivKey {
 	privKey := crypto.GenPrivKeyEd25519FromSecret([]byte(secret))
-	return privKey
+	return privKey.Wrap()
 }
 
 func secret(index int) string {

client/keys/wire.go

@@ -1,15 +1,14 @@
 package keys
 
 import (
-	crypto "github.com/tendermint/go-crypto"
+	"github.com/cosmos/cosmos-sdk/wire"
-	wire "github.com/tendermint/go-wire"
 )
 
 var cdc *wire.Codec
 
 func init() {
 	cdc = wire.NewCodec()
-	crypto.RegisterWire(cdc)
+	wire.RegisterCrypto(cdc)
 }
 
 func MarshalJSON(o interface{}) ([]byte, error) {

client/tx/root.go

@@ -2,7 +2,8 @@ package tx
 
 import (
 	"github.com/spf13/cobra"
-	wire "github.com/tendermint/go-wire"
+
+	"github.com/cosmos/cosmos-sdk/wire"
 )
 
 // type used to pass around the provided cdc

client/tx/search.go

@@ -8,9 +8,10 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
-	"github.com/cosmos/cosmos-sdk/client"
-	wire "github.com/tendermint/go-wire"
 	ctypes "github.com/tendermint/tendermint/rpc/core/types"
+
+	"github.com/cosmos/cosmos-sdk/client"
+	"github.com/cosmos/cosmos-sdk/wire"
 )
 
 const (

client/tx/tx.go

@@ -9,11 +9,12 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
+	abci "github.com/tendermint/abci/types"
+	ctypes "github.com/tendermint/tendermint/rpc/core/types"
+
 	"github.com/cosmos/cosmos-sdk/client"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	abci "github.com/tendermint/abci/types"
+	"github.com/cosmos/cosmos-sdk/wire"
-	wire "github.com/tendermint/go-wire"
-	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 )
 
 // Get the default command for a tx query

examples/basecoin/app/app.go

@@ -4,14 +4,14 @@ import (
 	"encoding/json"
 
 	abci "github.com/tendermint/abci/types"
-	crypto "github.com/tendermint/go-crypto"
+	oldwire "github.com/tendermint/go-wire"
-	"github.com/tendermint/go-wire"
 	cmn "github.com/tendermint/tmlibs/common"
 	dbm "github.com/tendermint/tmlibs/db"
 	"github.com/tendermint/tmlibs/log"
 
 	bam "github.com/cosmos/cosmos-sdk/baseapp"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/wire"
 	"github.com/cosmos/cosmos-sdk/x/auth"
 	"github.com/cosmos/cosmos-sdk/x/bank"
 
@@ -74,11 +74,33 @@ func NewBasecoinApp(logger log.Logger, db dbm.DB) *BasecoinApp {
 
 // custom tx codec
 func MakeCodec() *wire.Codec {
+
+	// XXX: Using old wire for now :)
+	const (
+		msgTypeSend  = 0x1
+		msgTypeIssue = 0x2
+	)
+	var _ = oldwire.RegisterInterface(
+		struct{ sdk.Msg }{},
+		oldwire.ConcreteType{bank.SendMsg{}, msgTypeSend},
+		oldwire.ConcreteType{bank.IssueMsg{}, msgTypeIssue},
+	)
+
+	const (
+		accTypeApp = 0x1
+	)
+	var _ = oldwire.RegisterInterface(
+		struct{ sdk.Account }{},
+		oldwire.ConcreteType{&types.AppAccount{}, accTypeApp},
+	)
+
 	cdc := wire.NewCodec()
-	cdc.RegisterInterface((*sdk.Msg)(nil), nil)
+	// TODO: use new go-wire
-	bank.RegisterWire(cdc)   // Register bank.[SendMsg,IssueMsg] types.
+	// cdc.RegisterInterface((*sdk.Msg)(nil), nil)
-	crypto.RegisterWire(cdc) // Register crypto.[PubKey,PrivKey,Signature] types.
+	// bank.RegisterWire(cdc)   // Register bank.[SendMsg,IssueMsg] types.
+	// crypto.RegisterWire(cdc) // Register crypto.[PubKey,PrivKey,Signature] types.
 	return cdc
+
 }
 
 // custom logic for transaction decoding

examples/basecoin/types/account.go

@@ -2,8 +2,8 @@ package types
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/wire"
 	"github.com/cosmos/cosmos-sdk/x/auth"
-	wire "github.com/tendermint/go-wire"
 )
 
 var _ sdk.Account = (*AppAccount)(nil)

glide.lock

@@ -1,16 +1,12 @@
-hash: fa45c8a4f5512ed730f793b93d4876bdc604a1333a5a1f938c98a0f7dd55f22e
+hash: bff8e6213ad8494602f2095adde9bdbab0fd891345675920175cf05c65702e07
-updated: 2018-03-01T00:41:12.97082395-05:00
+updated: 2018-03-02T12:01:38.719098766-05:00
 imports:
 - name: github.com/bgentry/speakeasy
   version: 4aabc24848ce5fd31929f7d1e4ea74d3709c14cd
 - name: github.com/btcsuite/btcd
-  version: 50de9da05b50eb15658bb350f6ea24368a111ab7
+  version: 2be2f12b358dc57d70b8f501b00be450192efbc3
   subpackages:
   - btcec
-- name: github.com/davecgh/go-spew
-  version: 346938d642f2ec3594ed81d874461961cd0faa76
-  subpackages:
-  - spew
 - name: github.com/ebuchman/fail-test
   version: 95f809107225be108efcf10a3509e4ea6ceef3c4
 - name: github.com/fsnotify/fsnotify
@@ -45,7 +41,7 @@ imports:
 - name: github.com/golang/snappy
   version: 553a641470496b2327abcac10b36396bd98e45c9
 - name: github.com/gorilla/websocket
-  version: ea4d1f681babbce9545c9c5f3d5194a789c89f5b
+  version: 0647012449a1878977514a346b26637dd022446c
 - name: github.com/hashicorp/hcl
   version: 23c074d0eceb2b8a5bfdbb271ab780cde70f05a8
   subpackages:
@@ -58,7 +54,7 @@ imports:
   - json/scanner
   - json/token
 - name: github.com/howeyc/crc16
-  version: 96a97a1abb579c7ff1a8ffa77f2e72d1c314b57f
+  version: 2b2a61e366a66d3efb279e46176e7291001e0354
 - name: github.com/inconshreveable/mousetrap
   version: 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75
 - name: github.com/jmhodges/levigo
@@ -66,25 +62,25 @@ imports:
 - name: github.com/kr/logfmt
   version: b84e30acd515aadc4b783ad4ff83aff3299bdfe0
 - name: github.com/magiconair/properties
-  version: 49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934
+  version: 2c9e9502788518c97fe44e8955cd069417ee89df
 - name: github.com/mattn/go-isatty
   version: 0360b2af4f38e8d38c7fce2a9f4e702702d73a39
 - name: github.com/mitchellh/mapstructure
-  version: b4575eea38cca1123ec2dc90c26529b5c5acfcff
+  version: 00c29f56e2386353d58c599509e8dc3801b0d716
 - name: github.com/pelletier/go-toml
-  version: acdc4509485b587f5e675510c4f2c63e90ff68a8
+  version: 05bcc0fb0d3e60da4b8dd5bd7e0ea563eb4ca943
 - name: github.com/pkg/errors
   version: 645ef00459ed84a119197bfb8d8205042c6df63d
 - name: github.com/rcrowley/go-metrics
-  version: 1f30fe9094a513ce4c700b9a54458bbb0c96996c
+  version: 8732c616f52954686704c8645fe1a9d59e9df7c1
 - name: github.com/rigelrozanski/common
   version: f691f115798593d783b9999b1263c2f4ffecc439
 - name: github.com/spf13/afero
-  version: bb8f1927f2a9d3ab41c9340aa034f6b803f4359c
+  version: bbf41cb36dffe15dff5bf7e18c447801e7ffe163
   subpackages:
   - mem
 - name: github.com/spf13/cast
-  version: acbeb36b902d72a7a4c18e8f3241075e7ab763e4
+  version: 8965335b8c7107321228e3e3702cab9832751bac
 - name: github.com/spf13/cobra
   version: 7b2c5ac9fc04fc5efafb60700713d4fa609b777b
 - name: github.com/spf13/jwalterweatherman
@@ -94,7 +90,7 @@ imports:
 - name: github.com/spf13/viper
   version: 25b30aa063fc18e48662b86996252eabdcf2f0c7
 - name: github.com/syndtr/goleveldb
-  version: 34011bf325bce385408353a30b101fe5e923eb6e
+  version: c7a14d4b00e222eab6111b4cd1af829c13f53ec2
   subpackages:
   - leveldb
   - leveldb/cache
@@ -109,11 +105,11 @@ imports:
   - leveldb/table
   - leveldb/util
 - name: github.com/tendermint/abci
-  version: 68592f4d8ee34e97db94b7a7976b1309efdb7eb9
+  version: 9e0e00bef42aebf6b402f66bf0f3dc607de8a6f3
   subpackages:
   - client
   - example/code
-  - example/dummy
+  - example/kvstore
   - server
   - types
 - name: github.com/tendermint/ed25519
@@ -122,18 +118,20 @@ imports:
   - edwards25519
   - extra25519
 - name: github.com/tendermint/go-crypto
-  version: 4fc3055dbd17aa1203d0abc64b9293f378da22ec
+  version: c3e19f3ea26f5c3357e0bcbb799b0761ef923755
   subpackages:
   - keys
   - keys/bcrypt
   - keys/words
   - keys/words/wordlist
 - name: github.com/tendermint/go-wire
-  version: 5d7845f24b843c914cf571dad2ca13c91cf70f0d
+  version: fa721242b042ecd4c6ed1a934ee740db4f74e45c
+  subpackages:
+  - data
 - name: github.com/tendermint/iavl
-  version: 1a59ec0c82dc940c25339dd7c834df5cb76a95cb
+  version: 669ff61054a14c4542dbd657ab438800d5630e45
 - name: github.com/tendermint/tendermint
-  version: c330b9e43c93351a5c3040333d7d0c7c27859a20
+  version: 3cedd8cf070ef120964ac99367cd69414665604b
   subpackages:
   - blockchain
   - cmd/tendermint/commands
@@ -167,6 +165,7 @@ imports:
   - state/txindex/kv
   - state/txindex/null
   - types
+  - types/priv_validator
   - version
   - wire
 - name: github.com/tendermint/tmlibs
@@ -184,7 +183,7 @@ imports:
   - pubsub
   - pubsub/query
 - name: golang.org/x/crypto
-  version: 1875d0a70c90e57f11972aefd42276df65e895b9
+  version: 91a49db82a88618983a78a06c1cbd4e00ab749ab
   subpackages:
   - blowfish
   - curve25519
@@ -196,7 +195,7 @@ imports:
   - ripemd160
   - salsa20/salsa
 - name: golang.org/x/net
-  version: 2fb46b16b8dda405028c50f7c7f0f9dd1fa6bfb1
+  version: 22ae77b79946ea320088417e4d50825671d82d57
   subpackages:
   - context
   - http2
@@ -204,29 +203,34 @@ imports:
   - idna
   - internal/timeseries
   - lex/httplex
+  - netutil
   - trace
 - name: golang.org/x/sys
-  version: 37707fdb30a5b38865cfb95e5aab41707daec7fd
+  version: dd2ff4accc098aceecb86b36eaa7829b2a17b1c9
   subpackages:
   - unix
 - name: golang.org/x/text
-  version: e19ae1496984b1c655b8044a65c0300a3c878dd3
+  version: 0b0b1f509072617b86d90971b51da23cc52694f2
   subpackages:
   - secure/bidirule
   - transform
   - unicode/bidi
   - unicode/norm
 - name: google.golang.org/genproto
-  version: 4eb30f4778eed4c258ba66527a0d4f9ec8a36c45
+  version: 2c5e7ac708aaa719366570dd82bda44541ca2a63
   subpackages:
   - googleapis/rpc/status
 - name: google.golang.org/grpc
-  version: 401e0e00e4bb830a10496d64cd95e068c5bf50de
+  version: f0a1202acdc5c4702be05098d5ff8e9b3b444442
   subpackages:
   - balancer
+  - balancer/base
+  - balancer/roundrobin
   - codes
   - connectivity
   - credentials
+  - encoding
+  - encoding/proto
   - grpclb/grpc_lb_v1/messages
   - grpclog
   - internal
@@ -235,13 +239,19 @@ imports:
   - naming
   - peer
   - resolver
+  - resolver/dns
+  - resolver/passthrough
   - stats
   - status
   - tap
   - transport
 - name: gopkg.in/yaml.v2
-  version: d670f9405373e636a5a2765eea47fac0c9bc91a4
+  version: 7f97868eec74b32b0982dd158a51a446d1da7eb5
 testImports:
+- name: github.com/davecgh/go-spew
+  version: 8991bc29aa16c548c550c7ff78260e27b9ab7c73
+  subpackages:
+  - spew
 - name: github.com/pmezard/go-difflib
   version: 792786c7400a136282c1664665ae0a8db921c6c2
   subpackages:

glide.yaml

@@ -17,11 +17,11 @@ import:
   - server
   - types
 - package: github.com/tendermint/go-crypto
-  version: develop
+  version: v0.5.0
 - package: github.com/tendermint/go-wire
-  version: develop
+  version: v0.7.3
 - package: github.com/tendermint/iavl
-  version: develop
+  version: v0.6.1
 - package: github.com/tendermint/tmlibs
   version: develop
   subpackages:
@@ -30,7 +30,7 @@ import:
   - log
   - merkle
 - package: github.com/tendermint/tendermint
-  version: breaking/wire-sdk2
+  version: develop
   subpackages:
   - cmd/tendermint/commands
   - config

store/wire.go

@@ -1,7 +1,7 @@
 package store
 
 import (
-	"github.com/tendermint/go-wire"
+	"github.com/cosmos/cosmos-sdk/wire"
 )
 
 var cdc = wire.NewCodec()

wire/wire.go

@@ -0,0 +1,55 @@
+package wire
+
+import (
+	"bytes"
+	"reflect"
+
+	"github.com/tendermint/go-wire"
+)
+
+type Codec struct{}
+
+func NewCodec() *Codec {
+	return &Codec{}
+}
+
+func (cdc *Codec) MarshalBinary(o interface{}) ([]byte, error) {
+	w, n, err := new(bytes.Buffer), new(int), new(error)
+	wire.WriteBinary(o, w, n, err)
+	return w.Bytes(), *err
+}
+
+func (cdc *Codec) UnmarshalBinary(bz []byte, o interface{}) error {
+	r, n, err := bytes.NewBuffer(bz), new(int), new(error)
+
+	rv := reflect.ValueOf(o)
+	if rv.Kind() == reflect.Ptr {
+		wire.ReadBinaryPtr(o, r, len(bz), n, err)
+	} else {
+		wire.ReadBinary(o, r, len(bz), n, err)
+	}
+	return *err
+}
+
+func (cdc *Codec) MarshalJSON(o interface{}) ([]byte, error) {
+	w, n, err := new(bytes.Buffer), new(int), new(error)
+	wire.WriteJSON(o, w, n, err)
+	return w.Bytes(), *err
+}
+
+func (cdc *Codec) UnmarshalJSON(bz []byte, o interface{}) (err error) {
+
+	rv := reflect.ValueOf(o)
+	if rv.Kind() == reflect.Ptr {
+		wire.ReadJSONPtr(o, bz, &err)
+	} else {
+		wire.ReadJSON(o, bz, &err)
+	}
+	return err
+}
+
+//----------------------------------------------
+
+func RegisterCrypto(cdc *Codec) {
+	// TODO
+}

x/auth/ante.go

@@ -55,7 +55,7 @@ func NewAnteHandler(accountMapper sdk.AccountMapper) sdk.AnteHandler {
 			signerAccs[i] = signerAcc
 
 			// If no pubkey, set pubkey.
-			if signerAcc.GetPubKey() == nil {
+			if signerAcc.GetPubKey().Empty() {
 				err := signerAcc.SetPubKey(sig.PubKey)
 				if err != nil {
 					return ctx,

x/auth/baseaccount.go

@@ -3,9 +3,10 @@ package auth
 import (
 	"errors"
 
-	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/tendermint/go-crypto"
-	"github.com/tendermint/go-wire"
+
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/wire"
 )
 
 //-----------------------------------------------------------
@@ -17,10 +18,10 @@ var _ sdk.Account = (*BaseAccount)(nil)
 // Extend this by embedding this in your AppAccount.
 // See the examples/basecoin/types/account.go for an example.
 type BaseAccount struct {
-	Address  sdk.Address `json:"address"`
+	Address  sdk.Address   `json:"address"`
-	Coins    sdk.Coins      `json:"coins"`
+	Coins    sdk.Coins     `json:"coins"`
-	PubKey   crypto.PubKey  `json:"public_key"`
+	PubKey   crypto.PubKey `json:"public_key"`
-	Sequence int64          `json:"sequence"`
+	Sequence int64         `json:"sequence"`
 }
 
 func NewBaseAccountWithAddress(addr sdk.Address) BaseAccount {
@@ -60,7 +61,7 @@ func (acc BaseAccount) GetPubKey() crypto.PubKey {
 
 // Implements sdk.Account.
 func (acc *BaseAccount) SetPubKey(pubKey crypto.PubKey) error {
-	if acc.PubKey != nil {
+	if !acc.PubKey.Empty() {
 		return errors.New("cannot override BaseAccount pubkey")
 	}
 	acc.PubKey = pubKey
@@ -94,5 +95,5 @@ func (acc *BaseAccount) SetSequence(seq int64) error {
 
 func RegisterWireBaseAccount(cdc *wire.Codec) {
 	// Register crypto.[PubKey,PrivKey,Signature] types.
-	crypto.RegisterWire(cdc)
+	wire.RegisterCrypto(cdc)
 }

x/auth/baseaccount_test.go

@@ -3,10 +3,12 @@ package auth
 import (
 	"testing"
 
-	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/assert"
+
 	crypto "github.com/tendermint/go-crypto"
-	wire "github.com/tendermint/go-wire"
+
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	wire "github.com/cosmos/cosmos-sdk/wire"
 )
 
 func TestBaseAccount(t *testing.T) {
@@ -20,13 +22,13 @@ func TestBaseAccount(t *testing.T) {
 
 	// need a codec for marshaling
 	codec := wire.NewCodec()
-	crypto.RegisterWire(codec)
+	wire.RegisterCrypto(codec)
 
 	err := acc.SetPubKey(pub)
 	assert.Nil(t, err)
 	assert.Equal(t, pub, acc.GetPubKey())
 
-	assert.Equal(t, addr, acc.GetAddress())
+	assert.EqualValues(t, addr, acc.GetAddress())
 
 	err = acc.SetCoins(someCoins)
 	assert.Nil(t, err)

x/auth/commands/account.go

@@ -8,10 +8,9 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	wire "github.com/tendermint/go-wire"
-
 	"github.com/cosmos/cosmos-sdk/client"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/wire"
 	"github.com/cosmos/cosmos-sdk/x/auth"
 )
 

x/auth/mapper.go

@@ -1,12 +1,14 @@
 package auth
 
 import (
+	"bytes"
 	"fmt"
 	"reflect"
 
-	wire "github.com/tendermint/go-wire"
+	oldwire "github.com/tendermint/go-wire"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	wire "github.com/cosmos/cosmos-sdk/wire"
 )
 
 // Implements sdk.AccountMapper.
@@ -154,14 +156,27 @@ func (am accountMapper) encodeAccount(acc sdk.Account) []byte {
 }
 
 func (am accountMapper) decodeAccount(bz []byte) sdk.Account {
-	accPtr := am.clonePrototypePtr()
+	// ... old go-wire ...
-	err := am.cdc.UnmarshalBinary(bz, accPtr)
+	r, n, err := bytes.NewBuffer(bz), new(int), new(error)
-	if err != nil {
+	accI := oldwire.ReadBinary(struct{ sdk.Account }{}, r, len(bz), n, err)
-		panic(err)
+	if *err != nil {
-	}
+		panic(*err)
-	if reflect.ValueOf(am.proto).Kind() == reflect.Ptr {
+
-		return reflect.ValueOf(accPtr).Interface().(sdk.Account)
-	} else {
-		return reflect.ValueOf(accPtr).Elem().Interface().(sdk.Account)
 	}
+
+	acc := accI.(struct{ sdk.Account }).Account
+	return acc
+
+	/*
+		accPtr := am.clonePrototypePtr()
+			err := am.cdc.UnmarshalBinary(bz, accPtr)
+			if err != nil {
+				panic(err)
+			}
+			if reflect.ValueOf(am.proto).Kind() == reflect.Ptr {
+				return reflect.ValueOf(accPtr).Interface().(sdk.Account)
+			} else {
+				return reflect.ValueOf(accPtr).Elem().Interface().(sdk.Account)
+			}
+	*/
 }

x/bank/commands/sendtx.go

@@ -8,11 +8,10 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
-	wire "github.com/tendermint/go-wire"
-
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/keys"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/wire"
 
 	"github.com/cosmos/cosmos-sdk/x/bank"
 )

x/bank/wire.go

@@ -1,11 +1,14 @@
 package bank
 
 import (
-	"github.com/tendermint/go-wire"
+	"github.com/cosmos/cosmos-sdk/wire"
 )
 
 func RegisterWire(cdc *wire.Codec) {
-	// TODO include option to always include prefix bytes.
+	// TODO: bring this back ...
-	cdc.RegisterConcrete(SendMsg{}, "cosmos-sdk/SendMsg", nil)
+	/*
-	cdc.RegisterConcrete(IssueMsg{}, "cosmos-sdk/IssueMsg", nil)
+		// TODO include option to always include prefix bytes.
+		cdc.RegisterConcrete(SendMsg{}, "cosmos-sdk/SendMsg", nil)
+		cdc.RegisterConcrete(IssueMsg{}, "cosmos-sdk/IssueMsg", nil)
+	*/
 }