diff --git a/api/irismod/token/v1/event.pulsar.go b/api/irismod/token/v1/event.pulsar.go
index a2341aa8..0ac1fbbb 100644
--- a/api/irismod/token/v1/event.pulsar.go
+++ b/api/irismod/token/v1/event.pulsar.go
@@ -676,11 +676,11 @@ func (x *fastReflection_EventDeployERC20) ProtoMethods() *protoiface.Methods {
 }
 
 var (
-	md_EventSwapToERC20          protoreflect.MessageDescriptor
-	fd_EventSwapToERC20_amount   protoreflect.FieldDescriptor
-	fd_EventSwapToERC20_sender   protoreflect.FieldDescriptor
-	fd_EventSwapToERC20_receiver protoreflect.FieldDescriptor
-	fd_EventSwapToERC20_contract protoreflect.FieldDescriptor
+	md_EventSwapToERC20             protoreflect.MessageDescriptor
+	fd_EventSwapToERC20_amount      protoreflect.FieldDescriptor
+	fd_EventSwapToERC20_sender      protoreflect.FieldDescriptor
+	fd_EventSwapToERC20_receiver    protoreflect.FieldDescriptor
+	fd_EventSwapToERC20_to_contract protoreflect.FieldDescriptor
 )
 
 func init() {
@@ -689,7 +689,7 @@ func init() {
 	fd_EventSwapToERC20_amount = md_EventSwapToERC20.Fields().ByName("amount")
 	fd_EventSwapToERC20_sender = md_EventSwapToERC20.Fields().ByName("sender")
 	fd_EventSwapToERC20_receiver = md_EventSwapToERC20.Fields().ByName("receiver")
-	fd_EventSwapToERC20_contract = md_EventSwapToERC20.Fields().ByName("contract")
+	fd_EventSwapToERC20_to_contract = md_EventSwapToERC20.Fields().ByName("to_contract")
 }
 
 var _ protoreflect.Message = (*fastReflection_EventSwapToERC20)(nil)
@@ -775,9 +775,9 @@ func (x *fastReflection_EventSwapToERC20) Range(f func(protoreflect.FieldDescrip
 			return
 		}
 	}
-	if x.Contract != "" {
-		value := protoreflect.ValueOfString(x.Contract)
-		if !f(fd_EventSwapToERC20_contract, value) {
+	if x.ToContract != "" {
+		value := protoreflect.ValueOfString(x.ToContract)
+		if !f(fd_EventSwapToERC20_to_contract, value) {
 			return
 		}
 	}
@@ -802,8 +802,8 @@ func (x *fastReflection_EventSwapToERC20) Has(fd protoreflect.FieldDescriptor) b
 		return x.Sender != ""
 	case "irismod.token.v1.EventSwapToERC20.receiver":
 		return x.Receiver != ""
-	case "irismod.token.v1.EventSwapToERC20.contract":
-		return x.Contract != ""
+	case "irismod.token.v1.EventSwapToERC20.to_contract":
+		return x.ToContract != ""
 	default:
 		if fd.IsExtension() {
 			panic(fmt.Errorf("proto3 declared messages do not support extensions: irismod.token.v1.EventSwapToERC20"))
@@ -826,8 +826,8 @@ func (x *fastReflection_EventSwapToERC20) Clear(fd protoreflect.FieldDescriptor)
 		x.Sender = ""
 	case "irismod.token.v1.EventSwapToERC20.receiver":
 		x.Receiver = ""
-	case "irismod.token.v1.EventSwapToERC20.contract":
-		x.Contract = ""
+	case "irismod.token.v1.EventSwapToERC20.to_contract":
+		x.ToContract = ""
 	default:
 		if fd.IsExtension() {
 			panic(fmt.Errorf("proto3 declared messages do not support extensions: irismod.token.v1.EventSwapToERC20"))
@@ -853,8 +853,8 @@ func (x *fastReflection_EventSwapToERC20) Get(descriptor protoreflect.FieldDescr
 	case "irismod.token.v1.EventSwapToERC20.receiver":
 		value := x.Receiver
 		return protoreflect.ValueOfString(value)
-	case "irismod.token.v1.EventSwapToERC20.contract":
-		value := x.Contract
+	case "irismod.token.v1.EventSwapToERC20.to_contract":
+		value := x.ToContract
 		return protoreflect.ValueOfString(value)
 	default:
 		if descriptor.IsExtension() {
@@ -882,8 +882,8 @@ func (x *fastReflection_EventSwapToERC20) Set(fd protoreflect.FieldDescriptor, v
 		x.Sender = value.Interface().(string)
 	case "irismod.token.v1.EventSwapToERC20.receiver":
 		x.Receiver = value.Interface().(string)
-	case "irismod.token.v1.EventSwapToERC20.contract":
-		x.Contract = value.Interface().(string)
+	case "irismod.token.v1.EventSwapToERC20.to_contract":
+		x.ToContract = value.Interface().(string)
 	default:
 		if fd.IsExtension() {
 			panic(fmt.Errorf("proto3 declared messages do not support extensions: irismod.token.v1.EventSwapToERC20"))
@@ -913,8 +913,8 @@ func (x *fastReflection_EventSwapToERC20) Mutable(fd protoreflect.FieldDescripto
 		panic(fmt.Errorf("field sender of message irismod.token.v1.EventSwapToERC20 is not mutable"))
 	case "irismod.token.v1.EventSwapToERC20.receiver":
 		panic(fmt.Errorf("field receiver of message irismod.token.v1.EventSwapToERC20 is not mutable"))
-	case "irismod.token.v1.EventSwapToERC20.contract":
-		panic(fmt.Errorf("field contract of message irismod.token.v1.EventSwapToERC20 is not mutable"))
+	case "irismod.token.v1.EventSwapToERC20.to_contract":
+		panic(fmt.Errorf("field to_contract of message irismod.token.v1.EventSwapToERC20 is not mutable"))
 	default:
 		if fd.IsExtension() {
 			panic(fmt.Errorf("proto3 declared messages do not support extensions: irismod.token.v1.EventSwapToERC20"))
@@ -935,7 +935,7 @@ func (x *fastReflection_EventSwapToERC20) NewField(fd protoreflect.FieldDescript
 		return protoreflect.ValueOfString("")
 	case "irismod.token.v1.EventSwapToERC20.receiver":
 		return protoreflect.ValueOfString("")
-	case "irismod.token.v1.EventSwapToERC20.contract":
+	case "irismod.token.v1.EventSwapToERC20.to_contract":
 		return protoreflect.ValueOfString("")
 	default:
 		if fd.IsExtension() {
@@ -1018,7 +1018,7 @@ func (x *fastReflection_EventSwapToERC20) ProtoMethods() *protoiface.Methods {
 		if l > 0 {
 			n += 1 + l + runtime.Sov(uint64(l))
 		}
-		l = len(x.Contract)
+		l = len(x.ToContract)
 		if l > 0 {
 			n += 1 + l + runtime.Sov(uint64(l))
 		}
@@ -1051,10 +1051,10 @@ func (x *fastReflection_EventSwapToERC20) ProtoMethods() *protoiface.Methods {
 			i -= len(x.unknownFields)
 			copy(dAtA[i:], x.unknownFields)
 		}
-		if len(x.Contract) > 0 {
-			i -= len(x.Contract)
-			copy(dAtA[i:], x.Contract)
-			i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Contract)))
+		if len(x.ToContract) > 0 {
+			i -= len(x.ToContract)
+			copy(dAtA[i:], x.ToContract)
+			i = runtime.EncodeVarint(dAtA, i, uint64(len(x.ToContract)))
 			i--
 			dAtA[i] = 0x22
 		}
@@ -1237,7 +1237,7 @@ func (x *fastReflection_EventSwapToERC20) ProtoMethods() *protoiface.Methods {
 				iNdEx = postIndex
 			case 4:
 				if wireType != 2 {
-					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Contract", wireType)
+					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field ToContract", wireType)
 				}
 				var stringLen uint64
 				for shift := uint(0); ; shift += 7 {
@@ -1265,7 +1265,7 @@ func (x *fastReflection_EventSwapToERC20) ProtoMethods() *protoiface.Methods {
 				if postIndex > l {
 					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF
 				}
-				x.Contract = string(dAtA[iNdEx:postIndex])
+				x.ToContract = string(dAtA[iNdEx:postIndex])
 				iNdEx = postIndex
 			default:
 				iNdEx = preIndex
@@ -1307,7 +1307,7 @@ var (
 	fd_EventSwapFromERC20_wanted_amount protoreflect.FieldDescriptor
 	fd_EventSwapFromERC20_sender        protoreflect.FieldDescriptor
 	fd_EventSwapFromERC20_receiver      protoreflect.FieldDescriptor
-	fd_EventSwapFromERC20_contract      protoreflect.FieldDescriptor
+	fd_EventSwapFromERC20_from_contract protoreflect.FieldDescriptor
 )
 
 func init() {
@@ -1316,7 +1316,7 @@ func init() {
 	fd_EventSwapFromERC20_wanted_amount = md_EventSwapFromERC20.Fields().ByName("wanted_amount")
 	fd_EventSwapFromERC20_sender = md_EventSwapFromERC20.Fields().ByName("sender")
 	fd_EventSwapFromERC20_receiver = md_EventSwapFromERC20.Fields().ByName("receiver")
-	fd_EventSwapFromERC20_contract = md_EventSwapFromERC20.Fields().ByName("contract")
+	fd_EventSwapFromERC20_from_contract = md_EventSwapFromERC20.Fields().ByName("from_contract")
 }
 
 var _ protoreflect.Message = (*fastReflection_EventSwapFromERC20)(nil)
@@ -1402,9 +1402,9 @@ func (x *fastReflection_EventSwapFromERC20) Range(f func(protoreflect.FieldDescr
 			return
 		}
 	}
-	if x.Contract != "" {
-		value := protoreflect.ValueOfString(x.Contract)
-		if !f(fd_EventSwapFromERC20_contract, value) {
+	if x.FromContract != "" {
+		value := protoreflect.ValueOfString(x.FromContract)
+		if !f(fd_EventSwapFromERC20_from_contract, value) {
 			return
 		}
 	}
@@ -1429,8 +1429,8 @@ func (x *fastReflection_EventSwapFromERC20) Has(fd protoreflect.FieldDescriptor)
 		return x.Sender != ""
 	case "irismod.token.v1.EventSwapFromERC20.receiver":
 		return x.Receiver != ""
-	case "irismod.token.v1.EventSwapFromERC20.contract":
-		return x.Contract != ""
+	case "irismod.token.v1.EventSwapFromERC20.from_contract":
+		return x.FromContract != ""
 	default:
 		if fd.IsExtension() {
 			panic(fmt.Errorf("proto3 declared messages do not support extensions: irismod.token.v1.EventSwapFromERC20"))
@@ -1453,8 +1453,8 @@ func (x *fastReflection_EventSwapFromERC20) Clear(fd protoreflect.FieldDescripto
 		x.Sender = ""
 	case "irismod.token.v1.EventSwapFromERC20.receiver":
 		x.Receiver = ""
-	case "irismod.token.v1.EventSwapFromERC20.contract":
-		x.Contract = ""
+	case "irismod.token.v1.EventSwapFromERC20.from_contract":
+		x.FromContract = ""
 	default:
 		if fd.IsExtension() {
 			panic(fmt.Errorf("proto3 declared messages do not support extensions: irismod.token.v1.EventSwapFromERC20"))
@@ -1480,8 +1480,8 @@ func (x *fastReflection_EventSwapFromERC20) Get(descriptor protoreflect.FieldDes
 	case "irismod.token.v1.EventSwapFromERC20.receiver":
 		value := x.Receiver
 		return protoreflect.ValueOfString(value)
-	case "irismod.token.v1.EventSwapFromERC20.contract":
-		value := x.Contract
+	case "irismod.token.v1.EventSwapFromERC20.from_contract":
+		value := x.FromContract
 		return protoreflect.ValueOfString(value)
 	default:
 		if descriptor.IsExtension() {
@@ -1509,8 +1509,8 @@ func (x *fastReflection_EventSwapFromERC20) Set(fd protoreflect.FieldDescriptor,
 		x.Sender = value.Interface().(string)
 	case "irismod.token.v1.EventSwapFromERC20.receiver":
 		x.Receiver = value.Interface().(string)
-	case "irismod.token.v1.EventSwapFromERC20.contract":
-		x.Contract = value.Interface().(string)
+	case "irismod.token.v1.EventSwapFromERC20.from_contract":
+		x.FromContract = value.Interface().(string)
 	default:
 		if fd.IsExtension() {
 			panic(fmt.Errorf("proto3 declared messages do not support extensions: irismod.token.v1.EventSwapFromERC20"))
@@ -1540,8 +1540,8 @@ func (x *fastReflection_EventSwapFromERC20) Mutable(fd protoreflect.FieldDescrip
 		panic(fmt.Errorf("field sender of message irismod.token.v1.EventSwapFromERC20 is not mutable"))
 	case "irismod.token.v1.EventSwapFromERC20.receiver":
 		panic(fmt.Errorf("field receiver of message irismod.token.v1.EventSwapFromERC20 is not mutable"))
-	case "irismod.token.v1.EventSwapFromERC20.contract":
-		panic(fmt.Errorf("field contract of message irismod.token.v1.EventSwapFromERC20 is not mutable"))
+	case "irismod.token.v1.EventSwapFromERC20.from_contract":
+		panic(fmt.Errorf("field from_contract of message irismod.token.v1.EventSwapFromERC20 is not mutable"))
 	default:
 		if fd.IsExtension() {
 			panic(fmt.Errorf("proto3 declared messages do not support extensions: irismod.token.v1.EventSwapFromERC20"))
@@ -1562,7 +1562,7 @@ func (x *fastReflection_EventSwapFromERC20) NewField(fd protoreflect.FieldDescri
 		return protoreflect.ValueOfString("")
 	case "irismod.token.v1.EventSwapFromERC20.receiver":
 		return protoreflect.ValueOfString("")
-	case "irismod.token.v1.EventSwapFromERC20.contract":
+	case "irismod.token.v1.EventSwapFromERC20.from_contract":
 		return protoreflect.ValueOfString("")
 	default:
 		if fd.IsExtension() {
@@ -1645,7 +1645,7 @@ func (x *fastReflection_EventSwapFromERC20) ProtoMethods() *protoiface.Methods {
 		if l > 0 {
 			n += 1 + l + runtime.Sov(uint64(l))
 		}
-		l = len(x.Contract)
+		l = len(x.FromContract)
 		if l > 0 {
 			n += 1 + l + runtime.Sov(uint64(l))
 		}
@@ -1678,10 +1678,10 @@ func (x *fastReflection_EventSwapFromERC20) ProtoMethods() *protoiface.Methods {
 			i -= len(x.unknownFields)
 			copy(dAtA[i:], x.unknownFields)
 		}
-		if len(x.Contract) > 0 {
-			i -= len(x.Contract)
-			copy(dAtA[i:], x.Contract)
-			i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Contract)))
+		if len(x.FromContract) > 0 {
+			i -= len(x.FromContract)
+			copy(dAtA[i:], x.FromContract)
+			i = runtime.EncodeVarint(dAtA, i, uint64(len(x.FromContract)))
 			i--
 			dAtA[i] = 0x22
 		}
@@ -1864,7 +1864,7 @@ func (x *fastReflection_EventSwapFromERC20) ProtoMethods() *protoiface.Methods {
 				iNdEx = postIndex
 			case 4:
 				if wireType != 2 {
-					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Contract", wireType)
+					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field FromContract", wireType)
 				}
 				var stringLen uint64
 				for shift := uint(0); ; shift += 7 {
@@ -1892,7 +1892,7 @@ func (x *fastReflection_EventSwapFromERC20) ProtoMethods() *protoiface.Methods {
 				if postIndex > l {
 					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF
 				}
-				x.Contract = string(dAtA[iNdEx:postIndex])
+				x.FromContract = string(dAtA[iNdEx:postIndex])
 				iNdEx = postIndex
 			default:
 				iNdEx = preIndex
@@ -2010,16 +2010,17 @@ func (x *EventDeployERC20) GetContract() string {
 	return ""
 }
 
-// EventSwapToERC20 is an event emitted when swapping token from native token to ERC20.
+// EventSwapToERC20 is an event emitted when swapping token from native token to
+// ERC20.
 type EventSwapToERC20 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Amount   *v1beta1.Coin `protobuf:"bytes,1,opt,name=amount,proto3" json:"amount,omitempty"`
-	Sender   string        `protobuf:"bytes,2,opt,name=sender,proto3" json:"sender,omitempty"`
-	Receiver string        `protobuf:"bytes,3,opt,name=receiver,proto3" json:"receiver,omitempty"`
-	Contract string        `protobuf:"bytes,4,opt,name=contract,proto3" json:"contract,omitempty"`
+	Amount     *v1beta1.Coin `protobuf:"bytes,1,opt,name=amount,proto3" json:"amount,omitempty"`
+	Sender     string        `protobuf:"bytes,2,opt,name=sender,proto3" json:"sender,omitempty"`
+	Receiver   string        `protobuf:"bytes,3,opt,name=receiver,proto3" json:"receiver,omitempty"`
+	ToContract string        `protobuf:"bytes,4,opt,name=to_contract,json=toContract,proto3" json:"to_contract,omitempty"`
 }
 
 func (x *EventSwapToERC20) Reset() {
@@ -2063,14 +2064,15 @@ func (x *EventSwapToERC20) GetReceiver() string {
 	return ""
 }
 
-func (x *EventSwapToERC20) GetContract() string {
+func (x *EventSwapToERC20) GetToContract() string {
 	if x != nil {
-		return x.Contract
+		return x.ToContract
 	}
 	return ""
 }
 
-// EventSwapFromERC20 is an event emitted when swapping token from ERC20 to native token.
+// EventSwapFromERC20 is an event emitted when swapping token from ERC20 to
+// native token.
 type EventSwapFromERC20 struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -2079,7 +2081,7 @@ type EventSwapFromERC20 struct {
 	WantedAmount *v1beta1.Coin `protobuf:"bytes,1,opt,name=wanted_amount,json=wantedAmount,proto3" json:"wanted_amount,omitempty"`
 	Sender       string        `protobuf:"bytes,2,opt,name=sender,proto3" json:"sender,omitempty"`
 	Receiver     string        `protobuf:"bytes,3,opt,name=receiver,proto3" json:"receiver,omitempty"`
-	Contract     string        `protobuf:"bytes,4,opt,name=contract,proto3" json:"contract,omitempty"`
+	FromContract string        `protobuf:"bytes,4,opt,name=from_contract,json=fromContract,proto3" json:"from_contract,omitempty"`
 }
 
 func (x *EventSwapFromERC20) Reset() {
@@ -2123,9 +2125,9 @@ func (x *EventSwapFromERC20) GetReceiver() string {
 	return ""
 }
 
-func (x *EventSwapFromERC20) GetContract() string {
+func (x *EventSwapFromERC20) GetFromContract() string {
 	if x != nil {
-		return x.Contract
+		return x.FromContract
 	}
 	return ""
 }
@@ -2150,7 +2152,7 @@ var file_irismod_token_v1_event_proto_rawDesc = []byte{
 	0x75, 0x6e, 0x69, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x69, 0x6e, 0x55,
 	0x6e, 0x69, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x18,
 	0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x22,
-	0xb5, 0x01, 0x0a, 0x10, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x53, 0x77, 0x61, 0x70, 0x54, 0x6f, 0x45,
+	0xba, 0x01, 0x0a, 0x10, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x53, 0x77, 0x61, 0x70, 0x54, 0x6f, 0x45,
 	0x52, 0x43, 0x32, 0x30, 0x12, 0x37, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01,
 	0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61,
 	0x73, 0x65, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x42,
@@ -2159,35 +2161,36 @@ var file_irismod_token_v1_event_proto_rawDesc = []byte{
 	0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73,
 	0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12,
 	0x1a, 0x0a, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x63,
-	0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63,
-	0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x22, 0xd8, 0x01, 0x0a, 0x12, 0x45, 0x76, 0x65, 0x6e,
-	0x74, 0x53, 0x77, 0x61, 0x70, 0x46, 0x72, 0x6f, 0x6d, 0x45, 0x52, 0x43, 0x32, 0x30, 0x12, 0x3e,
-	0x0a, 0x0d, 0x77, 0x61, 0x6e, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62,
-	0x61, 0x73, 0x65, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x69, 0x6e,
-	0x52, 0x0c, 0x77, 0x61, 0x6e, 0x74, 0x65, 0x64, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x30,
-	0x0a, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18,
-	0xd2, 0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65,
-	0x73, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72,
-	0x12, 0x34, 0x0a, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41,
-	0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x08, 0x72, 0x65,
-	0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61,
-	0x63, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61,
-	0x63, 0x74, 0x42, 0xc1, 0x01, 0xc8, 0xe1, 0x1e, 0x00, 0x0a, 0x14, 0x63, 0x6f, 0x6d, 0x2e, 0x69,
-	0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x2e, 0x76, 0x31, 0x42,
-	0x0a, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x37, 0x67,
-	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x69, 0x72, 0x69, 0x73, 0x6e, 0x65,
-	0x74, 0x2f, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x69, 0x72,
-	0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x2f, 0x76, 0x31, 0x3b, 0x74,
-	0x6f, 0x6b, 0x65, 0x6e, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x49, 0x54, 0x58, 0xaa, 0x02, 0x10, 0x49,
-	0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x2e, 0x56, 0x31, 0xca,
-	0x02, 0x10, 0x49, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x5c, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x5c,
-	0x56, 0x31, 0xe2, 0x02, 0x1c, 0x49, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x5c, 0x54, 0x6f, 0x6b,
-	0x65, 0x6e, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74,
-	0x61, 0xea, 0x02, 0x12, 0x49, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x3a, 0x3a, 0x54, 0x6f, 0x6b,
-	0x65, 0x6e, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x09, 0x52, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x12, 0x1f, 0x0a, 0x0b, 0x74,
+	0x6f, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x0a, 0x74, 0x6f, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x22, 0xe1, 0x01, 0x0a,
+	0x12, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x53, 0x77, 0x61, 0x70, 0x46, 0x72, 0x6f, 0x6d, 0x45, 0x52,
+	0x43, 0x32, 0x30, 0x12, 0x3e, 0x0a, 0x0d, 0x77, 0x61, 0x6e, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x6d,
+	0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x73,
+	0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31,
+	0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x52, 0x0c, 0x77, 0x61, 0x6e, 0x74, 0x65, 0x64, 0x41, 0x6d, 0x6f,
+	0x75, 0x6e, 0x74, 0x12, 0x30, 0x0a, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e,
+	0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x06, 0x73,
+	0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x34, 0x0a, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65,
+	0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73,
+	0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e,
+	0x67, 0x52, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x12, 0x23, 0x0a, 0x0d, 0x66,
+	0x72, 0x6f, 0x6d, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0c, 0x66, 0x72, 0x6f, 0x6d, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74,
+	0x42, 0xc1, 0x01, 0xc8, 0xe1, 0x1e, 0x00, 0x0a, 0x14, 0x63, 0x6f, 0x6d, 0x2e, 0x69, 0x72, 0x69,
+	0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x2e, 0x76, 0x31, 0x42, 0x0a, 0x45,
+	0x76, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x37, 0x67, 0x69, 0x74,
+	0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x69, 0x72, 0x69, 0x73, 0x6e, 0x65, 0x74, 0x2f,
+	0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x69, 0x72, 0x69, 0x73,
+	0x6d, 0x6f, 0x64, 0x2f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x2f, 0x76, 0x31, 0x3b, 0x74, 0x6f, 0x6b,
+	0x65, 0x6e, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x49, 0x54, 0x58, 0xaa, 0x02, 0x10, 0x49, 0x72, 0x69,
+	0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x10,
+	0x49, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x5c, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x5c, 0x56, 0x31,
+	0xe2, 0x02, 0x1c, 0x49, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x5c, 0x54, 0x6f, 0x6b, 0x65, 0x6e,
+	0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea,
+	0x02, 0x12, 0x49, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x3a, 0x3a, 0x54, 0x6f, 0x6b, 0x65, 0x6e,
+	0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/api/irismod/token/v1/tx.pulsar.go b/api/irismod/token/v1/tx.pulsar.go
index 83ccf020..4b42f7ba 100644
--- a/api/irismod/token/v1/tx.pulsar.go
+++ b/api/irismod/token/v1/tx.pulsar.go
@@ -9020,14 +9020,14 @@ func (x *fastReflection_MsgSwapFromERC20) ProtoMethods() *protoiface.Methods {
 			copy(dAtA[i:], x.Receiver)
 			i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Receiver)))
 			i--
-			dAtA[i] = 0x22
+			dAtA[i] = 0x1a
 		}
 		if len(x.Sender) > 0 {
 			i -= len(x.Sender)
 			copy(dAtA[i:], x.Sender)
 			i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Sender)))
 			i--
-			dAtA[i] = 0x1a
+			dAtA[i] = 0x12
 		}
 		if x.WantedAmount != nil {
 			encoded, err := options.Marshal(x.WantedAmount)
@@ -9128,7 +9128,7 @@ func (x *fastReflection_MsgSwapFromERC20) ProtoMethods() *protoiface.Methods {
 					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err
 				}
 				iNdEx = postIndex
-			case 3:
+			case 2:
 				if wireType != 2 {
 					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Sender", wireType)
 				}
@@ -9160,7 +9160,7 @@ func (x *fastReflection_MsgSwapFromERC20) ProtoMethods() *protoiface.Methods {
 				}
 				x.Sender = string(dAtA[iNdEx:postIndex])
 				iNdEx = postIndex
-			case 4:
+			case 3:
 				if wireType != 2 {
 					return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Receiver", wireType)
 				}
@@ -10390,8 +10390,8 @@ type MsgSwapFromERC20 struct {
 	unknownFields protoimpl.UnknownFields
 
 	WantedAmount *v1beta1.Coin `protobuf:"bytes,1,opt,name=wanted_amount,json=wantedAmount,proto3" json:"wanted_amount,omitempty"`
-	Sender       string        `protobuf:"bytes,3,opt,name=sender,proto3" json:"sender,omitempty"`
-	Receiver     string        `protobuf:"bytes,4,opt,name=receiver,proto3" json:"receiver,omitempty"`
+	Sender       string        `protobuf:"bytes,2,opt,name=sender,proto3" json:"sender,omitempty"`
+	Receiver     string        `protobuf:"bytes,3,opt,name=receiver,proto3" json:"receiver,omitempty"`
 }
 
 func (x *MsgSwapFromERC20) Reset() {
@@ -10600,10 +10600,10 @@ var file_irismod_token_v1_tx_proto_rawDesc = []byte{
 	0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x76, 0x31, 0x62,
 	0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52,
 	0x0c, 0x77, 0x61, 0x6e, 0x74, 0x65, 0x64, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x30, 0x0a,
-	0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2,
+	0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2,
 	0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73,
 	0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12,
-	0x34, 0x0a, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x34, 0x0a, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28,
 	0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64,
 	0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x08, 0x72, 0x65, 0x63,
 	0x65, 0x69, 0x76, 0x65, 0x72, 0x3a, 0x0b, 0x82, 0xe7, 0xb0, 0x2a, 0x06, 0x73, 0x65, 0x6e, 0x64,
diff --git a/api/irismod/token/v1/tx_grpc.pb.go b/api/irismod/token/v1/tx_grpc.pb.go
index 02e3089f..3d9655fc 100644
--- a/api/irismod/token/v1/tx_grpc.pb.go
+++ b/api/irismod/token/v1/tx_grpc.pb.go
@@ -45,19 +45,18 @@ type MsgClient interface {
 	BurnToken(ctx context.Context, in *MsgBurnToken, opts ...grpc.CallOption) (*MsgBurnTokenResponse, error)
 	// TransferTokenOwner defines a method for transfering token owner
 	TransferTokenOwner(ctx context.Context, in *MsgTransferTokenOwner, opts ...grpc.CallOption) (*MsgTransferTokenOwnerResponse, error)
-	// SwapFeeToken defines a method for swapping some fee token
+	// SwapFeeToken defines a method for swapping between IRIS and ERIS
 	SwapFeeToken(ctx context.Context, in *MsgSwapFeeToken, opts ...grpc.CallOption) (*MsgSwapFeeTokenResponse, error)
-	// SwapToERC20 defines a method for swapping some erc20 token
+	// SwapToERC20 defines a method for swapping some native token to its ERC20 counterpart
 	SwapToERC20(ctx context.Context, in *MsgSwapToERC20, opts ...grpc.CallOption) (*MsgSwapToERC20Response, error)
-	// SwapFromERC20 defines a method for swapping some native token
+	// SwapFromERC20 defines a method for swapping some ERC20 token to its native counterpart
 	SwapFromERC20(ctx context.Context, in *MsgSwapFromERC20, opts ...grpc.CallOption) (*MsgSwapFromERC20Response, error)
 	// UpdateParams defines a governance operation for updating the token
 	// module parameters. The authority is defined in the keeper.
 	//
 	// Since: cosmos-sdk 0.47
 	UpdateParams(ctx context.Context, in *MsgUpdateParams, opts ...grpc.CallOption) (*MsgUpdateParamsResponse, error)
-	// DeployERC20 defines a governance operation for deploying erc20 token for
-	// the native token
+	// DeployERC20 defines a governance operation for deploying an ERC20 contract that binds to a native token
 	DeployERC20(ctx context.Context, in *MsgDeployERC20, opts ...grpc.CallOption) (*MsgDeployERC20Response, error)
 }
 
@@ -173,19 +172,18 @@ type MsgServer interface {
 	BurnToken(context.Context, *MsgBurnToken) (*MsgBurnTokenResponse, error)
 	// TransferTokenOwner defines a method for transfering token owner
 	TransferTokenOwner(context.Context, *MsgTransferTokenOwner) (*MsgTransferTokenOwnerResponse, error)
-	// SwapFeeToken defines a method for swapping some fee token
+	// SwapFeeToken defines a method for swapping between IRIS and ERIS
 	SwapFeeToken(context.Context, *MsgSwapFeeToken) (*MsgSwapFeeTokenResponse, error)
-	// SwapToERC20 defines a method for swapping some erc20 token
+	// SwapToERC20 defines a method for swapping some native token to its ERC20 counterpart
 	SwapToERC20(context.Context, *MsgSwapToERC20) (*MsgSwapToERC20Response, error)
-	// SwapFromERC20 defines a method for swapping some native token
+	// SwapFromERC20 defines a method for swapping some ERC20 token to its native counterpart
 	SwapFromERC20(context.Context, *MsgSwapFromERC20) (*MsgSwapFromERC20Response, error)
 	// UpdateParams defines a governance operation for updating the token
 	// module parameters. The authority is defined in the keeper.
 	//
 	// Since: cosmos-sdk 0.47
 	UpdateParams(context.Context, *MsgUpdateParams) (*MsgUpdateParamsResponse, error)
-	// DeployERC20 defines a governance operation for deploying erc20 token for
-	// the native token
+	// DeployERC20 defines a governance operation for deploying an ERC20 contract that binds to a native token
 	DeployERC20(context.Context, *MsgDeployERC20) (*MsgDeployERC20Response, error)
 	mustEmbedUnimplementedMsgServer()
 }
diff --git a/modules/token/types/v1/event.pb.go b/modules/token/types/v1/event.pb.go
index d48547c1..aaac3530 100644
--- a/modules/token/types/v1/event.pb.go
+++ b/modules/token/types/v1/event.pb.go
@@ -67,12 +67,13 @@ func (m *EventDeployERC20) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_EventDeployERC20 proto.InternalMessageInfo
 
-// EventSwapToERC20 is an event emitted when swapping token from native token to ERC20.
+// EventSwapToERC20 is an event emitted when swapping token from native token to
+// ERC20.
 type EventSwapToERC20 struct {
-	Amount   types.Coin `protobuf:"bytes,1,opt,name=amount,proto3" json:"amount"`
-	Sender   string     `protobuf:"bytes,2,opt,name=sender,proto3" json:"sender,omitempty"`
-	Receiver string     `protobuf:"bytes,3,opt,name=receiver,proto3" json:"receiver,omitempty"`
-	Contract string     `protobuf:"bytes,4,opt,name=contract,proto3" json:"contract,omitempty"`
+	Amount     types.Coin `protobuf:"bytes,1,opt,name=amount,proto3" json:"amount"`
+	Sender     string     `protobuf:"bytes,2,opt,name=sender,proto3" json:"sender,omitempty"`
+	Receiver   string     `protobuf:"bytes,3,opt,name=receiver,proto3" json:"receiver,omitempty"`
+	ToContract string     `protobuf:"bytes,4,opt,name=to_contract,json=toContract,proto3" json:"to_contract,omitempty"`
 }
 
 func (m *EventSwapToERC20) Reset()         { *m = EventSwapToERC20{} }
@@ -108,12 +109,13 @@ func (m *EventSwapToERC20) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_EventSwapToERC20 proto.InternalMessageInfo
 
-// EventSwapFromERC20 is an event emitted when swapping token from ERC20 to native token.
+// EventSwapFromERC20 is an event emitted when swapping token from ERC20 to
+// native token.
 type EventSwapFromERC20 struct {
 	WantedAmount *types.Coin `protobuf:"bytes,1,opt,name=wanted_amount,json=wantedAmount,proto3" json:"wanted_amount,omitempty"`
 	Sender       string      `protobuf:"bytes,2,opt,name=sender,proto3" json:"sender,omitempty"`
 	Receiver     string      `protobuf:"bytes,3,opt,name=receiver,proto3" json:"receiver,omitempty"`
-	Contract     string      `protobuf:"bytes,4,opt,name=contract,proto3" json:"contract,omitempty"`
+	FromContract string      `protobuf:"bytes,4,opt,name=from_contract,json=fromContract,proto3" json:"from_contract,omitempty"`
 }
 
 func (m *EventSwapFromERC20) Reset()         { *m = EventSwapFromERC20{} }
@@ -158,34 +160,35 @@ func init() {
 func init() { proto.RegisterFile("irismod/token/v1/event.proto", fileDescriptor_b15e65dad722cc70) }
 
 var fileDescriptor_b15e65dad722cc70 = []byte{
-	// 426 bytes of a gzipped FileDescriptorProto
+	// 448 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0x41, 0x6b, 0x13, 0x41,
-	0x1c, 0xc5, 0x77, 0x35, 0x8d, 0xed, 0x68, 0xa1, 0x0c, 0x41, 0x36, 0x41, 0xc6, 0xd2, 0x53, 0x2f,
-	0xee, 0x74, 0xab, 0xe0, 0x4d, 0x68, 0x6a, 0xbd, 0x0a, 0x5b, 0xbd, 0x78, 0x09, 0x93, 0xdd, 0x3f,
-	0x71, 0x30, 0x33, 0xff, 0x30, 0x33, 0xd9, 0x92, 0xcf, 0xe0, 0xc5, 0x0f, 0xa3, 0xdf, 0x21, 0xc7,
-	0xe2, 0xa9, 0x27, 0xd1, 0xe4, 0x8b, 0xc8, 0xce, 0x4c, 0x03, 0xf6, 0x20, 0xa1, 0xb7, 0x79, 0xfb,
-	0xde, 0x9f, 0xfd, 0x3d, 0x78, 0xe4, 0x99, 0x34, 0xd2, 0x2a, 0xac, 0xb9, 0xc3, 0x2f, 0xa0, 0x79,
-	0x53, 0x70, 0x68, 0x40, 0xbb, 0x7c, 0x66, 0xd0, 0x21, 0x3d, 0x88, 0x6e, 0xee, 0xdd, 0xbc, 0x29,
-	0x06, 0xbd, 0x09, 0x4e, 0xd0, 0x9b, 0xbc, 0x7d, 0x85, 0xdc, 0x80, 0x55, 0x68, 0x15, 0x5a, 0x3e,
-	0x16, 0x16, 0x78, 0x53, 0x8c, 0xc1, 0x89, 0x82, 0x57, 0x28, 0x75, 0xf4, 0xfb, 0xc1, 0x1f, 0x85,
-	0xc3, 0x20, 0x82, 0x75, 0xf4, 0x35, 0x25, 0x07, 0x17, 0xed, 0x2f, 0xdf, 0xc2, 0x6c, 0x8a, 0x8b,
-	0x8b, 0xf2, 0xfc, 0xf4, 0x84, 0x3e, 0x25, 0x5d, 0xbb, 0x50, 0x63, 0x9c, 0x66, 0xe9, 0x61, 0x7a,
-	0xbc, 0x57, 0x46, 0x45, 0x29, 0xe9, 0x68, 0xa1, 0x20, 0x7b, 0xe0, 0xbf, 0xfa, 0x37, 0xed, 0x91,
-	0x1d, 0x5b, 0x89, 0x29, 0x64, 0x0f, 0x0f, 0xd3, 0xe3, 0xfd, 0x32, 0x08, 0xda, 0x27, 0xbb, 0x4a,
-	0xea, 0xd1, 0x5c, 0x4b, 0x97, 0x75, 0x7c, 0xfa, 0x91, 0x92, 0xfa, 0xa3, 0x96, 0x8e, 0x0e, 0xc8,
-	0x6e, 0x85, 0xda, 0x19, 0x51, 0xb9, 0x6c, 0xc7, 0x5b, 0x1b, 0x7d, 0xf4, 0xe3, 0x96, 0xe6, 0xf2,
-	0x4a, 0xcc, 0x3e, 0x60, 0xa0, 0x79, 0x4d, 0xba, 0x42, 0xe1, 0x5c, 0x3b, 0x4f, 0xf3, 0xf8, 0xb4,
-	0x9f, 0xc7, 0x06, 0x6d, 0xdd, 0x3c, 0xd6, 0xcd, 0xcf, 0x51, 0xea, 0x61, 0x67, 0xf9, 0xeb, 0x79,
-	0x52, 0xc6, 0x38, 0x3d, 0x21, 0x5d, 0x0b, 0xba, 0x06, 0x13, 0x80, 0x87, 0xd9, 0xcf, 0xef, 0x2f,
-	0x7a, 0xf1, 0xf6, 0xac, 0xae, 0x0d, 0x58, 0x7b, 0xe9, 0x8c, 0xd4, 0x93, 0x32, 0xe6, 0x5a, 0x36,
-	0x03, 0x15, 0xc8, 0x06, 0x8c, 0xef, 0xb3, 0x57, 0x6e, 0xf4, 0x3f, 0xdc, 0x9d, 0x3b, 0xdc, 0x37,
-	0x29, 0xa1, 0x1b, 0xee, 0x77, 0x06, 0x55, 0x20, 0x7f, 0x43, 0xf6, 0xaf, 0x84, 0x76, 0x50, 0x8f,
-	0xb6, 0x2c, 0x50, 0x3e, 0x09, 0xf9, 0xb3, 0xfb, 0x16, 0x78, 0x75, 0xb7, 0xc0, 0x7f, 0x6e, 0xb6,
-	0xaa, 0x36, 0x7c, 0xbf, 0xfc, 0xc3, 0x92, 0xe5, 0x8a, 0xa5, 0xd7, 0x2b, 0x96, 0xfe, 0x5e, 0xb1,
-	0xf4, 0xdb, 0x9a, 0x25, 0xd7, 0x6b, 0x96, 0xdc, 0xac, 0x59, 0xf2, 0xa9, 0x98, 0x48, 0xf7, 0x79,
-	0x3e, 0xce, 0x2b, 0x54, 0xbc, 0x1d, 0xab, 0x06, 0xc7, 0x6f, 0x27, 0xad, 0xb0, 0x9e, 0x4f, 0xc1,
-	0xc6, 0x69, 0xbb, 0xc5, 0x0c, 0x6c, 0x3b, 0xce, 0xae, 0x1f, 0xde, 0xcb, 0xbf, 0x01, 0x00, 0x00,
-	0xff, 0xff, 0x42, 0x82, 0x23, 0x31, 0xfb, 0x02, 0x00, 0x00,
+	0x1c, 0xc5, 0x77, 0x35, 0x8d, 0xed, 0xb4, 0x81, 0x32, 0x04, 0xd9, 0x04, 0xd9, 0x96, 0x7a, 0xe9,
+	0xc5, 0x9d, 0x6e, 0x15, 0xbc, 0x09, 0x4d, 0xac, 0x57, 0x61, 0xab, 0x17, 0x2f, 0x61, 0xb2, 0xfb,
+	0x37, 0x0e, 0x66, 0xe6, 0x1f, 0x66, 0x26, 0x5b, 0xf2, 0x19, 0xbc, 0xf8, 0x61, 0x3c, 0xf9, 0x09,
+	0x72, 0x2c, 0x9e, 0x3c, 0x89, 0x4d, 0xbe, 0x88, 0xec, 0xcc, 0x24, 0x42, 0x0f, 0x22, 0xbd, 0xed,
+	0x9b, 0xf7, 0xfe, 0xec, 0xfb, 0xc1, 0x23, 0x4f, 0x84, 0x16, 0x46, 0x62, 0xc5, 0x2c, 0x7e, 0x06,
+	0xc5, 0xea, 0x9c, 0x41, 0x0d, 0xca, 0x66, 0x33, 0x8d, 0x16, 0xe9, 0x61, 0x70, 0x33, 0xe7, 0x66,
+	0x75, 0xde, 0xef, 0x4e, 0x70, 0x82, 0xce, 0x64, 0xcd, 0x97, 0xcf, 0xf5, 0xd3, 0x12, 0x8d, 0x44,
+	0xc3, 0xc6, 0xdc, 0x00, 0xab, 0xf3, 0x31, 0x58, 0x9e, 0xb3, 0x12, 0x85, 0x0a, 0x7e, 0xcf, 0xfb,
+	0x23, 0x7f, 0xe8, 0x85, 0xb7, 0x4e, 0xbe, 0xc4, 0xe4, 0xf0, 0xb2, 0xf9, 0xe5, 0x6b, 0x98, 0x4d,
+	0x71, 0x71, 0x59, 0x0c, 0xcf, 0xcf, 0xe8, 0x63, 0xd2, 0x36, 0x0b, 0x39, 0xc6, 0x69, 0x12, 0x1f,
+	0xc7, 0xa7, 0x7b, 0x45, 0x50, 0x94, 0x92, 0x96, 0xe2, 0x12, 0x92, 0x07, 0xee, 0xd5, 0x7d, 0xd3,
+	0x2e, 0xd9, 0x31, 0x25, 0x9f, 0x42, 0xf2, 0xf0, 0x38, 0x3e, 0xed, 0x14, 0x5e, 0xd0, 0x1e, 0xd9,
+	0x95, 0x42, 0x8d, 0xe6, 0x4a, 0xd8, 0xa4, 0xe5, 0xd2, 0x8f, 0xa4, 0x50, 0xef, 0x95, 0xb0, 0xb4,
+	0x4f, 0x76, 0x4b, 0x54, 0x56, 0xf3, 0xd2, 0x26, 0x3b, 0xce, 0xda, 0xea, 0x93, 0xef, 0x9b, 0x36,
+	0x57, 0xd7, 0x7c, 0xf6, 0x0e, 0x7d, 0x9b, 0x97, 0xa4, 0xcd, 0x25, 0xce, 0x95, 0x75, 0x6d, 0xf6,
+	0xcf, 0x7b, 0x59, 0x20, 0x68, 0x70, 0xb3, 0x80, 0x9b, 0x0d, 0x51, 0xa8, 0x41, 0x6b, 0xf9, 0xeb,
+	0x28, 0x2a, 0x42, 0x9c, 0x9e, 0x91, 0xb6, 0x01, 0x55, 0x81, 0xf6, 0x85, 0x07, 0xc9, 0x8f, 0x6f,
+	0xcf, 0xba, 0xe1, 0xf6, 0xa2, 0xaa, 0x34, 0x18, 0x73, 0x65, 0xb5, 0x50, 0x93, 0x22, 0xe4, 0x9a,
+	0x6e, 0x1a, 0x4a, 0x10, 0x35, 0x68, 0xc7, 0xb3, 0x57, 0x6c, 0x35, 0x3d, 0x22, 0xfb, 0x16, 0x47,
+	0xdb, 0xea, 0x9e, 0x8a, 0x58, 0x1c, 0x6e, 0xca, 0xdf, 0xc6, 0x84, 0x6e, 0xcb, 0xbf, 0xd1, 0x28,
+	0x7d, 0xfd, 0x57, 0xa4, 0x73, 0xcd, 0x95, 0x85, 0x6a, 0xf4, 0x9f, 0x14, 0xc5, 0x81, 0xcf, 0x5f,
+	0xdc, 0x97, 0xe2, 0xc5, 0x5d, 0x8a, 0x7f, 0xdc, 0xfc, 0xe5, 0x7b, 0x4a, 0x3a, 0x1f, 0x35, 0xca,
+	0xbb, 0x84, 0x07, 0xcd, 0xe3, 0x86, 0x71, 0xf0, 0x76, 0x79, 0x9b, 0x46, 0xcb, 0x55, 0x1a, 0xdf,
+	0xac, 0xd2, 0xf8, 0xf7, 0x2a, 0x8d, 0xbf, 0xae, 0xd3, 0xe8, 0x66, 0x9d, 0x46, 0x3f, 0xd7, 0x69,
+	0xf4, 0x21, 0x9f, 0x08, 0xfb, 0x69, 0x3e, 0xce, 0x4a, 0x94, 0xac, 0x99, 0xae, 0x02, 0xcb, 0x36,
+	0x03, 0x97, 0x58, 0xcd, 0xa7, 0x60, 0xc2, 0xd0, 0xed, 0x62, 0x06, 0xa6, 0x99, 0x6a, 0xdb, 0xcd,
+	0xf0, 0xf9, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x69, 0x98, 0x86, 0x71, 0x09, 0x03, 0x00, 0x00,
 }
 
 func (m *EventDeployERC20) Marshal() (dAtA []byte, err error) {
@@ -264,10 +267,10 @@ func (m *EventSwapToERC20) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
-	if len(m.Contract) > 0 {
-		i -= len(m.Contract)
-		copy(dAtA[i:], m.Contract)
-		i = encodeVarintEvent(dAtA, i, uint64(len(m.Contract)))
+	if len(m.ToContract) > 0 {
+		i -= len(m.ToContract)
+		copy(dAtA[i:], m.ToContract)
+		i = encodeVarintEvent(dAtA, i, uint64(len(m.ToContract)))
 		i--
 		dAtA[i] = 0x22
 	}
@@ -318,10 +321,10 @@ func (m *EventSwapFromERC20) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
-	if len(m.Contract) > 0 {
-		i -= len(m.Contract)
-		copy(dAtA[i:], m.Contract)
-		i = encodeVarintEvent(dAtA, i, uint64(len(m.Contract)))
+	if len(m.FromContract) > 0 {
+		i -= len(m.FromContract)
+		copy(dAtA[i:], m.FromContract)
+		i = encodeVarintEvent(dAtA, i, uint64(len(m.FromContract)))
 		i--
 		dAtA[i] = 0x22
 	}
@@ -409,7 +412,7 @@ func (m *EventSwapToERC20) Size() (n int) {
 	if l > 0 {
 		n += 1 + l + sovEvent(uint64(l))
 	}
-	l = len(m.Contract)
+	l = len(m.ToContract)
 	if l > 0 {
 		n += 1 + l + sovEvent(uint64(l))
 	}
@@ -434,7 +437,7 @@ func (m *EventSwapFromERC20) Size() (n int) {
 	if l > 0 {
 		n += 1 + l + sovEvent(uint64(l))
 	}
-	l = len(m.Contract)
+	l = len(m.FromContract)
 	if l > 0 {
 		n += 1 + l + sovEvent(uint64(l))
 	}
@@ -772,7 +775,7 @@ func (m *EventSwapToERC20) Unmarshal(dAtA []byte) error {
 			iNdEx = postIndex
 		case 4:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Contract", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field ToContract", wireType)
 			}
 			var stringLen uint64
 			for shift := uint(0); ; shift += 7 {
@@ -800,7 +803,7 @@ func (m *EventSwapToERC20) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Contract = string(dAtA[iNdEx:postIndex])
+			m.ToContract = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
@@ -954,7 +957,7 @@ func (m *EventSwapFromERC20) Unmarshal(dAtA []byte) error {
 			iNdEx = postIndex
 		case 4:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Contract", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field FromContract", wireType)
 			}
 			var stringLen uint64
 			for shift := uint(0); ; shift += 7 {
@@ -982,7 +985,7 @@ func (m *EventSwapFromERC20) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Contract = string(dAtA[iNdEx:postIndex])
+			m.FromContract = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
diff --git a/modules/token/types/v1/tx.pb.go b/modules/token/types/v1/tx.pb.go
index 9271a96e..64cf093e 100644
--- a/modules/token/types/v1/tx.pb.go
+++ b/modules/token/types/v1/tx.pb.go
@@ -747,8 +747,8 @@ var xxx_messageInfo_MsgSwapToERC20Response proto.InternalMessageInfo
 // MsgSwapFromERC20 defines an SDK message for SwapFromERC20
 type MsgSwapFromERC20 struct {
 	WantedAmount types.Coin `protobuf:"bytes,1,opt,name=wanted_amount,json=wantedAmount,proto3" json:"wanted_amount"`
-	Sender       string     `protobuf:"bytes,3,opt,name=sender,proto3" json:"sender,omitempty"`
-	Receiver     string     `protobuf:"bytes,4,opt,name=receiver,proto3" json:"receiver,omitempty"`
+	Sender       string     `protobuf:"bytes,2,opt,name=sender,proto3" json:"sender,omitempty"`
+	Receiver     string     `protobuf:"bytes,3,opt,name=receiver,proto3" json:"receiver,omitempty"`
 }
 
 func (m *MsgSwapFromERC20) Reset()         { *m = MsgSwapFromERC20{} }
@@ -847,73 +847,73 @@ func init() {
 func init() { proto.RegisterFile("irismod/token/v1/tx.proto", fileDescriptor_f5fa171367154e01) }
 
 var fileDescriptor_f5fa171367154e01 = []byte{
-	// 1052 bytes of a gzipped FileDescriptorProto
+	// 1048 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xcf, 0x6f, 0x1b, 0x45,
-	0x14, 0xf6, 0xc6, 0x3f, 0x62, 0x4f, 0xe2, 0x50, 0xad, 0x42, 0xb2, 0x5e, 0x5a, 0xc7, 0x58, 0x02,
+	0x14, 0xf6, 0xc6, 0x3f, 0x62, 0x4f, 0xea, 0x50, 0xad, 0x42, 0xb2, 0x5e, 0x5a, 0xc7, 0x58, 0x02,
 	0x4c, 0x24, 0x76, 0xeb, 0x04, 0xb5, 0x28, 0xb7, 0xba, 0x2d, 0x88, 0x83, 0xd5, 0xca, 0x4e, 0x91,
 	0x40, 0x48, 0xd6, 0xda, 0x3b, 0xd9, 0x8e, 0xf0, 0xce, 0xac, 0x76, 0xc6, 0x49, 0x7c, 0x43, 0x3d,
 	0x72, 0x01, 0xc4, 0xbf, 0x00, 0x1c, 0x38, 0xf5, 0xc0, 0x1f, 0x91, 0x0b, 0x52, 0xc5, 0x89, 0x53,
-	0x05, 0xc9, 0xa1, 0x12, 0x7f, 0x02, 0x27, 0xb4, 0x33, 0xe3, 0xf1, 0xda, 0x5e, 0xc7, 0x76, 0x11,
+	0x05, 0xc9, 0xa1, 0x12, 0x7f, 0x02, 0x27, 0xb4, 0x33, 0xe3, 0xf1, 0xda, 0x5e, 0xc7, 0x76, 0x10,
 	0x37, 0xcf, 0x7e, 0xdf, 0xbe, 0xf9, 0xde, 0xf7, 0xde, 0xbc, 0x59, 0x83, 0x12, 0x0a, 0x11, 0xf5,
-	0x89, 0x6b, 0x33, 0xf2, 0x15, 0xc4, 0xf6, 0x69, 0xdd, 0x66, 0xe7, 0x56, 0x10, 0x12, 0x46, 0xf4,
-	0x1b, 0x12, 0xb2, 0x38, 0x64, 0x9d, 0xd6, 0xcd, 0x6d, 0x8f, 0x78, 0x84, 0x83, 0x76, 0xf4, 0x4b,
-	0xf0, 0xcc, 0x72, 0x8f, 0x50, 0x9f, 0x50, 0xbb, 0xeb, 0x50, 0x68, 0x9f, 0xd6, 0xbb, 0x90, 0x39,
-	0x75, 0xbb, 0x47, 0x10, 0x96, 0xf8, 0xae, 0xc4, 0x7d, 0xea, 0x45, 0xf1, 0x7d, 0xea, 0x49, 0xa0,
-	0x24, 0x80, 0x8e, 0x88, 0x28, 0x16, 0x12, 0xba, 0x39, 0x2b, 0x8b, 0x8b, 0xe0, 0x68, 0xf5, 0x9b,
-	0x35, 0x50, 0x6c, 0x52, 0xef, 0x53, 0x4a, 0x07, 0xf0, 0x38, 0x7a, 0xae, 0xef, 0x80, 0x1c, 0x1d,
+	0x89, 0x6b, 0x33, 0xf2, 0x15, 0xc4, 0xf6, 0x49, 0xdd, 0x66, 0x67, 0x56, 0x10, 0x12, 0x46, 0xf4,
+	0x9b, 0x12, 0xb2, 0x38, 0x64, 0x9d, 0xd4, 0xcd, 0x2d, 0x8f, 0x78, 0x84, 0x83, 0x76, 0xf4, 0x4b,
+	0xf0, 0xcc, 0x72, 0x8f, 0x50, 0x9f, 0x50, 0xbb, 0xeb, 0x50, 0x68, 0x9f, 0xd4, 0xbb, 0x90, 0x39,
+	0x75, 0xbb, 0x47, 0x10, 0x96, 0xf8, 0x8e, 0xc4, 0x7d, 0xea, 0x45, 0xf1, 0x7d, 0xea, 0x49, 0xa0,
+	0x24, 0x80, 0x8e, 0x88, 0x28, 0x16, 0x12, 0xba, 0x35, 0x2b, 0x8b, 0x8b, 0xe0, 0x68, 0xf5, 0x9b,
+	0x35, 0x50, 0x6c, 0x52, 0xef, 0x53, 0x4a, 0x07, 0xf0, 0x28, 0x7a, 0xae, 0x6f, 0x83, 0x1c, 0x1d,
 	0xfa, 0x5d, 0xd2, 0x37, 0xb4, 0x8a, 0x56, 0x2b, 0xb4, 0xe4, 0x4a, 0xd7, 0x41, 0x06, 0x3b, 0x3e,
-	0x34, 0xd6, 0xf8, 0x53, 0xfe, 0x5b, 0xdf, 0x06, 0x59, 0xda, 0x73, 0xfa, 0xd0, 0x48, 0x57, 0xb4,
+	0x34, 0xd6, 0xf8, 0x53, 0xfe, 0x5b, 0xdf, 0x02, 0x59, 0xda, 0x73, 0xfa, 0xd0, 0x48, 0x57, 0xb4,
 	0x5a, 0xb1, 0x25, 0x16, 0x7a, 0x09, 0xe4, 0x7d, 0x84, 0x3b, 0x03, 0x8c, 0x98, 0x91, 0xe1, 0xec,
-	0x75, 0x1f, 0xe1, 0x27, 0x18, 0x31, 0xfd, 0x1d, 0xb0, 0x85, 0x30, 0x62, 0xc8, 0xe9, 0x77, 0xe8,
+	0x75, 0x1f, 0xe1, 0xa7, 0x18, 0x31, 0xfd, 0x1d, 0xb0, 0x89, 0x30, 0x62, 0xc8, 0xe9, 0x77, 0xe8,
 	0x20, 0x08, 0xfa, 0x43, 0x23, 0x5b, 0xd1, 0x6a, 0x99, 0x56, 0x51, 0x3e, 0x6d, 0xf3, 0x87, 0xfa,
-	0x2d, 0x00, 0x7c, 0xe7, 0x7c, 0x44, 0xc9, 0x71, 0x4a, 0xc1, 0x77, 0xce, 0x25, 0x6c, 0xf2, 0x0d,
-	0x98, 0xd3, 0xed, 0x43, 0x63, 0xbd, 0xa2, 0xd5, 0xf2, 0x2d, 0xb5, 0xd6, 0x2d, 0x90, 0x25, 0x67,
-	0x18, 0x86, 0x46, 0x3e, 0xda, 0xb9, 0x61, 0xfc, 0xfe, 0xeb, 0x07, 0xdb, 0xd2, 0x8f, 0x7b, 0xae,
-	0x1b, 0x42, 0x4a, 0xdb, 0x2c, 0x44, 0xd8, 0x6b, 0x09, 0xda, 0x11, 0x78, 0xf6, 0xea, 0xf9, 0xbe,
-	0xf8, 0x5d, 0xdd, 0x05, 0x6f, 0x4e, 0x78, 0xd1, 0x82, 0x34, 0x20, 0x98, 0xc2, 0xea, 0x0f, 0x1a,
-	0x47, 0x8e, 0x43, 0x07, 0xd3, 0x13, 0x18, 0x72, 0xf0, 0x51, 0xf4, 0x8a, 0xfe, 0x16, 0x28, 0xd0,
+	0x6d, 0x00, 0x7c, 0xe7, 0x6c, 0x44, 0xc9, 0x71, 0x4a, 0xc1, 0x77, 0xce, 0x24, 0x6c, 0xf2, 0x0d,
+	0x98, 0xd3, 0xed, 0x43, 0x63, 0xbd, 0xa2, 0xd5, 0xf2, 0x2d, 0xb5, 0xd6, 0x2d, 0x90, 0x25, 0xa7,
+	0x18, 0x86, 0x46, 0x3e, 0xda, 0xb9, 0x61, 0xfc, 0xfe, 0xeb, 0x07, 0x5b, 0xd2, 0x8f, 0xfb, 0xae,
+	0x1b, 0x42, 0x4a, 0xdb, 0x2c, 0x44, 0xd8, 0x6b, 0x09, 0xda, 0x21, 0x78, 0xfe, 0xfa, 0xc5, 0x9e,
+	0xf8, 0x5d, 0xdd, 0x01, 0x6f, 0x4e, 0x78, 0xd1, 0x82, 0x34, 0x20, 0x98, 0xc2, 0xea, 0x0f, 0x1a,
+	0x47, 0x8e, 0x42, 0x07, 0xd3, 0x63, 0x18, 0x72, 0xf0, 0x71, 0xf4, 0x8a, 0xfe, 0x16, 0x28, 0xd0,
 	0xb0, 0xd7, 0x11, 0x5b, 0x0a, 0xc3, 0xf2, 0x34, 0xec, 0x29, 0xd0, 0xa5, 0x4c, 0x82, 0xc2, 0xb7,
-	0xbc, 0x4b, 0x99, 0x00, 0x6f, 0x2b, 0x9f, 0xd3, 0x0b, 0x94, 0x4a, 0xde, 0xd1, 0x56, 0x24, 0x75,
-	0xbc, 0x5d, 0x75, 0x0f, 0xdc, 0x4a, 0x14, 0xa5, 0x64, 0xff, 0xad, 0x81, 0xcd, 0x26, 0xf5, 0x1e,
-	0xba, 0x88, 0xad, 0x5e, 0xdb, 0xc9, 0x1a, 0xa4, 0xa7, 0x6b, 0xd0, 0x8e, 0xd5, 0x80, 0x17, 0xb9,
-	0x71, 0xf7, 0x9f, 0x97, 0x7b, 0x87, 0x1e, 0x62, 0x4f, 0x07, 0x5d, 0xab, 0x47, 0x7c, 0x3b, 0xea,
-	0x3b, 0x0c, 0x99, 0x3d, 0xea, 0x3f, 0x9f, 0xb8, 0x83, 0x3e, 0xa4, 0xb2, 0x0f, 0xd9, 0x30, 0x80,
-	0xd4, 0x6a, 0x10, 0xd2, 0x4f, 0x2a, 0x5e, 0x76, 0xf5, 0xe2, 0xed, 0x80, 0xed, 0x78, 0xae, 0xca,
-	0x84, 0x6f, 0x85, 0x09, 0x4d, 0x84, 0xa5, 0x09, 0x87, 0x20, 0x13, 0x1d, 0x29, 0x6e, 0xc1, 0xc6,
-	0x41, 0xc9, 0x92, 0x1b, 0x44, 0x67, 0xce, 0x92, 0x67, 0xce, 0xba, 0x4f, 0x10, 0x6e, 0x64, 0x2e,
-	0x5e, 0xee, 0xa5, 0x5a, 0x9c, 0xac, 0x6f, 0x81, 0x35, 0x46, 0xa4, 0x3f, 0x6b, 0x8c, 0x8c, 0x95,
-	0xa6, 0x5f, 0x57, 0xa9, 0x12, 0xa4, 0x94, 0x3e, 0x13, 0x4a, 0x1b, 0x83, 0x10, 0xff, 0x07, 0xa5,
-	0x51, 0x5f, 0x41, 0xec, 0x8e, 0x3a, 0xee, 0xda, 0xbe, 0xe2, 0xbc, 0xa3, 0x8d, 0x48, 0x9b, 0x5c,
-	0x48, 0x71, 0x4a, 0x83, 0x12, 0xf7, 0x8b, 0x06, 0xde, 0x68, 0x52, 0xaf, 0x7d, 0xe6, 0x04, 0x1f,
-	0x43, 0x39, 0x2a, 0x8e, 0x40, 0xfe, 0x04, 0xc2, 0x4e, 0xe0, 0x20, 0x77, 0x59, 0x8d, 0xeb, 0x27,
-	0x10, 0x3e, 0x76, 0x90, 0xab, 0xdf, 0x04, 0x85, 0x10, 0xf6, 0x50, 0x80, 0x20, 0x66, 0xd2, 0xd7,
-	0xf1, 0x83, 0x58, 0x12, 0xe9, 0xd7, 0x49, 0xa2, 0x0d, 0x76, 0xa7, 0xb4, 0x8e, 0xf2, 0xd0, 0x3f,
-	0x02, 0x91, 0x84, 0x8e, 0x47, 0xd8, 0xb2, 0x92, 0x73, 0x27, 0x10, 0x7e, 0x42, 0x58, 0xf5, 0x7b,
-	0xe1, 0xc0, 0x93, 0xc0, 0x75, 0x18, 0x7c, 0xec, 0x84, 0x8e, 0x4f, 0xf5, 0x3b, 0xa0, 0xe0, 0x0c,
-	0xd8, 0x53, 0x12, 0x22, 0x36, 0x14, 0x67, 0xea, 0x1a, 0xa9, 0x63, 0xaa, 0x7e, 0x07, 0xe4, 0x02,
-	0x1e, 0x81, 0xa7, 0xbe, 0x71, 0x60, 0x58, 0xd3, 0x37, 0x84, 0x25, 0x76, 0x18, 0x69, 0x10, 0x6c,
-	0x39, 0x02, 0x54, 0x9c, 0x6a, 0x89, 0x27, 0x1a, 0x97, 0xa4, 0x0a, 0xf6, 0x93, 0x06, 0xb6, 0x9a,
-	0xd4, 0x7b, 0x00, 0x83, 0x3e, 0x19, 0x3e, 0x6c, 0xdd, 0x3f, 0xb8, 0xfd, 0xff, 0x8e, 0xf6, 0x09,
-	0x2b, 0xb2, 0x4b, 0x5b, 0x51, 0x35, 0xc0, 0xce, 0xa4, 0x4c, 0x95, 0xc1, 0x8f, 0x22, 0x83, 0xa8,
-	0x8c, 0xc7, 0x44, 0x64, 0x70, 0x17, 0xe4, 0x1c, 0x9f, 0x0c, 0xf0, 0xf2, 0xc5, 0x13, 0xf4, 0xd5,
-	0x4f, 0x45, 0x74, 0xc9, 0x84, 0xb0, 0x07, 0xd1, 0xe9, 0xa8, 0x09, 0x5b, 0x6a, 0x3d, 0xd9, 0x6c,
-	0x22, 0x81, 0x98, 0x4a, 0x95, 0xc0, 0x6f, 0x1a, 0xb8, 0x31, 0xea, 0xc3, 0x90, 0xf8, 0x22, 0x85,
-	0x07, 0xa0, 0x78, 0xe6, 0x60, 0x06, 0xdd, 0xce, 0x6a, 0x99, 0x6c, 0x8a, 0xb7, 0xee, 0x4d, 0xe7,
-	0xb3, 0xe4, 0x01, 0xd1, 0x3f, 0x8c, 0xe5, 0x93, 0x59, 0xf0, 0xce, 0x9c, 0x4c, 0x4d, 0x60, 0x4c,
-	0xa7, 0x33, 0xca, 0xf5, 0xe0, 0xe7, 0x75, 0x90, 0x6e, 0x52, 0x4f, 0xff, 0x0c, 0x80, 0xd8, 0xc7,
-	0xc4, 0xde, 0x6c, 0x5f, 0x4f, 0xdc, 0xb0, 0xe6, 0x7b, 0x0b, 0x08, 0xea, 0xdc, 0xb6, 0x41, 0x61,
-	0x7c, 0x8f, 0x95, 0x13, 0xdf, 0x52, 0xb8, 0xf9, 0xee, 0xf5, 0x78, 0x3c, 0xe8, 0xf8, 0x5e, 0x48,
-	0x0e, 0xaa, 0xf0, 0x39, 0x41, 0x67, 0xc6, 0x78, 0x14, 0x74, 0x3c, 0xc2, 0x93, 0x83, 0x2a, 0x7c,
-	0x4e, 0xd0, 0x99, 0xf1, 0xab, 0x63, 0xa0, 0x27, 0x7c, 0x7d, 0x24, 0xbb, 0x37, 0x4b, 0x34, 0xed,
-	0x25, 0x89, 0x6a, 0xbf, 0x2f, 0xc1, 0xe6, 0xc4, 0xa8, 0x7f, 0x3b, 0x31, 0x40, 0x9c, 0x62, 0xbe,
-	0xbf, 0x90, 0xa2, 0xa2, 0x7f, 0x0e, 0x36, 0xe2, 0xa7, 0xba, 0x32, 0xf7, 0x4d, 0xc9, 0x30, 0x6b,
-	0x8b, 0x18, 0x2a, 0x74, 0x07, 0x14, 0x27, 0xcf, 0x5b, 0x75, 0xbe, 0xac, 0x11, 0xc7, 0xdc, 0x5f,
-	0xcc, 0x89, 0x3b, 0x33, 0x71, 0x05, 0x24, 0x3b, 0x13, 0xa7, 0xcc, 0x71, 0x26, 0x69, 0x6a, 0x47,
-	0xce, 0xc4, 0x27, 0x76, 0xb2, 0x33, 0x31, 0xc6, 0x1c, 0x67, 0x12, 0xc6, 0xa9, 0x99, 0xfd, 0xfa,
-	0xd5, 0xf3, 0x7d, 0xad, 0xf1, 0xe8, 0xe2, 0xaf, 0x72, 0xea, 0xe2, 0xb2, 0xac, 0xbd, 0xb8, 0x2c,
-	0x6b, 0x7f, 0x5e, 0x96, 0xb5, 0xef, 0xae, 0xca, 0xa9, 0x17, 0x57, 0xe5, 0xd4, 0x1f, 0x57, 0xe5,
-	0xd4, 0x17, 0xf5, 0xd5, 0x3e, 0xe0, 0xa2, 0x3f, 0x29, 0x39, 0xfe, 0x4f, 0xe2, 0xf0, 0xdf, 0x00,
-	0x00, 0x00, 0xff, 0xff, 0x0d, 0xc6, 0xc4, 0x1e, 0x00, 0x0d, 0x00, 0x00,
+	0xbc, 0x4b, 0x99, 0x00, 0xef, 0x28, 0x9f, 0xd3, 0x0b, 0x94, 0x4a, 0xde, 0xe1, 0x66, 0x24, 0x75,
+	0xbc, 0x5d, 0x75, 0x17, 0xdc, 0x4e, 0x14, 0xa5, 0x64, 0xff, 0xad, 0x81, 0x1b, 0x4d, 0xea, 0x3d,
+	0x72, 0x11, 0x5b, 0xbd, 0xb6, 0x93, 0x35, 0x48, 0x4f, 0xd7, 0xa0, 0x1d, 0xab, 0x01, 0x2f, 0x72,
+	0xe3, 0xde, 0x3f, 0xaf, 0x76, 0x0f, 0x3c, 0xc4, 0x9e, 0x0d, 0xba, 0x56, 0x8f, 0xf8, 0x76, 0xd4,
+	0x77, 0x18, 0x32, 0x7b, 0xd4, 0x7f, 0x3e, 0x71, 0x07, 0x7d, 0x48, 0x65, 0x1f, 0xb2, 0x61, 0x00,
+	0xa9, 0xd5, 0x20, 0xa4, 0x9f, 0x54, 0xbc, 0xec, 0xea, 0xc5, 0xdb, 0x06, 0x5b, 0xf1, 0x5c, 0x95,
+	0x09, 0xdf, 0x0a, 0x13, 0x9a, 0x08, 0x4b, 0x13, 0x0e, 0x40, 0x26, 0x3a, 0x52, 0xdc, 0x82, 0x8d,
+	0xfd, 0x92, 0x25, 0x37, 0x88, 0xce, 0x9c, 0x25, 0xcf, 0x9c, 0xf5, 0x80, 0x20, 0xdc, 0xc8, 0x9c,
+	0xbf, 0xda, 0x4d, 0xb5, 0x38, 0x59, 0xdf, 0x04, 0x6b, 0x8c, 0x48, 0x7f, 0xd6, 0x18, 0x19, 0x2b,
+	0x4d, 0x5f, 0x57, 0xa9, 0x12, 0xa4, 0x94, 0x3e, 0x17, 0x4a, 0x1b, 0x83, 0x10, 0xff, 0x07, 0xa5,
+	0x51, 0x5f, 0x41, 0xec, 0x8e, 0x3a, 0xee, 0xca, 0xbe, 0xe2, 0xbc, 0xc3, 0x8d, 0x48, 0x9b, 0x5c,
+	0x48, 0x71, 0x4a, 0x83, 0x12, 0xf7, 0x8b, 0x06, 0xde, 0x68, 0x52, 0xaf, 0x7d, 0xea, 0x04, 0x1f,
+	0x43, 0x39, 0x2a, 0x0e, 0x41, 0xfe, 0x18, 0xc2, 0x4e, 0xe0, 0x20, 0x77, 0x59, 0x8d, 0xeb, 0xc7,
+	0x10, 0x3e, 0x71, 0x90, 0xab, 0xdf, 0x02, 0x85, 0x10, 0xf6, 0x50, 0x80, 0x20, 0x66, 0xd2, 0xd7,
+	0xf1, 0x83, 0x58, 0x12, 0xe9, 0xeb, 0x24, 0xd1, 0x06, 0x3b, 0x53, 0x5a, 0x47, 0x79, 0xe8, 0x1f,
+	0x81, 0x48, 0x42, 0xc7, 0x23, 0x6c, 0x59, 0xc9, 0xb9, 0x63, 0x08, 0x3f, 0x21, 0xac, 0xfa, 0xbd,
+	0x70, 0xe0, 0x69, 0xe0, 0x3a, 0x0c, 0x3e, 0x71, 0x42, 0xc7, 0xa7, 0xfa, 0x5d, 0x50, 0x70, 0x06,
+	0xec, 0x19, 0x09, 0x11, 0x1b, 0x8a, 0x33, 0x75, 0x85, 0xd4, 0x31, 0x55, 0xbf, 0x0b, 0x72, 0x01,
+	0x8f, 0xc0, 0x53, 0xdf, 0xd8, 0x37, 0xac, 0xe9, 0x1b, 0xc2, 0x12, 0x3b, 0x8c, 0x34, 0x08, 0xb6,
+	0x1c, 0x01, 0x2a, 0x4e, 0xb5, 0xc4, 0x13, 0x8d, 0x4b, 0x52, 0x05, 0xfb, 0x49, 0x03, 0x9b, 0x4d,
+	0xea, 0x3d, 0x84, 0x41, 0x9f, 0x0c, 0x1f, 0xb5, 0x1e, 0xec, 0xdf, 0xf9, 0x7f, 0x47, 0xfb, 0x84,
+	0x15, 0xd9, 0xa5, 0xad, 0xa8, 0x1a, 0x60, 0x7b, 0x52, 0xa6, 0xca, 0xe0, 0x47, 0x91, 0x41, 0x54,
+	0xc6, 0x23, 0x22, 0x32, 0xb8, 0x07, 0x72, 0x8e, 0x4f, 0x06, 0x78, 0xf9, 0xe2, 0x09, 0xfa, 0xea,
+	0xa7, 0x22, 0xba, 0x64, 0x42, 0xd8, 0x83, 0xe8, 0x64, 0xd4, 0x84, 0x2d, 0xb5, 0x9e, 0x6c, 0x36,
+	0x91, 0x40, 0x4c, 0xa5, 0x4a, 0xe0, 0x37, 0x0d, 0xdc, 0x1c, 0xf5, 0x61, 0x48, 0x7c, 0x91, 0xc2,
+	0x43, 0x50, 0x3c, 0x75, 0x30, 0x83, 0x6e, 0x67, 0xb5, 0x4c, 0x6e, 0x88, 0xb7, 0xee, 0x5f, 0x37,
+	0x9f, 0x0f, 0xa7, 0xf3, 0xb9, 0xe2, 0x9d, 0x39, 0x99, 0x9a, 0xc0, 0x98, 0x4e, 0x67, 0x94, 0xeb,
+	0xfe, 0xcf, 0xeb, 0x20, 0xdd, 0xa4, 0x9e, 0xfe, 0x19, 0x00, 0xb1, 0x8f, 0x89, 0xdd, 0xd9, 0xbe,
+	0x9e, 0xb8, 0x61, 0xcd, 0xf7, 0x16, 0x10, 0xd4, 0xb9, 0x6d, 0x83, 0xc2, 0xf8, 0x1e, 0x2b, 0x27,
+	0xbe, 0xa5, 0x70, 0xf3, 0xdd, 0xab, 0xf1, 0x78, 0xd0, 0xf1, 0xbd, 0x90, 0x1c, 0x54, 0xe1, 0x73,
+	0x82, 0xce, 0x8c, 0xf1, 0x28, 0xe8, 0x78, 0x84, 0x27, 0x07, 0x55, 0xf8, 0x9c, 0xa0, 0x33, 0xe3,
+	0x57, 0xc7, 0x40, 0x4f, 0xf8, 0xfa, 0x48, 0x76, 0x6f, 0x96, 0x68, 0xda, 0x4b, 0x12, 0xd5, 0x7e,
+	0x5f, 0x82, 0x1b, 0x13, 0xa3, 0xfe, 0xed, 0xc4, 0x00, 0x71, 0x8a, 0xf9, 0xfe, 0x42, 0x8a, 0x8a,
+	0xfe, 0x39, 0xd8, 0x88, 0x9f, 0xea, 0xca, 0xdc, 0x37, 0x25, 0xc3, 0xac, 0x2d, 0x62, 0xa8, 0xd0,
+	0x1d, 0x50, 0x9c, 0x3c, 0x6f, 0xd5, 0xf9, 0xb2, 0x46, 0x1c, 0x73, 0x6f, 0x31, 0x27, 0xee, 0xcc,
+	0xc4, 0x15, 0x90, 0xec, 0x4c, 0x9c, 0x32, 0xc7, 0x99, 0xa4, 0xa9, 0x1d, 0x39, 0x13, 0x9f, 0xd8,
+	0xc9, 0xce, 0xc4, 0x18, 0x73, 0x9c, 0x49, 0x18, 0xa7, 0x66, 0xf6, 0xeb, 0xd7, 0x2f, 0xf6, 0xb4,
+	0xc6, 0xe3, 0xf3, 0xbf, 0xca, 0xa9, 0xf3, 0x8b, 0xb2, 0xf6, 0xf2, 0xa2, 0xac, 0xfd, 0x79, 0x51,
+	0xd6, 0xbe, 0xbb, 0x2c, 0xa7, 0x5e, 0x5e, 0x96, 0x53, 0x7f, 0x5c, 0x96, 0x53, 0x5f, 0xd4, 0x57,
+	0xfb, 0x80, 0x8b, 0xfe, 0xa4, 0xe4, 0xf8, 0x3f, 0x89, 0x83, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff,
+	0x3e, 0xac, 0xed, 0x43, 0x00, 0x0d, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -938,19 +938,18 @@ type MsgClient interface {
 	BurnToken(ctx context.Context, in *MsgBurnToken, opts ...grpc.CallOption) (*MsgBurnTokenResponse, error)
 	// TransferTokenOwner defines a method for transfering token owner
 	TransferTokenOwner(ctx context.Context, in *MsgTransferTokenOwner, opts ...grpc.CallOption) (*MsgTransferTokenOwnerResponse, error)
-	// SwapFeeToken defines a method for swapping some fee token
+	// SwapFeeToken defines a method for swapping between IRIS and ERIS
 	SwapFeeToken(ctx context.Context, in *MsgSwapFeeToken, opts ...grpc.CallOption) (*MsgSwapFeeTokenResponse, error)
-	// SwapToERC20 defines a method for swapping some erc20 token
+	// SwapToERC20 defines a method for swapping some native token to its ERC20 counterpart
 	SwapToERC20(ctx context.Context, in *MsgSwapToERC20, opts ...grpc.CallOption) (*MsgSwapToERC20Response, error)
-	// SwapFromERC20 defines a method for swapping some native token
+	// SwapFromERC20 defines a method for swapping some ERC20 token to its native counterpart
 	SwapFromERC20(ctx context.Context, in *MsgSwapFromERC20, opts ...grpc.CallOption) (*MsgSwapFromERC20Response, error)
 	// UpdateParams defines a governance operation for updating the token
 	// module parameters. The authority is defined in the keeper.
 	//
 	// Since: cosmos-sdk 0.47
 	UpdateParams(ctx context.Context, in *MsgUpdateParams, opts ...grpc.CallOption) (*MsgUpdateParamsResponse, error)
-	// DeployERC20 defines a governance operation for deploying erc20 token for
-	// the native token
+	// DeployERC20 defines a governance operation for deploying an ERC20 contract that binds to a native token
 	DeployERC20(ctx context.Context, in *MsgDeployERC20, opts ...grpc.CallOption) (*MsgDeployERC20Response, error)
 }
 
@@ -1064,19 +1063,18 @@ type MsgServer interface {
 	BurnToken(context.Context, *MsgBurnToken) (*MsgBurnTokenResponse, error)
 	// TransferTokenOwner defines a method for transfering token owner
 	TransferTokenOwner(context.Context, *MsgTransferTokenOwner) (*MsgTransferTokenOwnerResponse, error)
-	// SwapFeeToken defines a method for swapping some fee token
+	// SwapFeeToken defines a method for swapping between IRIS and ERIS
 	SwapFeeToken(context.Context, *MsgSwapFeeToken) (*MsgSwapFeeTokenResponse, error)
-	// SwapToERC20 defines a method for swapping some erc20 token
+	// SwapToERC20 defines a method for swapping some native token to its ERC20 counterpart
 	SwapToERC20(context.Context, *MsgSwapToERC20) (*MsgSwapToERC20Response, error)
-	// SwapFromERC20 defines a method for swapping some native token
+	// SwapFromERC20 defines a method for swapping some ERC20 token to its native counterpart
 	SwapFromERC20(context.Context, *MsgSwapFromERC20) (*MsgSwapFromERC20Response, error)
 	// UpdateParams defines a governance operation for updating the token
 	// module parameters. The authority is defined in the keeper.
 	//
 	// Since: cosmos-sdk 0.47
 	UpdateParams(context.Context, *MsgUpdateParams) (*MsgUpdateParamsResponse, error)
-	// DeployERC20 defines a governance operation for deploying erc20 token for
-	// the native token
+	// DeployERC20 defines a governance operation for deploying an ERC20 contract that binds to a native token
 	DeployERC20(context.Context, *MsgDeployERC20) (*MsgDeployERC20Response, error)
 }
 
@@ -2043,14 +2041,14 @@ func (m *MsgSwapFromERC20) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		copy(dAtA[i:], m.Receiver)
 		i = encodeVarintTx(dAtA, i, uint64(len(m.Receiver)))
 		i--
-		dAtA[i] = 0x22
+		dAtA[i] = 0x1a
 	}
 	if len(m.Sender) > 0 {
 		i -= len(m.Sender)
 		copy(dAtA[i:], m.Sender)
 		i = encodeVarintTx(dAtA, i, uint64(len(m.Sender)))
 		i--
-		dAtA[i] = 0x1a
+		dAtA[i] = 0x12
 	}
 	{
 		size, err := m.WantedAmount.MarshalToSizedBuffer(dAtA[:i])
@@ -4428,7 +4426,7 @@ func (m *MsgSwapFromERC20) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
-		case 3:
+		case 2:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field Sender", wireType)
 			}
@@ -4460,7 +4458,7 @@ func (m *MsgSwapFromERC20) Unmarshal(dAtA []byte) error {
 			}
 			m.Sender = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
-		case 4:
+		case 3:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field Receiver", wireType)
 			}
diff --git a/proto/irismod/token/v1/event.proto b/proto/irismod/token/v1/event.proto
index d0b2fc62..5d7416c0 100644
--- a/proto/irismod/token/v1/event.proto
+++ b/proto/irismod/token/v1/event.proto
@@ -23,7 +23,7 @@ message EventSwapToERC20 {
   cosmos.base.v1beta1.Coin amount = 1 [ (gogoproto.nullable) = false ];
   string sender = 2 [ (cosmos_proto.scalar) = "cosmos.AddressString" ];
   string receiver = 3;
-  string contract = 4;
+  string to_contract = 4;
 }
 
 // EventSwapFromERC20 is an event emitted when swapping token from ERC20 to
@@ -32,5 +32,5 @@ message EventSwapFromERC20 {
   cosmos.base.v1beta1.Coin wanted_amount = 1;
   string sender = 2 [ (cosmos_proto.scalar) = "cosmos.AddressString" ];
   string receiver = 3 [ (cosmos_proto.scalar) = "cosmos.AddressString" ];
-  string contract = 4;
+  string from_contract = 4;
 }
diff --git a/proto/irismod/token/v1/tx.proto b/proto/irismod/token/v1/tx.proto
index 05fbf329..291afd75 100644
--- a/proto/irismod/token/v1/tx.proto
+++ b/proto/irismod/token/v1/tx.proto
@@ -30,13 +30,13 @@ service Msg {
   rpc TransferTokenOwner(MsgTransferTokenOwner)
       returns (MsgTransferTokenOwnerResponse);
 
-  // SwapFeeToken defines a method for swapping some fee token
+  // SwapFeeToken defines a method for swapping between IRIS and ERIS
   rpc SwapFeeToken(MsgSwapFeeToken) returns (MsgSwapFeeTokenResponse);
 
-  // SwapToERC20 defines a method for swapping some erc20 token
+  // SwapToERC20 defines a method for swapping some native token to its ERC20 counterpart
   rpc SwapToERC20(MsgSwapToERC20) returns (MsgSwapToERC20Response);
 
-  // SwapFromERC20 defines a method for swapping some native token
+  // SwapFromERC20 defines a method for swapping some ERC20 token to its native counterpart
   rpc SwapFromERC20(MsgSwapFromERC20) returns (MsgSwapFromERC20Response);
 
   // UpdateParams defines a governance operation for updating the token
@@ -45,8 +45,7 @@ service Msg {
   // Since: cosmos-sdk 0.47
   rpc UpdateParams(MsgUpdateParams) returns (MsgUpdateParamsResponse);
 
-  // DeployERC20 defines a governance operation for deploying erc20 token for
-  // the native token
+  // DeployERC20 defines a governance operation for deploying an ERC20 contract that binds to a native token
   rpc DeployERC20(MsgDeployERC20) returns (MsgDeployERC20Response);
 }
 
@@ -184,8 +183,8 @@ message MsgSwapFromERC20 {
   option (cosmos.msg.v1.signer) = "sender";
 
   cosmos.base.v1beta1.Coin wanted_amount = 1 [ (gogoproto.nullable) = false ];
-  string sender = 3 [ (cosmos_proto.scalar) = "cosmos.AddressString" ];
-  string receiver = 4 [ (cosmos_proto.scalar) = "cosmos.AddressString" ];
+  string sender = 2 [ (cosmos_proto.scalar) = "cosmos.AddressString" ];
+  string receiver = 3 [ (cosmos_proto.scalar) = "cosmos.AddressString" ];
 }
 
 // MsgSwapFromERC20Response defines the Msg/SwapFromERC20 response type