From 39c77de4642a1aa88193a01938a28e6a4f25263b Mon Sep 17 00:00:00 2001
From: Ilya Kapitonau <ilya.th.kapitonov@gmail.com>
Date: Thu, 21 Mar 2024 19:09:10 +0400
Subject: [PATCH] Regenerate protobuf files

---
 proto/secret/compute/v1beta1/genesis.proto    |  35 ++--
 proto/secret/compute/v1beta1/msg.proto        |  65 +++---
 proto/secret/compute/v1beta1/query.proto      | 189 +++++++++---------
 proto/secret/compute/v1beta1/types.proto      |  75 +++----
 .../emergencybutton/v1beta1/genesis.proto     |   4 +-
 .../emergencybutton/v1beta1/params.proto      |   5 +-
 .../emergencybutton/v1beta1/query.proto       |   4 +-
 proto/secret/emergencybutton/v1beta1/tx.proto |  10 +-
 proto/secret/intertx/v1beta1/query.proto      |  27 ++-
 proto/secret/intertx/v1beta1/tx.proto         |  19 +-
 .../secret/registration/v1beta1/genesis.proto |   7 +-
 proto/secret/registration/v1beta1/msg.proto   |  17 +-
 proto/secret/registration/v1beta1/query.proto |  22 +-
 proto/secret/registration/v1beta1/types.proto |  14 +-
 x/compute/internal/types/genesis.pb.go        |   4 +-
 x/compute/internal/types/msg.pb.go            |  34 ++--
 x/compute/internal/types/query.pb.go          |  12 +-
 x/compute/internal/types/query.pb.gw.go       |  54 ++++-
 x/compute/internal/types/types.pb.go          | 145 +++++++-------
 x/emergencybutton/types/genesis.pb.go         |   4 +-
 x/emergencybutton/types/params.pb.go          |   4 +-
 x/emergencybutton/types/query.pb.go           |  14 +-
 x/emergencybutton/types/query.pb.gw.go        |   9 +-
 x/emergencybutton/types/tx.pb.go              |  15 +-
 x/mauth/types/query.pb.go                     |  18 +-
 x/mauth/types/query.pb.gw.go                  |   9 +-
 x/mauth/types/tx.pb.go                        |  14 +-
 x/mauth/types/tx.pb.gw.go                     |  14 +-
 x/registration/internal/types/genesis.pb.go   |   4 +-
 x/registration/internal/types/msg.pb.go       |   4 +-
 x/registration/internal/types/query.pb.go     |   6 +-
 x/registration/internal/types/query.pb.gw.go  |  19 +-
 x/registration/internal/types/types.pb.go     |   4 +-
 x/registration/remote_attestation/types.pb.go | 118 +++++------
 34 files changed, 560 insertions(+), 438 deletions(-)

diff --git a/proto/secret/compute/v1beta1/genesis.proto b/proto/secret/compute/v1beta1/genesis.proto
index 1b7d2dbb6..d18f000e5 100644
--- a/proto/secret/compute/v1beta1/genesis.proto
+++ b/proto/secret/compute/v1beta1/genesis.proto
@@ -8,29 +8,38 @@ option go_package = "github.com/scrtlabs/SecretNetwork/x/compute/internal/types"
 
 // GenesisState - genesis state of x/wasm
 message GenesisState {
-//    Params params = 1 [(gogoproto.nullable) = false];
-    repeated Code codes = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "codes,omitempty"];
-    repeated Contract contracts = 3 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "contracts,omitempty"];
-    repeated Sequence sequences = 4 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "sequences,omitempty"];
+  //    Params params = 1 [(gogoproto.nullable) = false];
+  repeated Code codes = 2
+      [ (gogoproto.nullable) = false, (gogoproto.jsontag) = "codes,omitempty" ];
+  repeated Contract contracts = 3 [
+    (gogoproto.nullable) = false,
+    (gogoproto.jsontag) = "contracts,omitempty"
+  ];
+  repeated Sequence sequences = 4 [
+    (gogoproto.nullable) = false,
+    (gogoproto.jsontag) = "sequences,omitempty"
+  ];
 }
 
 // Code struct encompasses CodeInfo and CodeBytes
 message Code {
-    uint64 code_id = 1 [(gogoproto.customname) = "CodeID"];
-    CodeInfo code_info = 2 [(gogoproto.nullable) = false];
-    bytes code_bytes = 3;
+  uint64 code_id = 1 [ (gogoproto.customname) = "CodeID" ];
+  CodeInfo code_info = 2 [ (gogoproto.nullable) = false ];
+  bytes code_bytes = 3;
 }
 
 // Contract struct encompasses ContractAddress, ContractInfo, and ContractState
 message Contract {
-    bytes contract_address = 1 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"];
-    ContractInfo contract_info = 2 [(gogoproto.nullable) = false];
-    repeated Model contract_state = 3 [(gogoproto.nullable) = false];
-    ContractCustomInfo contract_custom_info = 4;
+  bytes contract_address = 1
+      [ (gogoproto.casttype) =
+            "github.com/cosmos/cosmos-sdk/types.AccAddress" ];
+  ContractInfo contract_info = 2 [ (gogoproto.nullable) = false ];
+  repeated Model contract_state = 3 [ (gogoproto.nullable) = false ];
+  ContractCustomInfo contract_custom_info = 4;
 }
 
 // Sequence id and value of a counter
 message Sequence {
-    bytes id_key = 1 [(gogoproto.customname) = "IDKey"];
-    uint64 value = 2;
+  bytes id_key = 1 [ (gogoproto.customname) = "IDKey" ];
+  uint64 value = 2;
 }
