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

There's no check for chain-id in TxBuilder.SignStdTx #3945 (#3946) 

Close: #3945
This commit is contained in:
wangjj9219 2019-04-09 20:46:13 +08:00 committed by Alessio Treglia
parent 1505c2b2e6
commit 65338f6642
3 changed files with 72 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.pending/bugfixes/gaiacli/3945-There-s-no-chec Normal file
View File

@ -0,0 +1 @@
#3945 There's no check for chain-id in TxBuilder.SignStdTx

7
x/auth/client/txbuilder/txbuilder.go
View File

@ -178,8 +178,7 @@ func (bldr TxBuilder) WithAccountNumber(accnum uint64) TxBuilder {
// set of messages. It returns an error if a fee is supplied but cannot be
// parsed.
func (bldr TxBuilder) BuildSignMsg(msgs []sdk.Msg) (StdSignMsg, error) {
chainID := bldr.chainID
if chainID == "" {
if bldr.chainID == "" {
return StdSignMsg{}, fmt.Errorf("chain ID required but not specified")
}
@ -248,6 +247,10 @@ func (bldr TxBuilder) BuildTxForSim(msgs []sdk.Msg) ([]byte, error) {
// SignStdTx appends a signature to a StdTx and returns a copy of it. If append
// is false, it replaces the signatures already attached with the new signature.
func (bldr TxBuilder) SignStdTx(name, passphrase string, stdTx auth.StdTx, appendSig bool) (signedStdTx auth.StdTx, err error) {
if bldr.chainID == "" {
return auth.StdTx{}, fmt.Errorf("chain ID required but not specified")
}
stdSignature, err := MakeSignature(bldr.keybase, name, passphrase, StdSignMsg{
ChainID: bldr.chainID,
AccountNumber: bldr.accountNumber,

79
x/auth/client/txbuilder/txbuilder_test.go
View File

@ -33,12 +33,14 @@ func TestTxBuilderBuild(t *testing.T) {
}
defaultMsg := []sdk.Msg{sdk.NewTestMsg(addr)}
tests := []struct {
name string
fields fields
msgs []sdk.Msg
want StdSignMsg
wantErr bool
}{
{
"builder with fees",
fields{
TxEncoder: auth.DefaultTxEncoder(codec.New()),
AccountNumber: 1,
@ -48,7 +50,7 @@ func TestTxBuilderBuild(t *testing.T) {
SimulateGas: false,
ChainID: "test-chain",
Memo: "hello from Voyager 1!",
Fees: sdk.Coins{sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(1))},
Fees: sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(1))),
},
defaultMsg,
StdSignMsg{
@ -62,6 +64,7 @@ func TestTxBuilderBuild(t *testing.T) {
false,
},
{
"builder with gas prices",
fields{
TxEncoder: auth.DefaultTxEncoder(codec.New()),
AccountNumber: 1,
@ -84,19 +87,69 @@ func TestTxBuilderBuild(t *testing.T) {
},
false,
},
{
"no chain-id supplied",
fields{
TxEncoder: auth.DefaultTxEncoder(codec.New()),
AccountNumber: 1,
Sequence: 1,
Gas: 200000,
GasAdjustment: 1.1,
SimulateGas: false,
ChainID: "",
Memo: "hello from Voyager 1!",
Fees: sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(1))),
},
defaultMsg,
StdSignMsg{
ChainID: "test-chain",
AccountNumber: 1,
Sequence: 1,
Memo: "hello from Voyager 1!",
Msgs: defaultMsg,
Fee: auth.NewStdFee(200000, sdk.Coins{sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(1))}),
},
true,
},
{
"builder w/ fees and gas prices",
fields{
TxEncoder: auth.DefaultTxEncoder(codec.New()),
AccountNumber: 1,
Sequence: 1,
Gas: 200000,
GasAdjustment: 1.1,
SimulateGas: false,
ChainID: "test-chain",
Memo: "hello from Voyager 1!",
Fees: sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(1))),
GasPrices: sdk.DecCoins{sdk.NewDecCoinFromDec(sdk.DefaultBondDenom, sdk.NewDecWithPrec(10000, sdk.Precision))},
},
defaultMsg,
StdSignMsg{
ChainID: "test-chain",
AccountNumber: 1,
Sequence: 1,
Memo: "hello from Voyager 1!",
Msgs: defaultMsg,
Fee: auth.NewStdFee(200000, sdk.Coins{sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(1))}),
},
true,
},
}
for i, tc := range tests {
bldr := NewTxBuilder(
tc.fields.TxEncoder, tc.fields.AccountNumber, tc.fields.Sequence,
tc.fields.Gas, tc.fields.GasAdjustment, tc.fields.SimulateGas,
tc.fields.ChainID, tc.fields.Memo, tc.fields.Fees, tc.fields.GasPrices,
)
got, err := bldr.BuildSignMsg(tc.msgs)
require.Equal(t, tc.wantErr, (err != nil), "TxBuilder.Build() error = %v, wantErr %v, tc %d", err, tc.wantErr, i)
if !reflect.DeepEqual(got, tc.want) {
t.Errorf("TxBuilder.Build() = %v, want %v", got, tc.want)
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
bldr := NewTxBuilder(
tt.fields.TxEncoder, tt.fields.AccountNumber, tt.fields.Sequence,
tt.fields.Gas, tt.fields.GasAdjustment, tt.fields.SimulateGas,
tt.fields.ChainID, tt.fields.Memo, tt.fields.Fees, tt.fields.GasPrices,
)
got, err := bldr.BuildSignMsg(tt.msgs)
require.Equal(t, tt.wantErr, (err != nil))
if err == nil {
require.True(t, reflect.DeepEqual(tt.want, got))
}
})
}
}