diff --git a/CHANGELOG.md b/CHANGELOG.md index 67f7aa7cf8..eb189e8729 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -74,6 +74,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ * (x/foundation) [\#686](https://github.com/line/lbm-sdk/pull/686) remove `Minthreshold` and `MinPercentage` from x/foundation config * (x/foundation) [\#693](https://github.com/line/lbm-sdk/pull/693) add pool to the state of x/foundation * (x/foundation) [\#698](https://github.com/line/lbm-sdk/pull/698) update x/group relevant logic in x/foundation +* (x) [\#691](https://github.com/line/lbm-sdk/pull/691) change AccAddressFromBech32 to MustAccAddressFromBech32 ### Bug Fixes * (x/wasm) [\#453](https://github.com/line/lbm-sdk/pull/453) modify wasm grpc query api path diff --git a/x/auth/types/account.go b/x/auth/types/account.go index 667969f8a0..2a1d86a891 100644 --- a/x/auth/types/account.go +++ b/x/auth/types/account.go @@ -57,7 +57,7 @@ func NewBaseAccountWithAddress(addr sdk.AccAddress) *BaseAccount { // GetAddress - Implements sdk.AccountI. func (acc BaseAccount) GetAddress() sdk.AccAddress { - addr, _ := sdk.AccAddressFromBech32(acc.Address) + addr := sdk.MustAccAddressFromBech32(acc.Address) return addr } diff --git a/x/bank/types/balance.go b/x/bank/types/balance.go index bfcde80529..59e7b9cff6 100644 --- a/x/bank/types/balance.go +++ b/x/bank/types/balance.go @@ -63,7 +63,7 @@ func SanitizeGenesisBalances(balances []Balance) []Balance { // 1. Retrieve the address equivalents for each Balance's address. addresses := make([]sdk.AccAddress, len(balances)) for i := range balances { - addr, _ := sdk.AccAddressFromBech32(balances[i].Address) + addr := sdk.MustAccAddressFromBech32(balances[i].Address) addresses[i] = addr } diff --git a/x/bank/types/msgs.go b/x/bank/types/msgs.go index 4eda612d2e..c6765e37ba 100644 --- a/x/bank/types/msgs.go +++ b/x/bank/types/msgs.go @@ -99,7 +99,7 @@ func (msg MsgMultiSend) GetSignBytes() []byte { func (msg MsgMultiSend) GetSigners() []sdk.AccAddress { addrs := make([]sdk.AccAddress, len(msg.Inputs)) for i, in := range msg.Inputs { - addr, _ := sdk.AccAddressFromBech32(in.Address) + addr := sdk.MustAccAddressFromBech32(in.Address) addrs[i] = addr } diff --git a/x/foundation/msgs.go b/x/foundation/msgs.go index 2451aa717f..3c98951547 100644 --- a/x/foundation/msgs.go +++ b/x/foundation/msgs.go @@ -25,7 +25,7 @@ func (m MsgFundTreasury) ValidateBasic() error { // GetSigners implements Msg. func (m MsgFundTreasury) GetSigners() []sdk.AccAddress { - signer, _ := sdk.AccAddressFromBech32(m.From) + signer := sdk.MustAccAddressFromBech32(m.From) return []sdk.AccAddress{signer} } @@ -50,7 +50,7 @@ func (m MsgWithdrawFromTreasury) ValidateBasic() error { // GetSigners implements Msg. func (m MsgWithdrawFromTreasury) GetSigners() []sdk.AccAddress { - signer, _ := sdk.AccAddressFromBech32(m.Operator) + signer := sdk.MustAccAddressFromBech32(m.Operator) return []sdk.AccAddress{signer} } @@ -75,7 +75,7 @@ func (m MsgUpdateMembers) ValidateBasic() error { // GetSigners implements Msg. func (m MsgUpdateMembers) GetSigners() []sdk.AccAddress { - signer, _ := sdk.AccAddressFromBech32(m.Operator) + signer := sdk.MustAccAddressFromBech32(m.Operator) return []sdk.AccAddress{signer} } @@ -99,7 +99,7 @@ func (m MsgUpdateDecisionPolicy) ValidateBasic() error { // GetSigners implements Msg. func (m MsgUpdateDecisionPolicy) GetSigners() []sdk.AccAddress { - signer, _ := sdk.AccAddressFromBech32(m.Operator) + signer := sdk.MustAccAddressFromBech32(m.Operator) return []sdk.AccAddress{signer} } @@ -179,7 +179,7 @@ func (m MsgSubmitProposal) UnpackInterfaces(unpacker codectypes.AnyUnpacker) err func (m MsgSubmitProposal) GetSigners() []sdk.AccAddress { signers := make([]sdk.AccAddress, len(m.Proposers)) for i, p := range m.Proposers { - proposer, _ := sdk.AccAddressFromBech32(p) + proposer := sdk.MustAccAddressFromBech32(p) signers[i] = proposer } return signers @@ -202,7 +202,7 @@ func (m MsgWithdrawProposal) ValidateBasic() error { // GetSigners implements Msg. func (m MsgWithdrawProposal) GetSigners() []sdk.AccAddress { - signer, _ := sdk.AccAddressFromBech32(m.Address) + signer := sdk.MustAccAddressFromBech32(m.Address) return []sdk.AccAddress{signer} } @@ -231,7 +231,7 @@ func (m MsgVote) ValidateBasic() error { // GetSigners implements Msg. func (m MsgVote) GetSigners() []sdk.AccAddress { - signer, _ := sdk.AccAddressFromBech32(m.Voter) + signer := sdk.MustAccAddressFromBech32(m.Voter) return []sdk.AccAddress{signer} } @@ -252,7 +252,7 @@ func (m MsgExec) ValidateBasic() error { // GetSigners implements Msg. func (m MsgExec) GetSigners() []sdk.AccAddress { - signer, _ := sdk.AccAddressFromBech32(m.Signer) + signer := sdk.MustAccAddressFromBech32(m.Signer) return []sdk.AccAddress{signer} } @@ -269,7 +269,7 @@ func (m MsgLeaveFoundation) ValidateBasic() error { // GetSigners implements Msg. func (m MsgLeaveFoundation) GetSigners() []sdk.AccAddress { - signer, _ := sdk.AccAddressFromBech32(m.Address) + signer := sdk.MustAccAddressFromBech32(m.Address) return []sdk.AccAddress{signer} } @@ -325,7 +325,7 @@ func (m MsgGrant) UnpackInterfaces(unpacker codectypes.AnyUnpacker) error { // GetSigners implements Msg. func (m MsgGrant) GetSigners() []sdk.AccAddress { - signer, _ := sdk.AccAddressFromBech32(m.Operator) + signer := sdk.MustAccAddressFromBech32(m.Operator) return []sdk.AccAddress{signer} } @@ -350,6 +350,6 @@ func (m MsgRevoke) ValidateBasic() error { // GetSigners implements Msg. func (m MsgRevoke) GetSigners() []sdk.AccAddress { - signer, _ := sdk.AccAddressFromBech32(m.Operator) + signer := sdk.MustAccAddressFromBech32(m.Operator) return []sdk.AccAddress{signer} } diff --git a/x/wasm/keeper/keeper_test.go b/x/wasm/keeper/keeper_test.go index b42d35284e..92e1bcc0e1 100644 --- a/x/wasm/keeper/keeper_test.go +++ b/x/wasm/keeper/keeper_test.go @@ -512,6 +512,7 @@ func TestInstantiateWithPermissions(t *testing.T) { srcActor: myAddr, }, "onlyAddress with non matching address": { + srcActor: myAddr, srcPermission: types.AccessTypeOnlyAddress.With(otherAddr), expError: sdkerrors.ErrUnauthorized, }, diff --git a/x/wasm/lbmtypes/tx.go b/x/wasm/lbmtypes/tx.go index ab3642182f..cb74722472 100644 --- a/x/wasm/lbmtypes/tx.go +++ b/x/wasm/lbmtypes/tx.go @@ -54,6 +54,6 @@ func (msg MsgStoreCodeAndInstantiateContract) GetSignBytes() []byte { } func (msg MsgStoreCodeAndInstantiateContract) GetSigners() []sdk.AccAddress { - senderAddr, _ := sdk.AccAddressFromBech32(msg.Sender) + senderAddr := sdk.MustAccAddressFromBech32(msg.Sender) return []sdk.AccAddress{senderAddr} } diff --git a/x/wasm/lbmtypes/tx_test.go b/x/wasm/lbmtypes/tx_test.go index 187f89394a..3fd9e18012 100644 --- a/x/wasm/lbmtypes/tx_test.go +++ b/x/wasm/lbmtypes/tx_test.go @@ -1,6 +1,8 @@ package lbmtypes import ( + "encoding/hex" + "fmt" "testing" "github.com/stretchr/testify/assert" @@ -10,6 +12,10 @@ import ( wasmTypes "github.com/line/lbm-sdk/x/wasm/types" ) +func NewMsgStoreCodeAndInstantiateContract(fromAddr sdk.AccAddress) *MsgStoreCodeAndInstantiateContract { + return &MsgStoreCodeAndInstantiateContract{Sender: fromAddr.String()} +} + func TestStoreCodeAndInstantiateContractValidation(t *testing.T) { bad, err := sdk.AccAddressFromHex("012345") require.NoError(t, err) @@ -122,3 +128,9 @@ func TestStoreCodeAndInstantiateContractValidation(t *testing.T) { }) } } + +func TestNewMsgStoreCodeAndInstantiateContractGetSigners(t *testing.T) { + res := NewMsgStoreCodeAndInstantiateContract(sdk.AccAddress([]byte("input111111111111111"))).GetSigners() + bytes := sdk.MustAccAddressFromBech32(res[0].String()) + require.Equal(t, "696e707574313131313131313131313131313131", fmt.Sprintf("%v", hex.EncodeToString(bytes))) +}