\ No newline at end of file
diff --git a/proto/secret/compute/v1beta1/msg.proto b/proto/secret/compute/v1beta1/msg.proto
index d128e6239..0fcffbaa1 100644
--- a/proto/secret/compute/v1beta1/msg.proto
+++ b/proto/secret/compute/v1beta1/msg.proto
@@ -11,7 +11,8 @@ service Msg {
   // StoreCode to submit Wasm code to the system
   rpc StoreCode(MsgStoreCode) returns (MsgStoreCodeResponse);
   //  Instantiate creates a new smart contract instance for the given code id.
-  rpc InstantiateContract(MsgInstantiateContract) returns (MsgInstantiateContractResponse);
+  rpc InstantiateContract(MsgInstantiateContract)
+      returns (MsgInstantiateContractResponse);
   // Execute submits the given message data to a smart contract
   rpc ExecuteContract(MsgExecuteContract) returns (MsgExecuteContractResponse);
   // Migrate runs a code upgrade/ downgrade for a smart contract
@@ -25,10 +26,12 @@ service Msg {
 message MsgStoreCode {
   option (gogoproto.goproto_getters) = false;
   // sender is the canonical address of the sender
-  bytes sender = 1 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"];
+  bytes sender = 1 [ (gogoproto.casttype) =
+                         "github.com/cosmos/cosmos-sdk/types.AccAddress" ];
   // WASMByteCode can be raw or gzip compressed
-  bytes wasm_byte_code = 2 [(gogoproto.customname) = "WASMByteCode"];
-  // Source is a valid absolute HTTPS URI to the contract's source code, optional
+  bytes wasm_byte_code = 2 [ (gogoproto.customname) = "WASMByteCode" ];
+  // Source is a valid absolute HTTPS URI to the contract's source code,
+  // optional
   string source = 3;
   // Builder is a valid docker image name with tag, optional
   string builder = 4;
@@ -44,15 +47,20 @@ message MsgInstantiateContract {
   option (gogoproto.goproto_getters) = false;
 
   // sender is the canonical address of the sender
-  bytes sender = 1 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"];
+  bytes sender = 1 [ (gogoproto.casttype) =
+                         "github.com/cosmos/cosmos-sdk/types.AccAddress" ];
   string callback_code_hash = 2;
-  uint64 code_id = 3 [(gogoproto.customname) = "CodeID"];
+  uint64 code_id = 3 [ (gogoproto.customname) = "CodeID" ];
   string label = 4;
   // init_msg is an encrypted input to pass to the contract on init
   bytes init_msg = 5;
-  repeated cosmos.base.v1beta1.Coin init_funds = 6 [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"];
-  // used internally for encryption, should always be empty in a signed transaction
-  bytes callback_sig = 7 [(gogoproto.customname) = "CallbackSig"];
+  repeated cosmos.base.v1beta1.Coin init_funds = 6 [
+    (gogoproto.nullable) = false,
+    (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
+  ];
+  // used internally for encryption, should always be empty in a signed
+  // transaction
+  bytes callback_sig = 7 [ (gogoproto.customname) = "CallbackSig" ];
   // Admin is an optional address that can execute migrations
   string admin = 8;
 }
@@ -69,16 +77,23 @@ message MsgExecuteContract {
   option (gogoproto.goproto_getters) = false;
 
   // sender is the canonical address of the sender
-  bytes sender = 1 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"];
+  bytes sender = 1 [ (gogoproto.casttype) =
+                         "github.com/cosmos/cosmos-sdk/types.AccAddress" ];
   // contract is the canonical address of the contract
-  bytes contract = 2 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"];
+  bytes contract = 2 [ (gogoproto.casttype) =
+                           "github.com/cosmos/cosmos-sdk/types.AccAddress" ];
   // msg is an encrypted input to pass to the contract on execute
   bytes msg = 3;
-  // used internally for encryption, should always be empty in a signed transaction
+  // used internally for encryption, should always be empty in a signed
+  // transaction
   string callback_code_hash = 4;
-  repeated cosmos.base.v1beta1.Coin sent_funds = 5 [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"];
-  // used internally for encryption, should always be empty in a signed transaction
-  bytes callback_sig = 6 [(gogoproto.customname) = "CallbackSig"];
+  repeated cosmos.base.v1beta1.Coin sent_funds = 5 [
+    (gogoproto.nullable) = false,
+    (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
+  ];
+  // used internally for encryption, should always be empty in a signed
+  // transaction
+  bytes callback_sig = 6 [ (gogoproto.customname) = "CallbackSig" ];
 }
 
 // MsgExecuteContractResponse returns execution result data.
@@ -95,11 +110,13 @@ message MsgMigrateContract {
   string contract = 2;
   // CodeID references the new WASM code
   uint64 code_id = 3 [ (gogoproto.customname) = "CodeID" ];
-  // msg is an encrypted input to pass to the contract on migration 
+  // msg is an encrypted input to pass to the contract on migration
   bytes msg = 4;
-  // used internally for encryption, should always be empty in a signed transaction
-  bytes callback_sig = 7 [(gogoproto.customname) = "CallbackSig"];
-  // used internally for encryption, should always be empty in a signed transaction
+  // used internally for encryption, should always be empty in a signed
+  // transaction
+  bytes callback_sig = 7 [ (gogoproto.customname) = "CallbackSig" ];
+  // used internally for encryption, should always be empty in a signed
+  // transaction
   string callback_code_hash = 8;
 }
 
@@ -118,8 +135,9 @@ message MsgUpdateAdmin {
   string new_admin = 2;
   // Contract is the address of the smart contract
   string contract = 3;
-  // used internally for encryption, should always be empty in a signed transaction
-  bytes callback_sig = 7 [(gogoproto.customname) = "CallbackSig"];
+  // used internally for encryption, should always be empty in a signed
+  // transaction
+  bytes callback_sig = 7 [ (gogoproto.customname) = "CallbackSig" ];
 }
 
 // MsgUpdateAdminResponse returns empty data
@@ -131,8 +149,9 @@ message MsgClearAdmin {
   string sender = 1;
   // Contract is the address of the smart contract
   string contract = 3;
-  // used internally for encryption, should always be empty in a signed transaction
-  bytes callback_sig = 7 [(gogoproto.customname) = "CallbackSig"];
+  // used internally for encryption, should always be empty in a signed
+  // transaction
+  bytes callback_sig = 7 [ (gogoproto.customname) = "CallbackSig" ];
 }
 
 // MsgClearAdminResponse returns empty data
diff --git a/proto/secret/compute/v1beta1/query.proto b/proto/secret/compute/v1beta1/query.proto
index a82240683..c88f62a8a 100644
--- a/proto/secret/compute/v1beta1/query.proto
+++ b/proto/secret/compute/v1beta1/query.proto
@@ -14,121 +14,120 @@ option (gogoproto.equal_all) = true;
 
 // Query defines the gRPC querier service
 service Query {
-    // Query contract info by address
-    rpc ContractInfo(QueryByContractAddressRequest)
-        returns (QueryContractInfoResponse) {
-        option (google.api.http).get =
-            "/compute/v1beta1/info/{contract_address}";
-    }
-    // Query code info by id
-    rpc ContractsByCodeId(QueryByCodeIdRequest)
-        returns (QueryContractsByCodeIdResponse) {
-        option (google.api.http).get = "/compute/v1beta1/contracts/{code_id}";
-    }
-    // Query secret contract
-    rpc QuerySecretContract(QuerySecretContractRequest)
-        returns (QuerySecretContractResponse) {
-        option (google.api.http).get =
-            "/compute/v1beta1/query/{contract_address}";
-    }
-    // Query a specific contract code by id
-    rpc Code(QueryByCodeIdRequest) returns (QueryCodeResponse) {
-        option (google.api.http).get = "/compute/v1beta1/code/{code_id}";
-    }
-    // Query all contract codes on-chain
-    rpc Codes(google.protobuf.Empty) returns (QueryCodesResponse) {
-        option (google.api.http).get = "/compute/v1beta1/codes";
-    }
-    // Query code hash by contract address
-    rpc CodeHashByContractAddress(QueryByContractAddressRequest)
-        returns (QueryCodeHashResponse) {
-        option (google.api.http).get =
-            "/compute/v1beta1/code_hash/by_contract_address/{contract_address}";
-    }
-    // Query code hash by code id
-    rpc CodeHashByCodeId(QueryByCodeIdRequest) returns (QueryCodeHashResponse) {
-        option (google.api.http).get = "/compute/v1beta1/code_hash/by_code_id/{code_id}";
-    }
-    // Query contract label by address
-    rpc LabelByAddress(QueryByContractAddressRequest)
-        returns (QueryContractLabelResponse) {
-        option (google.api.http).get =
-            "/compute/v1beta1/label/{contract_address}";
-    }
-    // Query contract address by label
-    rpc AddressByLabel(QueryByLabelRequest)
-        returns (QueryContractAddressResponse) {
-        option (google.api.http).get =
-            "/compute/v1beta1/contract_address/{label}";
-    }
-    // ContractHistory gets the contract code history
-    rpc ContractHistory(QueryContractHistoryRequest)
-        returns (QueryContractHistoryResponse) {
-        option (google.api.http).get =
-            "/compute/v1beta1/contract_history/{contract_address}";
-    }
+  // Query contract info by address
+  rpc ContractInfo(QueryByContractAddressRequest)
+      returns (QueryContractInfoResponse) {
+    option (google.api.http).get = "/compute/v1beta1/info/{contract_address}";
+  }
+  // Query code info by id
+  rpc ContractsByCodeId(QueryByCodeIdRequest)
+      returns (QueryContractsByCodeIdResponse) {
+    option (google.api.http).get = "/compute/v1beta1/contracts/{code_id}";
+  }
+  // Query secret contract
+  rpc QuerySecretContract(QuerySecretContractRequest)
+      returns (QuerySecretContractResponse) {
+    option (google.api.http).get = "/compute/v1beta1/query/{contract_address}";
+  }
+  // Query a specific contract code by id
+  rpc Code(QueryByCodeIdRequest) returns (QueryCodeResponse) {
+    option (google.api.http).get = "/compute/v1beta1/code/{code_id}";
+  }
+  // Query all contract codes on-chain
+  rpc Codes(google.protobuf.Empty) returns (QueryCodesResponse) {
+    option (google.api.http).get = "/compute/v1beta1/codes";
+  }
+  // Query code hash by contract address
+  rpc CodeHashByContractAddress(QueryByContractAddressRequest)
+      returns (QueryCodeHashResponse) {
+    option (google.api.http).get =
+        "/compute/v1beta1/code_hash/by_contract_address/{contract_address}";
+  }
+  // Query code hash by code id
+  rpc CodeHashByCodeId(QueryByCodeIdRequest) returns (QueryCodeHashResponse) {
+    option (google.api.http).get =
+        "/compute/v1beta1/code_hash/by_code_id/{code_id}";
+  }
+  // Query contract label by address
+  rpc LabelByAddress(QueryByContractAddressRequest)
+      returns (QueryContractLabelResponse) {
+    option (google.api.http).get = "/compute/v1beta1/label/{contract_address}";
+  }
+  // Query contract address by label
+  rpc AddressByLabel(QueryByLabelRequest)
+      returns (QueryContractAddressResponse) {
+    option (google.api.http).get = "/compute/v1beta1/contract_address/{label}";
+  }
+  // ContractHistory gets the contract code history
+  rpc ContractHistory(QueryContractHistoryRequest)
+      returns (QueryContractHistoryResponse) {
+    option (google.api.http).get =
+        "/compute/v1beta1/contract_history/{contract_address}";
+  }
 }
 
 message QuerySecretContractRequest {
-    // address is the bech32 human readable address of the contract
-    string contract_address = 1;
-    bytes query = 2;
+  // address is the bech32 human readable address of the contract
+  string contract_address = 1;
+  bytes query = 2;
 }
 
 message QueryByLabelRequest { string label = 1; }
 
 message QueryByContractAddressRequest {
-    // address is the bech32 human readable address of the contract
-    string contract_address = 1;
+  // address is the bech32 human readable address of the contract
+  string contract_address = 1;
 }
 
 message QueryByCodeIdRequest { uint64 code_id = 1; }
 
 message QuerySecretContractResponse { bytes data = 1; }
 
-// QueryContractInfoResponse is the response type for the Query/ContractInfo RPC method
+// QueryContractInfoResponse is the response type for the Query/ContractInfo RPC
+// method
 message QueryContractInfoResponse {
-    // contract_address is the bech32 human readable address of the contract
-    string contract_address = 1;
-    ContractInfo contract_info = 2
-        [ (gogoproto.embed) = true, (gogoproto.jsontag) = "" ];
+  // contract_address is the bech32 human readable address of the contract
+  string contract_address = 1;
+  ContractInfo contract_info = 2
+      [ (gogoproto.embed) = true, (gogoproto.jsontag) = "" ];
 }
 
-// ContractInfoWithAddress adds the contract address to the ContractInfo representation
+// ContractInfoWithAddress adds the contract address to the ContractInfo
+// representation
 message ContractInfoWithAddress {
-    // contract_address is the bech32 human readable address of the contract
-    string contract_address = 1;
-    ContractInfo contract_info = 2
-        [ (gogoproto.embed) = true, (gogoproto.jsontag) = "" ];
+  // contract_address is the bech32 human readable address of the contract
+  string contract_address = 1;
+  ContractInfo contract_info = 2
+      [ (gogoproto.embed) = true, (gogoproto.jsontag) = "" ];
 }
 
 message QueryContractsByCodeIdResponse {
-    repeated ContractInfoWithAddress contract_infos = 1
-        [ (gogoproto.nullable) = false ];
+  repeated ContractInfoWithAddress contract_infos = 1
+      [ (gogoproto.nullable) = false ];
 }
 
 message CodeInfoResponse {
-    uint64 code_id = 1;
-    // creator is the bech32 human readable address of the contract
-    string creator = 2;
-    string code_hash = 3;
-    string source = 4;
-    string builder = 5;
+  uint64 code_id = 1;
+  // creator is the bech32 human readable address of the contract
+  string creator = 2;
+  string code_hash = 3;
+  string source = 4;
+  string builder = 5;
 }
 
 message QueryCodeResponse {
-    CodeInfoResponse code_info = 1
-        [ (gogoproto.embed) = true, (gogoproto.jsontag) = "" ];
-    bytes wasm = 2;
+  CodeInfoResponse code_info = 1
+      [ (gogoproto.embed) = true, (gogoproto.jsontag) = "" ];
+  bytes wasm = 2;
 }
 
 message QueryCodesResponse {
-    repeated CodeInfoResponse code_infos = 1 [ (gogoproto.nullable) = false ];
+  repeated CodeInfoResponse code_infos = 1 [ (gogoproto.nullable) = false ];
 }
 
 message QueryContractAddressResponse {
-    // address is the bech32 human readable address of the contract
-    string contract_address = 1;
+  // address is the bech32 human readable address of the contract
+  string contract_address = 1;
 }
 
 message QueryContractLabelResponse { string label = 1; }
@@ -137,28 +136,28 @@ message QueryCodeHashResponse { string code_hash = 1; }
 
 // DecryptedAnswer is a struct that represents a decrypted tx-query
 message DecryptedAnswer {
-    option (gogoproto.equal) = false;
+  option (gogoproto.equal) = false;
 
-    string type = 1;
-    string input = 2;
-    string output_data = 3;
-    string output_data_as_string = 4;
+  string type = 1;
+  string input = 2;
+  string output_data = 3;
+  string output_data_as_string = 4;
 }
 
 message DecryptedAnswers {
-    option (gogoproto.equal) = false;
+  option (gogoproto.equal) = false;
 
-    repeated DecryptedAnswer answers = 1;
-    repeated cosmos.base.abci.v1beta1.StringEvent output_logs = 2
-        [ (gogoproto.nullable) = false ];
-    string output_error = 3;
-    string plaintext_error = 4;
+  repeated DecryptedAnswer answers = 1;
+  repeated cosmos.base.abci.v1beta1.StringEvent output_logs = 2
+      [ (gogoproto.nullable) = false ];
+  string output_error = 3;
+  string plaintext_error = 4;
 }
 
 // QueryContractHistoryRequest is the request type for the Query/ContractHistory
 // RPC method
 message QueryContractHistoryRequest {
-  option (gogoproto.equal)    = false;
+  option (gogoproto.equal) = false;
   // address is the address of the contract to query
   string contract_address = 1;
 }
@@ -166,7 +165,7 @@ message QueryContractHistoryRequest {
 // QueryContractHistoryResponse is the response type for the
 // Query/ContractHistory RPC method
 message QueryContractHistoryResponse {
-  option (gogoproto.equal)    = false;
+  option (gogoproto.equal) = false;
 
   repeated ContractCodeHistoryEntry entries = 1
       [ (gogoproto.nullable) = false ];
diff --git a/proto/secret/compute/v1beta1/types.proto b/proto/secret/compute/v1beta1/types.proto
index c5e157cbd..6349d7420 100644
--- a/proto/secret/compute/v1beta1/types.proto
+++ b/proto/secret/compute/v1beta1/types.proto
@@ -8,25 +8,27 @@ option (gogoproto.goproto_getters_all) = false;
 option (gogoproto.equal_all) = true;
 
 enum AccessType {
-    option (gogoproto.goproto_enum_prefix) = false;
-    option (gogoproto.goproto_enum_stringer) = false;
-    UNDEFINED = 0 [(gogoproto.enumvalue_customname) = "AccessTypeUndefined"];
-    NOBODY = 1 [(gogoproto.enumvalue_customname) = "AccessTypeNobody"];
-    ONLY_ADDRESS = 2 [(gogoproto.enumvalue_customname) = "AccessTypeOnlyAddress"];
-    EVERYBODY = 3 [(gogoproto.enumvalue_customname) = "AccessTypeEverybody"];
+  option (gogoproto.goproto_enum_prefix) = false;
+  option (gogoproto.goproto_enum_stringer) = false;
+  UNDEFINED = 0 [ (gogoproto.enumvalue_customname) = "AccessTypeUndefined" ];
+  NOBODY = 1 [ (gogoproto.enumvalue_customname) = "AccessTypeNobody" ];
+  ONLY_ADDRESS = 2
+      [ (gogoproto.enumvalue_customname) = "AccessTypeOnlyAddress" ];
+  EVERYBODY = 3 [ (gogoproto.enumvalue_customname) = "AccessTypeEverybody" ];
 }
 
 message AccessTypeParam {
-    option (gogoproto.goproto_stringer) = true;
-    AccessType value = 1 [(gogoproto.moretags) = "yaml:\"value\""];
+  option (gogoproto.goproto_stringer) = true;
+  AccessType value = 1 [ (gogoproto.moretags) = "yaml:\"value\"" ];
 }
 
 // CodeInfo is data for the uploaded contract WASM code
 message CodeInfo {
-    bytes code_hash = 1;
-    bytes creator = 2 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"];
-    string source = 3;
-    string builder = 4;
+  bytes code_hash = 1;
+  bytes creator = 2 [ (gogoproto.casttype) =
+                          "github.com/cosmos/cosmos-sdk/types.AccAddress" ];
+  string source = 3;
+  string builder = 4;
 }
 
 message ContractKey {
@@ -36,41 +38,44 @@ message ContractKey {
 }
 
 message ContractCustomInfo {
-    ContractKey enclave_key = 1 [(gogoproto.customname) = "EnclaveKey"];
-    string label = 2;
+  ContractKey enclave_key = 1 [ (gogoproto.customname) = "EnclaveKey" ];
+  string label = 2;
 }
 
 // ContractInfo stores a WASM contract instance
 message ContractInfo {
-    // CodeID is the reference to the stored Wasm code
-    uint64 code_id = 1 [(gogoproto.customname) = "CodeID"];
-    // Creator address who initially instantiated the contract
-    bytes creator = 2 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"];
-    // Label is mandatory metadata to be stored with a contract instance.
-    string label = 4;
-    // Created Tx position when the contract was instantiated.
-    AbsoluteTxPosition created = 5;
-    string ibc_port_id = 6 [ (gogoproto.customname) = "IBCPortID" ];
-    // Admin is an optional address that can execute migrations
-    string admin = 7;
-    // Proof that enclave executed the instantiate command
-    bytes admin_proof = 8;
+  // CodeID is the reference to the stored Wasm code
+  uint64 code_id = 1 [ (gogoproto.customname) = "CodeID" ];
+  // Creator address who initially instantiated the contract
+  bytes creator = 2 [ (gogoproto.casttype) =
+                          "github.com/cosmos/cosmos-sdk/types.AccAddress" ];
+  // Label is mandatory metadata to be stored with a contract instance.
+  string label = 4;
+  // Created Tx position when the contract was instantiated.
+  AbsoluteTxPosition created = 5;
+  string ibc_port_id = 6 [ (gogoproto.customname) = "IBCPortID" ];
+  // Admin is an optional address that can execute migrations
+  string admin = 7;
+  // Proof that enclave executed the instantiate command
+  bytes admin_proof = 8;
 }
 
 // AbsoluteTxPosition can be used to sort contracts
 message AbsoluteTxPosition {
-    // BlockHeight is the block the contract was created at
-    int64 block_height = 1;
-    // TxIndex is a monotonic counter within the block (actual transaction index, or gas consumed)
-    uint64 tx_index = 2;
+  // BlockHeight is the block the contract was created at
+  int64 block_height = 1;
+  // TxIndex is a monotonic counter within the block (actual transaction index,
+  // or gas consumed)
+  uint64 tx_index = 2;
 }
 
 // Model is a struct that holds a KV pair
 message Model {
-    // hex-encode key to read it better (this is often ascii)
-    bytes Key = 1 [(gogoproto.casttype) = "github.com/cometbft/cometbft/libs/bytes.HexBytes"];
-    // base64-encode raw value
-    bytes Value = 2;
+  // hex-encode key to read it better (this is often ascii)
+  bytes Key = 1 [ (gogoproto.casttype) =
+                      "github.com/cometbft/cometbft/libs/bytes.HexBytes" ];
+  // base64-encode raw value
+  bytes Value = 2;
 }
 
 // ContractCodeHistoryOperationType actions that caused a code change
diff --git a/proto/secret/emergencybutton/v1beta1/genesis.proto b/proto/secret/emergencybutton/v1beta1/genesis.proto
index 7115c4a79..6e395bd85 100644
--- a/proto/secret/emergencybutton/v1beta1/genesis.proto
+++ b/proto/secret/emergencybutton/v1beta1/genesis.proto
@@ -7,6 +7,4 @@ import "secret/emergencybutton/v1beta1/params.proto";
 option go_package = "github.com/scrtlabs/SecretNetwork/x/emergencybutton/types";
 
 // GenesisState - genesis state of x/wasm
-message GenesisState {
-    Params params = 1 [(gogoproto.nullable) = false];
-}
\ No newline at end of file
+message GenesisState { Params params = 1 [ (gogoproto.nullable) = false ]; }
\ No newline at end of file
diff --git a/proto/secret/emergencybutton/v1beta1/params.proto b/proto/secret/emergencybutton/v1beta1/params.proto
index ad267d3b2..4059ed04a 100644
--- a/proto/secret/emergencybutton/v1beta1/params.proto
+++ b/proto/secret/emergencybutton/v1beta1/params.proto
@@ -7,6 +7,7 @@ option go_package = "github.com/scrtlabs/SecretNetwork/x/emergencybutton/types";
 
 // Params defines the parameters for the ibc-rate-limit module.
 message Params {
-  string switch_status = 1 [(gogoproto.jsontag) = "switch_status,omitempty"];
-  string pauser_address = 2 [(gogoproto.jsontag) = "pauser_address,omitempty"];
+  string switch_status = 1 [ (gogoproto.jsontag) = "switch_status,omitempty" ];
+  string pauser_address = 2
+      [ (gogoproto.jsontag) = "pauser_address,omitempty" ];
 }
diff --git a/proto/secret/emergencybutton/v1beta1/query.proto b/proto/secret/emergencybutton/v1beta1/query.proto
index 369c11f7a..4b32dcd9e 100644
--- a/proto/secret/emergencybutton/v1beta1/query.proto
+++ b/proto/secret/emergencybutton/v1beta1/query.proto
@@ -11,8 +11,8 @@ option go_package = "github.com/scrtlabs/SecretNetwork/x/emergencybutton/types";
 
 // Query defines the gRPC querier service.
 service Query {
-  // Params defines a gRPC query method that returns the emergencybutton module's
-  // parameters.
+  // Params defines a gRPC query method that returns the emergencybutton
+  // module's parameters.
   rpc Params(ParamsRequest) returns (ParamsResponse) {
     option (google.api.http).get = "/emergencybutton/v1beta1/params";
   }
diff --git a/proto/secret/emergencybutton/v1beta1/tx.proto b/proto/secret/emergencybutton/v1beta1/tx.proto
index ace755102..d82b39ad4 100644
--- a/proto/secret/emergencybutton/v1beta1/tx.proto
+++ b/proto/secret/emergencybutton/v1beta1/tx.proto
@@ -7,14 +7,14 @@ option go_package = "github.com/scrtlabs/SecretNetwork/x/emergencybutton/types";
 
 // Msg defines the bank Msg service.
 service Msg {
-  // ToggleIbcSwitch defines a method for toggling the status of the emergencybutton.
+  // ToggleIbcSwitch defines a method for toggling the status of the
+  // emergencybutton.
   rpc ToggleIbcSwitch(MsgToggleIbcSwitch) returns (MsgToggleIbcSwitchResponse);
 }
 
-// MsgToggleIbcSwitch represents a message to toggle the emergencybutton status by the defined pauser.
-message MsgToggleIbcSwitch {
-  string sender = 1;
-}
+// MsgToggleIbcSwitch represents a message to toggle the emergencybutton status
+// by the defined pauser.
+message MsgToggleIbcSwitch { string sender = 1; }
 
 // MsgToggleIbcSwitchResponse defines the response type for the toggle.
 message MsgToggleIbcSwitchResponse {}
\ No newline at end of file
diff --git a/proto/secret/intertx/v1beta1/query.proto b/proto/secret/intertx/v1beta1/query.proto
index 8719eff4c..60938f193 100644
--- a/proto/secret/intertx/v1beta1/query.proto
+++ b/proto/secret/intertx/v1beta1/query.proto
@@ -2,29 +2,34 @@ syntax = "proto3";
 
 package secret.intertx.v1beta1;
 
-
 import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 
 option go_package = "github.com/scrtlabs/SecretNetwork/x/mauth/types";
-option (gogoproto.goproto_getters_all)  = false;
-option (gogoproto.equal_all)            = true;
+option (gogoproto.goproto_getters_all) = false;
+option (gogoproto.equal_all) = true;
 
 // Query defines the gRPC querier service.
 service Query {
-  // QueryInterchainAccountFromAddress returns the interchain account for given owner address on a given connection pair
-  rpc InterchainAccountFromAddress(QueryInterchainAccountFromAddressRequest) returns (QueryInterchainAccountFromAddressResponse) {
-    option (google.api.http).get = "/mauth/interchain_account/owner/{owner}/connection/{connection_id}";
+  // QueryInterchainAccountFromAddress returns the interchain account for given
+  // owner address on a given connection pair
+  rpc InterchainAccountFromAddress(QueryInterchainAccountFromAddressRequest)
+      returns (QueryInterchainAccountFromAddressResponse) {
+    option (google.api.http).get =
+        "/mauth/interchain_account/owner/{owner}/connection/{connection_id}";
   };
 }
 
-// QueryInterchainAccountFromAddressRequest is the request type for the Query/InterchainAccountAddress RPC
+// QueryInterchainAccountFromAddressRequest is the request type for the
+// Query/InterchainAccountAddress RPC
 message QueryInterchainAccountFromAddressRequest {
-  string owner                      = 1;
-  string connection_id              = 2 [(gogoproto.moretags) = "yaml:\"connection_id\""];
+  string owner = 1;
+  string connection_id = 2 [ (gogoproto.moretags) = "yaml:\"connection_id\"" ];
 }
 
-// QueryInterchainAccountFromAddressResponse the response type for the Query/InterchainAccountAddress RPC
+// QueryInterchainAccountFromAddressResponse the response type for the
+// Query/InterchainAccountAddress RPC
 message QueryInterchainAccountFromAddressResponse {
-  string interchain_account_address = 1 [(gogoproto.moretags) = "yaml:\"interchain_account_address\""];
+  string interchain_account_address = 1
+      [ (gogoproto.moretags) = "yaml:\"interchain_account_address\"" ];
 }
\ No newline at end of file
diff --git a/proto/secret/intertx/v1beta1/tx.proto b/proto/secret/intertx/v1beta1/tx.proto
index b1ae919ac..ce1799f77 100644
--- a/proto/secret/intertx/v1beta1/tx.proto
+++ b/proto/secret/intertx/v1beta1/tx.proto
@@ -23,23 +23,26 @@ service Msg {
   };
 }
 
-// MsgRegisterAccount registers an interchain account for the given owner over the specified connection pair
+// MsgRegisterAccount registers an interchain account for the given owner over
+// the specified connection pair
 message MsgRegisterAccount {
 
-  string owner                      = 1;
-  string connection_id              = 2 [(gogoproto.moretags) = "yaml:\"connection_id\""];
-  string version                    = 3;
+  string owner = 1;
+  string connection_id = 2 [ (gogoproto.moretags) = "yaml:\"connection_id\"" ];
+  string version = 3;
 }
 
 // MsgRegisterAccountResponse is the response type for Msg/RegisterAccount
 message MsgRegisterAccountResponse {}
 
-// MsgSubmitTx creates and submits an arbitrary transaction msg to be executed using an interchain account
+// MsgSubmitTx creates and submits an arbitrary transaction msg to be executed
+// using an interchain account
 message MsgSubmitTx {
 
-  bytes owner                       = 1 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"];
-  string connection_id              = 2 [(gogoproto.moretags) = "yaml:\"connection_id\""];
-  google.protobuf.Any msg           = 3;
+  bytes owner = 1 [ (gogoproto.casttype) =
+                        "github.com/cosmos/cosmos-sdk/types.AccAddress" ];
+  string connection_id = 2 [ (gogoproto.moretags) = "yaml:\"connection_id\"" ];
+  google.protobuf.Any msg = 3;
 }
 
 // MsgSubmitTxResponse defines the MsgSubmitTx response type
diff --git a/proto/secret/registration/v1beta1/genesis.proto b/proto/secret/registration/v1beta1/genesis.proto
index 58ba147fb..8a30bb3a4 100644
--- a/proto/secret/registration/v1beta1/genesis.proto
+++ b/proto/secret/registration/v1beta1/genesis.proto
@@ -10,7 +10,8 @@ option (gogoproto.goproto_getters_all) = false;
 option (gogoproto.equal_all) = true;
 
 message GenesisState {
-  repeated          RegistrationNodeInfo registration = 1 [(gogoproto.jsontag) = "reg_info"];
-  MasterKey node_exch_master_key = 2 [(gogoproto.jsontag) = "node_exch_key"];
-  MasterKey io_master_key = 3 [(gogoproto.jsontag) = "io_exch_key"];
+  repeated RegistrationNodeInfo registration = 1
+      [ (gogoproto.jsontag) = "reg_info" ];
+  MasterKey node_exch_master_key = 2 [ (gogoproto.jsontag) = "node_exch_key" ];
+  MasterKey io_master_key = 3 [ (gogoproto.jsontag) = "io_exch_key" ];
 }
\ No newline at end of file
diff --git a/proto/secret/registration/v1beta1/msg.proto b/proto/secret/registration/v1beta1/msg.proto
index 3dbd54c99..549c555aa 100644
--- a/proto/secret/registration/v1beta1/msg.proto
+++ b/proto/secret/registration/v1beta1/msg.proto
@@ -8,14 +8,15 @@ option (gogoproto.goproto_getters_all) = false;
 option (gogoproto.equal_all) = true;
 
 message RaAuthenticate {
-  bytes sender = 1 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"];
-  bytes certificate = 2 [(gogoproto.casttype) = "github.com/scrtlabs/SecretNetwork/x/registration/remote_attestation.Certificate", (gogoproto.jsontag) = "ra_cert"];
+  bytes sender = 1 [ (gogoproto.casttype) =
+                         "github.com/cosmos/cosmos-sdk/types.AccAddress" ];
+  bytes certificate = 2 [
+    (gogoproto.casttype) = "github.com/scrtlabs/SecretNetwork/x/registration/"
+                           "remote_attestation.Certificate",
+    (gogoproto.jsontag) = "ra_cert"
+  ];
 }
 
-message MasterKey {
-  bytes bytes = 1;
-}
+message MasterKey { bytes bytes = 1; }
 
-message Key {
-  bytes key = 1 [(gogoproto.jsontag) = "key"];
-}
\ No newline at end of file
+message Key { bytes key = 1 [ (gogoproto.jsontag) = "key" ]; }
\ No newline at end of file
diff --git a/proto/secret/registration/v1beta1/query.proto b/proto/secret/registration/v1beta1/query.proto
index 02cad6ffb..72f69fca4 100644
--- a/proto/secret/registration/v1beta1/query.proto
+++ b/proto/secret/registration/v1beta1/query.proto
@@ -7,33 +7,31 @@ import "google/api/annotations.proto";
 import "secret/registration/v1beta1/msg.proto";
 import "secret/registration/v1beta1/genesis.proto";
 
-option go_package                       = "github.com/scrtlabs/SecretNetwork/x/registration/internal/types";
-option (gogoproto.goproto_getters_all)  = false;
-option (gogoproto.equal_all)            = true;
+option go_package = "github.com/scrtlabs/SecretNetwork/x/registration/internal/types";
+option (gogoproto.goproto_getters_all) = false;
+option (gogoproto.equal_all) = true;
 
 // Query provides defines the gRPC querier service
 service Query {
   // Returns the key used for transactions
-  rpc TxKey (google.protobuf.Empty) returns (Key) {
+  rpc TxKey(google.protobuf.Empty) returns (Key) {
     option (google.api.http).get = "/registration/v1beta1/tx-key";
   }
   // Returns the key used for registration
-  rpc RegistrationKey (google.protobuf.Empty) returns (Key) {
+  rpc RegistrationKey(google.protobuf.Empty) returns (Key) {
     option (google.api.http).get = "/registration/v1beta1/registration-key";
   }
 
   // Returns the encrypted seed for a registered node by public key
-  rpc EncryptedSeed (QueryEncryptedSeedRequest) returns (QueryEncryptedSeedResponse) {
-    option (google.api.http).get = "/registration/v1beta1/encrypted-seed/{pub_key}";
+  rpc EncryptedSeed(QueryEncryptedSeedRequest)
+      returns (QueryEncryptedSeedResponse) {
+    option (google.api.http).get =
+        "/registration/v1beta1/encrypted-seed/{pub_key}";
   }
 }
 
-message QueryEncryptedSeedRequest {
-  bytes pub_key = 1;
-}
+message QueryEncryptedSeedRequest { bytes pub_key = 1; }
 
 message QueryEncryptedSeedResponse {
   bytes encrypted_seed = 1; // [(gogoproto.nullable) = false];
 }
-
-
diff --git a/proto/secret/registration/v1beta1/types.proto b/proto/secret/registration/v1beta1/types.proto
index d1c9607da..0da5e2f0b 100644
--- a/proto/secret/registration/v1beta1/types.proto
+++ b/proto/secret/registration/v1beta1/types.proto
@@ -8,17 +8,19 @@ option (gogoproto.goproto_getters_all) = false;
 option (gogoproto.equal_all) = true;
 
 message SeedConfig {
-  string master_key = 1 [(gogoproto.jsontag) = "pk2"];
-  string encrypted_key = 2 [(gogoproto.jsontag) = "encKey"];
-  uint32 version = 3 [(gogoproto.jsontag) = "version"];
+  string master_key = 1 [ (gogoproto.jsontag) = "pk2" ];
+  string encrypted_key = 2 [ (gogoproto.jsontag) = "encKey" ];
+  uint32 version = 3 [ (gogoproto.jsontag) = "version" ];
 }
 
 message LegacySeedConfig {
-  string master_cert = 1 [(gogoproto.jsontag) = "pk"];
-  string encrypted_key = 2 [(gogoproto.jsontag) = "encKey"];
+  string master_cert = 1 [ (gogoproto.jsontag) = "pk" ];
+  string encrypted_key = 2 [ (gogoproto.jsontag) = "encKey" ];
 }
 
 message RegistrationNodeInfo {
-  bytes certificate = 1 [(gogoproto.casttype) = "github.com/scrtlabs/SecretNetwork/x/registration/remote_attestation.Certificate"];
+  bytes certificate = 1
+      [ (gogoproto.casttype) = "github.com/scrtlabs/SecretNetwork/x/"
+                               "registration/remote_attestation.Certificate" ];
   bytes encrypted_seed = 2;
 }
diff --git a/x/compute/internal/types/genesis.pb.go b/x/compute/internal/types/genesis.pb.go
index c24ca035e..3d7562647 100644
--- a/x/compute/internal/types/genesis.pb.go
+++ b/x/compute/internal/types/genesis.pb.go
@@ -6,8 +6,8 @@ package types
 import (
 	fmt "fmt"
 	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
-	_ "github.com/gogo/protobuf/gogoproto"
-	proto "github.com/gogo/protobuf/proto"
+	_ "github.com/cosmos/gogoproto/gogoproto"
+	proto "github.com/cosmos/gogoproto/proto"
 	io "io"
 	math "math"
 	math_bits "math/bits"
diff --git a/x/compute/internal/types/msg.pb.go b/x/compute/internal/types/msg.pb.go
index 2e5c2dfd5..cdc28e4f3 100644
--- a/x/compute/internal/types/msg.pb.go
+++ b/x/compute/internal/types/msg.pb.go
@@ -8,9 +8,9 @@ import (
 	fmt "fmt"
 	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
 	types "github.com/cosmos/cosmos-sdk/types"
-	_ "github.com/gogo/protobuf/gogoproto"
-	grpc1 "github.com/gogo/protobuf/grpc"
-	proto "github.com/gogo/protobuf/proto"
+	_ "github.com/cosmos/gogoproto/gogoproto"
+	grpc1 "github.com/cosmos/gogoproto/grpc"
+	proto "github.com/cosmos/gogoproto/proto"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
@@ -35,7 +35,8 @@ type MsgStoreCode struct {
 	Sender github_com_cosmos_cosmos_sdk_types.AccAddress `protobuf:"bytes,1,opt,name=sender,proto3,casttype=github.com/cosmos/cosmos-sdk/types.AccAddress" json:"sender,omitempty"`
 	// WASMByteCode can be raw or gzip compressed
 	WASMByteCode []byte `protobuf:"bytes,2,opt,name=wasm_byte_code,json=wasmByteCode,proto3" json:"wasm_byte_code,omitempty"`
-	// Source is a valid absolute HTTPS URI to the contract's source code, optional
+	// Source is a valid absolute HTTPS URI to the contract's source code,
+	// optional
 	Source string `protobuf:"bytes,3,opt,name=source,proto3" json:"source,omitempty"`
 	// Builder is a valid docker image name with tag, optional
 	Builder string `protobuf:"bytes,4,opt,name=builder,proto3" json:"builder,omitempty"`
@@ -129,7 +130,8 @@ type MsgInstantiateContract struct {
 	// init_msg is an encrypted input to pass to the contract on init
 	InitMsg   []byte                                   `protobuf:"bytes,5,opt,name=init_msg,json=initMsg,proto3" json:"init_msg,omitempty"`
 	InitFunds github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,6,rep,name=init_funds,json=initFunds,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"init_funds"`
-	// used internally for encryption, should always be empty in a signed transaction
+	// used internally for encryption, should always be empty in a signed
+	// transaction
 	CallbackSig []byte `protobuf:"bytes,7,opt,name=callback_sig,json=callbackSig,proto3" json:"callback_sig,omitempty"`
 	// Admin is an optional address that can execute migrations
 	Admin string `protobuf:"bytes,8,opt,name=admin,proto3" json:"admin,omitempty"`
@@ -230,10 +232,12 @@ type MsgExecuteContract struct {
 	Contract github_com_cosmos_cosmos_sdk_types.AccAddress `protobuf:"bytes,2,opt,name=contract,proto3,casttype=github.com/cosmos/cosmos-sdk/types.AccAddress" json:"contract,omitempty"`
 	// msg is an encrypted input to pass to the contract on execute
 	Msg []byte `protobuf:"bytes,3,opt,name=msg,proto3" json:"msg,omitempty"`
-	// used internally for encryption, should always be empty in a signed transaction
+	// used internally for encryption, should always be empty in a signed
+	// transaction
 	CallbackCodeHash string                                   `protobuf:"bytes,4,opt,name=callback_code_hash,json=callbackCodeHash,proto3" json:"callback_code_hash,omitempty"`
 	SentFunds        github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,5,rep,name=sent_funds,json=sentFunds,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"sent_funds"`
-	// used internally for encryption, should always be empty in a signed transaction
+	// used internally for encryption, should always be empty in a signed
+	// transaction
 	CallbackSig []byte `protobuf:"bytes,6,opt,name=callback_sig,json=callbackSig,proto3" json:"callback_sig,omitempty"`
 }
 
@@ -326,9 +330,11 @@ type MsgMigrateContract struct {
 	CodeID uint64 `protobuf:"varint,3,opt,name=code_id,json=codeId,proto3" json:"code_id,omitempty"`
 	// msg is an encrypted input to pass to the contract on migration
 	Msg []byte `protobuf:"bytes,4,opt,name=msg,proto3" json:"msg,omitempty"`
-	// used internally for encryption, should always be empty in a signed transaction
+	// used internally for encryption, should always be empty in a signed
+	// transaction
 	CallbackSig []byte `protobuf:"bytes,7,opt,name=callback_sig,json=callbackSig,proto3" json:"callback_sig,omitempty"`
-	// used internally for encryption, should always be empty in a signed transaction
+	// used internally for encryption, should always be empty in a signed
+	// transaction
 	CallbackCodeHash string `protobuf:"bytes,8,opt,name=callback_code_hash,json=callbackCodeHash,proto3" json:"callback_code_hash,omitempty"`
 }
 
@@ -462,7 +468,8 @@ type MsgUpdateAdmin struct {
 	NewAdmin string `protobuf:"bytes,2,opt,name=new_admin,json=newAdmin,proto3" json:"new_admin,omitempty"`
 	// Contract is the address of the smart contract
 	Contract string `protobuf:"bytes,3,opt,name=contract,proto3" json:"contract,omitempty"`
-	// used internally for encryption, should always be empty in a signed transaction
+	// used internally for encryption, should always be empty in a signed
+	// transaction
 	CallbackSig []byte `protobuf:"bytes,7,opt,name=callback_sig,json=callbackSig,proto3" json:"callback_sig,omitempty"`
 }
 
@@ -570,7 +577,8 @@ type MsgClearAdmin struct {
 	Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty"`
 	// Contract is the address of the smart contract
 	Contract string `protobuf:"bytes,3,opt,name=contract,proto3" json:"contract,omitempty"`
-	// used internally for encryption, should always be empty in a signed transaction
+	// used internally for encryption, should always be empty in a signed
+	// transaction
 	CallbackSig []byte `protobuf:"bytes,7,opt,name=callback_sig,json=callbackSig,proto3" json:"callback_sig,omitempty"`
 }
 
@@ -755,7 +763,7 @@ const _ = grpc.SupportPackageIsVersion4
 type MsgClient interface {
 	// StoreCode to submit Wasm code to the system
 	StoreCode(ctx context.Context, in *MsgStoreCode, opts ...grpc.CallOption) (*MsgStoreCodeResponse, error)
-	//  Instantiate creates a new smart contract instance for the given code id.
+	// Instantiate creates a new smart contract instance for the given code id.
 	InstantiateContract(ctx context.Context, in *MsgInstantiateContract, opts ...grpc.CallOption) (*MsgInstantiateContractResponse, error)
 	// Execute submits the given message data to a smart contract
 	ExecuteContract(ctx context.Context, in *MsgExecuteContract, opts ...grpc.CallOption) (*MsgExecuteContractResponse, error)
@@ -833,7 +841,7 @@ func (c *msgClient) ClearAdmin(ctx context.Context, in *MsgClearAdmin, opts ...g
 type MsgServer interface {
 	// StoreCode to submit Wasm code to the system
 	StoreCode(context.Context, *MsgStoreCode) (*MsgStoreCodeResponse, error)
-	//  Instantiate creates a new smart contract instance for the given code id.
+	// Instantiate creates a new smart contract instance for the given code id.
 	InstantiateContract(context.Context, *MsgInstantiateContract) (*MsgInstantiateContractResponse, error)
 	// Execute submits the given message data to a smart contract
 	ExecuteContract(context.Context, *MsgExecuteContract) (*MsgExecuteContractResponse, error)
diff --git a/x/compute/internal/types/query.pb.go b/x/compute/internal/types/query.pb.go
index 4036fc171..7f1784254 100644
--- a/x/compute/internal/types/query.pb.go
+++ b/x/compute/internal/types/query.pb.go
@@ -9,9 +9,9 @@ import (
 	fmt "fmt"
 	types "github.com/cosmos/cosmos-sdk/types"
 	_ "github.com/cosmos/cosmos-sdk/types/query"
-	_ "github.com/gogo/protobuf/gogoproto"
-	grpc1 "github.com/gogo/protobuf/grpc"
-	proto "github.com/gogo/protobuf/proto"
+	_ "github.com/cosmos/gogoproto/gogoproto"
+	grpc1 "github.com/cosmos/gogoproto/grpc"
+	proto "github.com/cosmos/gogoproto/proto"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
@@ -221,7 +221,8 @@ func (m *QuerySecretContractResponse) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_QuerySecretContractResponse proto.InternalMessageInfo
 
-// QueryContractInfoResponse is the response type for the Query/ContractInfo RPC method
+// QueryContractInfoResponse is the response type for the Query/ContractInfo RPC
+// method
 type QueryContractInfoResponse struct {
 	// contract_address is the bech32 human readable address of the contract
 	ContractAddress string `protobuf:"bytes,1,opt,name=contract_address,json=contractAddress,proto3" json:"contract_address,omitempty"`
@@ -261,7 +262,8 @@ func (m *QueryContractInfoResponse) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_QueryContractInfoResponse proto.InternalMessageInfo
 
-// ContractInfoWithAddress adds the contract address to the ContractInfo representation
+// ContractInfoWithAddress adds the contract address to the ContractInfo
+// representation
 type ContractInfoWithAddress struct {
 	// contract_address is the bech32 human readable address of the contract
 	ContractAddress string `protobuf:"bytes,1,opt,name=contract_address,json=contractAddress,proto3" json:"contract_address,omitempty"`
diff --git a/x/compute/internal/types/query.pb.gw.go b/x/compute/internal/types/query.pb.gw.go
index a51afbe4c..b1582aa56 100644
--- a/x/compute/internal/types/query.pb.gw.go
+++ b/x/compute/internal/types/query.pb.gw.go
@@ -20,6 +20,7 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/grpclog"
+	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/types/known/emptypb"
 )
@@ -31,6 +32,7 @@ var _ status.Status
 var _ = runtime.String
 var _ = utilities.NewDoubleArray
 var _ = descriptor.ForMessage
+var _ = metadata.Join
 
 func request_Query_ContractInfo_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq QueryByContractAddressRequest
@@ -557,12 +559,14 @@ func local_request_Query_ContractHistory_0(ctx context.Context, marshaler runtim
 // RegisterQueryHandlerServer registers the http handlers for service Query to "mux".
 // UnaryRPC     :call QueryServer directly.
 // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906.
-// Note that using this registration option will cause many gRPC library features (such as grpc.SendHeader, etc) to stop working. Consider using RegisterQueryHandlerFromEndpoint instead.
+// Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterQueryHandlerFromEndpoint instead.
 func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, server QueryServer) error {
 
 	mux.Handle("GET", pattern_Query_ContractInfo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
+		var stream runtime.ServerTransportStream
+		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
 		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req)
 		if err != nil {
@@ -570,6 +574,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 			return
 		}
 		resp, md, err := local_request_Query_ContractInfo_0(rctx, inboundMarshaler, server, req, pathParams)
+		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
@@ -583,6 +588,8 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 	mux.Handle("GET", pattern_Query_ContractsByCodeId_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
+		var stream runtime.ServerTransportStream
+		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
 		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req)
 		if err != nil {
@@ -590,6 +597,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 			return
 		}
 		resp, md, err := local_request_Query_ContractsByCodeId_0(rctx, inboundMarshaler, server, req, pathParams)
+		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
@@ -603,6 +611,8 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 	mux.Handle("GET", pattern_Query_QuerySecretContract_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
+		var stream runtime.ServerTransportStream
+		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
 		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req)
 		if err != nil {
@@ -610,6 +620,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 			return
 		}
 		resp, md, err := local_request_Query_QuerySecretContract_0(rctx, inboundMarshaler, server, req, pathParams)
+		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
@@ -623,6 +634,8 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 	mux.Handle("GET", pattern_Query_Code_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
+		var stream runtime.ServerTransportStream
+		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
 		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req)
 		if err != nil {
@@ -630,6 +643,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 			return
 		}
 		resp, md, err := local_request_Query_Code_0(rctx, inboundMarshaler, server, req, pathParams)
+		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
@@ -643,6 +657,8 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 	mux.Handle("GET", pattern_Query_Codes_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
+		var stream runtime.ServerTransportStream
+		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
 		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req)
 		if err != nil {
@@ -650,6 +666,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 			return
 		}
 		resp, md, err := local_request_Query_Codes_0(rctx, inboundMarshaler, server, req, pathParams)
+		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
@@ -663,6 +680,8 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 	mux.Handle("GET", pattern_Query_CodeHashByContractAddress_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
+		var stream runtime.ServerTransportStream
+		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
 		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req)
 		if err != nil {
@@ -670,6 +689,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 			return
 		}
 		resp, md, err := local_request_Query_CodeHashByContractAddress_0(rctx, inboundMarshaler, server, req, pathParams)
+		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
@@ -683,6 +703,8 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 	mux.Handle("GET", pattern_Query_CodeHashByCodeId_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
+		var stream runtime.ServerTransportStream
+		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
 		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req)
 		if err != nil {
@@ -690,6 +712,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 			return
 		}
 		resp, md, err := local_request_Query_CodeHashByCodeId_0(rctx, inboundMarshaler, server, req, pathParams)
+		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
@@ -703,6 +726,8 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 	mux.Handle("GET", pattern_Query_LabelByAddress_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
+		var stream runtime.ServerTransportStream
+		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
 		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req)
 		if err != nil {
@@ -710,6 +735,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 			return
 		}
 		resp, md, err := local_request_Query_LabelByAddress_0(rctx, inboundMarshaler, server, req, pathParams)
+		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
@@ -723,6 +749,8 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 	mux.Handle("GET", pattern_Query_AddressByLabel_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
+		var stream runtime.ServerTransportStream
+		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
 		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req)
 		if err != nil {
@@ -730,6 +758,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 			return
 		}
 		resp, md, err := local_request_Query_AddressByLabel_0(rctx, inboundMarshaler, server, req, pathParams)
+		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
@@ -743,6 +772,8 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 	mux.Handle("GET", pattern_Query_ContractHistory_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
+		var stream runtime.ServerTransportStream
+		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
 		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req)
 		if err != nil {
@@ -750,6 +781,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 			return
 		}
 		resp, md, err := local_request_Query_ContractHistory_0(rctx, inboundMarshaler, server, req, pathParams)
+		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
@@ -1005,25 +1037,25 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie
 }
 
 var (
-	pattern_Query_ContractInfo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"compute", "v1beta1", "info", "contract_address"}, "", runtime.AssumeColonVerbOpt(true)))
+	pattern_Query_ContractInfo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"compute", "v1beta1", "info", "contract_address"}, "", runtime.AssumeColonVerbOpt(false)))
 
-	pattern_Query_ContractsByCodeId_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"compute", "v1beta1", "contracts", "code_id"}, "", runtime.AssumeColonVerbOpt(true)))
+	pattern_Query_ContractsByCodeId_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"compute", "v1beta1", "contracts", "code_id"}, "", runtime.AssumeColonVerbOpt(false)))
 
-	pattern_Query_QuerySecretContract_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"compute", "v1beta1", "query", "contract_address"}, "", runtime.AssumeColonVerbOpt(true)))
+	pattern_Query_QuerySecretContract_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"compute", "v1beta1", "query", "contract_address"}, "", runtime.AssumeColonVerbOpt(false)))
 
-	pattern_Query_Code_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"compute", "v1beta1", "code", "code_id"}, "", runtime.AssumeColonVerbOpt(true)))
+	pattern_Query_Code_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"compute", "v1beta1", "code", "code_id"}, "", runtime.AssumeColonVerbOpt(false)))
 
