0.9.1 to master 3076a8b

README.md

@@ -63,6 +63,19 @@ To set up a single node testnet, [look at the deployment documentation](./docs/d
 
 If you want to deploy a whole cluster, [look at the network scripts](./networks/README.md).
 
+## Protobuf
+
+1. Install [protoc](https://github.com/protocolbuffers/protobuf#protocol-compiler-installation) 
+
+2. Install [cosmos-extension](https://github.com/regen-network/cosmos-proto/) for [gogo-protobuf](https://github.com/gogo/protobuf) 
+```sh
+go install github.com/regen-network/cosmos-proto/protoc-gen-gocosmos
+```
+3. Run generator
+```sh
+ make proto-gen
+```
+
 ## Dockerized
 
 We provide a docker image to help with test setups. There are two modes to use it

app/app.go

@@ -9,10 +9,10 @@ import (
  "github.com/cosmos/cosmos-sdk/baseapp"
  "github.com/cosmos/cosmos-sdk/client/rpc"
  "github.com/cosmos/cosmos-sdk/codec"
- "github.com/cosmos/cosmos-sdk/codec/testdata"
  "github.com/cosmos/cosmos-sdk/server/api"
  "github.com/cosmos/cosmos-sdk/simapp"
  "github.com/cosmos/cosmos-sdk/std"
+ "github.com/cosmos/cosmos-sdk/testutil/testdata"
  sdk "github.com/cosmos/cosmos-sdk/types"
  "github.com/cosmos/cosmos-sdk/types/module"
  "github.com/cosmos/cosmos-sdk/version"
@@ -48,7 +48,7 @@ import (
  ibctransfertypes "github.com/cosmos/cosmos-sdk/x/ibc-transfer/types"
  ibcclient "github.com/cosmos/cosmos-sdk/x/ibc/02-client"
  ibcclienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
- port "github.com/cosmos/cosmos-sdk/x/ibc/05-port"
+ porttypes "github.com/cosmos/cosmos-sdk/x/ibc/05-port/types"
  ibchost "github.com/cosmos/cosmos-sdk/x/ibc/24-host"
  ibckeeper "github.com/cosmos/cosmos-sdk/x/ibc/keeper"
  "github.com/cosmos/cosmos-sdk/x/mint"
@@ -178,15 +178,17 @@ type WasmWrapper struct {
 // NewWasmApp returns a reference to an initialized WasmApp.
 func NewWasmApp(
  logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest bool,
- invCheckPeriod uint, skipUpgradeHeights map[int64]bool, homeDir string,
+ skipUpgradeHeights map[int64]bool, homeDir string, invCheckPeriod uint,
  baseAppOptions ...func(*baseapp.BaseApp),
 ) *WasmApp {
- encoding := MakeEncoding()
- appCodec, cdc := encoding.Marshaler, encoding.Amino
+ encodingConfig := MakeEncodingConfig()
+ appCodec, cdc := encodingConfig.Marshaler, encodingConfig.Amino
+ interfaceRegistry := encodingConfig.InterfaceRegistry
 
  bApp := baseapp.NewBaseApp(appName, logger, db, authtypes.DefaultTxDecoder(cdc), baseAppOptions...)
  bApp.SetCommitMultiStoreTracer(traceStore)
  bApp.SetAppVersion(version.Version)
+ bApp.GRPCQueryRouter().SetAnyUnpacker(interfaceRegistry)
 
  keys := sdk.NewKVStoreKeys(
  authtypes.StoreKey, banktypes.StoreKey, stakingtypes.StoreKey,
@@ -275,7 +277,7 @@ func NewWasmApp(
  transferModule := transfer.NewAppModule(app.transferKeeper)
 
  // Create static IBC router, add transfer route, then set and seal it
- ibcRouter := port.NewRouter()
+ ibcRouter := porttypes.NewRouter()
  ibcRouter.AddRoute(ibctransfertypes.ModuleName, transferModule)
  app.ibcKeeper.SetRouter(ibcRouter)
 
@@ -308,7 +310,7 @@ func NewWasmApp(
  // NOTE: Any module instantiated in the module manager that is later modified
  // must be passed by reference here.
  app.mm = module.NewManager(
- genutil.NewAppModule(app.accountKeeper, app.stakingKeeper, app.BaseApp.DeliverTx),
+ genutil.NewAppModule(app.accountKeeper, app.stakingKeeper, app.BaseApp.DeliverTx, encodingConfig.TxConfig),
  auth.NewAppModule(appCodec, app.accountKeeper),
  bank.NewAppModule(appCodec, app.bankKeeper, app.accountKeeper),
  capability.NewAppModule(appCodec, *app.capabilityKeeper),
@@ -348,7 +350,7 @@ func NewWasmApp(
  wasm.ModuleName,
  )
  app.mm.RegisterInvariants(&app.crisisKeeper)
- app.mm.RegisterRoutes(app.Router(), app.QueryRouter())
+ app.mm.RegisterRoutes(app.Router(), app.QueryRouter(), codec.NewAminoCodec(encodingConfig.Amino))
  app.mm.RegisterQueryServices(app.GRPCQueryRouter())
 
  // add test gRPC service for testing gRPC queries in isolation
@@ -385,8 +387,8 @@ func NewWasmApp(
  app.SetBeginBlocker(app.BeginBlocker)
  app.SetAnteHandler(
  ante.NewAnteHandler(
- app.accountKeeper, app.bankKeeper, *app.ibcKeeper, ante.DefaultSigVerificationGasConsumer,
- authtypes.LegacyAminoJSONHandler{},
+ app.accountKeeper, app.bankKeeper, ante.DefaultSigVerificationGasConsumer,
+ encodingConfig.TxConfig.SignModeHandler(),
  ),
  )
  app.SetEndBlocker(app.EndBlocker)

app/app_test.go

@@ -16,20 +16,20 @@ import (
 
 func TestWasmdExport(t *testing.T) {
  db := db.NewMemDB()
- gapp := NewWasmApp(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, 0, map[int64]bool{}, "")
+ gapp := NewWasmApp(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, map[int64]bool{}, "", 0)
  err := setGenesis(gapp)
  require.NoError(t, err)
 
  // Making a new app object with the db, so that initchain hasn't been called
- newGapp := NewWasmApp(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, 0, map[int64]bool{}, "")
+ newGapp := NewWasmApp(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, map[int64]bool{}, "", 0)
  _, _, _, err = newGapp.ExportAppStateAndValidators(false, []string{})
  require.NoError(t, err, "ExportAppStateAndValidators should not have an error")
 }
 
 // ensure that black listed addresses are properly set in bank keeper
 func TestBlackListedAddrs(t *testing.T) {
  db := db.NewMemDB()
- gapp := NewWasmApp(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, 0, map[int64]bool{}, "")
+ gapp := NewWasmApp(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, map[int64]bool{}, "", 0)
 
  for acc := range maccPerms {
  require.Equal(t, !allowedReceivingModAcc[acc], gapp.bankKeeper.BlockedAddr(gapp.accountKeeper.GetModuleAddress(acc)))

app/encoding.go

@@ -6,8 +6,8 @@ import (
  simparams "github.com/cosmos/cosmos-sdk/simapp/params"
 )
 
-func MakeEncoding() simparams.EncodingConfig{
- encodingConfig := simapp.MakeEncodingConfig()
+func MakeEncodingConfig() simparams.EncodingConfig {
+ encodingConfig := simapp.MakeEncodingConfig() // todo: this is the simapp !!!
  wasm.RegisterCodec(encodingConfig.Amino)
  wasm.RegisterInterfaces(encodingConfig.InterfaceRegistry)
  return encodingConfig

app/integration/common_test.go

@@ -6,15 +6,20 @@ This file is full of test helper functions, taken from simapp
 
 import (
  "fmt"
+ "math/rand"
  "os"
  "testing"
+ "time"
 
  wasmd "github.com/CosmWasm/wasmd/app"
+ "github.com/cosmos/cosmos-sdk/client"
  "github.com/cosmos/cosmos-sdk/codec"
  sdk "github.com/cosmos/cosmos-sdk/types"
+ "github.com/cosmos/cosmos-sdk/types/simulation"
+ "github.com/cosmos/cosmos-sdk/types/tx/signing"
+ authsign "github.com/cosmos/cosmos-sdk/x/auth/signing"
  authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
  "github.com/stretchr/testify/require"
-
  abci "github.com/tendermint/tendermint/abci/types"
  "github.com/tendermint/tendermint/crypto"
  "github.com/tendermint/tendermint/libs/log"
@@ -30,7 +35,7 @@ const (
 // Setup initializes a new wasmd.WasmApp. A Nop logger is set in WasmApp.
 func Setup(isCheckTx bool) *wasmd.WasmApp {
  db := dbm.NewMemDB()
- app := wasmd.NewWasmApp(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, 0, map[int64]bool{}, "")
+ app := wasmd.NewWasmApp(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, map[int64]bool{}, "", 0)
  // app := wasmd.NewWasmApp(log.NewNopLogger(), db, nil, true, map[int64]bool{}, 0)
  if !isCheckTx {
  // init chain must be called to stop deliverState from being nil
@@ -56,7 +61,7 @@ func Setup(isCheckTx bool) *wasmd.WasmApp {
 // genesis accounts.
 func SetupWithGenesisAccounts(genAccs []authtypes.GenesisAccount) *wasmd.WasmApp {
  db := dbm.NewMemDB()
- app := wasmd.NewWasmApp(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, 0, map[int64]bool{}, "")
+ app := wasmd.NewWasmApp(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, map[int64]bool{}, "", 0)
 
  // initialize the chain with the passed in genesis accounts
  genesisState := wasmd.NewDefaultGenesisState()
@@ -93,8 +98,9 @@ func SignAndDeliver(
  t *testing.T, app *wasmd.WasmApp, msgs []sdk.Msg,
  accNums, seq []uint64, expPass bool, priv ...crypto.PrivKey,
 ) (sdk.GasInfo, *sdk.Result, error) {
-
- tx := GenTx(
+ t.Helper()
+ tx, err := GenTx(
+ wasmd.MakeEncodingConfig().TxConfig,
  msgs,
  sdk.Coins{sdk.NewInt64Coin(sdk.DefaultBondDenom, 0)},
  DefaultGenTxGas,
@@ -103,7 +109,7 @@ func SignAndDeliver(
  seq,
  priv...,
  )
-
+ require.NoError(t, err)
  // Simulate a sending a transaction and committing a block
  app.BeginBlock(abci.RequestBeginBlock{Header: abci.Header{Height: app.LastBlockHeight() + 1, ChainID: SimAppChainID}})
 
@@ -123,27 +129,58 @@ func SignAndDeliver(
 }
 
 // GenTx generates a signed mock transaction.
-func GenTx(msgs []sdk.Msg, feeAmt sdk.Coins, gas uint64, chainID string, accnums []uint64, seq []uint64, priv ...crypto.PrivKey) authtypes.StdTx {
- fee := authtypes.StdFee{
- Amount: feeAmt,
- Gas: gas,
- }
+func GenTx(gen client.TxConfig, msgs []sdk.Msg, feeAmt sdk.Coins, gas uint64, chainID string, accnums []uint64, seq []uint64, priv ...crypto.PrivKey) (sdk.Tx, error) {
+ sigs := make([]signing.SignatureV2, len(priv))
+
+ // create a random length memo
+ r := rand.New(rand.NewSource(time.Now().UnixNano()))
+
+ memo := simulation.RandStringOfLength(r, simulation.RandIntBetween(r, 0, 100))
 
- sigs := make([]authtypes.StdSignature, len(priv))
+ signMode := gen.SignModeHandler().DefaultMode()
+
+ for i, p := range priv {
+ sigs[i] = signing.SignatureV2{
+ PubKey: p.PubKey(),
+ Data: &signing.SingleSignatureData{
+ SignMode: signMode,
+ },
+ }
+ }
 
- memo := "Test tx"
+ tx := gen.NewTxBuilder()
+ err := tx.SetMsgs(msgs...)
+ if err != nil {
+ return nil, err
+ }
+ err = tx.SetSignatures(sigs...)
+ if err != nil {
+ return nil, err
+ }
+ tx.SetMemo(memo)
+ tx.SetFeeAmount(feeAmt)
+ tx.SetGasLimit(gas)
  for i, p := range priv {
  // use a empty chainID for ease of testing
- sig, err := p.Sign(authtypes.StdSignBytes(chainID, accnums[i], seq[i], fee, msgs, memo))
+ signerData := authsign.SignerData{
+ ChainID: chainID,
+ AccountNumber: accnums[i],
+ AccountSequence: seq[i],
+ }
+ signBytes, err := gen.SignModeHandler().GetSignBytes(signMode, signerData, tx.GetTx())
  if err != nil {
  panic(err)
  }
-
- sigs[i] = authtypes.StdSignature{
- PubKey: p.PubKey().Bytes(),
- Signature: sig,
+ sig, err := p.Sign(signBytes)
+ if err != nil {
+ panic(err)
+ }
+ sigs[i].Data.(*signing.SingleSignatureData).Signature = sig
+ err = tx.SetSignatures(sigs...)
+ if err != nil {
+ panic(err)
  }
  }
 
- return authtypes.NewStdTx(msgs, fee, sigs, memo)
+ return tx.GetTx(), nil
 }

app/sim_bench_test.go

@@ -27,7 +27,7 @@ func BenchmarkFullAppSimulation(b *testing.B) {
  }
  }()
 
- app := NewWasmApp(logger, db, nil, true, simapp.FlagPeriodValue, map[int64]bool{}, "", interBlockCacheOpt())
+ app := NewWasmApp(logger, db, nil, true, map[int64]bool{}, "", simapp.FlagPeriodValue, interBlockCacheOpt())
 
  // run randomized simulation
  _, simParams, simErr := simulation.SimulateFromSeed(
@@ -66,7 +66,7 @@ func BenchmarkInvariants(b *testing.B) {
  }
  }()
 
- app := NewWasmApp(logger, db, nil, true, simapp.FlagPeriodValue, map[int64]bool{}, "", interBlockCacheOpt())
+ app := NewWasmApp(logger, db, nil, true, map[int64]bool{}, "", simapp.FlagPeriodValue, interBlockCacheOpt())
 
  // run randomized simulation
  _, simParams, simErr := simulation.SimulateFromSeed(

app/sim_test.go

@@ -68,7 +68,7 @@ func TestFullAppSimulation(t *testing.T) {
  require.NoError(t, os.RemoveAll(dir))
  }()
 
- app := NewWasmApp(logger, db, nil, true, simapp.FlagPeriodValue, map[int64]bool{}, "", fauxMerkleModeOpt)
+ app := NewWasmApp(logger, db, nil, true, map[int64]bool{}, "", simapp.FlagPeriodValue, fauxMerkleModeOpt)
  require.Equal(t, appName, app.Name())
 
  // run randomized simulation
@@ -100,7 +100,7 @@ func TestAppImportExport(t *testing.T) {
  require.NoError(t, os.RemoveAll(dir))
  }()
 
- app := NewWasmApp(logger, db, nil, true, simapp.FlagPeriodValue, map[int64]bool{}, "", fauxMerkleModeOpt)
+ app := NewWasmApp(logger, db, nil, true, map[int64]bool{}, "", simapp.FlagPeriodValue, fauxMerkleModeOpt)
  require.Equal(t, appName, app.Name())
 
  // Run randomized simulation
@@ -134,7 +134,7 @@ func TestAppImportExport(t *testing.T) {
  require.NoError(t, os.RemoveAll(newDir))
  }()
 
- newApp := NewWasmApp(log.NewNopLogger(), newDB, nil, true, simapp.FlagPeriodValue, map[int64]bool{}, "", fauxMerkleModeOpt)
+ newApp := NewWasmApp(log.NewNopLogger(), newDB, nil, true, map[int64]bool{}, "", simapp.FlagPeriodValue, fauxMerkleModeOpt)
  require.Equal(t, appName, newApp.Name())
 
  var genesisState GenesisState
@@ -191,7 +191,7 @@ func TestAppSimulationAfterImport(t *testing.T) {
  require.NoError(t, os.RemoveAll(dir))
  }()
 
- app := NewWasmApp(logger, db, nil, true, simapp.FlagPeriodValue, map[int64]bool{}, "", fauxMerkleModeOpt)
+ app := NewWasmApp(logger, db, nil, true, map[int64]bool{}, "", simapp.FlagPeriodValue, fauxMerkleModeOpt)
  require.Equal(t, appName, app.Name())
 
  // Run randomized simulation
@@ -230,7 +230,7 @@ func TestAppSimulationAfterImport(t *testing.T) {
  require.NoError(t, os.RemoveAll(newDir))
  }()
 
- newApp := NewWasmApp(log.NewNopLogger(), newDB, nil, true, simapp.FlagPeriodValue, map[int64]bool{}, "", fauxMerkleModeOpt)
+ newApp := NewWasmApp(log.NewNopLogger(), newDB, nil, true, map[int64]bool{}, "", simapp.FlagPeriodValue, fauxMerkleModeOpt)
  require.Equal(t, appName, newApp.Name())
 
  newApp.InitChain(abci.RequestInitChain{
@@ -274,7 +274,7 @@ func TestAppStateDeterminism(t *testing.T) {
 
  db := dbm.NewMemDB()
 
- app := NewWasmApp(logger, db, nil, true, simapp.FlagPeriodValue, map[int64]bool{}, "", interBlockCacheOpt())
+ app := NewWasmApp(logger, db, nil, true, map[int64]bool{}, "", simapp.FlagPeriodValue, interBlockCacheOpt())
 
  fmt.Printf(
  "running non-determinism simulation; seed %d: %d/%d, attempt: %d/%d\n",