Skip to content

Commit 1f64bd5

Browse files
authored
Merge pull request realiotech#185 from decentrio/trintiy/fix-bridge-cli
2 parents 11ddfaa + 67c1395 commit 1f64bd5

File tree

5 files changed

+73
-65
lines changed

5 files changed

+73
-65
lines changed

proto/realionetwork/bridge/v1/tx.proto

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ message MsgBridgeIn {
2828
(gogoproto.nullable) = false,
2929
(gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coin"
3030
];
31-
string reciever = 3;
31+
string receiver = 3;
3232
}
3333

3434
message MsgBridgeInResponse {}
@@ -45,6 +45,7 @@ message MsgBridgeOut {
4545
message MsgBridgeOutResponse {}
4646

4747
message MsgRegisterNewCoins {
48+
option (cosmos.msg.v1.signer) = "authority";
4849
string authority = 1;
4950
repeated cosmos.base.v1beta1.Coin coins = 2 [
5051
(gogoproto.nullable) = false,

x/bridge/client/cli/tx.go

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ func GetTxCmd() *cobra.Command {
3434

3535
func CmdBridgeIn() *cobra.Command {
3636
cmd := &cobra.Command{
37-
Use: "bridge-in [amount]",
37+
Use: "bridge-in [amount] [receiver]",
3838
Short: "Broadcast message BridgeIn",
39-
Args: cobra.ExactArgs(1),
39+
Args: cobra.ExactArgs(2),
4040
RunE: func(cmd *cobra.Command, args []string) (err error) {
4141
clientCtx, err := client.GetClientTxContext(cmd)
4242
if err != nil {
@@ -52,9 +52,15 @@ func CmdBridgeIn() *cobra.Command {
5252
return err
5353
}
5454

55+
_, err = sdk.AccAddressFromBech32(args[1])
56+
if err != nil {
57+
return err
58+
}
59+
5560
msg := &types.MsgBridgeIn{
5661
Authority: clientCtx.GetFromAddress().String(),
5762
Coin: coin,
63+
Receiver: args[1],
5864
}
5965

6066
return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
@@ -112,7 +118,7 @@ func CmdDeregisterCoins() *cobra.Command {
112118
}
113119

114120
var denoms []string
115-
denoms = append(denoms, args[0:len(args)-1]...)
121+
denoms = append(denoms, args...)
116122

117123
msg := &types.MsgDeregisterCoins{
118124
Authority: clientCtx.GetFromAddress().String(),
@@ -129,9 +135,10 @@ func CmdDeregisterCoins() *cobra.Command {
129135

130136
func CmdRegisterNewCoins() *cobra.Command {
131137
cmd := &cobra.Command{
132-
Use: "register-coins [amount]",
133-
Short: "Broadcast message RegisterNewCoins",
134-
Args: cobra.ExactArgs(1),
138+
Use: "register-coins [amount]",
139+
Short: "Broadcast message RegisterNewCoins",
140+
Example: "realio-networkd tx bridge register-coins 100denoma,200denomb",
141+
Args: cobra.ExactArgs(1),
135142
RunE: func(cmd *cobra.Command, args []string) (err error) {
136143
clientCtx, err := client.GetClientTxContext(cmd)
137144
if err != nil {

x/bridge/keeper/msg_server_bridge.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func (ms msgServer) BridgeIn(goCtx context.Context, msg *types.MsgBridgeIn) (*ty
3131
}
3232

3333
addrCodec := ms.authKeeper.AddressCodec()
34-
accAddr, err := addrCodec.StringToBytes(msg.Reciever)
34+
accAddr, err := addrCodec.StringToBytes(msg.Receiver)
3535
if err != nil {
3636
return nil, err
3737
}

x/bridge/keeper/msg_server_bridge_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func (suite *KeeperTestSuite) TestBridgeIn() {
5656

5757
if tc.setAuthority {
5858
tc.msg.Authority = suite.admin
59-
tc.msg.Reciever = suite.admin
59+
tc.msg.Receiver = suite.admin
6060
}
6161

6262
addr, err := suite.app.AccountKeeper.AddressCodec().StringToBytes(tc.msg.Authority)

x/bridge/types/tx.pb.go

Lines changed: 56 additions & 56 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)