-	pattern_Query_Codes_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"compute", "v1beta1", "codes"}, "", runtime.AssumeColonVerbOpt(true)))
+	pattern_Query_Codes_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"compute", "v1beta1", "codes"}, "", runtime.AssumeColonVerbOpt(false)))
 
-	pattern_Query_CodeHashByContractAddress_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"compute", "v1beta1", "code_hash", "by_contract_address", "contract_address"}, "", runtime.AssumeColonVerbOpt(true)))
+	pattern_Query_CodeHashByContractAddress_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"compute", "v1beta1", "code_hash", "by_contract_address", "contract_address"}, "", runtime.AssumeColonVerbOpt(false)))
 
-	pattern_Query_CodeHashByCodeId_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"compute", "v1beta1", "code_hash", "by_code_id", "code_id"}, "", runtime.AssumeColonVerbOpt(true)))
+	pattern_Query_CodeHashByCodeId_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"compute", "v1beta1", "code_hash", "by_code_id", "code_id"}, "", runtime.AssumeColonVerbOpt(false)))
 
-	pattern_Query_LabelByAddress_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"compute", "v1beta1", "label", "contract_address"}, "", runtime.AssumeColonVerbOpt(true)))
+	pattern_Query_LabelByAddress_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"compute", "v1beta1", "label", "contract_address"}, "", runtime.AssumeColonVerbOpt(false)))
 
