Merge pull request #90 from sideprotocol/ping/feat/update-fee-rate

Ping/feat/update fee rate

Author: liangping

local_node_dev.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 
-KEYS=("dev0" "dev1" "dev2")
+KEYS=("validator" "user" "relayer")
 CHAINID="devnet"
 MONIKER="Side Labs"
 BINARY="$HOME/go/bin/sided"
-DENOM_STR="uside,sat"
+DENOM_STR="uside,uusdt"
 INITIAL_ACCOUNT_STR=""
 set -f
 IFS=,

proto/side/btcbridge/tx.proto

@@ -96,7 +96,7 @@ message MsgWithdrawBitcoinRequest {
   // withdraw amount in satoshi, etc: 100000000sat = 1btc
   string amount = 2;
   // fee rate in sats/vB
-  int64 fee_rate = 3;
+  string fee_rate = 3;
 }
 
 // MsgWithdrawBitcoinResponse defines the Msg/WithdrawBitcoin response type.

x/btcbridge/keeper/keeper_withdraw.go

@@ -70,8 +70,10 @@ func (k Keeper) NewSigningRequest(ctx sdk.Context, sender string, coin sdk.Coin,
 	k.LockUTXOs(ctx, selectedUTXOs)
 
 	// save the change utxo and mark minted
-	k.saveUTXO(ctx, changeUTXO)
-	k.addToMintHistory(ctx, psbt.UnsignedTx.TxHash().String())
+	if changeUTXO != nil {
+		k.saveUTXO(ctx, changeUTXO)
+		k.addToMintHistory(ctx, psbt.UnsignedTx.TxHash().String())
+	}
 
 	signingRequest := &types.BitcoinSigningRequest{
 		Address:      sender,

x/btcbridge/keeper/msg_server.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"encoding/base64"
+	"strconv"
 
 	"github.com/btcsuite/btcd/btcutil/psbt"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -137,7 +138,11 @@ func (m msgServer) WithdrawBitcoin(goCtx context.Context, msg *types.MsgWithdraw
 		return nil, err
 	}
 
-	_, err = m.Keeper.NewSigningRequest(ctx, msg.Sender, coin, msg.FeeRate, "")
+	feeRate, err := strconv.ParseInt(msg.FeeRate, 10, 64)
+	if err != nil {
+		return nil, err
+	}
+	_, err = m.Keeper.NewSigningRequest(ctx, msg.Sender, coin, feeRate, "")
 	if err != nil {
 		return nil, err
 	}
@@ -170,6 +175,11 @@ func (m msgServer) SubmitWithdrawSignatures(goCtx context.Context, msg *types.Ms
 	if err != nil {
 		return nil, err
 	}
+
+	if packet.UnsignedTx.TxHash().String() != msg.Txid {
+		return nil, types.ErrInvalidSignatures
+	}
+
 	if err = packet.SanityCheck(); err != nil {
 		return nil, err
 	}

x/btcbridge/types/message_withdraw_bitcoin.go

@@ -1,6 +1,8 @@
 package types
 
 import (
+	"strconv"
+
 	sdkerrors "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
@@ -10,7 +12,7 @@ const TypeMsgWithdrawBitcoin = "withdraw_bitcoin"
 func NewMsgWithdrawBitcoinRequest(
 	sender string,
 	amount string,
-	feeRate int64,
+	feeRate string,
 ) *MsgWithdrawBitcoinRequest {
 	return &MsgWithdrawBitcoinRequest{
 		Sender:  sender,
@@ -56,7 +58,12 @@ func (msg *MsgWithdrawBitcoinRequest) ValidateBasic() error {
 		return err
 	}
 
-	if msg.FeeRate <= 0 {
+	feeRate, err := strconv.ParseInt(msg.FeeRate, 10, 64)
+	if err != nil {
+		return err
+	}
+
+	if feeRate <= 0 {
 		return sdkerrors.Wrap(ErrInvalidFeeRate, "fee rate must be greater than zero")
 	}