optimize bridge pegout via ibc

Author: keithsue

app/app.go

@@ -586,7 +586,6 @@ func New(
 		scopedTransferKeeper,
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 	)
-	transferModule := transfer.NewAppModule(app.TransferKeeper)
 
 	app.ICAHostKeeper = icahostkeeper.NewKeeper(
 		appCodec, keys[icahosttypes.StoreKey],
@@ -835,7 +834,7 @@ func New(
 		consensus.NewAppModule(appCodec, app.ConsensusParamsKeeper),
 		ibc.NewAppModule(app.IBCKeeper),
 		params.NewAppModule(app.ParamsKeeper),
-		transferModule,
+		transfer.NewAppModule(app.TransferKeeper),
 		ibcFeeModule,
 		icaModule,
 		ibctm.AppModule{},

x/btcbridge/keeper/ibc.go

@@ -105,8 +105,8 @@ func (k Keeper) IterateIBCWithdrawRequestQueue(ctx sdk.Context, cb func(req *typ
 	}
 }
 
-// CheckSBTCAutoPegOut returns true if the given packet is to receive native sBTC and auto-pegout enabled, false otherwise
-func (k Keeper) CheckSBTCAutoPegOut(ctx sdk.Context, packet ibcexported.PacketI, data transfertypes.FungibleTokenPacketData) bool {
+// CheckSBTC returns true if the given packet is to receive native sBTC, false otherwise
+func (k Keeper) CheckSBTC(ctx sdk.Context, packet ibcexported.PacketI, data transfertypes.FungibleTokenPacketData) bool {
 	// check if the receiving chain is source
 	if !transfertypes.ReceiverChainIsSource(packet.GetSourcePort(), packet.GetSourceChannel(), data.Denom) {
 		return false
@@ -118,7 +118,7 @@ func (k Keeper) CheckSBTCAutoPegOut(ctx sdk.Context, packet ibcexported.PacketI,
 	// remove sender prefix
 	unprefixedDenom := data.Denom[len(prefix):]
 
-	return unprefixedDenom == k.BtcDenom(ctx) && data.Memo == types.FlagAutoPegOut
+	return unprefixedDenom == k.BtcDenom(ctx)
 }
 
 // GetClientHeight gets the current client height by the given source port and channel
@@ -188,14 +188,19 @@ func (k Keeper) IBCReceivePacketCallback(
 	ack ibcexported.Acknowledgement,
 	contractAddress string,
 ) error {
+	// check if the callback address is the expected address
+	if contractAddress != types.CallbackAddress {
+		return nil
+	}
+
 	// check if withdrawal is enabled
 	if !k.WithdrawEnabled(ctx) {
 		return nil
 	}
 
 	// check if the packet is sBTC token transfer and auto-pegout enabled
 	data, ok := tryGetFungibleTokenPacketData(packet)
-	if !ok || !k.CheckSBTCAutoPegOut(ctx, packet, data) {
+	if !ok || !k.CheckSBTC(ctx, packet, data) {
 		return nil
 	}
 

x/btcbridge/types/ibc.go

@@ -12,8 +12,8 @@ const (
 	// default memo for IBC transfer
 	DefaultMemo = "BTC bridge | Side Chain"
 
-	// flag to enable auto pegout
-	FlagAutoPegOut = "auto-pegout"
+	// callback address to enable auto pegout
+	CallbackAddress = "btcbridge"
 
 	// default max gas for IBC callback
 	DefaultMaxIBCCallbackGas = uint64(1_000_000)