-	pattern_Query_AddressByLabel_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"compute", "v1beta1", "contract_address", "label"}, "", runtime.AssumeColonVerbOpt(true)))
+	pattern_Query_AddressByLabel_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"compute", "v1beta1", "contract_address", "label"}, "", runtime.AssumeColonVerbOpt(false)))
 
-	pattern_Query_ContractHistory_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"compute", "v1beta1", "contract_history", "contract_address"}, "", runtime.AssumeColonVerbOpt(true)))
+	pattern_Query_ContractHistory_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"compute", "v1beta1", "contract_history", "contract_address"}, "", runtime.AssumeColonVerbOpt(false)))
 )
 
 var (
diff --git a/x/compute/internal/types/types.pb.go b/x/compute/internal/types/types.pb.go
index 79b1cc6fc..19c46c3d2 100644
--- a/x/compute/internal/types/types.pb.go
+++ b/x/compute/internal/types/types.pb.go
@@ -6,10 +6,10 @@ package types
 import (
 	bytes "bytes"
 	fmt "fmt"
+	github_com_cometbft_cometbft_libs_bytes "github.com/cometbft/cometbft/libs/bytes"
 	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
-	_ "github.com/gogo/protobuf/gogoproto"
-	proto "github.com/gogo/protobuf/proto"
-	github_com_tendermint_tendermint_libs_bytes "github.com/cometbft/cometbft/libs/bytes"
+	_ "github.com/cosmos/gogoproto/gogoproto"
+	proto "github.com/cosmos/gogoproto/proto"
 	io "io"
 	math "math"
 	math_bits "math/bits"
@@ -298,7 +298,8 @@ var xxx_messageInfo_ContractInfo proto.InternalMessageInfo
 type AbsoluteTxPosition struct {
 	// BlockHeight is the block the contract was created at
 	BlockHeight int64 `protobuf:"varint,1,opt,name=block_height,json=blockHeight,proto3" json:"block_height,omitempty"`
-	// TxIndex is a monotonic counter within the block (actual transaction index, or gas consumed)
+	// TxIndex is a monotonic counter within the block (actual transaction index,
+	// or gas consumed)
 	TxIndex uint64 `protobuf:"varint,2,opt,name=tx_index,json=txIndex,proto3" json:"tx_index,omitempty"`
 }
 
@@ -338,7 +339,7 @@ var xxx_messageInfo_AbsoluteTxPosition proto.InternalMessageInfo
 // Model is a struct that holds a KV pair
 type Model struct {
 	// hex-encode key to read it better (this is often ascii)
-	Key github_com_tendermint_tendermint_libs_bytes.HexBytes `protobuf:"bytes,1,opt,name=Key,proto3,casttype=github.com/cometbft/cometbft/libs/bytes.HexBytes" json:"Key,omitempty"`
+	Key github_com_cometbft_cometbft_libs_bytes.HexBytes `protobuf:"bytes,1,opt,name=Key,proto3,casttype=github.com/cometbft/cometbft/libs/bytes.HexBytes" json:"Key,omitempty"`
 	// base64-encode raw value
 	Value []byte `protobuf:"bytes,2,opt,name=Value,proto3" json:"Value,omitempty"`
 }
@@ -437,73 +438,73 @@ func init() {
 }
 
 var fileDescriptor_8ba7f40a6d1951b3 = []byte{
-	// 1053 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x4d, 0x6f, 0x1a, 0x47,
-	0x1f, 0x67, 0x0d, 0x06, 0x33, 0x90, 0x04, 0xcd, 0xe3, 0x27, 0x21, 0x54, 0x02, 0xba, 0xa9, 0x52,
-	0xd7, 0xae, 0x21, 0x4e, 0x7b, 0x88, 0xdc, 0x13, 0x2f, 0x1b, 0x7b, 0xe3, 0x7a, 0x41, 0x03, 0x76,
-	0xe5, 0xaa, 0xd5, 0x6a, 0x5f, 0xc6, 0xb0, 0xf2, 0xb2, 0x83, 0x66, 0x06, 0x97, 0xbd, 0xf5, 0x58,
-	0x71, 0xea, 0xb1, 0x17, 0xa4, 0x4a, 0x8d, 0xa2, 0x7c, 0x81, 0x7e, 0x81, 0x9e, 0x72, 0xcc, 0xb1,
-	0x27, 0xd4, 0xe2, 0x0f, 0x50, 0xa9, 0xc7, 0x9c, 0xaa, 0x1d, 0x16, 0x43, 0x9b, 0x58, 0x76, 0xa5,
-	0x9e, 0xfc, 0x7f, 0xfd, 0xfd, 0xdf, 0x7e, 0x3b, 0x06, 0xc8, 0x0c, 0x5b, 0x14, 0xf3, 0xb2, 0x45,
-	0x7a, 0xfd, 0x01, 0xc7, 0xe5, 0xf3, 0x1d, 0x13, 0x73, 0x63, 0xa7, 0xcc, 0xfd, 0x3e, 0x66, 0xa5,
-	0x3e, 0x25, 0x9c, 0xc0, 0xbb, 0xb3, 0x98, 0x52, 0x18, 0x53, 0x0a, 0x63, 0x72, 0xeb, 0x1d, 0xd2,
-	0x21, 0x22, 0xa4, 0x1c, 0x48, 0xb3, 0x68, 0xd9, 0x02, 0x77, 0x2a, 0x96, 0x85, 0x19, 0x6b, 0xfb,
-	0x7d, 0xdc, 0x34, 0xa8, 0xd1, 0x83, 0xcf, 0xc0, 0xea, 0xb9, 0xe1, 0x0e, 0x70, 0x56, 0x2a, 0x4a,
-	0x1b, 0xb7, 0x1f, 0xcb, 0xa5, 0x77, 0x03, 0x96, 0x16, 0x79, 0xd5, 0xcc, 0x9f, 0x93, 0x42, 0xda,
-	0x37, 0x7a, 0xee, 0xae, 0x2c, 0x52, 0x65, 0x34, 0x83, 0xd8, 0x8d, 0xfd, 0xf0, 0x63, 0x41, 0x92,
-	0x5f, 0x48, 0x60, 0xad, 0x46, 0x6c, 0xac, 0x7a, 0xa7, 0x04, 0xbe, 0x07, 0x92, 0x16, 0xb1, 0xb1,
-	0xde, 0x35, 0x58, 0x57, 0x94, 0x48, 0xa3, 0xb5, 0xc0, 0xb0, 0x6f, 0xb0, 0x2e, 0x3c, 0x00, 0x09,
-	0x8b, 0x62, 0x83, 0x13, 0x9a, 0x5d, 0x09, 0x5c, 0xd5, 0x9d, 0x37, 0x93, 0xc2, 0x76, 0xc7, 0xe1,
-	0xdd, 0x81, 0x19, 0x34, 0x50, 0xb6, 0x08, 0xeb, 0x11, 0x16, 0xfe, 0xd9, 0x66, 0xf6, 0x59, 0x38,
-	0x7b, 0xc5, 0xb2, 0x2a, 0xb6, 0x4d, 0x31, 0x63, 0x68, 0x8e, 0x00, 0xef, 0x82, 0x38, 0x23, 0x03,
-	0x6a, 0xe1, 0x6c, 0xb4, 0x28, 0x6d, 0x24, 0x51, 0xa8, 0xc1, 0x2c, 0x48, 0x98, 0x03, 0xc7, 0xb5,
-	0x31, 0xcd, 0xc6, 0x84, 0x63, 0xae, 0xca, 0xcf, 0x25, 0x90, 0xaa, 0x11, 0x8f, 0x53, 0xc3, 0xe2,
-	0x07, 0xd8, 0x87, 0x0f, 0xc1, 0x1d, 0xd2, 0xd1, 0xad, 0xd0, 0xa2, 0x9f, 0x61, 0x3f, 0xec, 0xf8,
-	0x16, 0xe9, 0x2c, 0xc7, 0x3d, 0x02, 0xeb, 0xd6, 0x80, 0x52, 0xec, 0xf1, 0xbf, 0x07, 0x8b, 0x19,
-	0x10, 0x0c, 0x7d, 0xcb, 0x19, 0x9f, 0x81, 0xdc, 0xbb, 0x32, 0xf4, 0x3e, 0x25, 0xe4, 0x54, 0xf4,
-	0x9b, 0x46, 0xf7, 0xde, 0xce, 0x6b, 0x06, 0x6e, 0xf9, 0x5b, 0x09, 0xc0, 0xb9, 0xb1, 0x36, 0x60,
-	0x9c, 0xf4, 0xc4, 0x66, 0xdb, 0x20, 0x85, 0x3d, 0xcb, 0x35, 0xce, 0xf1, 0x65, 0xa7, 0xa9, 0xc7,
-	0x0f, 0xae, 0x3a, 0xdf, 0x12, 0x6a, 0xf5, 0xf6, 0x74, 0x52, 0x00, 0xca, 0x2c, 0xf7, 0x00, 0xfb,
-	0x08, 0xe0, 0x4b, 0x19, 0xae, 0x83, 0x55, 0xd7, 0x30, 0xb1, 0x2b, 0x86, 0x49, 0xa2, 0x99, 0x22,
-	0xff, 0xb2, 0x02, 0xd2, 0x73, 0x04, 0x51, 0xfc, 0x01, 0x48, 0x88, 0xb3, 0x3a, 0xb6, 0x28, 0x1c,
-	0xab, 0x82, 0xe9, 0xa4, 0x10, 0x17, 0x57, 0xaf, 0xa3, 0x78, 0xe0, 0x52, 0xed, 0xff, 0xf6, 0xbc,
-	0x97, 0x8d, 0xc5, 0x96, 0x1a, 0x83, 0xf5, 0xb0, 0x04, 0xb6, 0xb3, 0xab, 0x62, 0x01, 0x9b, 0x57,
-	0xf2, 0xd7, 0x64, 0xc4, 0x1d, 0x70, 0xdc, 0x1e, 0x36, 0x09, 0x73, 0xb8, 0x43, 0x3c, 0x34, 0x4f,
-	0x85, 0xdb, 0x20, 0xe5, 0x98, 0x96, 0xde, 0x27, 0x94, 0x07, 0x13, 0xc5, 0x83, 0x0a, 0xd5, 0x5b,
-	0xd3, 0x49, 0x21, 0xa9, 0x56, 0x6b, 0x4d, 0x42, 0xb9, 0x5a, 0x47, 0x49, 0xc7, 0xb4, 0x84, 0x68,
-	0x07, 0xad, 0x18, 0x76, 0xcf, 0xf1, 0xb2, 0x89, 0x59, 0x2b, 0x42, 0x81, 0x05, 0x90, 0x12, 0x42,
-	0x78, 0xd4, 0x35, 0x71, 0x54, 0x20, 0x4c, 0xb3, 0x3b, 0x22, 0x00, 0xdf, 0x6e, 0x02, 0xbe, 0x0f,
-	0xd2, 0xa6, 0x4b, 0xac, 0x33, 0xbd, 0x8b, 0x9d, 0x4e, 0x97, 0x8b, 0x75, 0x46, 0x51, 0x4a, 0xd8,
-	0xf6, 0x85, 0x09, 0xde, 0x07, 0x6b, 0x7c, 0xa8, 0x3b, 0x9e, 0x8d, 0x87, 0x62, 0x91, 0x31, 0x94,
-	0xe0, 0x43, 0x35, 0x50, 0x65, 0x07, 0xac, 0x1e, 0x12, 0x1b, 0xbb, 0xf0, 0x19, 0x88, 0x1e, 0xcc,
-	0xf9, 0x5a, 0x7d, 0xf2, 0x66, 0x52, 0xf8, 0x74, 0x69, 0xcf, 0x1c, 0x7b, 0x36, 0xa6, 0x3d, 0xc7,
-	0xe3, 0xcb, 0xa2, 0xeb, 0x98, 0xac, 0x6c, 0xfa, 0x1c, 0xb3, 0xd2, 0x3e, 0x1e, 0x56, 0x03, 0x01,
-	0x45, 0x43, 0x0e, 0x1c, 0x8b, 0x27, 0x61, 0x46, 0xe8, 0x99, 0x22, 0xff, 0x21, 0x81, 0xec, 0x25,
-	0x0d, 0x83, 0x2f, 0xd8, 0x61, 0x9c, 0x50, 0x5f, 0xf1, 0x38, 0xf5, 0xe1, 0x31, 0x48, 0x92, 0x3e,
-	0xa6, 0x46, 0x30, 0x52, 0xf8, 0x92, 0x3c, 0xb9, 0x8e, 0x8a, 0x4b, 0x20, 0x8d, 0x79, 0x6e, 0xf0,
-	0xbe, 0xa0, 0x05, 0xd4, 0x32, 0xcf, 0x56, 0xae, 0xe4, 0x59, 0x1d, 0x24, 0x06, 0x7d, 0x5b, 0x90,
-	0x20, 0xfa, 0xef, 0x49, 0x10, 0xa6, 0xc2, 0x0c, 0x88, 0xf6, 0x58, 0x47, 0xd0, 0x2b, 0x8d, 0x02,
-	0x71, 0xf3, 0x67, 0x09, 0x80, 0xc5, 0xb3, 0x07, 0x1f, 0x82, 0xe4, 0x91, 0x56, 0x57, 0x9e, 0xaa,
-	0x9a, 0x52, 0xcf, 0x44, 0x72, 0xf7, 0x46, 0xe3, 0xe2, 0xff, 0x16, 0xee, 0x23, 0xcf, 0xc6, 0xa7,
-	0x8e, 0x87, 0x6d, 0x58, 0x04, 0x71, 0xad, 0x51, 0x6d, 0xd4, 0x4f, 0x32, 0x52, 0x6e, 0x7d, 0x34,
-	0x2e, 0x66, 0x16, 0x41, 0x1a, 0x31, 0x89, 0xed, 0xc3, 0x2d, 0x90, 0x6e, 0x68, 0x9f, 0x9f, 0xe8,
-	0x95, 0x7a, 0x1d, 0x29, 0xad, 0x56, 0x66, 0x25, 0x77, 0x7f, 0x34, 0x2e, 0xfe, 0x7f, 0x11, 0xd7,
-	0xf0, 0x5c, 0x3f, 0xfc, 0x02, 0x82, 0xb2, 0xca, 0xb1, 0x82, 0x4e, 0x04, 0x62, 0xf4, 0x9f, 0x65,
-	0x95, 0x73, 0x4c, 0xfd, 0x00, 0x34, 0xb7, 0xf6, 0xdd, 0x4f, 0xf9, 0xc8, 0xcb, 0xe7, 0xf9, 0xc8,
-	0xe6, 0x8b, 0x28, 0x28, 0x5e, 0xb7, 0x64, 0x88, 0xc1, 0xa3, 0x5a, 0x43, 0x6b, 0xa3, 0x4a, 0xad,
-	0xad, 0xd7, 0x1a, 0x75, 0x45, 0xdf, 0x57, 0x5b, 0xed, 0x06, 0x3a, 0xd1, 0x1b, 0x4d, 0x05, 0x55,
-	0xda, 0x6a, 0x43, 0xd3, 0xdb, 0x27, 0x4d, 0x45, 0x3f, 0xd2, 0x5a, 0x4d, 0xa5, 0xa6, 0x3e, 0x55,
-	0xc5, 0xd0, 0xe5, 0xd1, 0xb8, 0xb8, 0x75, 0x1d, 0xf6, 0x91, 0xc7, 0xfa, 0xd8, 0x72, 0x4e, 0x1d,
-	0x6c, 0xc3, 0x2f, 0xc0, 0x47, 0x37, 0x2a, 0xa3, 0x6a, 0x6a, 0x3b, 0x23, 0xe5, 0x36, 0x46, 0xe3,
-	0xe2, 0x07, 0xd7, 0xe1, 0xab, 0x9e, 0xc3, 0xe1, 0xd7, 0xe0, 0xe3, 0x1b, 0x01, 0x1f, 0xaa, 0x7b,
-	0xa8, 0xd2, 0x56, 0x32, 0x2b, 0xb9, 0xad, 0xd1, 0xb8, 0xf8, 0xe1, 0x75, 0xd8, 0x87, 0x4e, 0x87,
-	0x1a, 0x1c, 0xdf, 0x18, 0x7e, 0x4f, 0xd1, 0x94, 0x96, 0xda, 0xca, 0x44, 0x6f, 0x06, 0xbf, 0x87,
-	0x3d, 0xcc, 0x1c, 0x96, 0x8b, 0x05, 0xc7, 0xaa, 0x7e, 0xf5, 0xea, 0xf7, 0x7c, 0xe4, 0xe5, 0x34,
-	0x2f, 0xbd, 0x9a, 0xe6, 0xa5, 0xd7, 0xd3, 0xbc, 0xf4, 0xdb, 0x34, 0x2f, 0x7d, 0x7f, 0x91, 0x8f,
-	0xbc, 0xbe, 0xc8, 0x47, 0x7e, 0xbd, 0xc8, 0x47, 0xbe, 0xdc, 0x5d, 0xfa, 0x8a, 0x99, 0x45, 0xb9,
-	0x6b, 0x98, 0xac, 0xdc, 0x12, 0xe4, 0xd6, 0x30, 0xff, 0x86, 0xd0, 0xb3, 0xf2, 0xf0, 0xf2, 0xf7,
-	0x81, 0xe3, 0x71, 0x4c, 0x3d, 0xc3, 0x9d, 0xbd, 0xa2, 0x66, 0x5c, 0xfc, 0xcf, 0xff, 0xe4, 0xaf,
-	0x00, 0x00, 0x00, 0xff, 0xff, 0xa3, 0x45, 0x65, 0xf6, 0x47, 0x08, 0x00, 0x00,
+	// 1048 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x4b, 0x6f, 0x1b, 0x45,
+	0x1c, 0xf7, 0xc6, 0x8e, 0x1d, 0x8f, 0xdd, 0xd6, 0x1a, 0x42, 0xeb, 0x1a, 0xc9, 0x36, 0x5b, 0x54,
+	0x4a, 0x43, 0xec, 0xa4, 0x70, 0x40, 0xe1, 0xe4, 0xc7, 0x26, 0x59, 0x42, 0xd6, 0xd6, 0xd8, 0x09,
+	0x0a, 0x02, 0xad, 0xf6, 0x31, 0xb1, 0x57, 0x59, 0xef, 0x58, 0x33, 0xe3, 0xe0, 0xbd, 0x71, 0x44,
+	0x3e, 0x71, 0xe4, 0x62, 0x09, 0x89, 0xaa, 0xea, 0x17, 0xe0, 0x0b, 0x70, 0xea, 0xb1, 0x47, 0x4e,
+	0x16, 0x38, 0x1f, 0x00, 0x89, 0x63, 0x4f, 0x68, 0xc7, 0xeb, 0xd8, 0xa5, 0x8d, 0x12, 0x24, 0x4e,
+	0xf9, 0x3f, 0x7f, 0xff, 0xd7, 0x6f, 0x27, 0x06, 0x32, 0xc3, 0x16, 0xc5, 0xbc, 0x6c, 0x91, 0x5e,
+	0x7f, 0xc0, 0x71, 0xf9, 0x7c, 0xdb, 0xc4, 0xdc, 0xd8, 0x2e, 0x73, 0xbf, 0x8f, 0x59, 0xa9, 0x4f,
+	0x09, 0x27, 0xf0, 0xee, 0x2c, 0xa6, 0x14, 0xc6, 0x94, 0xc2, 0x98, 0xdc, 0x7a, 0x87, 0x74, 0x88,
+	0x08, 0x29, 0x07, 0xd2, 0x2c, 0x5a, 0xb6, 0xc0, 0x9d, 0x8a, 0x65, 0x61, 0xc6, 0xda, 0x7e, 0x1f,
+	0x37, 0x0d, 0x6a, 0xf4, 0xe0, 0x17, 0x60, 0xf5, 0xdc, 0x70, 0x07, 0x38, 0x2b, 0x15, 0xa5, 0x47,
+	0xb7, 0x9f, 0xc8, 0xa5, 0xb7, 0x03, 0x96, 0x16, 0x79, 0xd5, 0xcc, 0xdf, 0x93, 0x42, 0xda, 0x37,
+	0x7a, 0xee, 0x8e, 0x2c, 0x52, 0x65, 0x34, 0x83, 0xd8, 0x89, 0xfd, 0xf4, 0x73, 0x41, 0x92, 0x9f,
+	0x49, 0x60, 0xad, 0x46, 0x6c, 0xac, 0x7a, 0xa7, 0x04, 0xbe, 0x07, 0x92, 0x16, 0xb1, 0xb1, 0xde,
+	0x35, 0x58, 0x57, 0x94, 0x48, 0xa3, 0xb5, 0xc0, 0xb0, 0x6f, 0xb0, 0x2e, 0x3c, 0x00, 0x09, 0x8b,
+	0x62, 0x83, 0x13, 0x9a, 0x5d, 0x09, 0x5c, 0xd5, 0xed, 0x57, 0x93, 0xc2, 0x66, 0xc7, 0xe1, 0xdd,
+	0x81, 0x19, 0x34, 0x50, 0xb6, 0x08, 0xeb, 0x11, 0x16, 0xfe, 0xd9, 0x64, 0xf6, 0x59, 0x38, 0x7b,
+	0xc5, 0xb2, 0x2a, 0xb6, 0x4d, 0x31, 0x63, 0x68, 0x8e, 0x00, 0xef, 0x82, 0x38, 0x23, 0x03, 0x6a,
+	0xe1, 0x6c, 0xb4, 0x28, 0x3d, 0x4a, 0xa2, 0x50, 0x83, 0x59, 0x90, 0x30, 0x07, 0x8e, 0x6b, 0x63,
+	0x9a, 0x8d, 0x09, 0xc7, 0x5c, 0x95, 0x9f, 0x4a, 0x20, 0x55, 0x23, 0x1e, 0xa7, 0x86, 0xc5, 0x0f,
+	0xb0, 0x0f, 0x1f, 0x82, 0x3b, 0xa4, 0xa3, 0x5b, 0xa1, 0x45, 0x3f, 0xc3, 0x7e, 0xd8, 0xf1, 0x2d,
+	0xd2, 0x59, 0x8e, 0xdb, 0x02, 0xeb, 0xd6, 0x80, 0x52, 0xec, 0xf1, 0xd7, 0x83, 0xc5, 0x0c, 0x08,
+	0x86, 0xbe, 0xe5, 0x8c, 0xcf, 0x41, 0xee, 0x6d, 0x19, 0x7a, 0x9f, 0x12, 0x72, 0x2a, 0xfa, 0x4d,
+	0xa3, 0x7b, 0x6f, 0xe6, 0x35, 0x03, 0xb7, 0xfc, 0xbd, 0x04, 0xe0, 0xdc, 0x58, 0x1b, 0x30, 0x4e,
+	0x7a, 0x62, 0xb3, 0x6d, 0x90, 0xc2, 0x9e, 0xe5, 0x1a, 0xe7, 0xf8, 0xb2, 0xd3, 0xd4, 0x93, 0x07,
+	0x57, 0x9d, 0x6f, 0x09, 0xb5, 0x7a, 0x7b, 0x3a, 0x29, 0x00, 0x65, 0x96, 0x7b, 0x80, 0x7d, 0x04,
+	0xf0, 0xa5, 0x0c, 0xd7, 0xc1, 0xaa, 0x6b, 0x98, 0xd8, 0x15, 0xc3, 0x24, 0xd1, 0x4c, 0x91, 0x7f,
+	0x5b, 0x01, 0xe9, 0x39, 0x82, 0x28, 0xfe, 0x00, 0x24, 0xc4, 0x59, 0x1d, 0x5b, 0x14, 0x8e, 0x55,
+	0xc1, 0x74, 0x52, 0x88, 0x8b, 0xab, 0xd7, 0x51, 0x3c, 0x70, 0xa9, 0xf6, 0xff, 0x7b, 0xde, 0xcb,
+	0xc6, 0x62, 0x4b, 0x8d, 0xc1, 0x7a, 0x58, 0x02, 0xdb, 0xd9, 0x55, 0xb1, 0x80, 0xc7, 0x57, 0xf2,
+	0xd7, 0x64, 0xc4, 0x1d, 0x70, 0xdc, 0x1e, 0x36, 0x09, 0x73, 0xb8, 0x43, 0x3c, 0x34, 0x4f, 0x85,
+	0x9b, 0x20, 0xe5, 0x98, 0x96, 0xde, 0x27, 0x94, 0x07, 0x13, 0xc5, 0x83, 0x0a, 0xd5, 0x5b, 0xd3,
+	0x49, 0x21, 0xa9, 0x56, 0x6b, 0x4d, 0x42, 0xb9, 0x5a, 0x47, 0x49, 0xc7, 0xb4, 0x84, 0x68, 0x07,
+	0xad, 0x18, 0x76, 0xcf, 0xf1, 0xb2, 0x89, 0x59, 0x2b, 0x42, 0x81, 0x05, 0x90, 0x12, 0x42, 0x78,
+	0xd4, 0x35, 0x71, 0x54, 0x20, 0x4c, 0xb3, 0x3b, 0x22, 0x00, 0xdf, 0x6c, 0x02, 0xbe, 0x0f, 0xd2,
+	0xa6, 0x4b, 0xac, 0x33, 0xbd, 0x8b, 0x9d, 0x4e, 0x97, 0x8b, 0x75, 0x46, 0x51, 0x4a, 0xd8, 0xf6,
+	0x85, 0x09, 0xde, 0x07, 0x6b, 0x7c, 0xa8, 0x3b, 0x9e, 0x8d, 0x87, 0x62, 0x91, 0x31, 0x94, 0xe0,
+	0x43, 0x35, 0x50, 0x65, 0x0c, 0x56, 0x0f, 0x89, 0x8d, 0x5d, 0xb8, 0x0b, 0xa2, 0x07, 0x73, 0xbe,
+	0x56, 0x3f, 0x7d, 0x35, 0x29, 0x6c, 0xbd, 0xb6, 0xe7, 0x1e, 0xe6, 0xe6, 0x29, 0x5f, 0x08, 0xae,
+	0x63, 0xb2, 0xb2, 0xe9, 0x73, 0xcc, 0x4a, 0xfb, 0x78, 0x58, 0x0d, 0x04, 0x14, 0x0d, 0xef, 0x7f,
+	0x2c, 0x9e, 0x83, 0x19, 0x99, 0x67, 0x8a, 0xfc, 0x97, 0x04, 0xb2, 0x97, 0x14, 0x0c, 0xbe, 0x5e,
+	0x87, 0x71, 0x42, 0x7d, 0xc5, 0xe3, 0xd4, 0x87, 0xc7, 0x20, 0x49, 0xfa, 0x98, 0x1a, 0xc1, 0x38,
+	0xe1, 0x2b, 0xf2, 0xd9, 0x75, 0x34, 0x5c, 0x02, 0x69, 0xcc, 0x73, 0x83, 0xb7, 0x05, 0x2d, 0xa0,
+	0x96, 0x39, 0xb6, 0x72, 0x25, 0xc7, 0xea, 0x20, 0x31, 0xe8, 0xdb, 0x82, 0x00, 0xd1, 0xff, 0x4e,
+	0x80, 0x30, 0x15, 0x66, 0x40, 0xb4, 0xc7, 0x3a, 0x82, 0x5a, 0x69, 0x14, 0x88, 0x8f, 0x7f, 0x95,
+	0x00, 0x58, 0x3c, 0x79, 0xf0, 0x21, 0x48, 0x1e, 0x69, 0x75, 0x65, 0x57, 0xd5, 0x94, 0x7a, 0x26,
+	0x92, 0xbb, 0x37, 0x1a, 0x17, 0xdf, 0x59, 0xb8, 0x8f, 0x3c, 0x1b, 0x9f, 0x3a, 0x1e, 0xb6, 0x61,
+	0x11, 0xc4, 0xb5, 0x46, 0xb5, 0x51, 0x3f, 0xc9, 0x48, 0xb9, 0xf5, 0xd1, 0xb8, 0x98, 0x59, 0x04,
+	0x69, 0xc4, 0x24, 0xb6, 0x0f, 0x37, 0x40, 0xba, 0xa1, 0x7d, 0x79, 0xa2, 0x57, 0xea, 0x75, 0xa4,
+	0xb4, 0x5a, 0x99, 0x95, 0xdc, 0xfd, 0xd1, 0xb8, 0xf8, 0xee, 0x22, 0xae, 0xe1, 0xb9, 0x7e, 0xc8,
+	0xfe, 0xa0, 0xac, 0x72, 0xac, 0xa0, 0x13, 0x81, 0x18, 0xfd, 0x77, 0x59, 0xe5, 0x1c, 0x53, 0x3f,
+	0x00, 0xcd, 0xad, 0xfd, 0xf0, 0x4b, 0x3e, 0xf2, 0xfc, 0x69, 0x3e, 0xf2, 0xf8, 0x59, 0x14, 0x14,
+	0xaf, 0x5b, 0x32, 0xc4, 0x60, 0xab, 0xd6, 0xd0, 0xda, 0xa8, 0x52, 0x6b, 0xeb, 0xb5, 0x46, 0x5d,
+	0xd1, 0xf7, 0xd5, 0x56, 0xbb, 0x81, 0x4e, 0xf4, 0x46, 0x53, 0x41, 0x95, 0xb6, 0xda, 0xd0, 0xf4,
+	0xf6, 0x49, 0x53, 0xd1, 0x8f, 0xb4, 0x56, 0x53, 0xa9, 0xa9, 0xbb, 0xaa, 0x18, 0xba, 0x3c, 0x1a,
+	0x17, 0x37, 0xae, 0xc3, 0x3e, 0xf2, 0x58, 0x1f, 0x5b, 0xce, 0xa9, 0x83, 0x6d, 0xf8, 0x15, 0xf8,
+	0xe8, 0x46, 0x65, 0x54, 0x4d, 0x6d, 0x67, 0xa4, 0xdc, 0xa3, 0xd1, 0xb8, 0xf8, 0xc1, 0x75, 0xf8,
+	0xaa, 0xe7, 0x70, 0xf8, 0x2d, 0xf8, 0xf8, 0x46, 0xc0, 0x87, 0xea, 0x1e, 0xaa, 0xb4, 0x95, 0xcc,
+	0x4a, 0x6e, 0x63, 0x34, 0x2e, 0x7e, 0x78, 0x1d, 0xf6, 0xa1, 0xd3, 0xa1, 0x06, 0xc7, 0x37, 0x86,
+	0xdf, 0x53, 0x34, 0xa5, 0xa5, 0xb6, 0x32, 0xd1, 0x9b, 0xc1, 0xef, 0x61, 0x0f, 0x33, 0x87, 0xe5,
+	0x62, 0xc1, 0xb1, 0xaa, 0xdf, 0xbc, 0xf8, 0x33, 0x1f, 0x79, 0x3e, 0xcd, 0x4b, 0x2f, 0xa6, 0x79,
+	0xe9, 0xe5, 0x34, 0x2f, 0xfd, 0x31, 0xcd, 0x4b, 0x3f, 0x5e, 0xe4, 0x23, 0x2f, 0x2f, 0xf2, 0x91,
+	0xdf, 0x2f, 0xf2, 0x91, 0xaf, 0x77, 0x96, 0xbe, 0x60, 0x66, 0x51, 0xee, 0x1a, 0x26, 0x2b, 0xb7,
+	0x04, 0xb9, 0x35, 0xcc, 0xbf, 0x23, 0xf4, 0xac, 0x3c, 0xbc, 0xfc, 0x6d, 0xe0, 0x78, 0x1c, 0x53,
+	0xcf, 0x70, 0x67, 0x2f, 0xa8, 0x19, 0x17, 0xff, 0xef, 0x3f, 0xf9, 0x27, 0x00, 0x00, 0xff, 0xff,
+	0x7f, 0x72, 0x40, 0x8b, 0x43, 0x08, 0x00, 0x00,
 }
 
 func (this *AccessTypeParam) Equal(that interface{}) bool {
diff --git a/x/emergencybutton/types/genesis.pb.go b/x/emergencybutton/types/genesis.pb.go
index 44af7bbdc..6c9bff150 100644
--- a/x/emergencybutton/types/genesis.pb.go
+++ b/x/emergencybutton/types/genesis.pb.go
@@ -5,8 +5,8 @@ package types
 
 import (
 	fmt "fmt"
-	_ "github.com/gogo/protobuf/gogoproto"
-	proto "github.com/gogo/protobuf/proto"
+	_ "github.com/cosmos/gogoproto/gogoproto"
+	proto "github.com/cosmos/gogoproto/proto"
 	io "io"
 	math "math"
 	math_bits "math/bits"
diff --git a/x/emergencybutton/types/params.pb.go b/x/emergencybutton/types/params.pb.go
index e05db00d5..d7afe949c 100644
--- a/x/emergencybutton/types/params.pb.go
+++ b/x/emergencybutton/types/params.pb.go
@@ -5,8 +5,8 @@ package types
 
 import (
 	fmt "fmt"
-	_ "github.com/gogo/protobuf/gogoproto"
-	proto "github.com/gogo/protobuf/proto"
+	_ "github.com/cosmos/gogoproto/gogoproto"
+	proto "github.com/cosmos/gogoproto/proto"
 	io "io"
 	math "math"
 	math_bits "math/bits"
diff --git a/x/emergencybutton/types/query.pb.go b/x/emergencybutton/types/query.pb.go
index ff86f04f1..dea84b4c0 100644
--- a/x/emergencybutton/types/query.pb.go
+++ b/x/emergencybutton/types/query.pb.go
@@ -6,9 +6,9 @@ package types
 import (
 	context "context"
 	fmt "fmt"
-	_ "github.com/gogo/protobuf/gogoproto"
-	grpc1 "github.com/gogo/protobuf/grpc"
-	proto "github.com/gogo/protobuf/proto"
+	_ "github.com/cosmos/gogoproto/gogoproto"
+	grpc1 "github.com/cosmos/gogoproto/grpc"
+	proto "github.com/cosmos/gogoproto/proto"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
@@ -156,8 +156,8 @@ const _ = grpc.SupportPackageIsVersion4
 //
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type QueryClient interface {
-	// Params defines a gRPC query method that returns the emergencybutton module's
-	// parameters.
+	// Params defines a gRPC query method that returns the emergencybutton
+	// module's parameters.
 	Params(ctx context.Context, in *ParamsRequest, opts ...grpc.CallOption) (*ParamsResponse, error)
 }
 
@@ -180,8 +180,8 @@ func (c *queryClient) Params(ctx context.Context, in *ParamsRequest, opts ...grp
 
 // QueryServer is the server API for Query service.
 type QueryServer interface {
-	// Params defines a gRPC query method that returns the emergencybutton module's
-	// parameters.
+	// Params defines a gRPC query method that returns the emergencybutton
+	// module's parameters.
 	Params(context.Context, *ParamsRequest) (*ParamsResponse, error)
 }
 
diff --git a/x/emergencybutton/types/query.pb.gw.go b/x/emergencybutton/types/query.pb.gw.go
index eef6e68f3..f855d707e 100644
--- a/x/emergencybutton/types/query.pb.gw.go
+++ b/x/emergencybutton/types/query.pb.gw.go
@@ -20,6 +20,7 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/grpclog"
+	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/status"
 )
 
@@ -30,6 +31,7 @@ var _ status.Status
 var _ = runtime.String
 var _ = utilities.NewDoubleArray
 var _ = descriptor.ForMessage
+var _ = metadata.Join
 
 func request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq ParamsRequest
@@ -52,12 +54,14 @@ func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshal
 // RegisterQueryHandlerServer registers the http handlers for service Query to "mux".
 // UnaryRPC     :call QueryServer directly.
 // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906.
-// Note that using this registration option will cause many gRPC library features (such as grpc.SendHeader, etc) to stop working. Consider using RegisterQueryHandlerFromEndpoint instead.
+// Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterQueryHandlerFromEndpoint instead.
 func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, server QueryServer) error {
 
 	mux.Handle("GET", pattern_Query_Params_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
+		var stream runtime.ServerTransportStream
+		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
 		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req)
 		if err != nil {
@@ -65,6 +69,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 			return
 		}
 		resp, md, err := local_request_Query_Params_0(rctx, inboundMarshaler, server, req, pathParams)
+		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
@@ -140,7 +145,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie
 }
 
 var (
-	pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"emergencybutton", "v1beta1", "params"}, "", runtime.AssumeColonVerbOpt(true)))
+	pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"emergencybutton", "v1beta1", "params"}, "", runtime.AssumeColonVerbOpt(false)))
 )
 
 var (
diff --git a/x/emergencybutton/types/tx.pb.go b/x/emergencybutton/types/tx.pb.go
index 003f7d3d1..b2cbb647a 100644
--- a/x/emergencybutton/types/tx.pb.go
+++ b/x/emergencybutton/types/tx.pb.go
@@ -6,9 +6,9 @@ package types
 import (
 	context "context"
 	fmt "fmt"
-	_ "github.com/gogo/protobuf/gogoproto"
-	grpc1 "github.com/gogo/protobuf/grpc"
-	proto "github.com/gogo/protobuf/proto"
+	_ "github.com/cosmos/gogoproto/gogoproto"
+	grpc1 "github.com/cosmos/gogoproto/grpc"
+	proto "github.com/cosmos/gogoproto/proto"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
@@ -28,7 +28,8 @@ var _ = math.Inf
 // proto package needs to be updated.
 const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 
-// MsgToggleIbcSwitch represents a message to toggle the emergencybutton status by the defined pauser.
+// MsgToggleIbcSwitch represents a message to toggle the emergencybutton status
+// by the defined pauser.
 type MsgToggleIbcSwitch struct {
 	Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty"`
 }
@@ -151,7 +152,8 @@ const _ = grpc.SupportPackageIsVersion4
 //
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type MsgClient interface {
-	// ToggleIbcSwitch defines a method for toggling the status of the emergencybutton.
+	// ToggleIbcSwitch defines a method for toggling the status of the
+	// emergencybutton.
 	ToggleIbcSwitch(ctx context.Context, in *MsgToggleIbcSwitch, opts ...grpc.CallOption) (*MsgToggleIbcSwitchResponse, error)
 }
 
@@ -174,7 +176,8 @@ func (c *msgClient) ToggleIbcSwitch(ctx context.Context, in *MsgToggleIbcSwitch,
 
 // MsgServer is the server API for Msg service.
 type MsgServer interface {
-	// ToggleIbcSwitch defines a method for toggling the status of the emergencybutton.
+	// ToggleIbcSwitch defines a method for toggling the status of the
+	// emergencybutton.
 	ToggleIbcSwitch(context.Context, *MsgToggleIbcSwitch) (*MsgToggleIbcSwitchResponse, error)
 }
 
diff --git a/x/mauth/types/query.pb.go b/x/mauth/types/query.pb.go
index d88b44077..148cbd7ec 100644
--- a/x/mauth/types/query.pb.go
+++ b/x/mauth/types/query.pb.go
@@ -6,9 +6,9 @@ package types
 import (
 	context "context"
 	fmt "fmt"
-	_ "github.com/gogo/protobuf/gogoproto"
-	grpc1 "github.com/gogo/protobuf/grpc"
-	proto "github.com/gogo/protobuf/proto"
+	_ "github.com/cosmos/gogoproto/gogoproto"
+	grpc1 "github.com/cosmos/gogoproto/grpc"
+	proto "github.com/cosmos/gogoproto/proto"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
@@ -29,7 +29,8 @@ var _ = math.Inf
 // proto package needs to be updated.
 const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 
-// QueryInterchainAccountFromAddressRequest is the request type for the Query/InterchainAccountAddress RPC
+// QueryInterchainAccountFromAddressRequest is the request type for the
+// Query/InterchainAccountAddress RPC
 type QueryInterchainAccountFromAddressRequest struct {
 	Owner        string `protobuf:"bytes,1,opt,name=owner,proto3" json:"owner,omitempty"`
 	ConnectionId string `protobuf:"bytes,2,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" yaml:"connection_id"`
@@ -70,7 +71,8 @@ func (m *QueryInterchainAccountFromAddressRequest) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_QueryInterchainAccountFromAddressRequest proto.InternalMessageInfo
 
-// QueryInterchainAccountFromAddressResponse the response type for the Query/InterchainAccountAddress RPC
+// QueryInterchainAccountFromAddressResponse the response type for the
+// Query/InterchainAccountAddress RPC
 type QueryInterchainAccountFromAddressResponse struct {
 	InterchainAccountAddress string `protobuf:"bytes,1,opt,name=interchain_account_address,json=interchainAccountAddress,proto3" json:"interchain_account_address,omitempty" yaml:"interchain_account_address"`
 }
@@ -215,7 +217,8 @@ const _ = grpc.SupportPackageIsVersion4
 //
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type QueryClient interface {
-	// QueryInterchainAccountFromAddress returns the interchain account for given owner address on a given connection pair
+	// QueryInterchainAccountFromAddress returns the interchain account for given
+	// owner address on a given connection pair
 	InterchainAccountFromAddress(ctx context.Context, in *QueryInterchainAccountFromAddressRequest, opts ...grpc.CallOption) (*QueryInterchainAccountFromAddressResponse, error)
 }
 
@@ -238,7 +241,8 @@ func (c *queryClient) InterchainAccountFromAddress(ctx context.Context, in *Quer
 
 // QueryServer is the server API for Query service.
 type QueryServer interface {
-	// QueryInterchainAccountFromAddress returns the interchain account for given owner address on a given connection pair
+	// QueryInterchainAccountFromAddress returns the interchain account for given
+	// owner address on a given connection pair
 	InterchainAccountFromAddress(context.Context, *QueryInterchainAccountFromAddressRequest) (*QueryInterchainAccountFromAddressResponse, error)
 }
 
diff --git a/x/mauth/types/query.pb.gw.go b/x/mauth/types/query.pb.gw.go
index ea4453cd8..ea8b22516 100644
--- a/x/mauth/types/query.pb.gw.go
+++ b/x/mauth/types/query.pb.gw.go
@@ -20,6 +20,7 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/grpclog"
+	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/status"
 )
 
@@ -30,6 +31,7 @@ var _ status.Status
 var _ = runtime.String
 var _ = utilities.NewDoubleArray
 var _ = descriptor.ForMessage
+var _ = metadata.Join
 
 func request_Query_InterchainAccountFromAddress_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq QueryInterchainAccountFromAddressRequest
@@ -110,12 +112,14 @@ func local_request_Query_InterchainAccountFromAddress_0(ctx context.Context, mar
 // RegisterQueryHandlerServer registers the http handlers for service Query to "mux".
 // UnaryRPC     :call QueryServer directly.
 // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906.
-// Note that using this registration option will cause many gRPC library features (such as grpc.SendHeader, etc) to stop working. Consider using RegisterQueryHandlerFromEndpoint instead.
+// Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterQueryHandlerFromEndpoint instead.
 func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, server QueryServer) error {
 
 	mux.Handle("GET", pattern_Query_InterchainAccountFromAddress_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
+		var stream runtime.ServerTransportStream
+		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
 		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req)
 		if err != nil {
@@ -123,6 +127,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 			return
 		}
 		resp, md, err := local_request_Query_InterchainAccountFromAddress_0(rctx, inboundMarshaler, server, req, pathParams)
+		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
@@ -198,7 +203,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie
 }
 
 var (
-	pattern_Query_InterchainAccountFromAddress_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"mauth", "interchain_account", "owner", "connection", "connection_id"}, "", runtime.AssumeColonVerbOpt(true)))
+	pattern_Query_InterchainAccountFromAddress_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"mauth", "interchain_account", "owner", "connection", "connection_id"}, "", runtime.AssumeColonVerbOpt(false)))
 )
 
 var (
diff --git a/x/mauth/types/tx.pb.go b/x/mauth/types/tx.pb.go
index 668340f74..67932f363 100644
--- a/x/mauth/types/tx.pb.go
+++ b/x/mauth/types/tx.pb.go
@@ -7,13 +7,13 @@ import (
 	bytes "bytes"
 	context "context"
 	fmt "fmt"
+	_ "github.com/cosmos/cosmos-proto"
 	types "github.com/cosmos/cosmos-sdk/codec/types"
 	_ "github.com/cosmos/cosmos-sdk/types"
 	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
-	_ "github.com/gogo/protobuf/gogoproto"
-	grpc1 "github.com/gogo/protobuf/grpc"
-	proto "github.com/gogo/protobuf/proto"
-	_ "github.com/regen-network/cosmos-proto"
+	_ "github.com/cosmos/gogoproto/gogoproto"
+	grpc1 "github.com/cosmos/gogoproto/grpc"
+	proto "github.com/cosmos/gogoproto/proto"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
@@ -34,7 +34,8 @@ var _ = math.Inf
 // proto package needs to be updated.
 const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 
-// MsgRegisterAccount registers an interchain account for the given owner over the specified connection pair
+// MsgRegisterAccount registers an interchain account for the given owner over
+// the specified connection pair
 type MsgRegisterAccount struct {
 	Owner        string `protobuf:"bytes,1,opt,name=owner,proto3" json:"owner,omitempty"`
 	ConnectionId string `protobuf:"bytes,2,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" yaml:"connection_id"`
@@ -111,7 +112,8 @@ func (m *MsgRegisterAccountResponse) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_MsgRegisterAccountResponse proto.InternalMessageInfo
 
-// MsgSubmitTx creates and submits an arbitrary transaction msg to be executed using an interchain account
+// MsgSubmitTx creates and submits an arbitrary transaction msg to be executed
+// using an interchain account
 type MsgSubmitTx struct {
 	Owner        github_com_cosmos_cosmos_sdk_types.AccAddress `protobuf:"bytes,1,opt,name=owner,proto3,casttype=github.com/cosmos/cosmos-sdk/types.AccAddress" json:"owner,omitempty"`
 	ConnectionId string                                        `protobuf:"bytes,2,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" yaml:"connection_id"`
diff --git a/x/mauth/types/tx.pb.gw.go b/x/mauth/types/tx.pb.gw.go
index bda8b8a86..96b920b27 100644
--- a/x/mauth/types/tx.pb.gw.go
+++ b/x/mauth/types/tx.pb.gw.go
@@ -20,6 +20,7 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/grpclog"
+	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/status"
 )
 
@@ -30,6 +31,7 @@ var _ status.Status
 var _ = runtime.String
 var _ = utilities.NewDoubleArray
 var _ = descriptor.ForMessage
+var _ = metadata.Join
 
 var (
 	filter_Msg_RegisterAccount_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
@@ -106,12 +108,14 @@ func local_request_Msg_SubmitTx_0(ctx context.Context, marshaler runtime.Marshal
 // RegisterMsgHandlerServer registers the http handlers for service Msg to "mux".
 // UnaryRPC     :call MsgServer directly.
 // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906.
-// Note that using this registration option will cause many gRPC library features (such as grpc.SendHeader, etc) to stop working. Consider using RegisterMsgHandlerFromEndpoint instead.
+// Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterMsgHandlerFromEndpoint instead.
 func RegisterMsgHandlerServer(ctx context.Context, mux *runtime.ServeMux, server MsgServer) error {
 
 	mux.Handle("POST", pattern_Msg_RegisterAccount_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
+		var stream runtime.ServerTransportStream
+		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
 		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req)
 		if err != nil {
@@ -119,6 +123,7 @@ func RegisterMsgHandlerServer(ctx context.Context, mux *runtime.ServeMux, server
 			return
 		}
 		resp, md, err := local_request_Msg_RegisterAccount_0(rctx, inboundMarshaler, server, req, pathParams)
+		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
@@ -132,6 +137,8 @@ func RegisterMsgHandlerServer(ctx context.Context, mux *runtime.ServeMux, server
 	mux.Handle("POST", pattern_Msg_SubmitTx_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
+		var stream runtime.ServerTransportStream
+		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
 		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req)
 		if err != nil {
@@ -139,6 +146,7 @@ func RegisterMsgHandlerServer(ctx context.Context, mux *runtime.ServeMux, server
 			return
 		}
 		resp, md, err := local_request_Msg_SubmitTx_0(rctx, inboundMarshaler, server, req, pathParams)
+		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
@@ -234,9 +242,9 @@ func RegisterMsgHandlerClient(ctx context.Context, mux *runtime.ServeMux, client
 }
 
 var (
-	pattern_Msg_RegisterAccount_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"mauth", "v1beta1", "register-account"}, "", runtime.AssumeColonVerbOpt(true)))
+	pattern_Msg_RegisterAccount_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"mauth", "v1beta1", "register-account"}, "", runtime.AssumeColonVerbOpt(false)))
 
-	pattern_Msg_SubmitTx_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"mauth", "v1beta1", "submit-tx"}, "", runtime.AssumeColonVerbOpt(true)))
+	pattern_Msg_SubmitTx_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"mauth", "v1beta1", "submit-tx"}, "", runtime.AssumeColonVerbOpt(false)))
 )
 
 var (
diff --git a/x/registration/internal/types/genesis.pb.go b/x/registration/internal/types/genesis.pb.go
index ea90a4cc3..bb2041914 100644
--- a/x/registration/internal/types/genesis.pb.go
+++ b/x/registration/internal/types/genesis.pb.go
@@ -5,8 +5,8 @@ package types
 
 import (
 	fmt "fmt"
-	_ "github.com/gogo/protobuf/gogoproto"
-	proto "github.com/gogo/protobuf/proto"
+	_ "github.com/cosmos/gogoproto/gogoproto"
+	proto "github.com/cosmos/gogoproto/proto"
 	io "io"
 	math "math"
 	math_bits "math/bits"
diff --git a/x/registration/internal/types/msg.pb.go b/x/registration/internal/types/msg.pb.go
index c5e1bab30..b1805d3ec 100644
--- a/x/registration/internal/types/msg.pb.go
+++ b/x/registration/internal/types/msg.pb.go
@@ -7,8 +7,8 @@ import (
 	bytes "bytes"
 	fmt "fmt"
 	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
-	_ "github.com/gogo/protobuf/gogoproto"
-	proto "github.com/gogo/protobuf/proto"
+	_ "github.com/cosmos/gogoproto/gogoproto"
+	proto "github.com/cosmos/gogoproto/proto"
 	github_com_scrtlabs_SecretNetwork_x_registration_remote_attestation "github.com/scrtlabs/SecretNetwork/x/registration/remote_attestation"
 	io "io"
 	math "math"
diff --git a/x/registration/internal/types/query.pb.go b/x/registration/internal/types/query.pb.go
index 78340b1b7..f1e0b6378 100644
--- a/x/registration/internal/types/query.pb.go
+++ b/x/registration/internal/types/query.pb.go
@@ -7,9 +7,9 @@ import (
 	bytes "bytes"
 	context "context"
 	fmt "fmt"
-	_ "github.com/gogo/protobuf/gogoproto"
-	grpc1 "github.com/gogo/protobuf/grpc"
-	proto "github.com/gogo/protobuf/proto"
+	_ "github.com/cosmos/gogoproto/gogoproto"
+	grpc1 "github.com/cosmos/gogoproto/grpc"
+	proto "github.com/cosmos/gogoproto/proto"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
diff --git a/x/registration/internal/types/query.pb.gw.go b/x/registration/internal/types/query.pb.gw.go
index 65250601d..3aa606ab9 100644
--- a/x/registration/internal/types/query.pb.gw.go
+++ b/x/registration/internal/types/query.pb.gw.go
@@ -20,6 +20,7 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/grpclog"
+	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/types/known/emptypb"
 )
@@ -31,6 +32,7 @@ var _ status.Status
 var _ = runtime.String
 var _ = utilities.NewDoubleArray
 var _ = descriptor.ForMessage
+var _ = metadata.Join
 
 func request_Query_TxKey_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq emptypb.Empty
@@ -125,12 +127,14 @@ func local_request_Query_EncryptedSeed_0(ctx context.Context, marshaler runtime.
 // RegisterQueryHandlerServer registers the http handlers for service Query to "mux".
 // UnaryRPC     :call QueryServer directly.
 // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906.
-// Note that using this registration option will cause many gRPC library features (such as grpc.SendHeader, etc) to stop working. Consider using RegisterQueryHandlerFromEndpoint instead.
+// Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterQueryHandlerFromEndpoint instead.
 func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, server QueryServer) error {
 
 	mux.Handle("GET", pattern_Query_TxKey_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
+		var stream runtime.ServerTransportStream
+		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
 		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req)
 		if err != nil {
@@ -138,6 +142,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 			return
 		}
 		resp, md, err := local_request_Query_TxKey_0(rctx, inboundMarshaler, server, req, pathParams)
+		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
@@ -151,6 +156,8 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 	mux.Handle("GET", pattern_Query_RegistrationKey_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
+		var stream runtime.ServerTransportStream
+		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
 		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req)
 		if err != nil {
@@ -158,6 +165,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 			return
 		}
 		resp, md, err := local_request_Query_RegistrationKey_0(rctx, inboundMarshaler, server, req, pathParams)
+		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
@@ -171,6 +179,8 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 	mux.Handle("GET", pattern_Query_EncryptedSeed_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
+		var stream runtime.ServerTransportStream
+		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
 		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req)
 		if err != nil {
@@ -178,6 +188,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 			return
 		}
 		resp, md, err := local_request_Query_EncryptedSeed_0(rctx, inboundMarshaler, server, req, pathParams)
+		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
 		ctx = runtime.NewServerMetadataContext(ctx, md)
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
@@ -293,11 +304,11 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie
 }
 
 var (
-	pattern_Query_TxKey_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"registration", "v1beta1", "tx-key"}, "", runtime.AssumeColonVerbOpt(true)))
+	pattern_Query_TxKey_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"registration", "v1beta1", "tx-key"}, "", runtime.AssumeColonVerbOpt(false)))
 
-	pattern_Query_RegistrationKey_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"registration", "v1beta1", "registration-key"}, "", runtime.AssumeColonVerbOpt(true)))
+	pattern_Query_RegistrationKey_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"registration", "v1beta1", "registration-key"}, "", runtime.AssumeColonVerbOpt(false)))
 
-	pattern_Query_EncryptedSeed_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"registration", "v1beta1", "encrypted-seed", "pub_key"}, "", runtime.AssumeColonVerbOpt(true)))
+	pattern_Query_EncryptedSeed_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"registration", "v1beta1", "encrypted-seed", "pub_key"}, "", runtime.AssumeColonVerbOpt(false)))
 )
 
 var (
diff --git a/x/registration/internal/types/types.pb.go b/x/registration/internal/types/types.pb.go
index 8a64655e1..0b42b7184 100644
--- a/x/registration/internal/types/types.pb.go
+++ b/x/registration/internal/types/types.pb.go
@@ -6,8 +6,8 @@ package types
 import (
 	bytes "bytes"
 	fmt "fmt"
-	_ "github.com/gogo/protobuf/gogoproto"
-	proto "github.com/gogo/protobuf/proto"
+	_ "github.com/cosmos/gogoproto/gogoproto"
+	proto "github.com/cosmos/gogoproto/proto"
 	github_com_scrtlabs_SecretNetwork_x_registration_remote_attestation "github.com/scrtlabs/SecretNetwork/x/registration/remote_attestation"
 	io "io"
 	math "math"
diff --git a/x/registration/remote_attestation/types.pb.go b/x/registration/remote_attestation/types.pb.go
index 9df0a080d..61f4b2485 100644
--- a/x/registration/remote_attestation/types.pb.go
+++ b/x/registration/remote_attestation/types.pb.go
@@ -1,13 +1,13 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: secret/registration/v1beta1/remote_attestation/types.proto
+// source: secret/registration/remote_attestation/v1beta1/types.proto
 
 package remote_attestation
 
 import (
 	bytes "bytes"
 	fmt "fmt"
-	_ "github.com/gogo/protobuf/gogoproto"
-	proto "github.com/gogo/protobuf/proto"
+	_ "github.com/cosmos/gogoproto/gogoproto"
+	proto "github.com/cosmos/gogoproto/proto"
 	io "io"
 	math "math"
 	math_bits "math/bits"
@@ -38,7 +38,7 @@ func (m *QuoteReport) Reset()         { *m = QuoteReport{} }
 func (m *QuoteReport) String() string { return proto.CompactTextString(m) }
 func (*QuoteReport) ProtoMessage()    {}
 func (*QuoteReport) Descriptor() ([]byte, []int) {
-	return fileDescriptor_c8a3a0e7f2a8fa26, []int{0}
+	return fileDescriptor_799802904e8e109a, []int{0}
 }
 func (m *QuoteReport) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -77,7 +77,7 @@ func (m *QuoteReportBody) Reset()         { *m = QuoteReportBody{} }
 func (m *QuoteReportBody) String() string { return proto.CompactTextString(m) }
 func (*QuoteReportBody) ProtoMessage()    {}
 func (*QuoteReportBody) Descriptor() ([]byte, []int) {
-	return fileDescriptor_c8a3a0e7f2a8fa26, []int{1}
+	return fileDescriptor_799802904e8e109a, []int{1}
 }
 func (m *QuoteReportBody) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -116,7 +116,7 @@ func (m *QuoteReportData) Reset()         { *m = QuoteReportData{} }
 func (m *QuoteReportData) String() string { return proto.CompactTextString(m) }
 func (*QuoteReportData) ProtoMessage()    {}
 func (*QuoteReportData) Descriptor() ([]byte, []int) {
-	return fileDescriptor_c8a3a0e7f2a8fa26, []int{2}
+	return fileDescriptor_799802904e8e109a, []int{2}
 }
 func (m *QuoteReportData) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -155,7 +155,7 @@ func (m *EndorsedAttestationReport) Reset()         { *m = EndorsedAttestationRe
 func (m *EndorsedAttestationReport) String() string { return proto.CompactTextString(m) }
 func (*EndorsedAttestationReport) ProtoMessage()    {}
 func (*EndorsedAttestationReport) Descriptor() ([]byte, []int) {
-	return fileDescriptor_c8a3a0e7f2a8fa26, []int{3}
+	return fileDescriptor_799802904e8e109a, []int{3}
 }
 func (m *EndorsedAttestationReport) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -193,7 +193,7 @@ func (m *SGXEC256Signature) Reset()         { *m = SGXEC256Signature{} }
 func (m *SGXEC256Signature) String() string { return proto.CompactTextString(m) }
 func (*SGXEC256Signature) ProtoMessage()    {}
 func (*SGXEC256Signature) Descriptor() ([]byte, []int) {
-	return fileDescriptor_c8a3a0e7f2a8fa26, []int{4}
+	return fileDescriptor_799802904e8e109a, []int{4}
 }
 func (m *SGXEC256Signature) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -238,7 +238,7 @@ func (m *PlatformInfoBlob) Reset()         { *m = PlatformInfoBlob{} }
 func (m *PlatformInfoBlob) String() string { return proto.CompactTextString(m) }
 func (*PlatformInfoBlob) ProtoMessage()    {}
 func (*PlatformInfoBlob) Descriptor() ([]byte, []int) {
-	return fileDescriptor_c8a3a0e7f2a8fa26, []int{5}
+	return fileDescriptor_799802904e8e109a, []int{5}
 }
 func (m *PlatformInfoBlob) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -277,63 +277,63 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("secret/registration/v1beta1/remote_attestation/types.proto", fileDescriptor_c8a3a0e7f2a8fa26)
+	proto.RegisterFile("secret/registration/remote_attestation/v1beta1/types.proto", fileDescriptor_799802904e8e109a)
 }
 
-var fileDescriptor_c8a3a0e7f2a8fa26 = []byte{
-	// 818 bytes of a gzipped FileDescriptorProto
+var fileDescriptor_799802904e8e109a = []byte{
+	// 817 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x4f, 0x6f, 0xdb, 0x36,
 	0x14, 0x8f, 0xe4, 0x2c, 0x89, 0x68, 0x77, 0x49, 0xb8, 0xa4, 0x55, 0xdb, 0x4d, 0xce, 0x7c, 0x18,
 	0x82, 0x1d, 0xac, 0x35, 0x45, 0x3b, 0x60, 0x3b, 0x0c, 0x71, 0xe2, 0x15, 0x01, 0x86, 0x21, 0xa3,
 	0x73, 0x18, 0x76, 0xe1, 0x28, 0x91, 0xd1, 0x88, 0x49, 0xa2, 0x4a, 0xd2, 0x9a, 0xfd, 0x05, 0x76,
 	0xde, 0xc7, 0x18, 0xf6, 0x49, 0x7a, 0xec, 0x71, 0xc0, 0x00, 0x63, 0x73, 0x6e, 0xfe, 0x14, 0x03,
-	0x29, 0xf9, 0x4f, 0xec, 0x5e, 0x7a, 0xe3, 0xfb, 0xbd, 0xf7, 0x7b, 0xbf, 0x9f, 0xf8, 0x1e, 0x05,
-	0xbe, 0x52, 0x2c, 0x96, 0x4c, 0x87, 0x92, 0x25, 0x5c, 0x69, 0x49, 0x34, 0x17, 0x79, 0x58, 0x3e,
-	0x8b, 0x98, 0x26, 0xcf, 0x42, 0xc9, 0x32, 0xa1, 0x19, 0x26, 0x5a, 0x33, 0xa5, 0xab, 0x94, 0x1e,
-	0x17, 0x4c, 0x75, 0x0b, 0x29, 0xb4, 0x80, 0xdd, 0x8a, 0xdb, 0x5d, 0xe5, 0x76, 0x37, 0x39, 0xdd,
-	0xba, 0xdd, 0x93, 0xa3, 0x44, 0x24, 0xc2, 0x52, 0x43, 0x73, 0xaa, 0xba, 0x74, 0x7e, 0x6f, 0x80,
-	0xe6, 0x0f, 0x43, 0xa1, 0x19, 0x62, 0x85, 0x90, 0x1a, 0x3e, 0x04, 0x2e, 0xa7, 0xbe, 0x73, 0xe2,
-	0x9c, 0x7a, 0xbd, 0x9d, 0xe9, 0xa4, 0xed, 0x5e, 0x5d, 0x22, 0x97, 0x53, 0xf8, 0x31, 0xf0, 0x34,
-	0xcf, 0x4c, 0xd3, 0xac, 0xf0, 0x5d, 0x93, 0x46, 0x4b, 0x00, 0xfa, 0x60, 0xb7, 0x64, 0x52, 0x71,
-	0x91, 0xfb, 0x8d, 0x13, 0xe7, 0x74, 0x1b, 0xcd, 0x43, 0x88, 0x80, 0xcf, 0x55, 0x89, 0x59, 0x1e,
-	0xa7, 0xa4, 0x64, 0xf8, 0xb5, 0x91, 0xc2, 0xc6, 0xda, 0x50, 0xf9, 0xdb, 0x56, 0xe5, 0xf1, 0x6c,
-	0xd2, 0x3e, 0xe6, 0xaa, 0xec, 0x57, 0x25, 0xd6, 0xcc, 0xc0, 0x16, 0xa0, 0x77, 0xc3, 0xb0, 0x07,
-	0x60, 0x91, 0x12, 0x7d, 0x2b, 0x64, 0x86, 0x79, 0x7e, 0x2b, 0x70, 0x94, 0x8a, 0xc8, 0xff, 0xc0,
-	0x76, 0x3b, 0x9a, 0x4d, 0xda, 0x07, 0xf3, 0xec, 0x55, 0x7e, 0x2b, 0x7a, 0xa9, 0x88, 0xd0, 0x06,
-	0x02, 0xbf, 0x03, 0x0f, 0x37, 0x7d, 0x45, 0x82, 0x8e, 0xfd, 0x1d, 0xdb, 0xe7, 0xd1, 0x6c, 0xd2,
-	0xfe, 0x68, 0x4d, 0xbe, 0x27, 0xe8, 0x18, 0xbd, 0x0b, 0x84, 0xe7, 0xa0, 0x45, 0x68, 0xc9, 0x95,
-	0x90, 0x63, 0xcc, 0xa9, 0xf2, 0x77, 0x4f, 0x1a, 0xa7, 0x5e, 0x2f, 0x98, 0x4e, 0xda, 0xcd, 0xf3,
-	0x1a, 0xbf, 0xba, 0x54, 0xb3, 0x49, 0xbb, 0x49, 0x96, 0x21, 0x5a, 0x06, 0x54, 0x75, 0x72, 0xb0,
-	0xbf, 0x32, 0x07, 0xdb, 0xf5, 0x13, 0x00, 0x32, 0x39, 0xb7, 0x58, 0xcd, 0x04, 0x79, 0x99, 0xac,
-	0xd5, 0xe1, 0x53, 0xe0, 0x65, 0x12, 0x2b, 0x9e, 0xe4, 0x4c, 0xd6, 0x23, 0xd9, 0xcb, 0xe4, 0xc0,
-	0xc6, 0xb0, 0x0d, 0x9a, 0xd2, 0x76, 0xc2, 0x94, 0x68, 0x62, 0xa7, 0xe2, 0x21, 0x50, 0x41, 0x97,
-	0x44, 0x93, 0xce, 0x5f, 0xce, 0x3d, 0x41, 0x83, 0xad, 0x8e, 0xd1, 0xb9, 0x3f, 0xc6, 0xa7, 0xc0,
-	0x33, 0x42, 0xd8, 0x2c, 0xa0, 0xd5, 0xda, 0x46, 0x7b, 0x06, 0xb8, 0x19, 0x17, 0x0c, 0xfe, 0xbc,
-	0xd0, 0xb2, 0x17, 0x68, 0xb4, 0x9a, 0x67, 0xdf, 0xbc, 0xe7, 0x7e, 0x76, 0xd7, 0xbe, 0x7e, 0x6e,
-	0xd6, 0x9c, 0x3b, 0x1a, 0x3c, 0xee, 0xe7, 0x54, 0x48, 0xc5, 0xe8, 0xf9, 0x92, 0xba, 0x58, 0xd9,
-	0x9d, 0xaa, 0xd4, 0x9a, 0x6e, 0xa1, 0x3a, 0x32, 0x2b, 0x6b, 0x2c, 0x12, 0x3d, 0x94, 0x95, 0xe7,
-	0x16, 0x5a, 0x02, 0xf0, 0x53, 0xd0, 0x32, 0x01, 0xcf, 0x13, 0x1c, 0x33, 0xa9, 0xad, 0xeb, 0x16,
-	0x6a, 0xd6, 0xd8, 0x05, 0x93, 0xba, 0xf3, 0x1c, 0x1c, 0x0e, 0x5e, 0xfd, 0xd8, 0xbf, 0x38, 0x7b,
-	0xf1, 0x72, 0xb0, 0xe0, 0x7d, 0x08, 0xdc, 0x64, 0x54, 0x0f, 0xc3, 0x4d, 0x46, 0x36, 0x1e, 0xd7,
-	0xd7, 0xef, 0x26, 0xe3, 0xce, 0x3f, 0x0d, 0x70, 0x70, 0xbd, 0xbe, 0x6d, 0x21, 0x38, 0x52, 0xc9,
-	0x08, 0xb3, 0x82, 0x53, 0x9c, 0x48, 0x31, 0x2c, 0xf0, 0x6d, 0x4a, 0x12, 0x65, 0xdb, 0x3c, 0x40,
-	0x87, 0x2a, 0x19, 0xf5, 0x0b, 0x4e, 0x5f, 0x99, 0xcc, 0xb7, 0x26, 0x01, 0xbf, 0x04, 0xbe, 0x21,
-	0xe8, 0x38, 0xc2, 0xac, 0x24, 0xe9, 0xd0, 0x7e, 0x6f, 0x4d, 0x72, 0x2d, 0xe9, 0x58, 0x25, 0xa3,
-	0x9b, 0x38, 0xea, 0x2f, 0xb2, 0x15, 0xf1, 0x0b, 0x70, 0x54, 0x28, 0xb6, 0x49, 0x6a, 0x58, 0x12,
-	0x2c, 0x14, 0x5b, 0x67, 0x7c, 0x0d, 0x9e, 0xa4, 0xc4, 0xdc, 0x29, 0x66, 0xaf, 0x87, 0xbc, 0x24,
-	0x29, 0xcb, 0xb5, 0x15, 0x2e, 0x54, 0x99, 0x57, 0x6f, 0x14, 0x3d, 0xaa, 0x2a, 0xfa, 0x8b, 0x82,
-	0x9b, 0x38, 0xba, 0x56, 0x65, 0x0e, 0x3f, 0x07, 0x87, 0x35, 0xd9, 0xa8, 0x72, 0x55, 0x1a, 0x8e,
-	0x7d, 0x89, 0x68, 0xbf, 0x4a, 0x5c, 0x2b, 0x76, 0x65, 0x61, 0xf8, 0x19, 0xd8, 0x5f, 0xd4, 0x52,
-	0x82, 0x4d, 0xa5, 0x7d, 0x6b, 0xe8, 0xc1, 0xbc, 0x92, 0x92, 0x41, 0x99, 0x43, 0x08, 0xb6, 0x47,
-	0x8c, 0x53, 0x7f, 0xd7, 0x5a, 0xb6, 0x67, 0x78, 0x00, 0x1a, 0x09, 0xa7, 0xfe, 0x9e, 0x85, 0xcc,
-	0x11, 0x6a, 0x70, 0x6c, 0xaf, 0x34, 0x3e, 0x7b, 0xf1, 0x12, 0x2f, 0xc6, 0x8a, 0xb5, 0xef, 0xd9,
-	0xf5, 0x3b, 0x7f, 0xdf, 0xf5, 0xdb, 0x98, 0x34, 0x82, 0x66, 0x2c, 0xf1, 0x2a, 0x74, 0xd3, 0x63,
-	0x6f, 0xfe, 0x0b, 0xb6, 0xfe, 0x9c, 0x06, 0xce, 0x9b, 0x69, 0xe0, 0xbc, 0x9d, 0x06, 0xce, 0xbf,
-	0xd3, 0xc0, 0xf9, 0xe3, 0x2e, 0xd8, 0x7a, 0x7b, 0x17, 0x6c, 0xfd, 0x7d, 0x17, 0x6c, 0xfd, 0x74,
-	0x91, 0x70, 0xfd, 0xcb, 0x30, 0xea, 0xc6, 0x22, 0x0b, 0x55, 0x2c, 0x75, 0x4a, 0x22, 0x15, 0x0e,
-	0xac, 0x97, 0xef, 0x99, 0xfe, 0x4d, 0xc8, 0x5f, 0xc3, 0xd1, 0xfd, 0xff, 0xfd, 0xa6, 0xa9, 0x68,
-	0xc7, 0xfe, 0x9c, 0x9f, 0xff, 0x1f, 0x00, 0x00, 0xff, 0xff, 0x14, 0x1b, 0x64, 0xf4, 0x20, 0x06,
-	0x00, 0x00,
+	0x29, 0xf9, 0x4f, 0xed, 0x02, 0x45, 0x6f, 0x7c, 0xbf, 0xf7, 0x7e, 0xef, 0xf7, 0x13, 0xdf, 0xa3,
+	0xc0, 0x57, 0x8a, 0xc5, 0x92, 0xe9, 0x50, 0xb2, 0x84, 0x2b, 0x2d, 0x89, 0xe6, 0x22, 0x0f, 0x25,
+	0xcb, 0x84, 0x66, 0x98, 0x68, 0xcd, 0x94, 0xae, 0xa0, 0xf2, 0x49, 0xc4, 0x34, 0x79, 0x12, 0xea,
+	0x71, 0xc1, 0x54, 0xb7, 0x90, 0x42, 0x0b, 0xd8, 0xad, 0xb8, 0xdd, 0x55, 0x6e, 0x77, 0x93, 0xdb,
+	0xad, 0xb9, 0x8f, 0x8e, 0x12, 0x91, 0x08, 0x4b, 0x0d, 0xcd, 0xa9, 0xea, 0xd2, 0xf9, 0xbd, 0x01,
+	0x9a, 0x3f, 0x0c, 0x85, 0x66, 0x88, 0x15, 0x42, 0x6a, 0x78, 0x1f, 0xb8, 0x9c, 0xfa, 0xce, 0x89,
+	0x73, 0xea, 0xf5, 0x76, 0xa6, 0x93, 0xb6, 0x7b, 0x75, 0x89, 0x5c, 0x4e, 0xe1, 0xc7, 0xc0, 0xd3,
+	0x3c, 0x33, 0x4d, 0xb3, 0xc2, 0x77, 0x4d, 0x1a, 0x2d, 0x01, 0xe8, 0x83, 0xdd, 0x92, 0x49, 0xc5,
+	0x45, 0xee, 0x37, 0x4e, 0x9c, 0xd3, 0x6d, 0x34, 0x0f, 0x21, 0x02, 0x3e, 0x57, 0x25, 0x66, 0x79,
+	0x9c, 0x92, 0x92, 0xe1, 0x97, 0x46, 0x0a, 0x1b, 0x6b, 0x43, 0xe5, 0x6f, 0x5b, 0x95, 0x87, 0xb3,
+	0x49, 0xfb, 0x98, 0xab, 0xb2, 0x5f, 0x95, 0x58, 0x33, 0x03, 0x5b, 0x80, 0xde, 0x0e, 0xc3, 0x1e,
+	0x80, 0x45, 0x4a, 0xf4, 0xad, 0x90, 0x19, 0xe6, 0xf9, 0xad, 0xc0, 0x51, 0x2a, 0x22, 0xff, 0x03,
+	0xdb, 0xed, 0x68, 0x36, 0x69, 0x1f, 0xcc, 0xb3, 0x57, 0xf9, 0xad, 0xe8, 0xa5, 0x22, 0x42, 0x1b,
+	0x08, 0xfc, 0x0e, 0xdc, 0xdf, 0xf4, 0x15, 0x09, 0x3a, 0xf6, 0x77, 0x6c, 0x9f, 0x07, 0xb3, 0x49,
+	0xfb, 0xa3, 0x35, 0xf9, 0x9e, 0xa0, 0x63, 0xf4, 0x36, 0x10, 0x9e, 0x83, 0x16, 0xa1, 0x25, 0x57,
+	0x42, 0x8e, 0x31, 0xa7, 0xca, 0xdf, 0x3d, 0x69, 0x9c, 0x7a, 0xbd, 0x60, 0x3a, 0x69, 0x37, 0xcf,
+	0x6b, 0xfc, 0xea, 0x52, 0xcd, 0x26, 0xed, 0x26, 0x59, 0x86, 0x68, 0x19, 0x50, 0xd5, 0xc9, 0xc1,
+	0xfe, 0xca, 0x1c, 0x6c, 0xd7, 0x4f, 0x00, 0xc8, 0xe4, 0xdc, 0x62, 0x35, 0x13, 0xe4, 0x65, 0xb2,
+	0x56, 0x87, 0x8f, 0x81, 0x97, 0x49, 0xac, 0x78, 0x92, 0x33, 0x59, 0x8f, 0x64, 0x2f, 0x93, 0x03,
+	0x1b, 0xc3, 0x36, 0x68, 0x4a, 0xdb, 0x09, 0x53, 0xa2, 0x89, 0x9d, 0x8a, 0x87, 0x40, 0x05, 0x5d,
+	0x12, 0x4d, 0x3a, 0x7f, 0x39, 0x6f, 0x08, 0x1a, 0x6c, 0x75, 0x8c, 0xce, 0x9b, 0x63, 0x7c, 0x0c,
+	0x3c, 0x23, 0x84, 0xcd, 0x02, 0x5a, 0xad, 0x6d, 0xb4, 0x67, 0x80, 0x9b, 0x71, 0xc1, 0xe0, 0xcf,
+	0x0b, 0x2d, 0x7b, 0x81, 0x46, 0xab, 0x79, 0xf6, 0xcd, 0x7b, 0xee, 0x67, 0x77, 0xed, 0xeb, 0xe7,
+	0x66, 0xcd, 0xb9, 0xa3, 0xc1, 0xc3, 0x7e, 0x4e, 0x85, 0x54, 0x8c, 0x9e, 0x2f, 0xa9, 0x8b, 0x95,
+	0xdd, 0xa9, 0x4a, 0xad, 0xe9, 0x16, 0xaa, 0x23, 0xb3, 0xb2, 0xc6, 0x22, 0xd1, 0x43, 0x59, 0x79,
+	0x6e, 0xa1, 0x25, 0x00, 0x3f, 0x05, 0x2d, 0x13, 0xf0, 0x3c, 0xc1, 0x31, 0x93, 0xda, 0xba, 0x6e,
+	0xa1, 0x66, 0x8d, 0x5d, 0x30, 0xa9, 0x3b, 0x4f, 0xc1, 0xe1, 0xe0, 0xc5, 0x8f, 0xfd, 0x8b, 0xb3,
+	0x67, 0xcf, 0x07, 0x0b, 0xde, 0x87, 0xc0, 0x4d, 0x46, 0xf5, 0x30, 0xdc, 0x64, 0x64, 0xe3, 0x71,
+	0x7d, 0xfd, 0x6e, 0x32, 0xee, 0xfc, 0xd3, 0x00, 0x07, 0xd7, 0xeb, 0xdb, 0x16, 0x82, 0x23, 0x95,
+	0x8c, 0x30, 0x2b, 0x38, 0xc5, 0x89, 0x14, 0xc3, 0x02, 0xdf, 0xa6, 0x24, 0x51, 0xb6, 0xcd, 0x3d,
+	0x74, 0xa8, 0x92, 0x51, 0xbf, 0xe0, 0xf4, 0x85, 0xc9, 0x7c, 0x6b, 0x12, 0xf0, 0x4b, 0xe0, 0x1b,
+	0x82, 0x8e, 0x23, 0xcc, 0x4a, 0x92, 0x0e, 0xed, 0xf7, 0xd6, 0x24, 0xd7, 0x92, 0x8e, 0x55, 0x32,
+	0xba, 0x89, 0xa3, 0xfe, 0x22, 0x5b, 0x11, 0xbf, 0x00, 0x47, 0x85, 0x62, 0x9b, 0xa4, 0x86, 0x25,
+	0xc1, 0x42, 0xb1, 0x75, 0xc6, 0xd7, 0xe0, 0x51, 0x4a, 0xcc, 0x9d, 0x62, 0xf6, 0x72, 0xc8, 0x4b,
+	0x92, 0xb2, 0x5c, 0x5b, 0xe1, 0x42, 0x95, 0x79, 0xf5, 0x46, 0xd1, 0x83, 0xaa, 0xa2, 0xbf, 0x28,
+	0xb8, 0x89, 0xa3, 0x6b, 0x55, 0xe6, 0xf0, 0x73, 0x70, 0x58, 0x93, 0x8d, 0x2a, 0x57, 0xa5, 0xe1,
+	0xd8, 0x97, 0x88, 0xf6, 0xab, 0xc4, 0xb5, 0x62, 0x57, 0x16, 0x86, 0x9f, 0x81, 0xfd, 0x45, 0x2d,
+	0x25, 0xd8, 0x54, 0xda, 0xb7, 0x86, 0xee, 0xcd, 0x2b, 0x29, 0x19, 0x94, 0x39, 0x84, 0x60, 0x7b,
+	0xc4, 0x38, 0xf5, 0x77, 0xad, 0x65, 0x7b, 0x86, 0x07, 0xa0, 0x91, 0x70, 0xea, 0xef, 0x59, 0xc8,
+	0x1c, 0xa1, 0x06, 0xc7, 0xf6, 0x4a, 0xe3, 0xb3, 0x67, 0xcf, 0xf1, 0x62, 0xac, 0x58, 0xfb, 0x9e,
+	0x5d, 0xbf, 0xf3, 0xf7, 0x5d, 0xbf, 0x8d, 0x49, 0x23, 0x68, 0xc6, 0x12, 0xaf, 0x42, 0x37, 0x3d,
+	0xf6, 0xea, 0xbf, 0x60, 0xeb, 0xcf, 0x69, 0xe0, 0xbc, 0x9a, 0x06, 0xce, 0xeb, 0x69, 0xe0, 0xfc,
+	0x3b, 0x0d, 0x9c, 0x3f, 0xee, 0x82, 0xad, 0xd7, 0x77, 0xc1, 0xd6, 0xdf, 0x77, 0xc1, 0xd6, 0x4f,
+	0x17, 0x09, 0xd7, 0xbf, 0x0c, 0xa3, 0x6e, 0x2c, 0xb2, 0x50, 0xc5, 0x52, 0xa7, 0x24, 0x52, 0xe1,
+	0xc0, 0x7a, 0xf9, 0x9e, 0xe9, 0xdf, 0x84, 0xfc, 0x35, 0x1c, 0xbd, 0xeb, 0x7f, 0x1f, 0xed, 0xd8,
+	0x9f, 0xf3, 0xd3, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0xbc, 0xb3, 0x1e, 0x21, 0x20, 0x06, 0x00,
+	0x00,
 }
 
 func (this *QuoteReport) Equal(that interface{}) bool {