diff --git a/docs/openapi/openapi.swagger.yaml b/docs/openapi/openapi.swagger.yaml
index 987feb13d4..64312fb323 100644
--- a/docs/openapi/openapi.swagger.yaml
+++ b/docs/openapi/openapi.swagger.yaml
@@ -56965,6 +56965,9 @@ definitions:
       - optimism_sepolia
       - base_mainnet
       - base_sepolia
+      - solana_mainnet
+      - solana_testnet
+      - solana_localnet
     default: empty
     title: ChainName represents the name of the chain
   chainsConsensus:
@@ -56974,6 +56977,7 @@ definitions:
       - tendermint
       - bitcoin
       - op_stack
+      - solana_consensus
     default: ethereum
     title: |-
       Consensus represents the consensus algorithm used by the chain
@@ -56989,6 +56993,7 @@ definitions:
       - bsc
       - optimism
       - base
+      - solana
     default: eth
     title: |-
       Network represents the network of the chain
@@ -57022,6 +57027,7 @@ definitions:
     enum:
       - no_vm
       - evm
+      - svm
     default: no_vm
     title: |-
       Vm represents the virtual machine type of the chain to support smart
@@ -57832,6 +57838,8 @@ definitions:
         type: string
       is_supported:
         type: boolean
+      gateway_address:
+        type: string
   observerChainParamsList:
     type: object
     properties:
diff --git a/proto/zetachain/zetacore/observer/params.proto b/proto/zetachain/zetacore/observer/params.proto
index 1eb096fc0c..0504c0b112 100644
--- a/proto/zetachain/zetacore/observer/params.proto
+++ b/proto/zetachain/zetacore/observer/params.proto
@@ -30,6 +30,7 @@ message ChainParams {
     (gogoproto.nullable) = false
   ];
   bool is_supported = 16;
+  string gateway_address = 17;
 }
 
 // Deprecated(v17)
diff --git a/typescript/zetachain/zetacore/observer/params_pb.d.ts b/typescript/zetachain/zetacore/observer/params_pb.d.ts
index 252793f418..9155826e05 100644
--- a/typescript/zetachain/zetacore/observer/params_pb.d.ts
+++ b/typescript/zetachain/zetacore/observer/params_pb.d.ts
@@ -104,6 +104,11 @@ export declare class ChainParams extends Message<ChainParams> {
    */
   isSupported: boolean;
 
+  /**
+   * @generated from field: string gateway_address = 17;
+   */
+  gatewayAddress: string;
+
   constructor(data?: PartialMessage<ChainParams>);
 
   static readonly runtime: typeof proto3;
diff --git a/typescript/zetachain/zetacore/pkg/chains/chains_pb.d.ts b/typescript/zetachain/zetacore/pkg/chains/chains_pb.d.ts
index 782e669d43..1fcbdc818b 100644
--- a/typescript/zetachain/zetacore/pkg/chains/chains_pb.d.ts
+++ b/typescript/zetachain/zetacore/pkg/chains/chains_pb.d.ts
@@ -132,6 +132,21 @@ export declare enum ChainName {
    * @generated from enum value: base_sepolia = 20;
    */
   base_sepolia = 20,
+
+  /**
+   * @generated from enum value: solana_mainnet = 21;
+   */
+  solana_mainnet = 21,
+
+  /**
+   * @generated from enum value: solana_testnet = 22;
+   */
+  solana_testnet = 22,
+
+  /**
+   * @generated from enum value: solana_localnet = 23;
+   */
+  solana_localnet = 23,
 }
 
 /**
@@ -176,6 +191,11 @@ export declare enum Network {
    * @generated from enum value: base = 6;
    */
   base = 6,
+
+  /**
+   * @generated from enum value: solana = 7;
+   */
+  solana = 7,
 }
 
 /**
@@ -222,6 +242,11 @@ export declare enum Vm {
    * @generated from enum value: evm = 1;
    */
   evm = 1,
+
+  /**
+   * @generated from enum value: svm = 2;
+   */
+  svm = 2,
 }
 
 /**
@@ -251,6 +276,11 @@ export declare enum Consensus {
    * @generated from enum value: op_stack = 3;
    */
   op_stack = 3,
