Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: update proto #25

Merged
merged 1 commit into from
Aug 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ grpc = []
# @@protoc_deletion_point(features)
# This section is automatically generated by protoc-gen-prost-crate.
# Changes in this area may be lost on regeneration.
proto_full = ["amino","capability_v1","cosmos_app_runtime_v1alpha1","cosmos_app_v1alpha1","cosmos_auth_module_v1","cosmos_auth_v1beta1","cosmos_authz_module_v1","cosmos_authz_v1beta1","cosmos_autocli_v1","cosmos_bank_module_v1","cosmos_bank_v1beta1","cosmos_base_abci_v1beta1","cosmos_base_kv_v1beta1","cosmos_base_node_v1beta1","cosmos_base_query_v1beta1","cosmos_base_reflection_v1beta1","cosmos_base_reflection_v2alpha1","cosmos_base_snapshots_v1beta1","cosmos_base_store_v1beta1","cosmos_base_tendermint_v1beta1","cosmos_base_v1beta1","cosmos_capability_module_v1","cosmos_capability_v1beta1","cosmos_consensus_module_v1","cosmos_consensus_v1","cosmos_crisis_module_v1","cosmos_crisis_v1beta1","cosmos_crypto_ed25519","cosmos_crypto_hd_v1","cosmos_crypto_keyring_v1","cosmos_crypto_multisig","cosmos_crypto_multisig_v1beta1","cosmos_crypto_secp256k1","cosmos_crypto_secp256r1","cosmos_distribution_module_v1","cosmos_distribution_v1beta1","cosmos_evidence_module_v1","cosmos_evidence_v1beta1","cosmos_feegrant_module_v1","cosmos_feegrant_v1beta1","cosmos_genutil_module_v1","cosmos_genutil_v1beta1","cosmos_gov_module_v1","cosmos_gov_v1","cosmos_gov_v1beta1","cosmos_group_module_v1","cosmos_group_v1","cosmos_ics23_v1","cosmos_mint_module_v1","cosmos_mint_v1beta1","cosmos_msg_v1","cosmos_orm_module_v1alpha1","cosmos_orm_query_v1alpha1","cosmos_orm_v1","cosmos_orm_v1alpha1","cosmos_params_module_v1","cosmos_params_v1beta1","cosmos_query_v1","cosmos_reflection_v1","cosmos_slashing_module_v1","cosmos_slashing_v1beta1","cosmos_staking_module_v1","cosmos_staking_v1beta1","cosmos_tx_config_v1","cosmos_tx_signing_v1beta1","cosmos_tx_v1beta1","cosmos_upgrade_module_v1","cosmos_upgrade_v1beta1","cosmos_vesting_module_v1","cosmos_vesting_v1beta1","cosmos_proto","ethermint_crypto_v1_ethsecp256k1","ethermint_evm_v1","ethermint_feemarket_v1","ethermint_types_v1","evmos_epochs_v1","evmos_erc20_v1","haqq_coinomics_v1","haqq_dao_module_v1","haqq_dao_v1","haqq_liquidvesting_v1","haqq_vesting_v1","ibc_applications_fee_v1","ibc_applications_interchain_accounts_controller_v1","ibc_applications_interchain_accounts_genesis_v1","ibc_applications_interchain_accounts_host_v1","ibc_applications_interchain_accounts_v1","ibc_applications_transfer_v1","ibc_applications_transfer_v2","ibc_core_channel_v1","ibc_core_client_v1","ibc_core_commitment_v1","ibc_core_connection_v1","ibc_core_types_v1","ibc_lightclients_localhost_v2","ibc_lightclients_solomachine_v2","ibc_lightclients_solomachine_v3","ibc_lightclients_tendermint_v1","tendermint_abci","tendermint_crypto","tendermint_libs_bits","tendermint_p2p","tendermint_types","tendermint_version"]
proto_full = ["amino","capability_v1","cosmos_app_runtime_v1alpha1","cosmos_app_v1alpha1","cosmos_auth_module_v1","cosmos_auth_v1beta1","cosmos_authz_module_v1","cosmos_authz_v1beta1","cosmos_autocli_v1","cosmos_bank_module_v1","cosmos_bank_v1beta1","cosmos_base_abci_v1beta1","cosmos_base_kv_v1beta1","cosmos_base_node_v1beta1","cosmos_base_query_v1beta1","cosmos_base_reflection_v1beta1","cosmos_base_reflection_v2alpha1","cosmos_base_snapshots_v1beta1","cosmos_base_store_v1beta1","cosmos_base_tendermint_v1beta1","cosmos_base_v1beta1","cosmos_capability_module_v1","cosmos_capability_v1beta1","cosmos_consensus_module_v1","cosmos_consensus_v1","cosmos_crisis_module_v1","cosmos_crisis_v1beta1","cosmos_crypto_ed25519","cosmos_crypto_hd_v1","cosmos_crypto_keyring_v1","cosmos_crypto_multisig","cosmos_crypto_multisig_v1beta1","cosmos_crypto_secp256k1","cosmos_crypto_secp256r1","cosmos_distribution_module_v1","cosmos_distribution_v1beta1","cosmos_evidence_module_v1","cosmos_evidence_v1beta1","cosmos_feegrant_module_v1","cosmos_feegrant_v1beta1","cosmos_genutil_module_v1","cosmos_genutil_v1beta1","cosmos_gov_module_v1","cosmos_gov_v1","cosmos_gov_v1beta1","cosmos_group_module_v1","cosmos_group_v1","cosmos_ics23_v1","cosmos_mint_module_v1","cosmos_mint_v1beta1","cosmos_msg_v1","cosmos_orm_module_v1alpha1","cosmos_orm_query_v1alpha1","cosmos_orm_v1","cosmos_orm_v1alpha1","cosmos_params_module_v1","cosmos_params_v1beta1","cosmos_query_v1","cosmos_reflection_v1","cosmos_slashing_module_v1","cosmos_slashing_v1beta1","cosmos_staking_module_v1","cosmos_staking_v1beta1","cosmos_tx_config_v1","cosmos_tx_signing_v1beta1","cosmos_tx_v1beta1","cosmos_upgrade_module_v1","cosmos_upgrade_v1beta1","cosmos_vesting_module_v1","cosmos_vesting_v1beta1","cosmos_proto","ethermint_crypto_v1_ethsecp256k1","ethermint_evm_v1","ethermint_feemarket_v1","ethermint_types_v1","evmos_epochs_v1","evmos_erc20_v1","haqq_coinomics_v1","haqq_liquidvesting_v1","haqq_ucdao_module_v1","haqq_ucdao_v1","haqq_vesting_v1","ibc_applications_fee_v1","ibc_applications_interchain_accounts_controller_v1","ibc_applications_interchain_accounts_genesis_v1","ibc_applications_interchain_accounts_host_v1","ibc_applications_interchain_accounts_v1","ibc_applications_transfer_v1","ibc_applications_transfer_v2","ibc_core_channel_v1","ibc_core_client_v1","ibc_core_commitment_v1","ibc_core_connection_v1","ibc_core_types_v1","ibc_lightclients_localhost_v2","ibc_lightclients_solomachine_v2","ibc_lightclients_solomachine_v3","ibc_lightclients_tendermint_v1","tendermint_abci","tendermint_crypto","tendermint_libs_bits","tendermint_p2p","tendermint_types","tendermint_version"]
amino = []
capability_v1 = []
cosmos_app_runtime_v1alpha1 = []
Expand Down Expand Up @@ -126,9 +126,9 @@ ethermint_types_v1 = ["cosmos_auth_v1beta1"]
evmos_epochs_v1 = ["cosmos_base_query_v1beta1"]
evmos_erc20_v1 = ["cosmos_bank_v1beta1","cosmos_base_query_v1beta1","cosmos_base_v1beta1"]
haqq_coinomics_v1 = ["cosmos_base_v1beta1"]
haqq_dao_module_v1 = []
haqq_dao_v1 = ["cosmos_base_query_v1beta1","cosmos_base_v1beta1"]
haqq_liquidvesting_v1 = ["cosmos_base_query_v1beta1","cosmos_base_v1beta1","cosmos_vesting_v1beta1"]
haqq_ucdao_module_v1 = []
haqq_ucdao_v1 = ["cosmos_base_query_v1beta1","cosmos_base_v1beta1"]
haqq_vesting_v1 = ["cosmos_base_v1beta1","cosmos_vesting_v1beta1"]
ibc_applications_fee_v1 = ["cosmos_base_query_v1beta1","cosmos_base_v1beta1","ibc_core_channel_v1"]
ibc_applications_interchain_accounts_controller_v1 = ["ibc_applications_interchain_accounts_v1"]
Expand Down
2 changes: 1 addition & 1 deletion haqq-node
Submodule haqq-node updated 42 files
+1 −1 Makefile
+2 −1 app/ante/cosmos/fees_test.go
+13 −5 app/ante/integration_test.go
+7 −65 app/app.go
+0 −257 app/upgrades/v1.6.0/accounts.go
+0 −6 app/upgrades/v1.6.0/constants.go
+0 −97 app/upgrades/v1.6.0/tombstone.go
+0 −89 app/upgrades/v1.6.0/upgrades.go
+0 −9,127 app/upgrades/v1.6.1/accounts.go
+0 −62 app/upgrades/v1.6.1/upgrades.go
+0 −6 app/upgrades/v1.6.2/accounts.go
+0 −6 app/upgrades/v1.6.2/constants.go
+0 −38 app/upgrades/v1.6.2/evergreen.go
+0 −36 app/upgrades/v1.6.2/upgrades.go
+0 −43 app/upgrades/v1.6.2/vesting.go
+0 −6 app/upgrades/v1.6.3/constants.go
+0 −6 app/upgrades/v1.6.4/constants.go
+0 −73 app/upgrades/v1.6.4/upgrades.go
+2 −2 app/upgrades/v1.7.8/constants.go
+3 −3 app/upgrades/v1.7.8/upgrades.go
+1 −1 client/docs/statik/statik.go
+469 −0 client/docs/swagger-ui/swagger.json
+13 −13 go.mod
+32 −27 go.sum
+26 −26 gomod2nix.toml
+2 −2 proto/haqq/ucdao/module/v1/module.proto
+4 −4 proto/haqq/ucdao/v1/genesis.proto
+10 −10 proto/haqq/ucdao/v1/query.proto
+6 −6 proto/haqq/ucdao/v1/tx.proto
+1 −1 proto/haqq/ucdao/v1/ucdao.proto
+5 −0 testutil/abci.go
+4 −3 testutil/integration.go
+10 −2 testutil/tx/cosmos.go
+16 −12 x/erc20/keeper/integration_test.go
+20 −16 x/feemarket/keeper/integration_test.go
+24 −17 x/ucdao/keeper/integration_test.go
+2 −0 x/ucdao/types/codec.go
+36 −36 x/ucdao/types/genesis.pb.go
+81 −81 x/ucdao/types/query.pb.go
+5 −5 x/ucdao/types/query.pb.gw.go
+55 −55 x/ucdao/types/tx.pb.go
+73 −73 x/ucdao/types/ucdao.pb.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ pub struct Module {
/// Defaults to 5000 if not explicitly set.
#[prost(uint64, tag="1")]
pub max_metadata_len: u64,
/// authority defines the custom module authority. If not set, defaults to the dao module.
/// authority defines the custom module authority. If not set, defaults to the ucdao module.
#[prost(string, tag="2")]
pub authority: ::prost::alloc::string::String,
}
include!("haqq.dao.module.v1.serde.rs");
include!("haqq.ucdao.module.v1.serde.rs");
// @@protoc_insertion_point(module)
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ impl serde::Serialize for Module {
if !self.authority.is_empty() {
len += 1;
}
let mut struct_ser = serializer.serialize_struct("haqq.dao.module.v1.Module", len)?;
let mut struct_ser = serializer.serialize_struct("haqq.ucdao.module.v1.Module", len)?;
if self.max_metadata_len != 0 {
#[allow(clippy::needless_borrow)]
struct_ser.serialize_field("maxMetadataLen", ToString::to_string(&self.max_metadata_len).as_str())?;
Expand Down Expand Up @@ -75,7 +75,7 @@ impl<'de> serde::Deserialize<'de> for Module {
type Value = Module;

fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
formatter.write_str("struct haqq.dao.module.v1.Module")
formatter.write_str("struct haqq.ucdao.module.v1.Module")
}

fn visit_map<V>(self, mut map_: V) -> std::result::Result<Module, V::Error>
Expand Down Expand Up @@ -108,6 +108,6 @@ impl<'de> serde::Deserialize<'de> for Module {
})
}
}
deserializer.deserialize_struct("haqq.dao.module.v1.Module", FIELDS, GeneratedVisitor)
deserializer.deserialize_struct("haqq.ucdao.module.v1.Module", FIELDS, GeneratedVisitor)
}
}
18 changes: 9 additions & 9 deletions src/gen/haqq.dao.v1.rs → src/gen/haqq.ucdao.v1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ pub struct GenesisState {
/// params defines all the parameters of the module.
#[prost(message, optional, tag="1")]
pub params: ::core::option::Option<Params>,
/// balances is an array containing the balances of all the dao members' accounts.
/// balances is an array containing the balances of all the ucdao members' accounts.
#[prost(message, repeated, tag="2")]
pub balances: ::prost::alloc::vec::Vec<Balance>,
/// total_balance represents the total balance of the dao module. If it is left empty, then supply will be calculated based on the provided
/// total_balance represents the total balance of the ucdao module. If it is left empty, then supply will be calculated based on the provided
/// balances. Otherwise, it will be used to validate that the sum of the balances equals this amount.
#[prost(message, repeated, tag="3")]
pub total_balance: ::prost::alloc::vec::Vec<super::super::super::cosmos::base::v1beta1::Coin>,
Expand Down Expand Up @@ -157,21 +157,21 @@ pub struct QueryTotalBalanceResponse {
#[prost(message, optional, tag="2")]
pub pagination: ::core::option::Option<super::super::super::cosmos::base::query::v1beta1::PageResponse>,
}
/// QueryParamsRequest defines the request type for querying x/dao parameters.
/// QueryParamsRequest defines the request type for querying x/ucdao parameters.
#[derive(::derive_builder::Builder)]
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct QueryParamsRequest {
}
/// QueryParamsResponse defines the response type for querying x/dao parameters.
/// QueryParamsResponse defines the response type for querying x/ucdao parameters.
#[derive(::derive_builder::Builder)]
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct QueryParamsResponse {
#[prost(message, optional, tag="1")]
pub params: ::core::option::Option<Params>,
}
/// MsgFund allows an account to directly fund the dao.
/// MsgFund allows an account to directly fund the ucdao.
#[derive(::derive_builder::Builder)]
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
Expand All @@ -192,10 +192,10 @@ pub struct MsgFundResponse {
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct MsgTransferOwnership {
/// owner is a current owner of the shares in dao.
/// owner is a current owner of the shares in ucdao.
#[prost(string, tag="1")]
pub owner: ::prost::alloc::string::String,
/// new_owner is a new owner of the shares in dao.
/// new_owner is a new owner of the shares in ucdao.
#[prost(string, tag="2")]
pub new_owner: ::prost::alloc::string::String,
}
Expand All @@ -205,6 +205,6 @@ pub struct MsgTransferOwnership {
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct MsgTransferOwnershipResponse {
}
include!("haqq.dao.v1.serde.rs");
include!("haqq.dao.v1.tonic.rs");
include!("haqq.ucdao.v1.serde.rs");
include!("haqq.ucdao.v1.tonic.rs");
// @@protoc_insertion_point(module)
Loading