certusone
/
cosmos-sdk
mirror of https://github.com/certusone/cosmos-sdk.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

TxContext -> TxBuilder

This commit is contained in:
Alessio Treglia 2018-09-07 14:36:21 +01:00
parent 94b86f85c1
commit 3b6da7af18
No known key found for this signature in database
GPG Key ID: E8A48AE5311D765A
17 changed files with 78 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/utils/rest.go
View File

@ -52,7 +52,7 @@ func ParseFloat64OrReturnBadRequest(w http.ResponseWriter, s string, defaultIfEm
} }
// WriteGenerateStdTxResponse writes response for the generate_only mode. // WriteGenerateStdTxResponse writes response for the generate_only mode.
func WriteGenerateStdTxResponse(w http.ResponseWriter, txCtx authctx.TxContext, msgs []sdk.Msg) { func WriteGenerateStdTxResponse(w http.ResponseWriter, txCtx authctx.TxBuilder, msgs []sdk.Msg) {
stdMsg, err := txCtx.Build(msgs) stdMsg, err := txCtx.Build(msgs)
if err != nil { if err != nil {
WriteErrorResponse(w, http.StatusBadRequest, err.Error()) WriteErrorResponse(w, http.StatusBadRequest, err.Error())

16
client/utils/utils.go
View File

@ -14,11 +14,11 @@ import (
) )
// SendTx implements a auxiliary handler that facilitates sending a series of // SendTx implements a auxiliary handler that facilitates sending a series of
// messages in a signed transaction given a TxContext and a QueryContext. It // messages in a signed transaction given a TxBuilder and a QueryContext. It
// ensures that the account exists, has a proper number and sequence set. In // ensures that the account exists, has a proper number and sequence set. In
// addition, it builds and signs a transaction with the supplied messages. // addition, it builds and signs a transaction with the supplied messages.
// Finally, it broadcasts the signed transaction to a node. // Finally, it broadcasts the signed transaction to a node.
func SendTx(txCtx authctx.TxContext, cliCtx context.CLIContext, msgs []sdk.Msg) error { func SendTx(txCtx authctx.TxBuilder, cliCtx context.CLIContext, msgs []sdk.Msg) error {
txCtx, err := prepareTxContext(txCtx, cliCtx) txCtx, err := prepareTxContext(txCtx, cliCtx)
if err != nil { if err != nil {
return err return err
@ -50,7 +50,7 @@ func SendTx(txCtx authctx.TxContext, cliCtx context.CLIContext, msgs []sdk.Msg)
} }
// SimulateMsgs simulates the transaction and returns the gas estimate and the adjusted value. // SimulateMsgs simulates the transaction and returns the gas estimate and the adjusted value.
func SimulateMsgs(txCtx authctx.TxContext, cliCtx context.CLIContext, name string, msgs []sdk.Msg, gas int64) (estimated, adjusted int64, err error) { func SimulateMsgs(txCtx authctx.TxBuilder, cliCtx context.CLIContext, name string, msgs []sdk.Msg, gas int64) (estimated, adjusted int64, err error) {
txBytes, err := txCtx.WithGas(gas).BuildWithPubKey(name, msgs) txBytes, err := txCtx.WithGas(gas).BuildWithPubKey(name, msgs)
if err != nil { if err != nil {
return return
@ -61,7 +61,7 @@ func SimulateMsgs(txCtx authctx.TxContext, cliCtx context.CLIContext, name strin
// EnrichCtxWithGas calculates the gas estimate that would be consumed by the // EnrichCtxWithGas calculates the gas estimate that would be consumed by the
// transaction and set the transaction's respective value accordingly. // transaction and set the transaction's respective value accordingly.
func EnrichCtxWithGas(txCtx authctx.TxContext, cliCtx context.CLIContext, name string, msgs []sdk.Msg) (authctx.TxContext, error) { func EnrichCtxWithGas(txCtx authctx.TxBuilder, cliCtx context.CLIContext, name string, msgs []sdk.Msg) (authctx.TxBuilder, error) {
_, adjusted, err := SimulateMsgs(txCtx, cliCtx, name, msgs, 0) _, adjusted, err := SimulateMsgs(txCtx, cliCtx, name, msgs, 0)
if err != nil { if err != nil {
return txCtx, err return txCtx, err
@ -73,7 +73,7 @@ func EnrichCtxWithGas(txCtx authctx.TxContext, cliCtx context.CLIContext, name s
// both the estimate obtained by the query and the adjusted amount. // both the estimate obtained by the query and the adjusted amount.
func CalculateGas(queryFunc func(string, common.HexBytes) ([]byte, error), cdc *amino.Codec, txBytes []byte, adjustment float64) (estimate, adjusted int64, err error) { func CalculateGas(queryFunc func(string, common.HexBytes) ([]byte, error), cdc *amino.Codec, txBytes []byte, adjustment float64) (estimate, adjusted int64, err error) {
// run a simulation (via /app/simulate query) to // run a simulation (via /app/simulate query) to
// estimate gas and update TxContext accordingly // estimate gas and update TxBuilder accordingly
rawRes, err := queryFunc("/app/simulate", txBytes) rawRes, err := queryFunc("/app/simulate", txBytes)
if err != nil { if err != nil {
return return
@ -87,7 +87,7 @@ func CalculateGas(queryFunc func(string, common.HexBytes) ([]byte, error), cdc *
} }
// PrintUnsignedStdTx builds an unsigned StdTx and prints it to os.Stdout. // PrintUnsignedStdTx builds an unsigned StdTx and prints it to os.Stdout.
func PrintUnsignedStdTx(txCtx authctx.TxContext, cliCtx context.CLIContext, msgs []sdk.Msg) (err error) { func PrintUnsignedStdTx(txCtx authctx.TxBuilder, cliCtx context.CLIContext, msgs []sdk.Msg) (err error) {
stdTx, err := buildUnsignedStdTx(txCtx, cliCtx, msgs) stdTx, err := buildUnsignedStdTx(txCtx, cliCtx, msgs)
if err != nil { if err != nil {
return return
@ -111,7 +111,7 @@ func parseQueryResponse(cdc *amino.Codec, rawRes []byte) (int64, error) {
return simulationResult.GasUsed, nil return simulationResult.GasUsed, nil
} }
func prepareTxContext(txCtx authctx.TxContext, cliCtx context.CLIContext) (authctx.TxContext, error) { func prepareTxContext(txCtx authctx.TxBuilder, cliCtx context.CLIContext) (authctx.TxBuilder, error) {
if err := cliCtx.EnsureAccountExists(); err != nil { if err := cliCtx.EnsureAccountExists(); err != nil {
return txCtx, err return txCtx, err
} }
@ -145,7 +145,7 @@ func prepareTxContext(txCtx authctx.TxContext, cliCtx context.CLIContext) (authc
// buildUnsignedStdTx builds a StdTx as per the parameters passed in the // buildUnsignedStdTx builds a StdTx as per the parameters passed in the
// contexts. Gas is automatically estimated if gas wanted is set to 0. // contexts. Gas is automatically estimated if gas wanted is set to 0.
func buildUnsignedStdTx(txCtx authctx.TxContext, cliCtx context.CLIContext, msgs []sdk.Msg) (stdTx auth.StdTx, err error) { func buildUnsignedStdTx(txCtx authctx.TxBuilder, cliCtx context.CLIContext, msgs []sdk.Msg) (stdTx auth.StdTx, err error) {
txCtx, err = prepareTxContext(txCtx, cliCtx) txCtx, err = prepareTxContext(txCtx, cliCtx)
if err != nil { if err != nil {
return return

4
examples/democoin/x/cool/client/cli/tx.go
View File

@ -21,7 +21,7 @@ func QuizTxCmd(cdc *wire.Codec) *cobra.Command {
Short: "What's cooler than being cool?", Short: "What's cooler than being cool?",
Args: cobra.ExactArgs(1), Args: cobra.ExactArgs(1),
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
txCtx := authctx.NewTxContextFromCLI().WithCodec(cdc) txCtx := authctx.NewTxBuilderFromCLI().WithCodec(cdc)
cliCtx := context.NewCLIContext(). cliCtx := context.NewCLIContext().
WithCodec(cdc). WithCodec(cdc).
WithLogger(os.Stdout). WithLogger(os.Stdout).
@ -46,7 +46,7 @@ func SetTrendTxCmd(cdc *wire.Codec) *cobra.Command {
Short: "You're so cool, tell us what is cool!", Short: "You're so cool, tell us what is cool!",
Args: cobra.ExactArgs(1), Args: cobra.ExactArgs(1),
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
txCtx := authctx.NewTxContextFromCLI().WithCodec(cdc) txCtx := authctx.NewTxBuilderFromCLI().WithCodec(cdc)
cliCtx := context.NewCLIContext(). cliCtx := context.NewCLIContext().
WithCodec(cdc). WithCodec(cdc).
WithLogger(os.Stdout). WithLogger(os.Stdout).

2
examples/democoin/x/pow/client/cli/tx.go
View File

@ -22,7 +22,7 @@ func MineCmd(cdc *wire.Codec) *cobra.Command {
Short: "Mine some coins with proof-of-work!", Short: "Mine some coins with proof-of-work!",
Args: cobra.ExactArgs(4), Args: cobra.ExactArgs(4),
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
txCtx := authctx.NewTxContextFromCLI().WithCodec(cdc) txCtx := authctx.NewTxBuilderFromCLI().WithCodec(cdc)
cliCtx := context.NewCLIContext(). cliCtx := context.NewCLIContext().
WithCodec(cdc). WithCodec(cdc).
WithLogger(os.Stdout). WithLogger(os.Stdout).

4
examples/democoin/x/simplestake/client/cli/commands.go
View File

@ -30,7 +30,7 @@ func BondTxCmd(cdc *wire.Codec) *cobra.Command {
Use: "bond", Use: "bond",
Short: "Bond to a validator", Short: "Bond to a validator",
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
txCtx := authctx.NewTxContextFromCLI().WithCodec(cdc) txCtx := authctx.NewTxBuilderFromCLI().WithCodec(cdc)
cliCtx := context.NewCLIContext(). cliCtx := context.NewCLIContext().
WithCodec(cdc). WithCodec(cdc).
WithLogger(os.Stdout). WithLogger(os.Stdout).
@ -84,7 +84,7 @@ func UnbondTxCmd(cdc *wire.Codec) *cobra.Command {
Use: "unbond", Use: "unbond",
Short: "Unbond from a validator", Short: "Unbond from a validator",
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
txCtx := authctx.NewTxContextFromCLI().WithCodec(cdc) txCtx := authctx.NewTxBuilderFromCLI().WithCodec(cdc)
cliCtx := context.NewCLIContext(). cliCtx := context.NewCLIContext().
WithCodec(cdc). WithCodec(cdc).
WithLogger(os.Stdout) WithLogger(os.Stdout)

90
x/auth/client/context/context.go
View File

@ -11,8 +11,8 @@ import (
"github.com/spf13/viper" "github.com/spf13/viper"
) )
// TxContext implements a transaction context created in SDK modules. // TxBuilder implements a transaction context created in SDK modules.
type TxContext struct { type TxBuilder struct {
Codec *wire.Codec Codec *wire.Codec
AccountNumber int64 AccountNumber int64
Sequence int64 Sequence int64
@ -22,9 +22,9 @@ type TxContext struct {
Fee string Fee string
} }
// NewTxContextFromCLI returns a new initialized TxContext with parameters from // NewTxBuilderFromCLI returns a new initialized TxBuilder with parameters from
// the command line using Viper. // the command line using Viper.
func NewTxContextFromCLI() TxContext { func NewTxBuilderFromCLI() TxBuilder {
// if chain ID is not specified manually, read default chain ID // if chain ID is not specified manually, read default chain ID
chainID := viper.GetString(client.FlagChainID) chainID := viper.GetString(client.FlagChainID)
if chainID == "" { if chainID == "" {
@ -34,7 +34,7 @@ func NewTxContextFromCLI() TxContext {
} }
} }
return TxContext{ return TxBuilder{
ChainID: chainID, ChainID: chainID,
Gas: viper.GetInt64(client.FlagGas), Gas: viper.GetInt64(client.FlagGas),
AccountNumber: viper.GetInt64(client.FlagAccountNumber), AccountNumber: viper.GetInt64(client.FlagAccountNumber),
@ -45,58 +45,58 @@ func NewTxContextFromCLI() TxContext {
} }
// WithCodec returns a copy of the context with an updated codec. // WithCodec returns a copy of the context with an updated codec.
func (ctx TxContext) WithCodec(cdc *wire.Codec) TxContext { func (bld TxBuilder) WithCodec(cdc *wire.Codec) TxBuilder {
ctx.Codec = cdc bld.Codec = cdc
return ctx return bld
} }
// WithChainID returns a copy of the context with an updated chainID. // WithChainID returns a copy of the context with an updated chainID.
func (ctx TxContext) WithChainID(chainID string) TxContext { func (bld TxBuilder) WithChainID(chainID string) TxBuilder {
ctx.ChainID = chainID bld.ChainID = chainID
return ctx return bld
} }
// WithGas returns a copy of the context with an updated gas. // WithGas returns a copy of the context with an updated gas.
func (ctx TxContext) WithGas(gas int64) TxContext { func (bld TxBuilder) WithGas(gas int64) TxBuilder {
ctx.Gas = gas bld.Gas = gas
return ctx return bld
} }
// WithFee returns a copy of the context with an updated fee. // WithFee returns a copy of the context with an updated fee.
func (ctx TxContext) WithFee(fee string) TxContext { func (bld TxBuilder) WithFee(fee string) TxBuilder {
ctx.Fee = fee bld.Fee = fee
return ctx return bld
} }
// WithSequence returns a copy of the context with an updated sequence number. // WithSequence returns a copy of the context with an updated sequence number.
func (ctx TxContext) WithSequence(sequence int64) TxContext { func (bld TxBuilder) WithSequence(sequence int64) TxBuilder {
ctx.Sequence = sequence bld.Sequence = sequence
return ctx return bld
} }
// WithMemo returns a copy of the context with an updated memo. // WithMemo returns a copy of the context with an updated memo.
func (ctx TxContext) WithMemo(memo string) TxContext { func (bld TxBuilder) WithMemo(memo string) TxBuilder {
ctx.Memo = memo bld.Memo = memo
return ctx return bld
} }
// WithAccountNumber returns a copy of the context with an account number. // WithAccountNumber returns a copy of the context with an account number.
func (ctx TxContext) WithAccountNumber(accnum int64) TxContext { func (bld TxBuilder) WithAccountNumber(accnum int64) TxBuilder {
ctx.AccountNumber = accnum bld.AccountNumber = accnum
return ctx return bld
} }
// Build builds a single message to be signed from a TxContext given a set of // Build builds a single message to be signed from a TxBuilder given a set of
// messages. It returns an error if a fee is supplied but cannot be parsed. // messages. It returns an error if a fee is supplied but cannot be parsed.
func (ctx TxContext) Build(msgs []sdk.Msg) (auth.StdSignMsg, error) { func (bld TxBuilder) Build(msgs []sdk.Msg) (auth.StdSignMsg, error) {
chainID := ctx.ChainID chainID := bld.ChainID
if chainID == "" { if chainID == "" {
return auth.StdSignMsg{}, errors.Errorf("chain ID required but not specified") return auth.StdSignMsg{}, errors.Errorf("chain ID required but not specified")
} }
fee := sdk.Coin{} fee := sdk.Coin{}
if ctx.Fee != "" { if bld.Fee != "" {
parsedFee, err := sdk.ParseCoin(ctx.Fee) parsedFee, err := sdk.ParseCoin(bld.Fee)
if err != nil { if err != nil {
return auth.StdSignMsg{}, err return auth.StdSignMsg{}, err
} }
@ -105,18 +105,18 @@ func (ctx TxContext) Build(msgs []sdk.Msg) (auth.StdSignMsg, error) {
} }
return auth.StdSignMsg{ return auth.StdSignMsg{
ChainID: ctx.ChainID, ChainID: bld.ChainID,
AccountNumber: ctx.AccountNumber, AccountNumber: bld.AccountNumber,
Sequence: ctx.Sequence, Sequence: bld.Sequence,
Memo: ctx.Memo, Memo: bld.Memo,
Msgs: msgs, Msgs: msgs,
Fee: auth.NewStdFee(ctx.Gas, fee), Fee: auth.NewStdFee(bld.Gas, fee),
}, nil }, nil
} }
// Sign signs a transaction given a name, passphrase, and a single message to // Sign signs a transaction given a name, passphrase, and a single message to
// signed. An error is returned if signing fails. // signed. An error is returned if signing fails.
func (ctx TxContext) Sign(name, passphrase string, msg auth.StdSignMsg) ([]byte, error) { func (bld TxBuilder) Sign(name, passphrase string, msg auth.StdSignMsg) ([]byte, error) {
keybase, err := keys.GetKeyBase() keybase, err := keys.GetKeyBase()
if err != nil { if err != nil {
return nil, err return nil, err
@ -134,27 +134,27 @@ func (ctx TxContext) Sign(name, passphrase string, msg auth.StdSignMsg) ([]byte,
Signature: sig, Signature: sig,
}} }}
return ctx.Codec.MarshalBinary(auth.NewStdTx(msg.Msgs, msg.Fee, sigs, msg.Memo)) return bld.Codec.MarshalBinary(auth.NewStdTx(msg.Msgs, msg.Fee, sigs, msg.Memo))
} }
// BuildAndSign builds a single message to be signed, and signs a transaction // BuildAndSign builds a single message to be signed, and signs a transaction
// with the built message given a name, passphrase, and a set of // with the built message given a name, passphrase, and a set of
// messages. // messages.
func (ctx TxContext) BuildAndSign(name, passphrase string, msgs []sdk.Msg) ([]byte, error) { func (bld TxBuilder) BuildAndSign(name, passphrase string, msgs []sdk.Msg) ([]byte, error) {
msg, err := ctx.Build(msgs) msg, err := bld.Build(msgs)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return ctx.Sign(name, passphrase, msg) return bld.Sign(name, passphrase, msg)
} }
// BuildWithPubKey builds a single message to be signed from a TxContext given a set of // BuildWithPubKey builds a single message to be signed from a TxBuilder given a set of
// messages and attach the public key associated to the given name. // messages and attach the public key associated to the given name.
// It returns an error if a fee is supplied but cannot be parsed or the key cannot be // It returns an error if a fee is supplied but cannot be parsed or the key cannot be
// retrieved. // retrieved.
func (ctx TxContext) BuildWithPubKey(name string, msgs []sdk.Msg) ([]byte, error) { func (bld TxBuilder) BuildWithPubKey(name string, msgs []sdk.Msg) ([]byte, error) {
msg, err := ctx.Build(msgs) msg, err := bld.Build(msgs)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -175,5 +175,5 @@ func (ctx TxContext) BuildWithPubKey(name string, msgs []sdk.Msg) ([]byte, error
PubKey: info.GetPubKey(), PubKey: info.GetPubKey(),
}} }}
return ctx.Codec.MarshalBinary(auth.NewStdTx(msg.Msgs, msg.Fee, sigs, msg.Memo)) return bld.Codec.MarshalBinary(auth.NewStdTx(msg.Msgs, msg.Fee, sigs, msg.Memo))
} }

2
x/bank/client/cli/sendtx.go
View File

@ -27,7 +27,7 @@ func SendTxCmd(cdc *wire.Codec) *cobra.Command {
Use: "send", Use: "send",
Short: "Create and sign a send tx", Short: "Create and sign a send tx",
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
txCtx := authctx.NewTxContextFromCLI().WithCodec(cdc) txCtx := authctx.NewTxBuilderFromCLI().WithCodec(cdc)
cliCtx := context.NewCLIContext(). cliCtx := context.NewCLIContext().
WithCodec(cdc). WithCodec(cdc).
WithLogger(os.Stdout). WithLogger(os.Stdout).

2
x/bank/client/rest/sendtx.go
View File

@ -80,7 +80,7 @@ func SendRequestHandlerFn(cdc *wire.Codec, kb keys.Keybase, cliCtx context.CLICo
return return
} }
txCtx := authctx.TxContext{ txCtx := authctx.TxBuilder{
Codec: cdc, Codec: cdc,
Gas: m.Gas, Gas: m.Gas,
ChainID: m.ChainID, ChainID: m.ChainID,

6
x/gov/client/cli/tx.go
View File

@ -77,7 +77,7 @@ $ gaiacli gov submit-proposal --title="Test Proposal" --description="My awesome
return err return err
} }
txCtx := authctx.NewTxContextFromCLI().WithCodec(cdc) txCtx := authctx.NewTxBuilderFromCLI().WithCodec(cdc)
cliCtx := context.NewCLIContext(). cliCtx := context.NewCLIContext().
WithCodec(cdc). WithCodec(cdc).
WithLogger(os.Stdout). WithLogger(os.Stdout).
@ -161,7 +161,7 @@ func GetCmdDeposit(cdc *wire.Codec) *cobra.Command {
Use: "deposit", Use: "deposit",
Short: "deposit tokens for activing proposal", Short: "deposit tokens for activing proposal",
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
txCtx := authctx.NewTxContextFromCLI().WithCodec(cdc) txCtx := authctx.NewTxBuilderFromCLI().WithCodec(cdc)
cliCtx := context.NewCLIContext(). cliCtx := context.NewCLIContext().
WithCodec(cdc). WithCodec(cdc).
WithLogger(os.Stdout). WithLogger(os.Stdout).
@ -207,7 +207,7 @@ func GetCmdVote(cdc *wire.Codec) *cobra.Command {
Use: "vote", Use: "vote",
Short: "vote for an active proposal, options: Yes/No/NoWithVeto/Abstain", Short: "vote for an active proposal, options: Yes/No/NoWithVeto/Abstain",
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
txCtx := authctx.NewTxContextFromCLI().WithCodec(cdc) txCtx := authctx.NewTxBuilderFromCLI().WithCodec(cdc)
cliCtx := context.NewCLIContext(). cliCtx := context.NewCLIContext().
WithCodec(cdc). WithCodec(cdc).
WithLogger(os.Stdout). WithLogger(os.Stdout).

2
x/gov/client/rest/util.go
View File

@ -70,7 +70,7 @@ func (req baseReq) baseReqValidate(w http.ResponseWriter) bool {
// (probably should live in client/lcd). // (probably should live in client/lcd).
func signAndBuild(w http.ResponseWriter, r *http.Request, cliCtx context.CLIContext, baseReq baseReq, msg sdk.Msg, cdc *wire.Codec) { func signAndBuild(w http.ResponseWriter, r *http.Request, cliCtx context.CLIContext, baseReq baseReq, msg sdk.Msg, cdc *wire.Codec) {
var err error var err error
txCtx := authctx.TxContext{ txCtx := authctx.TxBuilder{
Codec: cdc, Codec: cdc,
AccountNumber: baseReq.AccountNumber, AccountNumber: baseReq.AccountNumber,
Sequence: baseReq.Sequence, Sequence: baseReq.Sequence,

2
x/ibc/client/cli/ibctx.go
View File

@ -28,7 +28,7 @@ func IBCTransferCmd(cdc *wire.Codec) *cobra.Command {
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "transfer", Use: "transfer",
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
txCtx := authctx.NewTxContextFromCLI().WithCodec(cdc) txCtx := authctx.NewTxBuilderFromCLI().WithCodec(cdc)
cliCtx := context.NewCLIContext(). cliCtx := context.NewCLIContext().
WithCodec(cdc). WithCodec(cdc).
WithLogger(os.Stdout). WithLogger(os.Stdout).

2
x/ibc/client/cli/relay.go
View File

@ -199,7 +199,7 @@ func (c relayCommander) refine(bz []byte, sequence int64, passphrase string) []b
Sequence: sequence, Sequence: sequence,
} }
txCtx := authctx.NewTxContextFromCLI().WithSequence(sequence).WithCodec(c.cdc) txCtx := authctx.NewTxBuilderFromCLI().WithSequence(sequence).WithCodec(c.cdc)
cliCtx := context.NewCLIContext() cliCtx := context.NewCLIContext()
res, err := txCtx.BuildAndSign(cliCtx.FromAddressName, passphrase, []sdk.Msg{msg}) res, err := txCtx.BuildAndSign(cliCtx.FromAddressName, passphrase, []sdk.Msg{msg})

2
x/ibc/client/rest/transfer.go
View File

@ -71,7 +71,7 @@ func TransferRequestHandlerFn(cdc *wire.Codec, kb keys.Keybase, cliCtx context.C
packet := ibc.NewIBCPacket(sdk.AccAddress(info.GetPubKey().Address()), to, m.Amount, m.SrcChainID, destChainID) packet := ibc.NewIBCPacket(sdk.AccAddress(info.GetPubKey().Address()), to, m.Amount, m.SrcChainID, destChainID)
msg := ibc.IBCTransferMsg{packet} msg := ibc.IBCTransferMsg{packet}
txCtx := authctx.TxContext{ txCtx := authctx.TxBuilder{
Codec: cdc, Codec: cdc,
ChainID: m.SrcChainID, ChainID: m.SrcChainID,
AccountNumber: m.AccountNumber, AccountNumber: m.AccountNumber,

2
x/slashing/client/cli/tx.go
View File

@ -21,7 +21,7 @@ func GetCmdUnjail(cdc *wire.Codec) *cobra.Command {
Args: cobra.NoArgs, Args: cobra.NoArgs,
Short: "unjail validator previously jailed for downtime", Short: "unjail validator previously jailed for downtime",
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
txCtx := authctx.NewTxContextFromCLI().WithCodec(cdc) txCtx := authctx.NewTxBuilderFromCLI().WithCodec(cdc)
cliCtx := context.NewCLIContext(). cliCtx := context.NewCLIContext().
WithCodec(cdc). WithCodec(cdc).
WithLogger(os.Stdout). WithLogger(os.Stdout).

2
x/slashing/client/rest/tx.go
View File

@ -70,7 +70,7 @@ func unjailRequestHandlerFn(cdc *wire.Codec, kb keys.Keybase, cliCtx context.CLI
return return
} }
txCtx := authctx.TxContext{ txCtx := authctx.TxBuilder{
Codec: cdc, Codec: cdc,
ChainID: m.ChainID, ChainID: m.ChainID,
AccountNumber: m.AccountNumber, AccountNumber: m.AccountNumber,

14
x/stake/client/cli/tx.go
View File

@ -25,7 +25,7 @@ func GetCmdCreateValidator(cdc *wire.Codec) *cobra.Command {
Use: "create-validator", Use: "create-validator",
Short: "create new validator initialized with a self-delegation to it", Short: "create new validator initialized with a self-delegation to it",
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
txCtx := authctx.NewTxContextFromCLI().WithCodec(cdc) txCtx := authctx.NewTxBuilderFromCLI().WithCodec(cdc)
cliCtx := context.NewCLIContext(). cliCtx := context.NewCLIContext().
WithCodec(cdc). WithCodec(cdc).
WithLogger(os.Stdout). WithLogger(os.Stdout).
@ -99,7 +99,7 @@ func GetCmdEditValidator(cdc *wire.Codec) *cobra.Command {
Use: "edit-validator", Use: "edit-validator",
Short: "edit and existing validator account", Short: "edit and existing validator account",
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
txCtx := authctx.NewTxContextFromCLI().WithCodec(cdc) txCtx := authctx.NewTxBuilderFromCLI().WithCodec(cdc)
cliCtx := context.NewCLIContext(). cliCtx := context.NewCLIContext().
WithCodec(cdc). WithCodec(cdc).
WithLogger(os.Stdout). WithLogger(os.Stdout).
@ -138,7 +138,7 @@ func GetCmdDelegate(cdc *wire.Codec) *cobra.Command {
Use: "delegate", Use: "delegate",
Short: "delegate liquid tokens to an validator", Short: "delegate liquid tokens to an validator",
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
txCtx := authctx.NewTxContextFromCLI().WithCodec(cdc) txCtx := authctx.NewTxBuilderFromCLI().WithCodec(cdc)
cliCtx := context.NewCLIContext(). cliCtx := context.NewCLIContext().
WithCodec(cdc). WithCodec(cdc).
WithLogger(os.Stdout). WithLogger(os.Stdout).
@ -197,7 +197,7 @@ func GetCmdBeginRedelegate(storeName string, cdc *wire.Codec) *cobra.Command {
Use: "begin", Use: "begin",
Short: "begin redelegation", Short: "begin redelegation",
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
txCtx := authctx.NewTxContextFromCLI().WithCodec(cdc) txCtx := authctx.NewTxBuilderFromCLI().WithCodec(cdc)
cliCtx := context.NewCLIContext(). cliCtx := context.NewCLIContext().
WithCodec(cdc). WithCodec(cdc).
WithLogger(os.Stdout). WithLogger(os.Stdout).
@ -301,7 +301,7 @@ func GetCmdCompleteRedelegate(cdc *wire.Codec) *cobra.Command {
Use: "complete", Use: "complete",
Short: "complete redelegation", Short: "complete redelegation",
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
txCtx := authctx.NewTxContextFromCLI().WithCodec(cdc) txCtx := authctx.NewTxBuilderFromCLI().WithCodec(cdc)
cliCtx := context.NewCLIContext(). cliCtx := context.NewCLIContext().
WithCodec(cdc). WithCodec(cdc).
WithLogger(os.Stdout). WithLogger(os.Stdout).
@ -359,7 +359,7 @@ func GetCmdBeginUnbonding(storeName string, cdc *wire.Codec) *cobra.Command {
Use: "begin", Use: "begin",
Short: "begin unbonding", Short: "begin unbonding",
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
txCtx := authctx.NewTxContextFromCLI().WithCodec(cdc) txCtx := authctx.NewTxBuilderFromCLI().WithCodec(cdc)
cliCtx := context.NewCLIContext(). cliCtx := context.NewCLIContext().
WithCodec(cdc). WithCodec(cdc).
WithLogger(os.Stdout). WithLogger(os.Stdout).
@ -408,7 +408,7 @@ func GetCmdCompleteUnbonding(cdc *wire.Codec) *cobra.Command {
Use: "complete", Use: "complete",
Short: "complete unbonding", Short: "complete unbonding",
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
txCtx := authctx.NewTxContextFromCLI().WithCodec(cdc) txCtx := authctx.NewTxBuilderFromCLI().WithCodec(cdc)
cliCtx := context.NewCLIContext(). cliCtx := context.NewCLIContext().
WithCodec(cdc). WithCodec(cdc).
WithLogger(os.Stdout). WithLogger(os.Stdout).

2
x/stake/client/rest/tx.go
View File

@ -263,7 +263,7 @@ func delegationsRequestHandlerFn(cdc *wire.Codec, kb keys.Keybase, cliCtx contex
i++ i++
} }
txCtx := authcliCtx.TxContext{ txCtx := authcliCtx.TxBuilder{
Codec: cdc, Codec: cdc,
ChainID: m.ChainID, ChainID: m.ChainID,
Gas: m.Gas, Gas: m.Gas,