+
+  /**
+   * @generated from enum value: solana_consensus = 4;
+   */
+  solana_consensus = 4,
 }
 
 /**
diff --git a/x/observer/types/params.pb.go b/x/observer/types/params.pb.go
index 0588f7228c..459aad9a6f 100644
--- a/x/observer/types/params.pb.go
+++ b/x/observer/types/params.pb.go
@@ -84,6 +84,7 @@ type ChainParams struct {
 	BallotThreshold             github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,14,opt,name=ballot_threshold,json=ballotThreshold,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"ballot_threshold"`
 	MinObserverDelegation       github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,15,opt,name=min_observer_delegation,json=minObserverDelegation,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"min_observer_delegation"`
 	IsSupported                 bool                                   `protobuf:"varint,16,opt,name=is_supported,json=isSupported,proto3" json:"is_supported,omitempty"`
+	GatewayAddress              string                                 `protobuf:"bytes,17,opt,name=gateway_address,json=gatewayAddress,proto3" json:"gateway_address,omitempty"`
 }
 
 func (m *ChainParams) Reset()         { *m = ChainParams{} }
@@ -203,6 +204,13 @@ func (m *ChainParams) GetIsSupported() bool {
 	return false
 }
 
+func (m *ChainParams) GetGatewayAddress() string {
+	if m != nil {
+		return m.GatewayAddress
+	}
+	return ""
+}
+
 // Deprecated(v17)
 type Params struct {
 	// Deprecated(v17):Moved into the emissions module
@@ -260,47 +268,48 @@ func init() {
 }
 
 var fileDescriptor_e7fa4666eddf88e5 = []byte{
-	// 626 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0xc1, 0x4e, 0xd4, 0x40,
-	0x18, 0xc7, 0xb7, 0x2e, 0x22, 0xcc, 0x02, 0x0b, 0x0d, 0x6a, 0x81, 0xa4, 0xac, 0x24, 0x6a, 0x43,
-	0x42, 0x6b, 0xd0, 0xa3, 0x92, 0xc8, 0x72, 0x21, 0x62, 0x24, 0x05, 0x0f, 0x7a, 0x70, 0x32, 0x3b,
-	0x1d, 0xda, 0xc9, 0xb6, 0xfd, 0x9a, 0x99, 0x29, 0x82, 0x4f, 0xe1, 0x3b, 0xf8, 0x32, 0x1c, 0x39,
-	0x1a, 0x0f, 0xc4, 0xc0, 0x8b, 0x98, 0x4e, 0xa7, 0xcb, 0x0a, 0x86, 0x83, 0xa7, 0xce, 0x7c, 0xff,
-	0xdf, 0xff, 0xbf, 0xdf, 0x6c, 0xbf, 0x0e, 0xf2, 0xbe, 0x31, 0x45, 0x68, 0x42, 0x78, 0x1e, 0xe8,
-	0x15, 0x08, 0x16, 0xc0, 0x40, 0x32, 0x71, 0xcc, 0x44, 0x50, 0x10, 0x41, 0x32, 0xe9, 0x17, 0x02,
-	0x14, 0xd8, 0x2b, 0x23, 0xd2, 0x6f, 0x48, 0xbf, 0x21, 0x97, 0x17, 0x63, 0x88, 0x41, 0x73, 0x41,
-	0xb5, 0xaa, 0x2d, 0xcb, 0xeb, 0x77, 0x85, 0x37, 0x8b, 0x3b, 0xd8, 0x62, 0x18, 0x07, 0xba, 0x24,
-	0xcd, 0xa3, 0x66, 0xd7, 0xbe, 0xa0, 0x6e, 0xbf, 0xda, 0xef, 0xeb, 0xfe, 0xf6, 0xb8, 0x54, 0xf6,
-	0x3b, 0x34, 0xa3, 0x11, 0x5c, 0xf7, 0xec, 0x58, 0xbd, 0xb6, 0xd7, 0xd9, 0xf4, 0xfc, 0x3b, 0x9a,
-	0xf6, 0xc7, 0x32, 0xc2, 0x0e, 0xbd, 0xde, 0xac, 0xfd, 0x98, 0x44, 0x9d, 0x31, 0xd1, 0x5e, 0x42,
-	0x53, 0x75, 0x38, 0x8f, 0x9c, 0x4e, 0xcf, 0xf2, 0xda, 0xe1, 0x03, 0xbd, 0xdf, 0x8d, 0xec, 0x0d,
-	0x64, 0x53, 0xc8, 0x8f, 0xb8, 0xc8, 0x88, 0xe2, 0x90, 0x63, 0x0a, 0x65, 0xae, 0x1c, 0xab, 0x67,
-	0x79, 0x13, 0xe1, 0xc2, 0xb8, 0xd2, 0xaf, 0x04, 0xdb, 0x43, 0xf3, 0x31, 0x91, 0xb8, 0x10, 0x9c,
-	0x32, 0xac, 0x38, 0x1d, 0x32, 0xe1, 0xdc, 0xd3, 0xf0, 0x5c, 0x4c, 0xe4, 0x7e, 0x55, 0x3e, 0xd4,
-	0x55, 0xfb, 0x29, 0x9a, 0xe3, 0xf9, 0x00, 0xca, 0x3c, 0x6a, 0xb8, 0xb6, 0xe6, 0x66, 0x4d, 0xd5,
-	0x60, 0xcf, 0x51, 0x17, 0x4a, 0xf5, 0x17, 0x37, 0x51, 0xe7, 0x35, 0x65, 0x03, 0xae, 0xa3, 0x85,
-	0xaf, 0x44, 0xd1, 0x04, 0x97, 0xea, 0x04, 0x1a, 0xf4, 0xbe, 0x46, 0xbb, 0x5a, 0xf8, 0xa8, 0x4e,
-	0xc0, 0xb0, 0x6f, 0x90, 0x7e, 0xd9, 0x58, 0xc1, 0x90, 0x55, 0x47, 0xca, 0x95, 0x20, 0x54, 0x61,
-	0x12, 0x45, 0x82, 0x49, 0xe9, 0x4c, 0xf5, 0x2c, 0x6f, 0x3a, 0x74, 0x2a, 0xe4, 0xb0, 0x22, 0xfa,
-	0x06, 0x78, 0x5b, 0xeb, 0xf6, 0x6b, 0xb4, 0x4c, 0x21, 0xcf, 0x19, 0x55, 0x20, 0x6e, 0xbb, 0xa7,
-	0x6b, 0xf7, 0x88, 0xb8, 0xe9, 0xee, 0x23, 0x97, 0x09, 0xba, 0xf9, 0x02, 0xd3, 0x52, 0x2a, 0x88,
-	0x4e, 0x6f, 0x27, 0x20, 0x9d, 0xb0, 0xa2, 0xa9, 0x7e, 0x0d, 0xfd, 0xa3, 0x85, 0xd1, 0xdf, 0x22,
-	0x69, 0xc2, 0xa2, 0x32, 0x65, 0x98, 0xe7, 0x8a, 0x89, 0x63, 0x92, 0x3a, 0x33, 0xfa, 0x1d, 0x3a,
-	0x0d, 0x71, 0x60, 0x80, 0x5d, 0xa3, 0xdb, 0x5b, 0x68, 0xe5, 0xb6, 0x3b, 0x05, 0x18, 0x92, 0x84,
-	0x91, 0xc8, 0x99, 0xd5, 0xf6, 0xa5, 0x9b, 0xf6, 0xbd, 0x06, 0xb0, 0x3f, 0xa1, 0xf9, 0x01, 0x49,
-	0x53, 0x50, 0x58, 0x25, 0x82, 0xc9, 0x04, 0xd2, 0xc8, 0x99, 0xab, 0x9a, 0xde, 0xf6, 0xcf, 0x2e,
-	0x56, 0x5b, 0xbf, 0x2e, 0x56, 0x9f, 0xc5, 0x5c, 0x25, 0xe5, 0xc0, 0xa7, 0x90, 0x05, 0x14, 0x64,
-	0x06, 0xd2, 0x3c, 0x36, 0x64, 0x34, 0x0c, 0xd4, 0x69, 0xc1, 0xa4, 0xbf, 0xc3, 0x68, 0xd8, 0xad,
-	0x73, 0x0e, 0x9b, 0x18, 0xfb, 0x08, 0x3d, 0xce, 0x78, 0x8e, 0x9b, 0x19, 0xc6, 0x11, 0x4b, 0x59,
-	0xac, 0x07, 0xcc, 0xe9, 0xfe, 0xd7, 0x2f, 0x3c, 0xcc, 0x78, 0xfe, 0xc1, 0xa4, 0xed, 0x8c, 0xc2,
-	0xec, 0x27, 0x68, 0x86, 0x4b, 0x2c, 0xcb, 0xa2, 0x00, 0xa1, 0x58, 0xe4, 0xcc, 0xf7, 0x2c, 0x6f,
-	0x2a, 0xec, 0x70, 0x79, 0xd0, 0x94, 0xd6, 0xb6, 0xd0, 0xa4, 0xf9, 0x3e, 0x5e, 0xa1, 0x47, 0xe6,
-	0xbc, 0x19, 0x51, 0xa5, 0xe0, 0xea, 0x14, 0x0f, 0x52, 0xa0, 0x43, 0xa9, 0x67, 0xb6, 0x1d, 0x2e,
-	0xd6, 0xea, 0x7b, 0x23, 0x6e, 0x6b, 0x6d, 0x7b, 0xf7, 0xec, 0xd2, 0xb5, 0xce, 0x2f, 0x5d, 0xeb,
-	0xf7, 0xa5, 0x6b, 0x7d, 0xbf, 0x72, 0x5b, 0xe7, 0x57, 0x6e, 0xeb, 0xe7, 0x95, 0xdb, 0xfa, 0x1c,
-	0x8c, 0xf5, 0x5e, 0x4d, 0xd9, 0xc6, 0x8d, 0x7b, 0xe1, 0xe4, 0xfa, 0x16, 0xd1, 0x07, 0x19, 0x4c,
-	0xea, 0x7b, 0xe1, 0xe5, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa1, 0x11, 0xb3, 0xd5, 0xce, 0x04,
-	0x00, 0x00,
+	// 645 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0xc1, 0x4f, 0xd4, 0x4e,
+	0x14, 0xc7, 0xb7, 0xbf, 0xe5, 0x87, 0x30, 0x0b, 0xbb, 0xd0, 0xa0, 0x16, 0x48, 0x96, 0x95, 0x44,
+	0x6d, 0x48, 0x68, 0x0d, 0x7a, 0x54, 0x12, 0x59, 0x2e, 0x44, 0x8c, 0xa4, 0xe0, 0x41, 0x0f, 0x4e,
+	0x66, 0xa7, 0x43, 0x3b, 0xd9, 0xb6, 0xaf, 0x99, 0x99, 0x02, 0xeb, 0x5f, 0xe1, 0x9f, 0xc5, 0xc1,
+	0x03, 0x47, 0xe3, 0x81, 0x18, 0xf8, 0x47, 0x4c, 0xa7, 0xd3, 0x65, 0x05, 0xc3, 0xc1, 0x53, 0x67,
+	0xde, 0xf7, 0xf3, 0xbe, 0xfb, 0x66, 0xde, 0xdb, 0x41, 0xee, 0x57, 0xa6, 0x08, 0x8d, 0x09, 0xcf,
+	0x7c, 0xbd, 0x02, 0xc1, 0x7c, 0x18, 0x48, 0x26, 0x4e, 0x98, 0xf0, 0x73, 0x22, 0x48, 0x2a, 0xbd,
+	0x5c, 0x80, 0x02, 0x7b, 0x75, 0x4c, 0x7a, 0x35, 0xe9, 0xd5, 0xe4, 0xca, 0x52, 0x04, 0x11, 0x68,
+	0xce, 0x2f, 0x57, 0x55, 0xca, 0xca, 0xc6, 0x7d, 0xe6, 0xf5, 0xe2, 0x1e, 0x36, 0x1f, 0x46, 0xbe,
+	0x0e, 0x49, 0xf3, 0xa9, 0xd8, 0xf5, 0x2f, 0xa8, 0xd3, 0x2f, 0xf7, 0x07, 0xba, 0xbe, 0x7d, 0x2e,
+	0x95, 0xfd, 0x0e, 0xcd, 0x69, 0x04, 0x57, 0x35, 0x3b, 0x56, 0xaf, 0xe9, 0xb6, 0xb6, 0x5c, 0xef,
+	0x9e, 0xa2, 0xbd, 0x09, 0x8f, 0xa0, 0x45, 0x6f, 0x36, 0xeb, 0xdf, 0xa7, 0x51, 0x6b, 0x42, 0xb4,
+	0x97, 0xd1, 0x4c, 0x65, 0xce, 0x43, 0xa7, 0xd5, 0xb3, 0xdc, 0x66, 0xf0, 0x40, 0xef, 0xf7, 0x42,
+	0x7b, 0x13, 0xd9, 0x14, 0xb2, 0x63, 0x2e, 0x52, 0xa2, 0x38, 0x64, 0x98, 0x42, 0x91, 0x29, 0xc7,
+	0xea, 0x59, 0xee, 0x54, 0xb0, 0x38, 0xa9, 0xf4, 0x4b, 0xc1, 0x76, 0xd1, 0x42, 0x44, 0x24, 0xce,
+	0x05, 0xa7, 0x0c, 0x2b, 0x4e, 0x87, 0x4c, 0x38, 0xff, 0x69, 0xb8, 0x1d, 0x11, 0x79, 0x50, 0x86,
+	0x8f, 0x74, 0xd4, 0x7e, 0x8a, 0xda, 0x3c, 0x1b, 0x40, 0x91, 0x85, 0x35, 0xd7, 0xd4, 0xdc, 0xbc,
+	0x89, 0x1a, 0xec, 0x39, 0xea, 0x40, 0xa1, 0xfe, 0xe0, 0xa6, 0x2a, 0xbf, 0x3a, 0x6c, 0xc0, 0x0d,
+	0xb4, 0x78, 0x4a, 0x14, 0x8d, 0x71, 0xa1, 0xce, 0xa0, 0x46, 0xff, 0xd7, 0x68, 0x47, 0x0b, 0x1f,
+	0xd5, 0x19, 0x18, 0xf6, 0x0d, 0xd2, 0xcd, 0xc6, 0x0a, 0x86, 0xac, 0x3c, 0x52, 0xa6, 0x04, 0xa1,
+	0x0a, 0x93, 0x30, 0x14, 0x4c, 0x4a, 0x67, 0xa6, 0x67, 0xb9, 0xb3, 0x81, 0x53, 0x22, 0x47, 0x25,
+	0xd1, 0x37, 0xc0, 0xdb, 0x4a, 0xb7, 0x5f, 0xa3, 0x15, 0x0a, 0x59, 0xc6, 0xa8, 0x02, 0x71, 0x37,
+	0x7b, 0xb6, 0xca, 0x1e, 0x13, 0xb7, 0xb3, 0xfb, 0xa8, 0xcb, 0x04, 0xdd, 0x7a, 0x81, 0x69, 0x21,
+	0x15, 0x84, 0xa3, 0xbb, 0x0e, 0x48, 0x3b, 0xac, 0x6a, 0xaa, 0x5f, 0x41, 0x7f, 0x29, 0x61, 0x7c,
+	0x2d, 0x92, 0xc6, 0x2c, 0x2c, 0x12, 0x86, 0x79, 0xa6, 0x98, 0x38, 0x21, 0x89, 0x33, 0xa7, 0x7b,
+	0xe8, 0xd4, 0xc4, 0xa1, 0x01, 0xf6, 0x8c, 0x6e, 0x6f, 0xa3, 0xd5, 0xbb, 0xd9, 0x09, 0xc0, 0x90,
+	0xc4, 0x8c, 0x84, 0xce, 0xbc, 0x4e, 0x5f, 0xbe, 0x9d, 0xbe, 0x5f, 0x03, 0xf6, 0x27, 0xb4, 0x30,
+	0x20, 0x49, 0x02, 0x0a, 0xab, 0x58, 0x30, 0x19, 0x43, 0x12, 0x3a, 0xed, 0xb2, 0xe8, 0x1d, 0xef,
+	0xfc, 0x72, 0xad, 0xf1, 0xf3, 0x72, 0xed, 0x59, 0xc4, 0x55, 0x5c, 0x0c, 0x3c, 0x0a, 0xa9, 0x4f,
+	0x41, 0xa6, 0x20, 0xcd, 0x67, 0x53, 0x86, 0x43, 0x5f, 0x8d, 0x72, 0x26, 0xbd, 0x5d, 0x46, 0x83,
+	0x4e, 0xe5, 0x73, 0x54, 0xdb, 0xd8, 0xc7, 0xe8, 0x71, 0xca, 0x33, 0x5c, 0xcf, 0x30, 0x0e, 0x59,
+	0xc2, 0x22, 0x3d, 0x60, 0x4e, 0xe7, 0x9f, 0x7e, 0xe1, 0x61, 0xca, 0xb3, 0x0f, 0xc6, 0x6d, 0x77,
+	0x6c, 0x66, 0x3f, 0x41, 0x73, 0x5c, 0x62, 0x59, 0xe4, 0x39, 0x08, 0xc5, 0x42, 0x67, 0xa1, 0x67,
+	0xb9, 0x33, 0x41, 0x8b, 0xcb, 0xc3, 0x3a, 0x54, 0x8e, 0x5e, 0x44, 0x14, 0x3b, 0x25, 0xa3, 0x71,
+	0x67, 0x16, 0x75, 0x67, 0xda, 0x26, 0x6c, 0x9a, 0xb1, 0xbe, 0x8d, 0xa6, 0xcd, 0x1f, 0xe9, 0x15,
+	0x7a, 0x64, 0x2e, 0x26, 0x25, 0xaa, 0x10, 0x5c, 0x8d, 0xf0, 0x20, 0x01, 0x3a, 0x94, 0x7a, 0xb8,
+	0x9b, 0xc1, 0x52, 0xa5, 0xbe, 0x37, 0xe2, 0x8e, 0xd6, 0x76, 0xf6, 0xce, 0xaf, 0xba, 0xd6, 0xc5,
+	0x55, 0xd7, 0xfa, 0x75, 0xd5, 0xb5, 0xbe, 0x5d, 0x77, 0x1b, 0x17, 0xd7, 0xdd, 0xc6, 0x8f, 0xeb,
+	0x6e, 0xe3, 0xb3, 0x3f, 0x71, 0xc8, 0x72, 0x1c, 0x37, 0x6f, 0x3d, 0x20, 0x67, 0x37, 0xcf, 0x8d,
+	0x3e, 0xf1, 0x60, 0x5a, 0x3f, 0x20, 0x2f, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0xaf, 0x14, 0xa2,
+	0x44, 0xf7, 0x04, 0x00, 0x00,
 }
 
 func (m *ChainParamsList) Marshal() (dAtA []byte, err error) {
@@ -360,6 +369,15 @@ func (m *ChainParams) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
+	if len(m.GatewayAddress) > 0 {
+		i -= len(m.GatewayAddress)
+		copy(dAtA[i:], m.GatewayAddress)
+		i = encodeVarintParams(dAtA, i, uint64(len(m.GatewayAddress)))
+		i--
+		dAtA[i] = 0x1
+		i--
+		dAtA[i] = 0x8a
+	}
 	if m.IsSupported {
 		i--
 		if m.IsSupported {
@@ -559,6 +577,10 @@ func (m *ChainParams) Size() (n int) {
 	if m.IsSupported {
 		n += 3
 	}
+	l = len(m.GatewayAddress)
+	if l > 0 {
+		n += 2 + l + sovParams(uint64(l))
+	}
 	return n
 }
 
@@ -1029,6 +1051,38 @@ func (m *ChainParams) Unmarshal(dAtA []byte) error {
 				}
 			}
 			m.IsSupported = bool(v != 0)
+		case 17:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field GatewayAddress", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowParams
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthParams
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthParams
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.GatewayAddress = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipParams(dAtA[iNdEx:])