Adress merge conflicts

go.mod

@@ -36,8 +36,10 @@ require (
 require (
 	cosmossdk.io/api v0.2.6
 	cosmossdk.io/core v0.3.2
+	cosmossdk.io/errors v1.0.0-beta.7
 	cosmossdk.io/math v1.0.0-beta.4
 	cosmossdk.io/tools/rosetta v0.2.0
+	github.com/spf13/viper v1.14.0
 )
 
 require (
@@ -47,7 +49,6 @@ require (
 	cloud.google.com/go/iam v0.7.0 // indirect
 	cloud.google.com/go/storage v1.27.0 // indirect
 	cosmossdk.io/depinject v1.0.0-alpha.3 // indirect
-	cosmossdk.io/errors v1.0.0-beta.7 // indirect
 	filippo.io/edwards25519 v1.0.0-rc.1 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
 	github.com/99designs/keyring v1.2.1 // indirect
@@ -143,7 +144,6 @@ require (
 	github.com/sasha-s/go-deadlock v0.3.1 // indirect
 	github.com/spf13/afero v1.9.2 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
-	github.com/spf13/viper v1.14.0 // indirect
 	github.com/subosito/gotenv v1.4.1 // indirect
 	github.com/tendermint/btcd v0.1.1 // indirect
 	github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15 // indirect

x/wasm/keeper/handler_plugin_encoders.go

@@ -313,20 +313,16 @@ func EncodeIBCMsg(portSource types.ICS20TransferPortSource) func(ctx sdk.Context
 }
 
 func EncodeGovMsg(sender sdk.AccAddress, msg *wasmvmtypes.GovMsg) ([]sdk.Msg, error) {
-<<<<<<< HEAD
-	var option v1.VoteOption
-	switch msg.Vote.Vote {
-=======
 	switch {
 	case msg.Vote != nil:
 		voteOption, err := convertVoteOption(msg.Vote.Vote)
 		if err != nil {
 			return nil, sdkerrors.Wrap(err, "vote option")
 		}
-		m := govtypes.NewMsgVote(sender, msg.Vote.ProposalId, voteOption)
+		m := v1.NewMsgVote(sender, msg.Vote.ProposalId, voteOption, "")
 		return []sdk.Msg{m}, nil
 	case msg.VoteWeighted != nil:
-		opts := make([]govtypes.WeightedVoteOption, len(msg.VoteWeighted.Options))
+		opts := make([]*v1.WeightedVoteOption, len(msg.VoteWeighted.Options))
 		for i, v := range msg.VoteWeighted.Options {
 			weight, err := sdk.NewDecFromStr(v.Weight)
 			if err != nil {
@@ -336,43 +332,31 @@ func EncodeGovMsg(sender sdk.AccAddress, msg *wasmvmtypes.GovMsg) ([]sdk.Msg, er
 			if err != nil {
 				return nil, sdkerrors.Wrap(err, "vote option")
 			}
-			opts[i] = govtypes.WeightedVoteOption{Option: voteOption, Weight: weight}
+			opts[i] = &v1.WeightedVoteOption{Option: voteOption, Weight: weight.String()}
 		}
-		m := govtypes.NewMsgVoteWeighted(sender, msg.VoteWeighted.ProposalId, opts)
+		m := v1.NewMsgVoteWeighted(sender, msg.VoteWeighted.ProposalId, opts, "")
 		return []sdk.Msg{m}, nil
 
 	default:
 		return nil, types.ErrUnknownMsg.Wrap("unknown variant of gov")
 	}
 }
 
-func convertVoteOption(s interface{}) (govtypes.VoteOption, error) {
-	var option govtypes.VoteOption
+func convertVoteOption(s interface{}) (v1.VoteOption, error) {
+	var option v1.VoteOption
 	switch s {
->>>>>>> 957b38e (Integrate wasmvm v1.2.0 (#1161))
 	case wasmvmtypes.Yes:
 		option = v1.OptionYes
 	case wasmvmtypes.No:
 		option = v1.OptionNo
 	case wasmvmtypes.NoWithVeto:
 		option = v1.OptionNoWithVeto
 	case wasmvmtypes.Abstain:
-<<<<<<< HEAD
 		option = v1.OptionAbstain
-	}
-	vote := &v1.MsgVote{
-		ProposalId: msg.Vote.ProposalId,
-		Voter:      sender.String(),
-		Option:     option,
-	}
-	return []sdk.Msg{vote}, nil
-=======
-		option = govtypes.OptionAbstain
 	default:
-		return govtypes.OptionEmpty, types.ErrInvalid
+		return v1.OptionEmpty, types.ErrInvalid
 	}
 	return option, nil
->>>>>>> 957b38e (Integrate wasmvm v1.2.0 (#1161))
 }
 
 // ConvertWasmIBCTimeoutHeightToCosmosHeight converts a wasmvm type ibc timeout height to ibc module type height

x/wasm/keeper/handler_plugin_encoders_test.go

@@ -303,7 +303,8 @@ func TestEncoding(t *testing.T) {
 					},
 				},
 			},
-			expError: false, // fails in the handler
+			expError:   false, // fails in the handler
+			expInvalid: true,
 			output: []sdk.Msg{
 				&stakingtypes.MsgDelegate{
 					DelegatorAddress: addr1.String(),
@@ -583,13 +584,8 @@ func TestEncodeGovMsg(t *testing.T) {
 			output: []sdk.Msg{
 				&v1.MsgVote{
 					ProposalId: 1,
-<<<<<<< HEAD
-					Voter:      addr1.String(),
-					Option:     v1.OptionYes,
-=======
 					Voter:      myAddr.String(),
-					Option:     govtypes.OptionYes,
->>>>>>> 957b38e (Integrate wasmvm v1.2.0 (#1161))
+					Option:     v1.OptionYes,
 				},
 			},
 		},
@@ -603,13 +599,8 @@ func TestEncodeGovMsg(t *testing.T) {
 			output: []sdk.Msg{
 				&v1.MsgVote{
 					ProposalId: 1,
-<<<<<<< HEAD
-					Voter:      addr1.String(),
-					Option:     v1.OptionNo,
-=======
 					Voter:      myAddr.String(),
-					Option:     govtypes.OptionNo,
->>>>>>> 957b38e (Integrate wasmvm v1.2.0 (#1161))
+					Option:     v1.OptionNo,
 				},
 			},
 		},
@@ -623,13 +614,8 @@ func TestEncodeGovMsg(t *testing.T) {
 			output: []sdk.Msg{
 				&v1.MsgVote{
 					ProposalId: 10,
-<<<<<<< HEAD
-					Voter:      addr1.String(),
-					Option:     v1.OptionAbstain,
-=======
 					Voter:      myAddr.String(),
-					Option:     govtypes.OptionAbstain,
->>>>>>> 957b38e (Integrate wasmvm v1.2.0 (#1161))
+					Option:     v1.OptionAbstain,
 				},
 			},
 		},
@@ -643,13 +629,8 @@ func TestEncodeGovMsg(t *testing.T) {
 			output: []sdk.Msg{
 				&v1.MsgVote{
 					ProposalId: 1,
-<<<<<<< HEAD
-					Voter:      addr1.String(),
-					Option:     v1.OptionNoWithVeto,
-=======
 					Voter:      myAddr.String(),
-					Option:     govtypes.OptionNoWithVeto,
->>>>>>> 957b38e (Integrate wasmvm v1.2.0 (#1161))
+					Option:     v1.OptionNoWithVeto,
 				},
 			},
 		},
@@ -675,11 +656,11 @@ func TestEncodeGovMsg(t *testing.T) {
 				},
 			},
 			output: []sdk.Msg{
-				&govtypes.MsgVoteWeighted{
+				&v1.MsgVoteWeighted{
 					ProposalId: 1,
 					Voter:      myAddr.String(),
-					Options: []govtypes.WeightedVoteOption{
-						{Option: govtypes.OptionYes, Weight: sdk.NewDec(1)},
+					Options: []*v1.WeightedVoteOption{
+						{Option: v1.OptionYes, Weight: sdk.NewDec(1).String()},
 					},
 				},
 			},
@@ -700,14 +681,14 @@ func TestEncodeGovMsg(t *testing.T) {
 				},
 			},
 			output: []sdk.Msg{
-				&govtypes.MsgVoteWeighted{
+				&v1.MsgVoteWeighted{
 					ProposalId: 1,
 					Voter:      myAddr.String(),
-					Options: []govtypes.WeightedVoteOption{
-						{Option: govtypes.OptionYes, Weight: sdk.NewDecWithPrec(23, 2)},
-						{Option: govtypes.OptionNo, Weight: sdk.NewDecWithPrec(24, 2)},
-						{Option: govtypes.OptionAbstain, Weight: sdk.NewDecWithPrec(26, 2)},
-						{Option: govtypes.OptionNoWithVeto, Weight: sdk.NewDecWithPrec(27, 2)},
+					Options: []*v1.WeightedVoteOption{
+						{Option: v1.OptionYes, Weight: sdk.NewDecWithPrec(23, 2).String()},
+						{Option: v1.OptionNo, Weight: sdk.NewDecWithPrec(24, 2).String()},
+						{Option: v1.OptionAbstain, Weight: sdk.NewDecWithPrec(26, 2).String()},
+						{Option: v1.OptionNoWithVeto, Weight: sdk.NewDecWithPrec(27, 2).String()},
 					},
 				},
 			},
@@ -726,12 +707,12 @@ func TestEncodeGovMsg(t *testing.T) {
 				},
 			},
 			output: []sdk.Msg{
-				&govtypes.MsgVoteWeighted{
+				&v1.MsgVoteWeighted{
 					ProposalId: 1,
 					Voter:      myAddr.String(),
-					Options: []govtypes.WeightedVoteOption{
-						{Option: govtypes.OptionYes, Weight: sdk.NewDecWithPrec(5, 1)},
-						{Option: govtypes.OptionYes, Weight: sdk.NewDecWithPrec(5, 1)},
+					Options: []*v1.WeightedVoteOption{
+						{Option: v1.OptionYes, Weight: sdk.NewDecWithPrec(5, 1).String()},
+						{Option: v1.OptionYes, Weight: sdk.NewDecWithPrec(5, 1).String()},
 					},
 				},
 			},
@@ -751,12 +732,12 @@ func TestEncodeGovMsg(t *testing.T) {
 				},
 			},
 			output: []sdk.Msg{
-				&govtypes.MsgVoteWeighted{
+				&v1.MsgVoteWeighted{
 					ProposalId: 1,
 					Voter:      myAddr.String(),
-					Options: []govtypes.WeightedVoteOption{
-						{Option: govtypes.OptionYes, Weight: sdk.NewDecWithPrec(51, 2)},
-						{Option: govtypes.OptionNo, Weight: sdk.NewDecWithPrec(5, 1)},
+					Options: []*v1.WeightedVoteOption{
+						{Option: v1.OptionYes, Weight: sdk.NewDecWithPrec(51, 2).String()},
+						{Option: v1.OptionNo, Weight: sdk.NewDecWithPrec(5, 1).String()},
 					},
 				},
 			},
@@ -776,12 +757,12 @@ func TestEncodeGovMsg(t *testing.T) {
 				},
 			},
 			output: []sdk.Msg{
-				&govtypes.MsgVoteWeighted{
+				&v1.MsgVoteWeighted{
 					ProposalId: 1,
 					Voter:      myAddr.String(),
-					Options: []govtypes.WeightedVoteOption{
-						{Option: govtypes.OptionYes, Weight: sdk.NewDecWithPrec(49, 2)},
-						{Option: govtypes.OptionNo, Weight: sdk.NewDecWithPrec(5, 1)},
+					Options: []*v1.WeightedVoteOption{
+						{Option: v1.OptionYes, Weight: sdk.NewDecWithPrec(49, 2).String()},
+						{Option: v1.OptionNo, Weight: sdk.NewDecWithPrec(5, 1).String()},
 					},
 				},
 			},

x/wasm/keeper/keeper.go

@@ -105,64 +105,6 @@ type Keeper struct {
 	accountPruner        AccountPruner
 }
 
-<<<<<<< HEAD
-// NewKeeper creates a new contract Keeper instance
-// If customEncoders is non-nil, we can use this to override some of the message handler, especially custom
-func NewKeeper(
-	cdc codec.Codec,
-	storeKey storetypes.StoreKey,
-	paramSpace paramtypes.Subspace,
-	accountKeeper types.AccountKeeper,
-	bankKeeper types.BankKeeper,
-	stakingKeeper types.StakingKeeper,
-	distrKeeper types.DistributionKeeper,
-	channelKeeper types.ChannelKeeper,
-	portKeeper types.PortKeeper,
-	capabilityKeeper types.CapabilityKeeper,
-	portSource types.ICS20TransferPortSource,
-	router MessageRouter,
-	_ GRPCQueryRouter,
-	homeDir string,
-	wasmConfig types.WasmConfig,
-	availableCapabilities string,
-	opts ...Option,
-) Keeper {
-	wasmer, err := wasmvm.NewVM(filepath.Join(homeDir, "wasm"), availableCapabilities, contractMemoryLimit, wasmConfig.ContractDebugMode, wasmConfig.MemoryCacheSize)
-	if err != nil {
-		panic(err)
-	}
-	// set KeyTable if it has not already been set
-	if !paramSpace.HasKeyTable() {
-		paramSpace = paramSpace.WithKeyTable(types.ParamKeyTable())
-	}
-
-	keeper := &Keeper{
-		storeKey:             storeKey,
-		cdc:                  cdc,
-		wasmVM:               wasmer,
-		accountKeeper:        accountKeeper,
-		bank:                 NewBankCoinTransferrer(bankKeeper),
-		accountPruner:        NewVestingCoinBurner(bankKeeper),
-		portKeeper:           portKeeper,
-		capabilityKeeper:     capabilityKeeper,
-		messenger:            NewDefaultMessageHandler(router, channelKeeper, capabilityKeeper, bankKeeper, cdc, portSource),
-		queryGasLimit:        wasmConfig.SmartQueryGasLimit,
-		paramSpace:           paramSpace,
-		gasRegister:          NewDefaultWasmGasRegister(),
-		maxQueryStackSize:    types.DefaultMaxQueryStackSize,
-		acceptedAccountTypes: defaultAcceptedAccountTypes,
-	}
-	keeper.wasmVMQueryHandler = DefaultQueryPlugins(bankKeeper, stakingKeeper, distrKeeper, channelKeeper, keeper)
-	for _, o := range opts {
-		o.apply(keeper)
-	}
-	// not updateable, yet
-	keeper.wasmVMResponseHandler = NewDefaultWasmVMContractResponseHandler(NewMessageDispatcher(keeper.messenger, keeper))
-	return *keeper
-}
-
-=======
->>>>>>> 957b38e (Integrate wasmvm v1.2.0 (#1161))
 func (k Keeper) getUploadAccessConfig(ctx sdk.Context) types.AccessConfig {
 	var a types.AccessConfig
 	k.paramSpace.Get(ctx, types.ParamStoreKeyUploadAccess, &a)

x/wasm/keeper/keeper_cgo.go

@@ -5,9 +5,10 @@ package keeper
 import (
 	"path/filepath"
 
+	storetypes "github.com/cosmos/cosmos-sdk/store/types"
+
 	wasmvm "github.com/CosmWasm/wasmvm"
 	"github.com/cosmos/cosmos-sdk/codec"
-	sdk "github.com/cosmos/cosmos-sdk/types"
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
 
 	"github.com/CosmWasm/wasmd/x/wasm/types"
@@ -17,18 +18,18 @@ import (
 // If customEncoders is non-nil, we can use this to override some of the message handler, especially custom
 func NewKeeper(
 	cdc codec.Codec,
-	storeKey sdk.StoreKey,
+	storeKey storetypes.StoreKey,
 	paramSpace paramtypes.Subspace,
 	accountKeeper types.AccountKeeper,
 	bankKeeper types.BankKeeper,
 	stakingKeeper types.StakingKeeper,
-	distKeeper types.DistributionKeeper,
+	distrKeeper types.DistributionKeeper,
 	channelKeeper types.ChannelKeeper,
 	portKeeper types.PortKeeper,
 	capabilityKeeper types.CapabilityKeeper,
 	portSource types.ICS20TransferPortSource,
 	router MessageRouter,
-	queryRouter GRPCQueryRouter,
+	_ GRPCQueryRouter,
 	homeDir string,
 	wasmConfig types.WasmConfig,
 	availableCapabilities string,
@@ -59,7 +60,7 @@ func NewKeeper(
 		maxQueryStackSize:    types.DefaultMaxQueryStackSize,
 		acceptedAccountTypes: defaultAcceptedAccountTypes,
 	}
-	keeper.wasmVMQueryHandler = DefaultQueryPlugins(bankKeeper, stakingKeeper, distKeeper, channelKeeper, keeper)
+	keeper.wasmVMQueryHandler = DefaultQueryPlugins(bankKeeper, stakingKeeper, distrKeeper, channelKeeper, keeper)
 	for _, o := range opts {
 		o.apply(keeper)
 	}

x/wasm/keeper/keeper_no_cgo.go

@@ -4,7 +4,7 @@ package keeper
 
 import (
 	"github.com/cosmos/cosmos-sdk/codec"
-	sdk "github.com/cosmos/cosmos-sdk/types"
+	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
 
 	"github.com/CosmWasm/wasmd/x/wasm/types"
@@ -14,18 +14,18 @@ import (
 // If customEncoders is non-nil, we can use this to override some of the message handler, especially custom
 func NewKeeper(
 	cdc codec.Codec,
-	storeKey sdk.StoreKey,
+	storeKey storetypes.StoreKey,
 	paramSpace paramtypes.Subspace,
 	accountKeeper types.AccountKeeper,
 	bankKeeper types.BankKeeper,
 	stakingKeeper types.StakingKeeper,
-	distKeeper types.DistributionKeeper,
+	distrKeeper types.DistributionKeeper,
 	channelKeeper types.ChannelKeeper,
 	portKeeper types.PortKeeper,
 	capabilityKeeper types.CapabilityKeeper,
 	portSource types.ICS20TransferPortSource,
 	router MessageRouter,
-	queryRouter GRPCQueryRouter,
+	_ GRPCQueryRouter,
 	homeDir string,
 	wasmConfig types.WasmConfig,
 	availableCapabilities string,