rebase fixes
This commit is contained in:
parent
abce3850ec
commit
c90d62e035
|
@ -4,7 +4,6 @@ import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
|
||||||
abci "github.com/tendermint/abci/types"
|
abci "github.com/tendermint/abci/types"
|
||||||
oldwire "github.com/tendermint/go-wire"
|
|
||||||
cmn "github.com/tendermint/tmlibs/common"
|
cmn "github.com/tendermint/tmlibs/common"
|
||||||
dbm "github.com/tendermint/tmlibs/db"
|
dbm "github.com/tendermint/tmlibs/db"
|
||||||
"github.com/tendermint/tmlibs/log"
|
"github.com/tendermint/tmlibs/log"
|
||||||
|
@ -52,10 +51,11 @@ func NewGaiaApp(logger log.Logger, dbs map[string]dbm.DB) *GaiaApp {
|
||||||
}
|
}
|
||||||
|
|
||||||
// define the accountMapper
|
// define the accountMapper
|
||||||
app.accountMapper = auth.NewAccountMapperSealed(
|
app.accountMapper = auth.NewAccountMapper(
|
||||||
|
app.cdc,
|
||||||
app.capKeyMainStore, // target store
|
app.capKeyMainStore, // target store
|
||||||
&auth.BaseAccount{}, // prototype
|
&auth.BaseAccount{}, // prototype
|
||||||
)
|
).Seal()
|
||||||
|
|
||||||
// add handlers
|
// add handlers
|
||||||
app.coinKeeper = bank.NewCoinKeeper(app.accountMapper)
|
app.coinKeeper = bank.NewCoinKeeper(app.accountMapper)
|
||||||
|
@ -87,41 +87,27 @@ func NewGaiaApp(logger log.Logger, dbs map[string]dbm.DB) *GaiaApp {
|
||||||
}
|
}
|
||||||
|
|
||||||
// custom tx codec
|
// custom tx codec
|
||||||
// TODO: use new go-wire
|
|
||||||
func MakeCodec() *wire.Codec {
|
func MakeCodec() *wire.Codec {
|
||||||
const (
|
var cdc = wire.NewCodec()
|
||||||
msgTypeSend = 0x1
|
|
||||||
msgTypeIssue = 0x2
|
|
||||||
msgTypeIBCTransferMsg = 0x3
|
|
||||||
msgTypeIBCReceiveMsg = 0x4
|
|
||||||
msgDeclareCandidacy = 0x5
|
|
||||||
msgEditCandidacy = 0x6
|
|
||||||
msgDelegate = 0x7
|
|
||||||
msgUnbond = 0x8
|
|
||||||
)
|
|
||||||
var _ = oldwire.RegisterInterface(
|
|
||||||
struct{ sdk.Msg }{},
|
|
||||||
oldwire.ConcreteType{bank.SendMsg{}, msgTypeSend},
|
|
||||||
oldwire.ConcreteType{bank.IssueMsg{}, msgTypeIssue},
|
|
||||||
oldwire.ConcreteType{ibc.IBCTransferMsg{}, msgTypeIBCTransferMsg},
|
|
||||||
oldwire.ConcreteType{ibc.IBCReceiveMsg{}, msgTypeIBCReceiveMsg},
|
|
||||||
oldwire.ConcreteType{stake.MsgDeclareCandidacy{}, msgDeclareCandidacy},
|
|
||||||
oldwire.ConcreteType{stake.MsgEditCandidacy{}, msgEditCandidacy},
|
|
||||||
oldwire.ConcreteType{stake.MsgDelegate{}, msgDelegate},
|
|
||||||
oldwire.ConcreteType{stake.MsgUnbond{}, msgUnbond},
|
|
||||||
)
|
|
||||||
|
|
||||||
const accTypeApp = 0x1
|
// Register Msgs
|
||||||
var _ = oldwire.RegisterInterface(
|
cdc.RegisterInterface((*sdk.Msg)(nil), nil)
|
||||||
struct{ sdk.Account }{},
|
cdc.RegisterConcrete(bank.SendMsg{}, "gaia/Send", nil)
|
||||||
oldwire.ConcreteType{&auth.BaseAccount{}, accTypeApp},
|
cdc.RegisterConcrete(bank.IssueMsg{}, "gaia/Issue", nil)
|
||||||
)
|
cdc.RegisterConcrete(ibc.IBCTransferMsg{}, "gaia/IBCTransferMsg", nil)
|
||||||
cdc := wire.NewCodec()
|
cdc.RegisterConcrete(ibc.IBCReceiveMsg{}, "gaia/IBCReceiveMsg", nil)
|
||||||
|
cdc.RegisterConcrete(stake.MsgDeclareCandidacy{}, "gaia/MsgDeclareCandidacy", nil)
|
||||||
|
cdc.RegisterConcrete(stake.MsgEditCandidacy{}, "gaia/MsgEditCandidacy", nil)
|
||||||
|
cdc.RegisterConcrete(stake.MsgDelegate{}, "gaia/MsgDelegate", nil)
|
||||||
|
cdc.RegisterConcrete(stake.MsgUnbond{}, "gaia/MsgUnbond", nil)
|
||||||
|
|
||||||
|
// Register AppAccount
|
||||||
|
cdc.RegisterInterface((*sdk.Account)(nil), nil)
|
||||||
|
cdc.RegisterConcrete(&auth.BaseAccount{}, "gaia/Account", nil)
|
||||||
|
|
||||||
|
// Register crypto.
|
||||||
|
wire.RegisterCrypto(cdc)
|
||||||
|
|
||||||
// cdc.RegisterInterface((*sdk.Msg)(nil), nil)
|
|
||||||
// bank.RegisterWire(cdc) // Register bank.[SendMsg,IssueMsg]
|
|
||||||
// crypto.RegisterWire(cdc) // Register crypto.[PubKey,PrivKey,Signature]
|
|
||||||
// ibc.RegisterWire(cdc) // Register ibc.[IBCTransferMsg, IBCReceiveMsg]
|
|
||||||
return cdc
|
return cdc
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,88 +0,0 @@
|
||||||
package main
|
|
||||||
|
|
||||||
import (
|
|
||||||
"os"
|
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
|
||||||
|
|
||||||
"github.com/tendermint/tmlibs/cli"
|
|
||||||
|
|
||||||
"github.com/cosmos/cosmos-sdk/client"
|
|
||||||
"github.com/cosmos/cosmos-sdk/client/keys"
|
|
||||||
"github.com/cosmos/cosmos-sdk/client/lcd"
|
|
||||||
"github.com/cosmos/cosmos-sdk/client/rpc"
|
|
||||||
"github.com/cosmos/cosmos-sdk/client/tx"
|
|
||||||
|
|
||||||
"github.com/cosmos/cosmos-sdk/version"
|
|
||||||
authcmd "github.com/cosmos/cosmos-sdk/x/auth/commands"
|
|
||||||
bankcmd "github.com/cosmos/cosmos-sdk/x/bank/commands"
|
|
||||||
ibccmd "github.com/cosmos/cosmos-sdk/x/ibc/commands"
|
|
||||||
simplestakingcmd "github.com/cosmos/cosmos-sdk/x/simplestake/commands"
|
|
||||||
|
|
||||||
"github.com/cosmos/cosmos-sdk/examples/basecoin/app"
|
|
||||||
"github.com/cosmos/cosmos-sdk/examples/basecoin/types"
|
|
||||||
)
|
|
||||||
|
|
||||||
// TODO: distinguish from basecli
|
|
||||||
|
|
||||||
// rootCmd is the entry point for this binary
|
|
||||||
var (
|
|
||||||
rootCmd = &cobra.Command{
|
|
||||||
Use: "gaiacli",
|
|
||||||
Short: "Gaia light-client",
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
func main() {
|
|
||||||
// disable sorting
|
|
||||||
cobra.EnableCommandSorting = false
|
|
||||||
|
|
||||||
// get the codec
|
|
||||||
cdc := app.MakeCodec()
|
|
||||||
|
|
||||||
// TODO: setup keybase, viper object, etc. to be passed into
|
|
||||||
// the below functions and eliminate global vars, like we do
|
|
||||||
// with the cdc
|
|
||||||
|
|
||||||
// add standard rpc, and tx commands
|
|
||||||
rpc.AddCommands(rootCmd)
|
|
||||||
rootCmd.AddCommand(client.LineBreak)
|
|
||||||
tx.AddCommands(rootCmd, cdc)
|
|
||||||
rootCmd.AddCommand(client.LineBreak)
|
|
||||||
|
|
||||||
// add query/post commands (custom to binary)
|
|
||||||
rootCmd.AddCommand(
|
|
||||||
client.GetCommands(
|
|
||||||
authcmd.GetAccountCmd("main", cdc, types.GetAccountDecoder(cdc)),
|
|
||||||
)...)
|
|
||||||
rootCmd.AddCommand(
|
|
||||||
client.PostCommands(
|
|
||||||
bankcmd.SendTxCmd(cdc),
|
|
||||||
)...)
|
|
||||||
rootCmd.AddCommand(
|
|
||||||
client.PostCommands(
|
|
||||||
ibccmd.IBCTransferCmd(cdc),
|
|
||||||
)...)
|
|
||||||
rootCmd.AddCommand(
|
|
||||||
client.PostCommands(
|
|
||||||
ibccmd.IBCRelayCmd(cdc),
|
|
||||||
simplestakingcmd.BondTxCmd(cdc),
|
|
||||||
)...)
|
|
||||||
rootCmd.AddCommand(
|
|
||||||
client.PostCommands(
|
|
||||||
simplestakingcmd.UnbondTxCmd(cdc),
|
|
||||||
)...)
|
|
||||||
|
|
||||||
// add proxy, version and key info
|
|
||||||
rootCmd.AddCommand(
|
|
||||||
client.LineBreak,
|
|
||||||
lcd.ServeCommand(cdc),
|
|
||||||
keys.Commands(),
|
|
||||||
client.LineBreak,
|
|
||||||
version.VersionCmd,
|
|
||||||
)
|
|
||||||
|
|
||||||
// prepare and add flags
|
|
||||||
executor := cli.PrepareMainCmd(rootCmd, "BC", os.ExpandEnv("$HOME/.gaiacli"))
|
|
||||||
executor.Execute()
|
|
||||||
}
|
|
|
@ -344,10 +344,9 @@ func TestQuizMsg(t *testing.T) {
|
||||||
|
|
||||||
// Construct genesis state
|
// Construct genesis state
|
||||||
// Construct some genesis bytes to reflect basecoin/types/AppAccount
|
// Construct some genesis bytes to reflect basecoin/types/AppAccount
|
||||||
coins := sdk.Coins{}
|
|
||||||
baseAcc := auth.BaseAccount{
|
baseAcc := auth.BaseAccount{
|
||||||
Address: addr1,
|
Address: addr1,
|
||||||
Coins: coins,
|
Coins: nil,
|
||||||
}
|
}
|
||||||
acc1 := &types.AppAccount{baseAcc, "foobart"}
|
acc1 := &types.AppAccount{baseAcc, "foobart"}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue