Merge branch 'main' into amino-type

Author: mbreithecker

proto/hyperlane/core/interchain_security/v1/tx.proto

@@ -70,7 +70,7 @@ message MsgCreateMessageIdMultisigIsmResponse {
   ];
 }
 
-// MsgCreateMultisigIsm ...
+// MsgCreateMerkleRootMultisigIsm ...
 message MsgCreateMerkleRootMultisigIsm {
   option (cosmos.msg.v1.signer) = "creator";
   option (amino.name) = "hyperlane/v1/MsgCreateMerkleRootMultisigIsm";
@@ -86,7 +86,7 @@ message MsgCreateMerkleRootMultisigIsm {
   uint32 threshold = 3;
 }
 
-// MsgCreateMultisigIsmResponse ...
+// MsgCreateMerkleRootMultisigIsmResponse ...
 message MsgCreateMerkleRootMultisigIsmResponse {
   string id = 1 [
     (gogoproto.customtype) =
@@ -165,8 +165,7 @@ message MsgCreateRoutingIsmResponse {
 // MsgSetRoutingIsmDomain ...
 message MsgSetRoutingIsmDomain {
   option (cosmos.msg.v1.signer) = "owner";
-  option (amino.name) =
-      "hyperlane/v1/MsgCreateRoMsgSetRoutingIsmDomainutingIsm";
+  option (amino.name) = "hyperlane/v1/MsgSetRoutingIsmDomain";
 
   // ism_id ...
   string ism_id = 1 [

proto/hyperlane/core/post_dispatch/v1/tx.proto

@@ -41,7 +41,7 @@ service Msg {
 // MsgCreateIgp ...
 message MsgCreateIgp {
   option (cosmos.msg.v1.signer) = "owner";
-  option (amino.name) = "hyperlane/v1/MsgCreateInterchainGasPaymaster";
+  option (amino.name) = "hyperlane/v1/MsgCreateIgp";
 
   // owner is the message sender.
   string owner = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ];
@@ -81,7 +81,7 @@ message MsgSetIgpOwner {
   bool renounce_ownership = 4;
 }
 
-// MsgCreateIgpResponse ...
+// MsgSetIgpOwnerResponse ...
 message MsgSetIgpOwnerResponse {}
 
 // MsgSetDestinationGasConfig ...
@@ -164,7 +164,7 @@ message MsgClaim {
 // MsgClaimResponse ...
 message MsgClaimResponse {}
 
-// MsgMerkleTreeHook ...
+// MsgCreateMerkleTreeHook ...
 message MsgCreateMerkleTreeHook {
   option (cosmos.msg.v1.signer) = "owner";
   option (amino.name) = "hyperlane/v1/MsgCreateMerkleTreeHook";
@@ -188,16 +188,16 @@ message MsgCreateMerkleTreeHookResponse {
   ];
 }
 
-// MsgMerkleTreeHook ...
+// MsgCreateNoopHook ...
 message MsgCreateNoopHook {
   option (cosmos.msg.v1.signer) = "owner";
-  option (amino.name) = "hyperlane/v1/MsgCreateMerkleTreeHook";
+  option (amino.name) = "hyperlane/v1/MsgCreateNoopHook";
 
   // sender ...
   string owner = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ];
 }
 
-// MsgCreateMerkleTreeHookResponse ...
+// MsgCreateNoopHookResponse ...
 message MsgCreateNoopHookResponse {
   string id = 1 [
     (gogoproto.customtype) =

x/core/01_interchain_security/module.go

@@ -35,7 +35,7 @@ func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) {
 	cdc.RegisterConcrete(&types.MsgCreateMerkleRootMultisigIsm{}, "hyperlane/v1/MsgCreateMerkleRootMultisigIsm", nil)
 	cdc.RegisterConcrete(&types.MsgCreateNoopIsm{}, "hyperlane/v1/MsgCreateNoopIsm", nil)
 	cdc.RegisterConcrete(&types.MsgCreateRoutingIsm{}, "hyperlane/v1/MsgCreateRoutingIsm", nil)
-	cdc.RegisterConcrete(&types.MsgSetRoutingIsmDomain{}, "hyperlane/v1/MsgCreateRoMsgSetRoutingIsmDomainutingIsm", nil)
+	cdc.RegisterConcrete(&types.MsgSetRoutingIsmDomain{}, "hyperlane/v1/MsgSetRoutingIsmDomain", nil)
 	cdc.RegisterConcrete(&types.MsgRemoveRoutingIsmDomain{}, "hyperlane/v1/MsgRemoveRoutingIsmDomain", nil)
 	cdc.RegisterConcrete(&types.MsgUpdateRoutingIsmOwner{}, "hyperlane/v1/MsgUpdateRoutingIsmOwner", nil)
 }

x/core/01_interchain_security/types/tx.pb.go

@@ -52,7 +52,7 @@ func (i InterchainGasPaymasterHookHandler) PayForGas(ctx context.Context, hookId
 		return sdk.NewCoins(), err
 	}
 
-	if requiredPayment.IsAllGT(maxFee) {
+	if !maxFee.IsAllGTE(requiredPayment) {
 		return sdk.NewCoins(), fmt.Errorf("required payment exceeds max hyperlane fee: %v", requiredPayment)
 	}
 
@@ -69,7 +69,8 @@ func (i InterchainGasPaymasterHookHandler) PayForGasWithoutQuote(ctx context.Con
 	}
 
 	if amount.IsZero() {
-		return fmt.Errorf("amount must be greater than zero")
+		// Nothing to charge
+		return nil
 	}
 
 	senderAcc, err := sdk.AccAddressFromBech32(sender)